diff --git a/Gemfile.lock b/Gemfile.lock index 2913272b71..1937b53eb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,7 +11,7 @@ GEM specs: ast (2.4.3) diff-lcs (1.6.2) - json (2.19.9) + json (2.20.0) language_server-protocol (3.17.0.5) lint_roller (1.1.0) parallel (2.1.0) diff --git a/acceptance-tests/go.mod b/acceptance-tests/go.mod index 5ed844fa61..36bc823be1 100644 --- a/acceptance-tests/go.mod +++ b/acceptance-tests/go.mod @@ -3,9 +3,9 @@ module github.com/cloudfoundry/bosh-linux-stemcell-builder/acceptance-tests go 1.25.0 require ( - github.com/cloudfoundry/bosh-utils v0.0.622 - github.com/onsi/ginkgo/v2 v2.30.0 - github.com/onsi/gomega v1.42.0 + github.com/cloudfoundry/bosh-utils v0.0.623 + github.com/onsi/ginkgo/v2 v2.31.0 + github.com/onsi/gomega v1.42.1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/acceptance-tests/go.sum b/acceptance-tests/go.sum index 6ca3aacb72..b2c7cc44c4 100644 --- a/acceptance-tests/go.sum +++ b/acceptance-tests/go.sum @@ -2,8 +2,8 @@ github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAw github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0= github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= -github.com/cloudfoundry/bosh-utils v0.0.622 h1:bNlURpKNiUOj+oaDdLekKfj15vHDA65tAdI9FRxX3H0= -github.com/cloudfoundry/bosh-utils v0.0.622/go.mod h1:XIgOJw+fCd+6fJd2yGbw/+I7DmHGeSbuOMZtV5ny+ZI= +github.com/cloudfoundry/bosh-utils v0.0.623 h1:mShY5jdn1pTuE0XcRBeeLqSuVLpenUX0u29drPkc9p0= +github.com/cloudfoundry/bosh-utils v0.0.623/go.mod h1:f/F2fvvtk50Kv6M13gDok4G4gONDVEyapdAiCcavF64= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs= @@ -34,10 +34,10 @@ github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3v github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= -github.com/onsi/ginkgo/v2 v2.30.0 h1:zxM/9XneXFIy64j6/wAmBIX4zRC7Hu6U8XFNZvDnCQc= -github.com/onsi/ginkgo/v2 v2.30.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= -github.com/onsi/gomega v1.42.0 h1:CJby8u36xb7v34W78F8WKvqTQP7PCMIPB78IVDB73l4= -github.com/onsi/gomega v1.42.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= +github.com/onsi/ginkgo/v2 v2.31.0 h1:GtuJos5DFUV9EerYJo8RhYxosYNGvOdDE5haKq6Grfs= +github.com/onsi/ginkgo/v2 v2.31.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= +github.com/onsi/gomega v1.42.1 h1:iN1rCUX+44NZ1Dc97MPoeFYbFR0vh8zxoxMFwKdyZ6I= +github.com/onsi/gomega v1.42.1/go.mod h1:REff/hsDsodHoKlWsP2mAPhu1+5/6hVYNf9rIEBpeSg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= @@ -68,9 +68,8 @@ golang.org/x/tools v0.46.0 h1:7jTurBkPZu4moS/Uy4OQT1M+QBlsj3wejyZwsT8Z7rk= golang.org/x/tools v0.46.0/go.mod h1:FrD85F8l+NWL+9XWBSyVSHO6Ne4jutsfIFba7AWQ5Ys= google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A= google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/acceptance-tests/ipv4director/smoke/smoke_suite_test.go b/acceptance-tests/ipv4director/smoke/smoke_suite_test.go index beb52552c0..e199e1f7a2 100644 --- a/acceptance-tests/ipv4director/smoke/smoke_suite_test.go +++ b/acceptance-tests/ipv4director/smoke/smoke_suite_test.go @@ -22,11 +22,11 @@ var _ = BeforeSuite(func() { bosh = testhelpers.NewBOSH() stemcellPath := testhelpers.RequireEnv("STEMCELL_PATH") syslogReleasePath := testhelpers.RequireEnv("SYSLOG_RELEASE_PATH") - osConfReleasePath := testhelpers.RequireEnv("OS_CONF_RELEASE_PATH") + bpmReleasePath := testhelpers.RequireEnv("BPM_RELEASE_PATH") bosh.UploadStemcell(stemcellPath) bosh.UploadRelease(syslogReleasePath) - bosh.UploadRelease(osConfReleasePath) + bosh.UploadRelease(bpmReleasePath) bosh.SafeDeploy() }) diff --git a/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md b/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md index 689c03cfcd..fe25998c6d 100644 --- a/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md +++ b/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md @@ -1,3 +1,12 @@ +## 2.31.0 + +Add a bunch of Claude Skills via the marketplace: + +``` +/plugin marketplace add onsi/ginkgo +/plugin install ginkgo@ginkgo +``` + ## 2.30.0 ### Features diff --git a/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/README.md b/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/README.md index 6d36e377eb..ad5e45f673 100644 --- a/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/README.md +++ b/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/README.md @@ -106,6 +106,19 @@ And that's just Ginkgo! [Gomega](https://onsi.github.io/gomega/) brings a rich, Happy Testing! +## Using Ginkgo with Claude Code + +Ginkgo ships a set of [Claude Code](https://claude.com/claude-code) skills as a plugin, with this repo doubling as the marketplace, so an agent writing specs in *your* project has Ginkgo's idioms, decorators, and gotchas on hand. From inside Claude Code: + +``` +/plugin marketplace add onsi/ginkgo +/plugin install ginkgo@ginkgo +``` + +(or non-interactively: `claude plugin marketplace add onsi/ginkgo` then `claude plugin install ginkgo@ginkgo`) + +This installs a family of `ginkgo:*` skills that activate automatically while you write and run specs. Start with `ginkgo:overview`; see the [plugin README](plugins/ginkgo/README.md) for the full list. + ## License Ginkgo is MIT-Licensed diff --git a/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/types/version.go b/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/types/version.go index 52e99f1edd..1b43092c22 100644 --- a/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/types/version.go +++ b/acceptance-tests/vendor/github.com/onsi/ginkgo/v2/types/version.go @@ -1,3 +1,3 @@ package types -const VERSION = "2.30.0" +const VERSION = "2.31.0" diff --git a/acceptance-tests/vendor/github.com/onsi/gomega/CHANGELOG.md b/acceptance-tests/vendor/github.com/onsi/gomega/CHANGELOG.md index e7601cfde9..7cd26c2ce3 100644 --- a/acceptance-tests/vendor/github.com/onsi/gomega/CHANGELOG.md +++ b/acceptance-tests/vendor/github.com/onsi/gomega/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.42.1 + +Bump Dependencies + ## 1.42.0 Add a set of Claude skill as a marketplace plugin diff --git a/acceptance-tests/vendor/github.com/onsi/gomega/gomega_dsl.go b/acceptance-tests/vendor/github.com/onsi/gomega/gomega_dsl.go index 967d90d0d5..db84085be8 100644 --- a/acceptance-tests/vendor/github.com/onsi/gomega/gomega_dsl.go +++ b/acceptance-tests/vendor/github.com/onsi/gomega/gomega_dsl.go @@ -22,7 +22,7 @@ import ( "github.com/onsi/gomega/types" ) -const GOMEGA_VERSION = "1.42.0" +const GOMEGA_VERSION = "1.42.1" const nilGomegaPanic = `You are trying to make an assertion, but haven't registered Gomega's fail handler. If you're using Ginkgo then you probably forgot to put your assertion in an It(). diff --git a/acceptance-tests/vendor/modules.txt b/acceptance-tests/vendor/modules.txt index bd4ea0487d..b0705e5b0f 100644 --- a/acceptance-tests/vendor/modules.txt +++ b/acceptance-tests/vendor/modules.txt @@ -4,7 +4,7 @@ github.com/Masterminds/semver/v3 # github.com/bmatcuk/doublestar v1.3.4 ## explicit; go 1.12 github.com/bmatcuk/doublestar -# github.com/cloudfoundry/bosh-utils v0.0.622 +# github.com/cloudfoundry/bosh-utils v0.0.623 ## explicit; go 1.25.0 github.com/cloudfoundry/bosh-utils/errors github.com/cloudfoundry/bosh-utils/logger @@ -26,7 +26,7 @@ github.com/google/go-cmp/cmp/internal/value # github.com/google/pprof v0.0.0-20260604005048-7023385849c0 ## explicit; go 1.24.0 github.com/google/pprof/profile -# github.com/onsi/ginkgo/v2 v2.30.0 +# github.com/onsi/ginkgo/v2 v2.31.0 ## explicit; go 1.25.0 github.com/onsi/ginkgo/v2 github.com/onsi/ginkgo/v2/config @@ -50,8 +50,8 @@ github.com/onsi/ginkgo/v2/internal/reporters github.com/onsi/ginkgo/v2/internal/testingtproxy github.com/onsi/ginkgo/v2/reporters github.com/onsi/ginkgo/v2/types -# github.com/onsi/gomega v1.42.0 -## explicit; go 1.24.0 +# github.com/onsi/gomega v1.42.1 +## explicit; go 1.25.0 github.com/onsi/gomega github.com/onsi/gomega/format github.com/onsi/gomega/internal diff --git a/ci/configure.sh b/ci/configure.sh index e9269e0acf..7145a4c031 100755 --- a/ci/configure.sh +++ b/ci/configure.sh @@ -27,7 +27,7 @@ rendered_template="$(ytt -f "${pipelines_dir}/${pipeline_template}" -f "${pipeli echo "" echo "Validating..." -fly validate-pipeline --strict --config <(echo "${rendered_template}") +"${fly}" validate-pipeline --strict --config <(echo "${rendered_template}") echo "" echo "Configuring..." diff --git a/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 index e9fc1e8087..6b27b19625 100644 --- a/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 +++ b/image-metalinks/ubuntu-jammy/ubuntu-jammy.meta4 @@ -1,22 +1,22 @@ - 5b34b19cc1715454577a7a3a703a9328cd6f135807c20420a5c9c0d3d8072fdf13fa83a500aa123ea07092cd882c4db15fd5b608a39bd0a568508415f3289337 - 0a784956dd3d4788d3da139beb8aec25346ae5453158241788719ade84f5cfcd - 3a9b69fe3be1247c7f17a8fc6af6e692d361dcbe - d125b502c543659eb29dc5f20322c696 - 435234438 + 725ee84eb6fa20e6b59d1cebd876f8ce740ebba380eba13834e0b19fa03ca8845de7d7331443be8cc71bb1e997b1bc42ea1bb1338ed439e36e681e600bb033d7 + fbe179e42fd3433a5a2548dde5b410474ec7b1e4c10e4dcb614df259840c0338 + 627b68931f348b58f0b137cebc1189d36e4b69ab + 21091554f8a0ae5ba5e4fa946d2f1c37 + 435266580 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz - 1114.0.0 + 1118.0.0 - 8fb4b6e9b9f2469249a8f20ee65a56dbdd663bf7b3eee14e49fefeaa8dc5826c553a9dc81b2af4cb56a1ff29cc18c5cc8610b2ca670ef647fedd4c9645a6db02 - 3f6e5e7d27eca945fe908f06f9ae1c9775cb9a4d57f0e3b0aa2ee01735ab5d15 - 79e5158fb4aa4e628569e5deb6f6f5343b348a4d - a1ad3da61ce7f95f9ca6a247f554a59d - 2177 + 46b54c2d589ad07eb295ab8c04c0ee727775a4e100bb2cd58f69635a3869b381bafeb0dc983b03294cdcc98157b797caf2e62d0310949a03f1bec293d5583991 + 12c1652109a03a8944ff657af0af2382347ad48d828b082af260e2935c8d7e18 + da2b934d80a2dc5839ef7386166994bcb0ecbaf4 + 7e19aada93393d7f3821b50dc345f036 + 4020 https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json - 1114.0.0 + 1118.0.0 metalink-repository-resource/0.0.0 - 2026-06-23T15:53:48.286667201Z + 2026-06-30T11:28:28.275858916Z diff --git a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.sha256sum b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.sha256sum index c1cb8332f3..928e91ea18 100644 --- a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.sha256sum +++ b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.sha256sum @@ -1 +1 @@ -9477c6a0aa2578d3d7f4f61d7dbdd98ffc52fd5721fc627b5fc0a98120ad84bb +fd094f2cd94a35fdfe0871163e987500295ac1c6fbab495ad254b094dd6dfc8a diff --git a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.url b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.url index 2313d1e15d..9f9e0b01f7 100644 --- a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.url +++ b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.url @@ -1 +1 @@ -https://bosh-azure-storage-cli-artifacts.s3.us-east-1.amazonaws.com/azure-storage-cli-0.0.240-linux-amd64 +https://bosh-azure-storage-cli-artifacts.s3.us-east-1.amazonaws.com/azure-storage-cli-0.0.242-linux-amd64 diff --git a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.version b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.version index 11be9708f2..ca22300819 100644 --- a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.version +++ b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-azure-storage.version @@ -1 +1 @@ -0.0.240 +0.0.242 diff --git a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.sha256sum b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.sha256sum index a7d11b40a4..3013fe1281 100644 --- a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.sha256sum +++ b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.sha256sum @@ -1 +1 @@ -707d2f94846d4d8974c506779a7436fd09711e268911956c5153fbd397c05999 +3367c115ec4968a5660bdba20c658afe6eeb8e29a5739ae89a00451a13690e1a diff --git a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.url b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.url index 0af16f0ee8..869de84630 100644 --- a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.url +++ b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.url @@ -1 +1 @@ -https://bosh-davcli-artifacts.s3.us-east-1.amazonaws.com/davcli-0.0.484-linux-amd64 +https://bosh-davcli-artifacts.s3.us-east-1.amazonaws.com/davcli-0.0.485-linux-amd64 diff --git a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.version b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.version index 05711ac2a1..51bd9dc5a4 100644 --- a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.version +++ b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-dav.version @@ -1 +1 @@ -0.0.484 +0.0.485 diff --git a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.sha256sum b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.sha256sum index 5ac3af4201..2e5d4a8242 100644 --- a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.sha256sum +++ b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.sha256sum @@ -1 +1 @@ -33ade69acc6f7494d6750c32c7c8aebfa96fed56c7da962d63f36c124d56d98a +8c8c9c501644d29b875ac73b1b737a443f9ab50f732c387e07090a78a12c32bf diff --git a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.url b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.url index 45be1c8184..4e7cebc39f 100644 --- a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.url +++ b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.url @@ -1 +1 @@ -https://bosh-s3cli-artifacts.s3.us-east-1.amazonaws.com/s3cli-0.0.411-linux-amd64 +https://bosh-s3cli-artifacts.s3.us-east-1.amazonaws.com/s3cli-0.0.412-linux-amd64 diff --git a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.version b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.version index c53a5e3cfa..01b554e66e 100644 --- a/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.version +++ b/stemcell_builder/stages/blobstore_clis/assets/bosh-blobstore-s3.version @@ -1 +1 @@ -0.0.411 +0.0.412 diff --git a/vendor/package/json-2.19.9.gem b/vendor/package/json-2.19.9.gem deleted file mode 100644 index 83c13b156c..0000000000 Binary files a/vendor/package/json-2.19.9.gem and /dev/null differ diff --git a/vendor/package/json-2.20.0.gem b/vendor/package/json-2.20.0.gem new file mode 100644 index 0000000000..8900ad3be1 Binary files /dev/null and b/vendor/package/json-2.20.0.gem differ