From 2860c0ba16ba0eb802b50e940ce5cc953847ef5a Mon Sep 17 00:00:00 2001 From: Arsalan Khan Date: Wed, 17 Apr 2024 13:14:57 +0200 Subject: [PATCH 01/42] configure app memory via make --- ci/autoscaler/scripts/run-acceptance-tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/autoscaler/scripts/run-acceptance-tests.sh b/ci/autoscaler/scripts/run-acceptance-tests.sh index e3b9a87eda..d5801d11df 100755 --- a/ci/autoscaler/scripts/run-acceptance-tests.sh +++ b/ci/autoscaler/scripts/run-acceptance-tests.sh @@ -15,6 +15,7 @@ existing_space="${EXISTING_SPACE:-}" suites=${SUITES:-"api app broker"} ginkgo_opts="${GINKGO_OPTS:-}" nodes="${NODES:-3}" +node_memory_limit="${APP_MEMORY:-128}" performance_app_count="${PERFORMANCE_APP_COUNT:-}" performance_app_percentage_to_scale="${PERFORMANCE_APP_PERCENTAGE_TO_SCALE:-}" performance_setup_workers="${PERFORMANCE_SETUP_WORKERS:-}" @@ -55,7 +56,7 @@ cat > acceptance_config.json < Date: Wed, 17 Apr 2024 17:13:34 +0200 Subject: [PATCH 02/42] test with 64MB test memory --- ci/autoscaler/scripts/run-acceptance-tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/autoscaler/scripts/run-acceptance-tests.sh b/ci/autoscaler/scripts/run-acceptance-tests.sh index d5801d11df..63cb947c89 100755 --- a/ci/autoscaler/scripts/run-acceptance-tests.sh +++ b/ci/autoscaler/scripts/run-acceptance-tests.sh @@ -15,7 +15,7 @@ existing_space="${EXISTING_SPACE:-}" suites=${SUITES:-"api app broker"} ginkgo_opts="${GINKGO_OPTS:-}" nodes="${NODES:-3}" -node_memory_limit="${APP_MEMORY:-128}" +node_memory_limit="${APP_MEMORY:-64}" # debug: change this to 128 performance_app_count="${PERFORMANCE_APP_COUNT:-}" performance_app_percentage_to_scale="${PERFORMANCE_APP_PERCENTAGE_TO_SCALE:-}" performance_setup_workers="${PERFORMANCE_SETUP_WORKERS:-}" @@ -83,6 +83,7 @@ step "running $suites_to_run" #run suites if [ "${suites_to_run}" != "" ]; then # shellcheck disable=SC2086 + echo "using CONFIG: $PWD/acceptance_config.json" SKIP_TEARDOWN=$skip_teardown CONFIG=$PWD/acceptance_config.json DEBUG=true ./bin/test -race -nodes="${nodes}" -trace $ginkgo_opts ${suites_to_run} else log "Nothing to run!" From 20f7f88ed13ad669b87ac125fc35d6b1a8e41388 Mon Sep 17 00:00:00 2001 From: Arsalan Khan Date: Thu, 18 Apr 2024 11:03:04 +0200 Subject: [PATCH 03/42] test with 128MB test memory --- ci/autoscaler/scripts/run-acceptance-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/autoscaler/scripts/run-acceptance-tests.sh b/ci/autoscaler/scripts/run-acceptance-tests.sh index 63cb947c89..bcdd254b96 100755 --- a/ci/autoscaler/scripts/run-acceptance-tests.sh +++ b/ci/autoscaler/scripts/run-acceptance-tests.sh @@ -15,7 +15,7 @@ existing_space="${EXISTING_SPACE:-}" suites=${SUITES:-"api app broker"} ginkgo_opts="${GINKGO_OPTS:-}" nodes="${NODES:-3}" -node_memory_limit="${APP_MEMORY:-64}" # debug: change this to 128 +node_memory_limit="${APP_MEMORY:-128}" # debug: change this to 128 performance_app_count="${PERFORMANCE_APP_COUNT:-}" performance_app_percentage_to_scale="${PERFORMANCE_APP_PERCENTAGE_TO_SCALE:-}" performance_setup_workers="${PERFORMANCE_SETUP_WORKERS:-}" From 889e372546412b6b13d1737a737ffc9956dd6174 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Mon, 29 Apr 2024 16:24:33 +0200 Subject: [PATCH 04/42] Revert "chore(deps): update ubuntu docker tag to v24" (#2911) This reverts commit 66952cedd528109b4f8cb444c57dabd2ba5ce078. --- ci/dockerfiles/autoscaler-tools/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dockerfiles/autoscaler-tools/Dockerfile b/ci/dockerfiles/autoscaler-tools/Dockerfile index 873292e9de..f3680abca5 100644 --- a/ci/dockerfiles/autoscaler-tools/Dockerfile +++ b/ci/dockerfiles/autoscaler-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:noble@sha256:562456a05a0dbd62a671c1854868862a4687bf979a96d48ae8e766642cd911e8 +FROM ubuntu:jammy MAINTAINER autoscaler-team ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London" From 67cfec9e0463d4eea1a45ffd9e41853f7c0eb6e9 Mon Sep 17 00:00:00 2001 From: Arsalan Khan Date: Tue, 30 Apr 2024 15:13:02 +0200 Subject: [PATCH 05/42] remove smoke label from memory test --- src/acceptance/app/dynamic_policy_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/acceptance/app/dynamic_policy_test.go b/src/acceptance/app/dynamic_policy_test.go index 1d2b181997..3ae3f81ec2 100644 --- a/src/acceptance/app/dynamic_policy_test.go +++ b/src/acceptance/app/dynamic_policy_test.go @@ -48,8 +48,8 @@ var _ = Describe("AutoScaler dynamic policy", func() { initialInstanceCount = 1 }) - It("should scale out and then back in.", Label(acceptance.LabelSmokeTests), func() { - By(fmt.Sprintf("Use heap %d mb of heap on app", heapToUse)) + It("should scale out and then back in.", func() { + By(fmt.Sprintf("Use heap %d MB of heap on app", heapToUse)) CurlAppInstance(cfg, appName, 0, fmt.Sprintf("/memory/%d/5", heapToUse)) By("wait for scale to 2") @@ -75,7 +75,7 @@ var _ = Describe("AutoScaler dynamic policy", func() { It("should scale out and back in", func() { heapToUse := min(maxHeapLimitMb, int(float64(cfg.NodeMemoryLimit)*0.80)) - By(fmt.Sprintf("use 80%% or %d of memory in app", heapToUse)) + By(fmt.Sprintf("use 80%% or %d MB of memory in app", heapToUse)) CurlAppInstance(cfg, appName, 0, fmt.Sprintf("/memory/%d/5", heapToUse)) By("Wait for scale to 2 instances") From 1870f4ebb4cd0fa6fa4da87f254b166f57581e82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 10:50:33 +0000 Subject: [PATCH 06/42] chore(deps): update dependency gruntwork-io/terragrunt to v0.58.0 --- ci/terragrunt/.tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/terragrunt/.tool-versions b/ci/terragrunt/.tool-versions index 70670557bc..08891a11ba 100644 --- a/ci/terragrunt/.tool-versions +++ b/ci/terragrunt/.tool-versions @@ -3,4 +3,4 @@ helm 3.14.4 python 3.12.3 terraform 1.8.2 terraform-lsp -terragrunt 0.57.12 +terragrunt 0.58.0 From 475d14668f5c53f6906bcf6bf67e9bff961cd030 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 00:20:16 +0000 Subject: [PATCH 07/42] chore(deps): update dependency act to v0.2.62 --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index b2c12e5d6d..db7e8b72ae 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ -act 0.2.61 +act 0.2.62 actionlint 1.6.27 bosh 7.5.6 cf 8.7.10 From 3ab66d5f1abffd666809f91242f8f91ed9c22e49 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 06:31:36 +0000 Subject: [PATCH 08/42] chore(deps): update ginkgo updates to v2.17.2 --- .tool-versions | 2 +- ci/dockerfiles/autoscaler-tools/Dockerfile | 2 +- src/acceptance/assets/app/go_app/go.mod | 2 +- src/acceptance/go.mod | 6 ++--- src/acceptance/go.sum | 16 +++++------- src/autoscaler/go.mod | 2 +- src/changeloglockcleaner/go.mod | 10 ++++---- src/changeloglockcleaner/go.sum | 30 +++++++++------------- 8 files changed, 30 insertions(+), 40 deletions(-) diff --git a/.tool-versions b/.tool-versions index db7e8b72ae..ddc660fcb5 100644 --- a/.tool-versions +++ b/.tool-versions @@ -5,7 +5,7 @@ cf 8.7.10 concourse 7.11.2 direnv 2.34.0 gcloud 473.0.0 -ginkgo 2.17.1 +ginkgo 2.17.2 golang 1.21.4 golangci-lint 1.57.2 java temurin-21.0.3+9.0.LTS diff --git a/ci/dockerfiles/autoscaler-tools/Dockerfile b/ci/dockerfiles/autoscaler-tools/Dockerfile index f3680abca5..c15d83bc6b 100644 --- a/ci/dockerfiles/autoscaler-tools/Dockerfile +++ b/ci/dockerfiles/autoscaler-tools/Dockerfile @@ -130,7 +130,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages. gcloud version # renovate: datasource=github-releases depName=ginkgo lookupName=onsi/ginkgo -ARG GINKGO_VERSION=v2.17.1 +ARG GINKGO_VERSION=v2.17.2 RUN go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} && \ ginkgo version diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index 27ca9d4fac..d47f36f5f0 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -15,7 +15,7 @@ require ( github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/mitchellh/mapstructure v1.5.0 github.com/ogen-go/ogen v1.1.0 - github.com/onsi/ginkgo/v2 v2.17.1 + github.com/onsi/ginkgo/v2 v2.17.2 github.com/onsi/gomega v1.33.0 github.com/prometheus/procfs v0.14.0 github.com/steinfletcher/apitest v1.5.15 diff --git a/src/acceptance/go.mod b/src/acceptance/go.mod index 5142f4f0aa..e9fdcb3571 100644 --- a/src/acceptance/go.mod +++ b/src/acceptance/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0 - github.com/onsi/ginkgo/v2 v2.17.1 + github.com/onsi/ginkgo/v2 v2.17.2 github.com/onsi/gomega v1.33.0 github.com/stretchr/testify v1.9.0 ) @@ -12,9 +12,9 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.1 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20240416155748-26353dc0451f // indirect + github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect github.com/kr/pretty v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect diff --git a/src/acceptance/go.sum b/src/acceptance/go.sum index 4057e29512..aa65c95abf 100644 --- a/src/acceptance/go.sum +++ b/src/acceptance/go.sum @@ -1,17 +1,16 @@ github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0 h1:TxmjLDCIopHVo8mhp7WrwKvgnsescsDKV/R5ATr8jgI= github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0/go.mod h1:fESCQ1sbdTejVXy9l10zh15R+BhrslRbumYT6F+VtxI= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20240416155748-26353dc0451f h1:WpZiq8iqvGjJ3m3wzAVKL6+0vz7VkE79iSy9GII00II= -github.com/google/pprof v0.0.0-20240416155748-26353dc0451f/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= @@ -20,8 +19,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= -github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -30,8 +29,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= @@ -49,6 +46,5 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index fe6b6064e4..497c1a794f 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -25,7 +25,7 @@ require ( github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d github.com/ogen-go/ogen v1.1.0 - github.com/onsi/ginkgo/v2 v2.17.1 + github.com/onsi/ginkgo/v2 v2.17.2 github.com/onsi/gomega v1.33.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pivotal-cf/brokerapi/v11 v11.0.0 diff --git a/src/changeloglockcleaner/go.mod b/src/changeloglockcleaner/go.mod index d417332704..0e88b16d07 100644 --- a/src/changeloglockcleaner/go.mod +++ b/src/changeloglockcleaner/go.mod @@ -6,26 +6,26 @@ require ( github.com/go-sql-driver/mysql v1.8.1 github.com/jackc/pgx/v5 v5.5.5 github.com/jmoiron/sqlx v1.4.0 - github.com/onsi/ginkgo/v2 v2.17.1 + github.com/onsi/ginkgo/v2 v2.17.2 github.com/onsi/gomega v1.33.0 ) require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/go-logr/logr v1.4.1 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect + github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect golang.org/x/crypto v0.22.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/net v0.24.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.20.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/src/changeloglockcleaner/go.sum b/src/changeloglockcleaner/go.sum index 110cc40d51..f757a76a70 100644 --- a/src/changeloglockcleaner/go.sum +++ b/src/changeloglockcleaner/go.sum @@ -1,8 +1,5 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -11,13 +8,12 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA= @@ -36,8 +32,8 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= -github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -46,23 +42,21 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 91645330f9bd0061adee5d1b17830bbf9e90b884 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 07:37:51 +0100 Subject: [PATCH 09/42] =?UTF-8?q?=F0=9F=A4=96=F0=9F=A6=BE=F0=9F=9B=A0?= =?UTF-8?q?=EF=B8=8F=20go=20mod=20tidy=20&=20make=20package-specs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/acceptance/assets/app/go_app/go.mod | 4 ++-- src/acceptance/assets/app/go_app/go.sum | 13 ++++++------- src/autoscaler/go.mod | 4 ++-- src/autoscaler/go.sum | 11 ++++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index d47f36f5f0..3a8cbfa412 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -43,10 +43,10 @@ require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.19.0 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect + github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect github.com/google/uuid v1.6.0 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/leodido/go-urn v1.4.0 // indirect diff --git a/src/acceptance/assets/app/go_app/go.sum b/src/acceptance/assets/app/go_app/go.sum index 1974215095..8e1c4ffb96 100644 --- a/src/acceptance/assets/app/go_app/go.sum +++ b/src/acceptance/assets/app/go_app/go.sum @@ -50,16 +50,16 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4= github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20230323073829-e72429f035bd h1:r8yyd+DJDmsUhGrRBxH5Pj7KeFK5l+Y3FsgT8keqKtk= -github.com/google/pprof v0.0.0-20230323073829-e72429f035bd/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= @@ -98,8 +98,8 @@ github.com/ogen-go/ogen v1.1.0/go.mod h1:d5Ph7PWpJz453ZdGbVe+DBVPS150idePr5dZ+S0 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= -github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= @@ -123,7 +123,6 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 497c1a794f..d6989afa91 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -67,9 +67,9 @@ require ( github.com/ghodss/yaml v1.0.0 // indirect github.com/go-faster/yaml v0.4.6 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20240416155748-26353dc0451f // indirect + github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum index 2ff531a995..2a8c629889 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -733,8 +733,9 @@ github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhO github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -815,8 +816,8 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20240416155748-26353dc0451f h1:WpZiq8iqvGjJ3m3wzAVKL6+0vz7VkE79iSy9GII00II= -github.com/google/pprof v0.0.0-20240416155748-26353dc0451f/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -937,8 +938,8 @@ github.com/onsi/ginkgo/v2 v2.9.0/go.mod h1:4xkjoL/tZv4SMWeww56BU5kAt19mVB47gTWxm github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts= github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= -github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= -github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= From d320fc29c5520264eefc481fd43796a7711888bd Mon Sep 17 00:00:00 2001 From: Arsalan Khan Date: Thu, 2 May 2024 14:36:51 +0200 Subject: [PATCH 10/42] remove debug statement --- ci/autoscaler/scripts/run-acceptance-tests.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/autoscaler/scripts/run-acceptance-tests.sh b/ci/autoscaler/scripts/run-acceptance-tests.sh index bcdd254b96..23e2c2640c 100755 --- a/ci/autoscaler/scripts/run-acceptance-tests.sh +++ b/ci/autoscaler/scripts/run-acceptance-tests.sh @@ -15,7 +15,6 @@ existing_space="${EXISTING_SPACE:-}" suites=${SUITES:-"api app broker"} ginkgo_opts="${GINKGO_OPTS:-}" nodes="${NODES:-3}" -node_memory_limit="${APP_MEMORY:-128}" # debug: change this to 128 performance_app_count="${PERFORMANCE_APP_COUNT:-}" performance_app_percentage_to_scale="${PERFORMANCE_APP_PERCENTAGE_TO_SCALE:-}" performance_setup_workers="${PERFORMANCE_SETUP_WORKERS:-}" @@ -56,7 +55,6 @@ cat > acceptance_config.json < Date: Thu, 2 May 2024 21:22:16 +0000 Subject: [PATCH 11/42] chore(deps): update dependency gruntwork-io/terragrunt to v0.58.2 --- ci/terragrunt/.tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/terragrunt/.tool-versions b/ci/terragrunt/.tool-versions index 08891a11ba..a047acc064 100644 --- a/ci/terragrunt/.tool-versions +++ b/ci/terragrunt/.tool-versions @@ -3,4 +3,4 @@ helm 3.14.4 python 3.12.3 terraform 1.8.2 terraform-lsp -terragrunt 0.58.0 +terragrunt 0.58.2 From 46e09e040278e96f27c03bb0850ee57656b12a24 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 01:00:27 +0000 Subject: [PATCH 12/42] fix(deps): update module github.com/onsi/gomega to v1.33.1 --- src/acceptance/assets/app/go_app/go.mod | 2 +- src/acceptance/go.mod | 2 +- src/acceptance/go.sum | 4 ++-- src/autoscaler/go.mod | 2 +- src/changeloglockcleaner/go.mod | 2 +- src/changeloglockcleaner/go.sum | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index 3a8cbfa412..bd30c0ed40 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -16,7 +16,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/ogen-go/ogen v1.1.0 github.com/onsi/ginkgo/v2 v2.17.2 - github.com/onsi/gomega v1.33.0 + github.com/onsi/gomega v1.33.1 github.com/prometheus/procfs v0.14.0 github.com/steinfletcher/apitest v1.5.15 go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.51.0 diff --git a/src/acceptance/go.mod b/src/acceptance/go.mod index e9fdcb3571..0216220dfa 100644 --- a/src/acceptance/go.mod +++ b/src/acceptance/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0 github.com/onsi/ginkgo/v2 v2.17.2 - github.com/onsi/gomega v1.33.0 + github.com/onsi/gomega v1.33.1 github.com/stretchr/testify v1.9.0 ) diff --git a/src/acceptance/go.sum b/src/acceptance/go.sum index aa65c95abf..6c499d2e35 100644 --- a/src/acceptance/go.sum +++ b/src/acceptance/go.sum @@ -21,8 +21,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index d6989afa91..e09bc8a1f4 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -26,7 +26,7 @@ require ( github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d github.com/ogen-go/ogen v1.1.0 github.com/onsi/ginkgo/v2 v2.17.2 - github.com/onsi/gomega v1.33.0 + github.com/onsi/gomega v1.33.1 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pivotal-cf/brokerapi/v11 v11.0.0 github.com/pkg/errors v0.9.1 diff --git a/src/changeloglockcleaner/go.mod b/src/changeloglockcleaner/go.mod index 0e88b16d07..68dbaedd59 100644 --- a/src/changeloglockcleaner/go.mod +++ b/src/changeloglockcleaner/go.mod @@ -7,7 +7,7 @@ require ( github.com/jackc/pgx/v5 v5.5.5 github.com/jmoiron/sqlx v1.4.0 github.com/onsi/ginkgo/v2 v2.17.2 - github.com/onsi/gomega v1.33.0 + github.com/onsi/gomega v1.33.1 ) require ( diff --git a/src/changeloglockcleaner/go.sum b/src/changeloglockcleaner/go.sum index f757a76a70..cb627267e9 100644 --- a/src/changeloglockcleaner/go.sum +++ b/src/changeloglockcleaner/go.sum @@ -34,8 +34,8 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= 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.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= From 9230b7f48783415f59bd366da6f3bf5264117078 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 02:07:51 +0100 Subject: [PATCH 13/42] =?UTF-8?q?=F0=9F=A4=96=F0=9F=A6=BE=F0=9F=9B=A0?= =?UTF-8?q?=EF=B8=8F=20go=20mod=20tidy=20&=20make=20package-specs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/acceptance/assets/app/go_app/go.sum | 4 ++-- src/autoscaler/go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/acceptance/assets/app/go_app/go.sum b/src/acceptance/assets/app/go_app/go.sum index 8e1c4ffb96..7968a18796 100644 --- a/src/acceptance/assets/app/go_app/go.sum +++ b/src/acceptance/assets/app/go_app/go.sum @@ -101,8 +101,8 @@ github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg= github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum index 2a8c629889..bee7cf2f8a 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -954,8 +954,8 @@ github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfad github.com/onsi/gomega v1.27.3/go.mod h1:5vG284IBtfDAmDyrK+eGyZmUgUlmi+Wngqo557cZ6Gw= github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= -github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= -github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA= github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= From 435cd8e02d9534733a92a20fa00f43b1ca8f8943 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 04:40:24 +0000 Subject: [PATCH 14/42] fix(deps): update module code.cloudfoundry.org/tlsconfig to v0.0.0-20240427164042-d6180ef19863 --- src/autoscaler/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index e09bc8a1f4..1df5510725 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -8,7 +8,7 @@ require ( code.cloudfoundry.org/go-log-cache/v2 v2.0.7 code.cloudfoundry.org/go-loggregator/v9 v9.2.1 code.cloudfoundry.org/lager/v3 v3.0.3 - code.cloudfoundry.org/tlsconfig v0.0.0-20240423163804-1b0dcf57fddb + code.cloudfoundry.org/tlsconfig v0.0.0-20240427164042-d6180ef19863 dario.cat/mergo v1.0.0 github.com/cenkalti/backoff/v4 v4.3.0 github.com/go-chi/chi/v5 v5.0.12 From f80eb05a141612e395c9383445e891b680b7ea79 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 05:46:36 +0100 Subject: [PATCH 15/42] =?UTF-8?q?=F0=9F=A4=96=F0=9F=A6=BE=F0=9F=9B=A0?= =?UTF-8?q?=EF=B8=8F=20go=20mod=20tidy=20&=20make=20package-specs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/autoscaler/go.sum | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum index bee7cf2f8a..d34a2ad93c 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -604,8 +604,8 @@ code.cloudfoundry.org/go-loggregator/v9 v9.2.1 h1:S6Lgg5UJbhh2bt2TGQxs6R00CF8PrU code.cloudfoundry.org/go-loggregator/v9 v9.2.1/go.mod h1:FTFFruqGeOhVCDFvyLgl8EV8YW63NNwRzLhxJcporu8= code.cloudfoundry.org/lager/v3 v3.0.3 h1:/UTmadZfIaKuT/whEinSxK1mzRfNu1uPfvjFfGqiwzM= code.cloudfoundry.org/lager/v3 v3.0.3/go.mod h1:Zn5q1SrIuuHjEUE7xerMKt3ztunrJQCZETAo7rV0CH8= -code.cloudfoundry.org/tlsconfig v0.0.0-20240423163804-1b0dcf57fddb h1:voTEy7XWxw0BnwkyU+UzjU2CAr7w6D1337pb1zXu3Ag= -code.cloudfoundry.org/tlsconfig v0.0.0-20240423163804-1b0dcf57fddb/go.mod h1:vjYzxJqNBNG1Knm9tZEJ2UrgdZ3XzzF2dF1y+sd+DWs= +code.cloudfoundry.org/tlsconfig v0.0.0-20240427164042-d6180ef19863 h1:oIfyeQxxTVz5Z6yyT3c1dWXsxpjNsyRjW8/yJvDff7I= +code.cloudfoundry.org/tlsconfig v0.0.0-20240427164042-d6180ef19863/go.mod h1:zQDKWy/HyJd6eHj1bODmYKAg9/3TAyv29KWHKphUWiE= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -1070,8 +1070,8 @@ go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZu go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.step.sm/crypto v0.44.7 h1:aJ7dVbkm5TxEtHbicgN6JEVzPxZlp9JW9RQQH5bpi/o= -go.step.sm/crypto v0.44.7/go.mod h1:oKRO4jaf2MaCohJDN+/8ShImkvIgUKfJxxy87gqsnXs= +go.step.sm/crypto v0.44.8 h1:jDSHL6FdB1UTA0d56ECNx9XtLVkewzeg38Vy3HWB3N8= +go.step.sm/crypto v0.44.8/go.mod h1:QEmu4T9YewrDuaJnrV1I0zWZ15aJ/mqRUfL5w3R2WgU= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= From f42154467b1791698ff6649ea09cbc470df5ab26 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Fri, 3 May 2024 11:45:58 +0200 Subject: [PATCH 16/42] feat! Remove `buildin` mode (#2916) # Issue The `buildin_mode` is no longer used (see #1619) but still wastes CI resources due to the the tests. # Fix BREAKING CHANGE: Remove `buildin` mode --- .../workflows/acceptance_tests_buildin.yaml | 23 ---- .../acceptance_tests_buildin_close.yaml | 43 ------- .../workflows/acceptance_tests_reusable.yaml | 5 - Makefile | 3 +- ci/autoscaler/pipeline.yml | 63 ---------- ci/autoscaler/scripts/common.sh | 1 - ci/autoscaler/scripts/deploy-autoscaler.sh | 1 - ci/autoscaler/scripts/vars.source.sh | 5 - ci/autoscaler/set-pipeline.sh | 2 - example/operation/use_buildin_mode.yml | 7 -- jobs/golangapiserver/spec | 3 - .../templates/apiserver.yml.erb | 9 +- operations/use_buildin_mode.yml | 6 - spec/fixtures/apiserver.yml | 5 +- spec/jobs/golangapiserver/apiserver_spec.rb | 8 +- src/autoscaler/api/cmd/api/api_suite_test.go | 2 - src/autoscaler/api/cmd/api/api_test.go | 35 ------ src/autoscaler/api/cmd/api/main.go | 39 +++---- src/autoscaler/api/config/config.go | 101 ++++++++-------- src/autoscaler/api/config/config_test.go | 27 ----- .../api/config/testdata/invalid_config.yml | 1 - .../api/config/testdata/valid_config.yml | 1 - src/autoscaler/api/exampleconfig/config.yml | 1 - .../api/publicapiserver/middleware.go | 9 -- .../api/publicapiserver/middleware_test.go | 22 ---- .../api/publicapiserver/public_api_handler.go | 66 ----------- .../public_api_handler_test.go | 106 ----------------- .../api/publicapiserver/public_api_server.go | 11 +- .../publicapiserver/public_api_server_test.go | 89 -------------- .../publicapiserver_suite_test.go | 7 +- src/autoscaler/integration/components_test.go | 5 +- ...tegration_golangapi_eventgenerator_test.go | 1 - ...ntegration_golangapi_scalingengine_test.go | 1 - .../integration_golangapi_scheduler_test.go | 109 ------------------ .../integration_operator_others_test.go | 13 ++- src/autoscaler/routes/routes.go | 8 -- templates/app-autoscaler-deployment.yml | 1 - templates/app-autoscaler.yml | 1 - 38 files changed, 93 insertions(+), 747 deletions(-) delete mode 100644 .github/workflows/acceptance_tests_buildin.yaml delete mode 100644 .github/workflows/acceptance_tests_buildin_close.yaml delete mode 100644 example/operation/use_buildin_mode.yml delete mode 100644 operations/use_buildin_mode.yml diff --git a/.github/workflows/acceptance_tests_buildin.yaml b/.github/workflows/acceptance_tests_buildin.yaml deleted file mode 100644 index db004d60d6..0000000000 --- a/.github/workflows/acceptance_tests_buildin.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: Acceptance Tests - Buildin -on: - pull_request: - types: [opened, labeled, synchronize] - paths: - - "Makefile" - - "src/acceptance/**" - -concurrency: - group: "${{ github.workflow }}/${{ github.ref }}" - cancel-in-progress: true - -jobs: - acceptance_tests_reusable: - name: " " # Whitespace name looks nicest on Github UI - uses: ./.github/workflows/acceptance_tests_reusable.yaml - with: - suites: "[ 'API', 'APP' ]" - buildin_mode: true - service_offering_enabled: false - deployment_name: "autoscaler-buildin-${{ github.event.pull_request.number }}" - secrets: - bbl_ssh_key: "${{ secrets.BBL_SSH_KEY }}" diff --git a/.github/workflows/acceptance_tests_buildin_close.yaml b/.github/workflows/acceptance_tests_buildin_close.yaml deleted file mode 100644 index 0353e1784f..0000000000 --- a/.github/workflows/acceptance_tests_buildin_close.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: Acceptance Tests Cleanup (Buildin) -on: - pull_request: - types: [closed] - paths: - - "Makefile" - - "src/acceptance/**" - -env: - BUILDIN_MODE: true - SERVICE_OFFERING_ENABLED: false - PR_NUMBER: "${{ github.event.pull_request.number }}" - DEPLOYMENT_NAME: "autoscaler-buildin-${{ github.event.pull_request.number }}" - -jobs: - deployment_cleanup: - name: Cleanup deployments - runs-on: ubuntu-latest - container: - image: ghcr.io/cloudfoundry/app-autoscaler-release-tools:main - steps: - - uses: actions/checkout@v4 - with: - path: app-autoscaler-release - ref: main - - - uses: ./app-autoscaler-release/.github/actions/setup-environment - with: - ssh-key: ${{ secrets.BBL_SSH_KEY }} - - - name: "clean up" - shell: bash - run: | - #! /usr/bin/env bash - set -eu -o pipefail - - # The subsequent assignments are needed *HERE* because of: - # or - # - export BBL_STATE_PATH="${GITHUB_WORKSPACE}/bbl/bbl-state" - declare -r AUTOSCALER_DIR="${GITHUB_WORKSPACE}/app-autoscaler-release" - - make --directory="${AUTOSCALER_DIR}" deploy-cleanup diff --git a/.github/workflows/acceptance_tests_reusable.yaml b/.github/workflows/acceptance_tests_reusable.yaml index d0137027b2..bc8d251a2b 100644 --- a/.github/workflows/acceptance_tests_reusable.yaml +++ b/.github/workflows/acceptance_tests_reusable.yaml @@ -5,10 +5,6 @@ on: self_hosted_image: type: string default: ghcr.io/cloudfoundry/app-autoscaler-release-tools:main - buildin_mode: - required: false - type: boolean - default: false service_offering_enabled: required: false type: boolean @@ -29,7 +25,6 @@ defaults: shell: bash env: - BUILDIN_MODE: "${{ inputs.buildin_mode }}" SERVICE_OFFERING_ENABLED: "${{ inputs.service_offering_enabled }}" PR_NUMBER: "${{ github.event.pull_request.number }}" DEPLOYMENT_NAME: "${{ inputs.deployment_name }}" diff --git a/Makefile b/Makefile index 333f80cfe8..a2948fcd01 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,6 @@ DEST ?= build GOLANGCI_LINT_VERSION = v$(shell cat .tool-versions | grep golangci-lint \ | cut --delimiter=' ' --fields='2') -export BUILDIN_MODE ?= false export DEBUG ?= false export ACCEPTANCE_TESTS_FILE ?= ${DEST}/app-autoscaler-acceptance-tests-v${VERSION}.tgz export GOWORK = off @@ -337,7 +336,7 @@ markdownlint-cli: deploy-autoscaler: go-mod-vendor uaac db scheduler deploy-autoscaler-bosh deploy-register-cf deploy-register-cf: echo " - registering broker with cf" - [ "$${BUILDIN_MODE}" == "false" ] && { ${CI_DIR}/autoscaler/scripts/register-broker.sh; } || echo " - Not registering broker due to buildin mode enabled" + ${CI_DIR}/autoscaler/scripts/register-broker.sh deploy-autoscaler-bosh: echo " - deploying autoscaler" DEBUG="${DEBUG}" ${CI_DIR}/autoscaler/scripts/deploy-autoscaler.sh diff --git a/ci/autoscaler/pipeline.yml b/ci/autoscaler/pipeline.yml index 330825bbdc..ba46002b6c 100644 --- a/ci/autoscaler/pipeline.yml +++ b/ci/autoscaler/pipeline.yml @@ -36,26 +36,10 @@ anchors: operations/add-extra-plan.yml operations/set-release-version.yml - app-autoscaler-ops-files-buildin: &app-autoscaler-ops-files-buildin - OPS_FILES: | - operations/add-releases.yml - operations/instance-identity-cert-from-cf.yml - operations/add-postgres-variables.yml - operations/enable-nats-tls.yml - operations/loggregator-certs-from-cf.yml - operations/add-extra-plan.yml - operations/set-release-version.yml - operations/configure-log-cache-and-forward-metrics-via-mtls.yml - operations/use_buildin_mode.yml - operations/remove-metricsserver.yml - operations/remove-metricsgateway.yml - operations/enable-scheduler-logging.yml - groups: - name: all jobs: - acceptance - - acceptance-buildin - acceptance-log-cache - cleanup-autoscaler-deployments - fetch-latest-stemcell @@ -71,7 +55,6 @@ groups: - name: autoscaler-release jobs: - acceptance - - acceptance-buildin - acceptance-log-cache - draft - integration-tests @@ -193,7 +176,6 @@ jobs: branch_name: ((branch_name)) acceptance_deployment_name: ((acceptance_deployment_name)) logcache_acceptance_deployment_name: ((logcache_acceptance_deployment_name)) - builtin_acceptance_deployment_name: ((builtin_acceptance_deployment_name)) - name: unit-tests public: true @@ -329,50 +311,6 @@ jobs: SUITES: broker timeout: 15m -- name: acceptance-buildin - public: true - build_logs_to_retain: 100 - serial: true - on_success: - task: cleanup - file: ci/ci/autoscaler/tasks/cleanup-autoscaler.yml - params: &acceptance-buildin-params - DEPLOYMENT_NAME: ((builtin_acceptance_deployment_name)) - BUILDIN_MODE: true - SERVICE_OFFERING_ENABLED: false - plan: - - in_parallel: - - get: bbl-state - - get: app-autoscaler-release - passed: [unit-tests, integration-tests] - trigger: true - - get: ci - - task: make-prerelease - file: ci/ci/autoscaler/tasks/make/make.yaml - params: - # ⚠️ Here it is used that make officially guarantees to reach the goals in the provided order. - TARGETS: generate-fakes generate-openapi-generated-clients-and-servers go-mod-tidy go-mod-vendor db scheduler - timeout: 15m - - task: deploy-autoscaler - file: ci/ci/autoscaler/tasks/deploy-autoscaler.yml - params: - <<: *acceptance-buildin-params - <<: *app-autoscaler-ops-files-buildin - timeout: 30m - - in_parallel: - - task: autoscaler-acceptance-api - file: ci/ci/autoscaler/tasks/run-acceptance-tests.yml - params: - <<: *acceptance-buildin-params - SUITES: api - timeout: 15m - - task: autoscaler-acceptance-app - file: ci/ci/autoscaler/tasks/run-acceptance-tests.yml - params: - <<: *acceptance-buildin-params - SUITES: app - timeout: 45m - - name: performance public: true build_logs_to_retain: 100 @@ -435,7 +373,6 @@ jobs: passed: - acceptance - acceptance-log-cache - - acceptance-buildin trigger: true - get: previous-stable-release - task: deploy-previous-stable-release diff --git a/ci/autoscaler/scripts/common.sh b/ci/autoscaler/scripts/common.sh index bac266da20..35221bca82 100644 --- a/ci/autoscaler/scripts/common.sh +++ b/ci/autoscaler/scripts/common.sh @@ -86,7 +86,6 @@ function unset_vars() { unset BBL_STATE_PATH unset AUTOSCALER_DIR unset CI_DIR - unset BUILDIN_MODE unset SERVICE_NAME unset SERVICE_BROKER_NAME unset NAME_PREFIX diff --git a/ci/autoscaler/scripts/deploy-autoscaler.sh b/ci/autoscaler/scripts/deploy-autoscaler.sh index 61e55eeb8f..d8db51bc3f 100755 --- a/ci/autoscaler/scripts/deploy-autoscaler.sh +++ b/ci/autoscaler/scripts/deploy-autoscaler.sh @@ -23,7 +23,6 @@ ops_files=${OPS_FILES:-"${autoscaler_dir}/operations/add-releases.yml\ ${autoscaler_dir}/operations/enable-scheduler-logging.yml"} -if [[ "${buildin_mode}" == "true" ]]; then ops_files+=" ${autoscaler_dir}/operations/use_buildin_mode.yml"; fi; case "${cpu_upper_threshold}" in "100") diff --git a/ci/autoscaler/scripts/vars.source.sh b/ci/autoscaler/scripts/vars.source.sh index 817b83a784..fb90a94f80 100644 --- a/ci/autoscaler/scripts/vars.source.sh +++ b/ci/autoscaler/scripts/vars.source.sh @@ -79,11 +79,6 @@ debug "CI_DIR: ${CI_DIR}" # shellcheck disable=SC2034 ci_dir="${CI_DIR}" -export BUILDIN_MODE=${BUILDIN_MODE:-"false"} -debug "BUILDIN_MODE: ${BUILDIN_MODE}" -# shellcheck disable=SC2034 -buildin_mode="${BUILDIN_MODE}" - export SERVICE_NAME="${DEPLOYMENT_NAME}" debug "SERVICE_NAME: ${SERVICE_NAME}" # shellcheck disable=SC2034 diff --git a/ci/autoscaler/set-pipeline.sh b/ci/autoscaler/set-pipeline.sh index 10b4eea96f..d8d7f63086 100755 --- a/ci/autoscaler/set-pipeline.sh +++ b/ci/autoscaler/set-pipeline.sh @@ -32,11 +32,9 @@ function set_pipeline(){ if [[ -z $PR_NUMBER ]]; then add_var acceptance_deployment_name "acceptance" add_var logcache_acceptance_deployment_name "acceptance-lc" - add_var builtin_acceptance_deployment_name "acceptance-bld" else add_var acceptance_deployment_name "${PR_NUMBER}-acceptance" add_var logcache_acceptance_deployment_name "${PR_NUMBER}-acceptance-lc" - add_var builtin_acceptance_deployment_name "${PR_NUMBER}-acceptance-bld" fi # shellcheck disable=SC2086 diff --git a/example/operation/use_buildin_mode.yml b/example/operation/use_buildin_mode.yml deleted file mode 100644 index b0cf62be54..0000000000 --- a/example/operation/use_buildin_mode.yml +++ /dev/null @@ -1,7 +0,0 @@ -# This can be used to set the release version of the autoscaler and is primarily used in our CI to modify the release version in our dev pipeline. -# Parameters: -# app_autoscaler_version: Version numbering of the release to deploy. ---- -- type: replace - path: /instance_groups/name=asapi/jobs/name=golangapiserver/properties/autoscaler/apiserver/use_buildin_mode? - value: true \ No newline at end of file diff --git a/jobs/golangapiserver/spec b/jobs/golangapiserver/spec index 6df7625a4c..5c469fa43e 100644 --- a/jobs/golangapiserver/spec +++ b/jobs/golangapiserver/spec @@ -87,9 +87,6 @@ properties: description: "PEM-encoded server certificate for the health endpoint" autoscaler.apiserver.health.server_key: description: "PEM-encoded server key for the health endpoint" - autoscaler.apiserver.use_buildin_mode: - default: true - description: "" autoscaler.apiserver.info.name: description: "Name of the autoscaler application to be shown in /info path" default: "Autoscaler" diff --git a/jobs/golangapiserver/templates/apiserver.yml.erb b/jobs/golangapiserver/templates/apiserver.yml.erb index cccc46b03f..32f298c965 100644 --- a/jobs/golangapiserver/templates/apiserver.yml.erb +++ b/jobs/golangapiserver/templates/apiserver.yml.erb @@ -38,9 +38,7 @@ require 'yaml' # Template Main # ########################################### job_name = 'golangapiserver' - if p("autoscaler.apiserver.use_buildin_mode") == false - binding_db_url = build_db_url('binding_db', job_name) - end + binding_db_url = build_db_url('binding_db', job_name) policy_db_url = build_db_url('policy_db', job_name) if p("autoscaler.storedprocedure_db.address") != '' storedprocedure_db_url = build_db_url('storedprocedure_db', job_name) @@ -68,7 +66,6 @@ public_api_server: key_file: /var/vcap/jobs/golangapiserver/config/certs/apiserver/server.key <% end %> -<% if p("autoscaler.apiserver.use_buildin_mode") == false %> broker_server: port: <%= p("autoscaler.apiserver.broker.server.port") %> <% if_p("autoscaler.apiserver.broker.server.ca_cert", "autoscaler.apiserver.broker.server.server_cert", "autoscaler.apiserver.broker.server.server_key") do %> @@ -88,11 +85,9 @@ broker_credentials: catalog_path: /var/vcap/jobs/golangapiserver/config/catalog.json catalog_schema_path: /var/vcap/packages/golangapiserver/catalog.schema.json -<% end %> info_file_path: /var/vcap/jobs/golangapiserver/config/info.json policy_schema_path: /var/vcap/packages/golangapiserver/policy_json.schema.json dashboard_redirect_uri: <%= p("autoscaler.apiserver.broker.server.dashboard_redirect_uri") %> -use_buildin_mode: <%= p("autoscaler.apiserver.use_buildin_mode") %> health: port: <%= p("autoscaler.apiserver.health.port") %> @@ -109,13 +104,11 @@ db: max_open_connections: <%= p("autoscaler.policy_db_connection_config.max_open_connections") %> max_idle_connections: <%= p("autoscaler.policy_db_connection_config.max_idle_connections") %> connection_max_lifetime: <%= p("autoscaler.policy_db_connection_config.connection_max_lifetime") %> -<% if p("autoscaler.apiserver.use_buildin_mode") == false %> binding_db: url: <%= binding_db_url %> max_open_connections: <%= p("autoscaler.binding_db_connection_config.max_open_connections") %> max_idle_connections: <%= p("autoscaler.binding_db_connection_config.max_idle_connections") %> connection_max_lifetime: <%= p("autoscaler.binding_db_connection_config.connection_max_lifetime") %> -<% end %> <% if p("autoscaler.storedprocedure_db.address") != '' %> storedprocedure_db: url: <%= storedprocedure_db_url %> diff --git a/operations/use_buildin_mode.yml b/operations/use_buildin_mode.yml deleted file mode 100644 index 04a8bc7ee4..0000000000 --- a/operations/use_buildin_mode.yml +++ /dev/null @@ -1,6 +0,0 @@ -# This can be used to enable the `build_in_mode`, which means disabling the service broker -# and exclusively using the API to interact with the App Autoscaler ---- -- type: replace - path: /instance_groups/name=apiserver/jobs/name=golangapiserver/properties/autoscaler/apiserver/use_buildin_mode? - value: true diff --git a/spec/fixtures/apiserver.yml b/spec/fixtures/apiserver.yml index d28bffdd0d..b60fbaf1cb 100644 --- a/spec/fixtures/apiserver.yml +++ b/spec/fixtures/apiserver.yml @@ -57,4 +57,7 @@ autoscaler: apiserver: broker: server: - dashboard_redirect_uri: https://application-autoscaler-dashboard.cf.domain \ No newline at end of file + dashboard_redirect_uri: https://application-autoscaler-dashboard.cf.domain + broker_credentials: + - broker_username: fake_b_user_1 + broker_password: fake_b_password_1 diff --git a/spec/jobs/golangapiserver/apiserver_spec.rb b/spec/jobs/golangapiserver/apiserver_spec.rb index a0e9966f78..ffb49e77b9 100644 --- a/spec/jobs/golangapiserver/apiserver_spec.rb +++ b/spec/jobs/golangapiserver/apiserver_spec.rb @@ -12,12 +12,7 @@ let(:properties) { YAML.safe_load(fixture("apiserver.yml").read) } let(:rendered_template) { YAML.safe_load(template.render(properties)) } - context "apiserver does not use buildin mode" do - before(:each) do - properties["autoscaler"]["apiserver"].merge!( - "use_buildin_mode" => false - ) - end + context "handles broker credentials" do it "writes service_broker_usernames" do properties["autoscaler"]["apiserver"]["broker"]["broker_credentials"] = [ @@ -38,6 +33,7 @@ end it "writes deprecated service_broker_usernames" do + properties["autoscaler"]["apiserver"]["broker"]["broker_credentials"] = nil properties["autoscaler"]["apiserver"]["broker"].merge!( "username" => "deprecated_username", "password" => "deprecated_password" diff --git a/src/autoscaler/api/cmd/api/api_suite_test.go b/src/autoscaler/api/cmd/api/api_suite_test.go index 9ff19646c3..8c87854992 100644 --- a/src/autoscaler/api/cmd/api/api_suite_test.go +++ b/src/autoscaler/api/cmd/api/api_suite_test.go @@ -193,8 +193,6 @@ var _ = SynchronizedBeforeSuite(func() []byte { MetricsForwarderUrl: "http://localhost:8088", } - cfg.UseBuildInMode = false - cfg.CF.API = ccServer.URL() cfg.CF.ClientID = "client-id" cfg.CF.Secret = "client-secret" diff --git a/src/autoscaler/api/cmd/api/api_test.go b/src/autoscaler/api/cmd/api/api_test.go index 4b772912bb..c73fda4e3b 100644 --- a/src/autoscaler/api/cmd/api/api_test.go +++ b/src/autoscaler/api/cmd/api/api_test.go @@ -5,7 +5,6 @@ import ( "io" "net/http" "os" - "time" . "code.cloudfoundry.org/app-autoscaler/src/autoscaler/testhelpers" @@ -109,40 +108,6 @@ var _ = Describe("Api", func() { }) - Describe("BuildIn Mode", func() { - AfterEach(func() { - runner.Interrupt() - Eventually(runner.Session, 5).Should(Exit(0)) - }) - Context("BuildIn Mode is false", func() { - BeforeEach(func() { - basicAuthConfig := cfg - basicAuthConfig.UseBuildInMode = false - runner.startCheck = "" - runner.Start() - }) - It("should start both broker and public-api", func() { - Eventually(runner.Session.Buffer, 2*time.Second).Should(Say("api.broker_http_server.new-http-server")) - Eventually(runner.Session.Buffer, 2*time.Second).Should(Say("api.public_api_http_server.new-http-server")) - Eventually(runner.Session.Buffer, 2*time.Second).Should(Say("api.started")) - }) - }) - - Context("BuildIn Mode is true", func() { - BeforeEach(func() { - basicAuthConfig := cfg - basicAuthConfig.UseBuildInMode = true - runner.startCheck = "" - runner.Start() - }) - It("should start not start broker ", func() { - Eventually(runner.Session.Buffer, 2*time.Second).ShouldNot(Say("api.broker_http_server.new-http-server")) - Eventually(runner.Session.Buffer, 2*time.Second).Should(Say("api.public_api_http_server.new-http-server")) - Eventually(runner.Session.Buffer, 2*time.Second).Should(Say("api.started")) - }) - }) - }) - Describe("Broker Rest API", func() { AfterEach(func() { runner.Interrupt() diff --git a/src/autoscaler/api/cmd/api/main.go b/src/autoscaler/api/cmd/api/main.go index 7b11395f44..c2d6efc4e4 100644 --- a/src/autoscaler/api/cmd/api/main.go +++ b/src/autoscaler/api/cmd/api/main.go @@ -88,30 +88,23 @@ func main() { } logger.Debug("Successfully logged into CF", lager.Data{"API": conf.CF.API}) - var checkBindingFunc api.CheckBindingFunc - var bindingDB db.BindingDB - - if !conf.UseBuildInMode { - bindingDB, err = sqldb.NewBindingSQLDB(conf.DB[db.BindingDb], logger.Session("bindingdb-db")) - if err != nil { - logger.Error("failed to connect bindingdb database", err, lager.Data{"dbConfig": conf.DB[db.BindingDb]}) - os.Exit(1) - } - defer func() { _ = bindingDB.Close() }() - prometheusCollectors = append(prometheusCollectors, healthendpoint.NewDatabaseStatusCollector("autoscaler", "golangapiserver", "bindingDB", bindingDB)) - checkBindingFunc = func(appId string) bool { - return bindingDB.CheckServiceBinding(appId) - } - brokerHttpServer, err := brokerserver.NewBrokerServer(logger.Session("broker_http_server"), conf, - bindingDB, policyDb, httpStatusCollector, cfClient, credentialProvider) - if err != nil { - logger.Error("failed to create broker http server", err) - os.Exit(1) - } - members = append(members, grouper.Member{"broker_http_server", brokerHttpServer}) - } else { - checkBindingFunc = func(appId string) bool { return true } + bindingDB, err := sqldb.NewBindingSQLDB(conf.DB[db.BindingDb], logger.Session("bindingdb-db")) + if err != nil { + logger.Error("failed to connect bindingdb database", err, lager.Data{"dbConfig": conf.DB[db.BindingDb]}) + os.Exit(1) + } + defer func() { _ = bindingDB.Close() }() + prometheusCollectors = append(prometheusCollectors, healthendpoint.NewDatabaseStatusCollector("autoscaler", "golangapiserver", "bindingDB", bindingDB)) + checkBindingFunc := func(appId string) bool { + return bindingDB.CheckServiceBinding(appId) + } + brokerHttpServer, err := brokerserver.NewBrokerServer(logger.Session("broker_http_server"), conf, + bindingDB, policyDb, httpStatusCollector, cfClient, credentialProvider) + if err != nil { + logger.Error("failed to create broker http server", err) + os.Exit(1) } + members = append(members, grouper.Member{"broker_http_server", brokerHttpServer}) promRegistry := prometheus.NewRegistry() healthendpoint.RegisterCollectors(promRegistry, prometheusCollectors, true, logger.Session("golangapiserver-prometheus")) diff --git a/src/autoscaler/api/config/config.go b/src/autoscaler/api/config/config.go index 089f347c21..ff8cd607a1 100644 --- a/src/autoscaler/api/config/config.go +++ b/src/autoscaler/api/config/config.go @@ -104,7 +104,6 @@ type Config struct { ScalingEngine ScalingEngineConfig `yaml:"scaling_engine"` EventGenerator EventGeneratorConfig `yaml:"event_generator"` CF cf.Config `yaml:"cf"` - UseBuildInMode bool `yaml:"use_buildin_mode"` InfoFilePath string `yaml:"info_file_path"` MetricsForwarder MetricsForwarderConfig `yaml:"metrics_forwarder"` Health helpers.HealthConfig `yaml:"health"` @@ -123,7 +122,6 @@ func LoadConfig(reader io.Reader) (*Config, error) { Logging: defaultLoggingConfig, BrokerServer: defaultBrokerServerConfig, PublicApiServer: defaultPublicApiServerConfig, - UseBuildInMode: false, CF: cf.Config{ ClientConfig: cf.ClientConfig{SkipSSLValidation: false}, }, @@ -210,67 +208,66 @@ func (c *Config) Validate() error { return fmt.Errorf("Configuration error: ScalingRules.CPU.UpperThreshold is less than zero") } - if !c.UseBuildInMode { - if c.DB[db.BindingDb].URL == "" { - return fmt.Errorf("Configuration error: BindingDB URL is empty") - } + if c.DB[db.BindingDb].URL == "" { + return fmt.Errorf("Configuration error: BindingDB URL is empty") + } - for _, brokerCredential := range c.BrokerCredentials { - if brokerCredential.BrokerUsername == "" && string(brokerCredential.BrokerUsernameHash) == "" { - return fmt.Errorf("Configuration error: both broker_username and broker_username_hash are empty, please provide one of them") - } - if brokerCredential.BrokerUsername != "" && string(brokerCredential.BrokerUsernameHash) != "" { - return fmt.Errorf("Configuration error: both broker_username and broker_username_hash are set, please provide only one of them") - } - if string(brokerCredential.BrokerUsernameHash) != "" { - if _, err := bcrypt.Cost(brokerCredential.BrokerUsernameHash); err != nil { - return fmt.Errorf("Configuration error: broker_username_hash is not a valid bcrypt hash") - } - } - if brokerCredential.BrokerPassword == "" && string(brokerCredential.BrokerPasswordHash) == "" { - return fmt.Errorf("Configuration error: both broker_password and broker_password_hash are empty, please provide one of them") + for _, brokerCredential := range c.BrokerCredentials { + if brokerCredential.BrokerUsername == "" && string(brokerCredential.BrokerUsernameHash) == "" { + return fmt.Errorf("Configuration error: both broker_username and broker_username_hash are empty, please provide one of them") + } + if brokerCredential.BrokerUsername != "" && string(brokerCredential.BrokerUsernameHash) != "" { + return fmt.Errorf("Configuration error: both broker_username and broker_username_hash are set, please provide only one of them") + } + if string(brokerCredential.BrokerUsernameHash) != "" { + if _, err := bcrypt.Cost(brokerCredential.BrokerUsernameHash); err != nil { + return fmt.Errorf("Configuration error: broker_username_hash is not a valid bcrypt hash") } + } + if brokerCredential.BrokerPassword == "" && string(brokerCredential.BrokerPasswordHash) == "" { + return fmt.Errorf("Configuration error: both broker_password and broker_password_hash are empty, please provide one of them") + } - if brokerCredential.BrokerPassword != "" && string(brokerCredential.BrokerPasswordHash) != "" { - return fmt.Errorf("Configuration error: both broker_password and broker_password_hash are set, please provide only one of them") - } + if brokerCredential.BrokerPassword != "" && string(brokerCredential.BrokerPasswordHash) != "" { + return fmt.Errorf("Configuration error: both broker_password and broker_password_hash are set, please provide only one of them") + } - if string(brokerCredential.BrokerPasswordHash) != "" { - if _, err := bcrypt.Cost(brokerCredential.BrokerPasswordHash); err != nil { - return fmt.Errorf("Configuration error: broker_password_hash is not a valid bcrypt hash") - } + if string(brokerCredential.BrokerPasswordHash) != "" { + if _, err := bcrypt.Cost(brokerCredential.BrokerPasswordHash); err != nil { + return fmt.Errorf("Configuration error: broker_password_hash is not a valid bcrypt hash") } } + } - if c.CatalogSchemaPath == "" { - return fmt.Errorf("Configuration error: CatalogSchemaPath is empty") - } - if c.CatalogPath == "" { - return fmt.Errorf("Configuration error: CatalogPath is empty") - } - if c.CredHelperImpl == "" { - return fmt.Errorf("Configuration error: CredHelperImpl is empty") - } + if c.CatalogSchemaPath == "" { + return fmt.Errorf("Configuration error: CatalogSchemaPath is empty") + } + if c.CatalogPath == "" { + return fmt.Errorf("Configuration error: CatalogPath is empty") + } + if c.CredHelperImpl == "" { + return fmt.Errorf("Configuration error: CredHelperImpl is empty") + } - catalogSchemaLoader := gojsonschema.NewReferenceLoader("file://" + c.CatalogSchemaPath) - catalogLoader := gojsonschema.NewReferenceLoader("file://" + c.CatalogPath) + catalogSchemaLoader := gojsonschema.NewReferenceLoader("file://" + c.CatalogSchemaPath) + catalogLoader := gojsonschema.NewReferenceLoader("file://" + c.CatalogPath) - result, err := gojsonschema.Validate(catalogSchemaLoader, catalogLoader) - if err != nil { - return err - } - if !result.Valid() { - errString := "{" - for index, desc := range result.Errors() { - if index == len(result.Errors())-1 { - errString += fmt.Sprintf("\"%s\"", desc.Description()) - } else { - errString += fmt.Sprintf("\"%s\",", desc.Description()) - } + result, err := gojsonschema.Validate(catalogSchemaLoader, catalogLoader) + if err != nil { + return err + } + if !result.Valid() { + errString := "{" + for index, desc := range result.Errors() { + if index == len(result.Errors())-1 { + errString += fmt.Sprintf("\"%s\"", desc.Description()) + } else { + errString += fmt.Sprintf("\"%s\",", desc.Description()) } - errString += "}" - return fmt.Errorf(errString) } + errString += "}" + return fmt.Errorf(errString) } + return nil } diff --git a/src/autoscaler/api/config/config_test.go b/src/autoscaler/api/config/config_test.go index 64389b70e4..8bc5389ec3 100644 --- a/src/autoscaler/api/config/config_test.go +++ b/src/autoscaler/api/config/config_test.go @@ -98,7 +98,6 @@ var _ = Describe("Config", func() { MetricsForwarderMtlsUrl: "https://mtlssdsdds:8084", }, )) - Expect(conf.UseBuildInMode).To(BeFalse()) Expect(conf.InfoFilePath).To(Equal("/var/vcap/jobs/autoscaer/config/info-file.json")) Expect(conf.CF).To(Equal( cf.Config{ @@ -148,7 +147,6 @@ var _ = Describe("Config", func() { MaxIdleConnections: 0, ConnectionMaxLifetime: 0 * time.Second, })) - Expect(conf.UseBuildInMode).To(BeFalse()) Expect(conf.ScalingRules.CPU.LowerThreshold).To(Equal(1)) Expect(conf.ScalingRules.CPU.UpperThreshold).To(Equal(100)) Expect(conf.ScalingRules.CPUUtil.LowerThreshold).To(Equal(1)) @@ -267,7 +265,6 @@ rate_limit: conf.CF.Secret = "secret" conf.InfoFilePath = "../exampleconfig/info-file.json" - conf.UseBuildInMode = false conf.RateLimit.MaxAmount = 10 conf.RateLimit.ValidDuration = 1 * time.Second @@ -521,29 +518,5 @@ rate_limit: }) }) - Describe("Using BuildIn Mode", func() { - BeforeEach(func() { - conf.UseBuildInMode = true - }) - Context("when broker related configs are not set", func() { - BeforeEach(func() { - conf.DB[db.BindingDb] = db.DatabaseConfig{URL: ""} - brokerCred1 := BrokerCredentialsConfig{ - BrokerUsername: "", - BrokerUsernameHash: nil, - BrokerPasswordHash: nil, - BrokerPassword: "", - } - var brokerCreds []BrokerCredentialsConfig - brokerCreds = append(brokerCreds, brokerCred1) - conf.CatalogPath = "" - conf.CatalogSchemaPath = "" - conf.BrokerCredentials = brokerCreds - }) - It("should not err", func() { - Expect(err).NotTo(HaveOccurred()) - }) - }) - }) }) }) diff --git a/src/autoscaler/api/config/testdata/invalid_config.yml b/src/autoscaler/api/config/testdata/invalid_config.yml index ad8b9eee6d..190a4fd711 100644 --- a/src/autoscaler/api/config/testdata/invalid_config.yml +++ b/src/autoscaler/api/config/testdata/invalid_config.yml @@ -42,7 +42,6 @@ event_generator: key_file: /var/vcap/jobs/autoscaler/config/certs/eg.key cert_file: /var/vcap/jobs/autoscaler/config/certs/eg.crt ca_file: /var/vcap/jobs/autoscaler/config/certs/autoscaler-ca.crt -use_buildin_mode: false info_file_path: /var/vcap/jobs/autoscaer/config/info-file.json cf: api: https://api.example.com diff --git a/src/autoscaler/api/config/testdata/valid_config.yml b/src/autoscaler/api/config/testdata/valid_config.yml index 96e5f195ce..bda41e3464 100644 --- a/src/autoscaler/api/config/testdata/valid_config.yml +++ b/src/autoscaler/api/config/testdata/valid_config.yml @@ -52,7 +52,6 @@ event_generator: metrics_forwarder: metrics_forwarder_url: https://localhost:8088 metrics_forwarder_mtls_url: https://mtlssdsdds:8084 -use_buildin_mode: false info_file_path: /var/vcap/jobs/autoscaer/config/info-file.json cf: api: https://api.example.com diff --git a/src/autoscaler/api/exampleconfig/config.yml b/src/autoscaler/api/exampleconfig/config.yml index 1ecdd052d3..21304ba4f7 100644 --- a/src/autoscaler/api/exampleconfig/config.yml +++ b/src/autoscaler/api/exampleconfig/config.yml @@ -42,7 +42,6 @@ scheduler: metrics_forwarder: metrics_forwarder_url: http://localhost:8088 metrics_forwarder_mtls_url: http://localhost:8088 -use_buildin_mode: false cf: api: https://api.example.com client_id: client-id diff --git a/src/autoscaler/api/publicapiserver/middleware.go b/src/autoscaler/api/publicapiserver/middleware.go index cf84b72b08..e64af3f281 100644 --- a/src/autoscaler/api/publicapiserver/middleware.go +++ b/src/autoscaler/api/publicapiserver/middleware.go @@ -125,15 +125,6 @@ func (mw *Middleware) CheckServiceBinding(next http.Handler) http.Handler { }) } -func (mw *Middleware) RejectCredentialOperationInServiceOffering(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - handlers.WriteJSONResponse(w, http.StatusForbidden, models.ErrorResponse{ - Code: "Forbidden", - Message: "This command is only valid for build-in auto-scaling capacity. Please operate service credential with \"cf bind/unbind-service\" command.", - }) - }) -} - func (mw *Middleware) isValidUserToken(userToken string) bool { lowerCaseToken := strings.ToLower(userToken) if !strings.HasPrefix(lowerCaseToken, "bearer ") { diff --git a/src/autoscaler/api/publicapiserver/middleware_test.go b/src/autoscaler/api/publicapiserver/middleware_test.go index ab4c1d5ffd..92ad777145 100644 --- a/src/autoscaler/api/publicapiserver/middleware_test.go +++ b/src/autoscaler/api/publicapiserver/middleware_test.go @@ -249,26 +249,4 @@ var _ = Describe("Middleware", func() { }) }) - Describe("RejectCredentialOperationInServiceOffering", func() { - BeforeEach(func() { - - fakeCFClient = &fakes.FakeCFClient{} - logger = lagertest.NewTestLogger("oauth") - mw = NewMiddleware(logger, fakeCFClient, func(appId string) bool { - return true - }, "") - - router = mux.NewRouter() - router.HandleFunc("/", GetTestHandler()) - router.HandleFunc("/v1/apps/{appId}", GetTestHandler()) - router.Use(mw.RejectCredentialOperationInServiceOffering) - - resp = httptest.NewRecorder() - }) - - JustBeforeEach(func() { - router.ServeHTTP(resp, req) - }) - }) - }) diff --git a/src/autoscaler/api/publicapiserver/public_api_handler.go b/src/autoscaler/api/publicapiserver/public_api_handler.go index b78c78d8bf..067508b6cb 100644 --- a/src/autoscaler/api/publicapiserver/public_api_handler.go +++ b/src/autoscaler/api/publicapiserver/public_api_handler.go @@ -353,69 +353,3 @@ func (h *PublicApiHandler) GetHealth(w http.ResponseWriter, _ *http.Request, _ m h.logger.Error(ActionWriteBody, err) } } - -func (h *PublicApiHandler) CreateCredential(w http.ResponseWriter, r *http.Request, vars map[string]string) { - appId := vars["appId"] - if appId == "" { - h.logger.Error(ActionCheckAppId, errors.New(ErrorMessageAppidIsRequired), nil) - writeErrorResponse(w, http.StatusBadRequest, ErrorMessageAppidIsRequired) - return - } - logger := h.logger.Session("CreateCredential", lager.Data{"appId": appId}) - var userProvidedCredential *models.Credential - bodyBytes, err := io.ReadAll(r.Body) - if err != nil { - logger.Error("Failed to read user provided credential request body", err, lager.Data{"appId": appId}) - writeErrorResponse(w, http.StatusInternalServerError, "Error creating credential") - return - } - if len(bodyBytes) > 0 { - userProvidedCredential = &models.Credential{} - err = json.Unmarshal(bodyBytes, userProvidedCredential) - if err != nil { - logger.Error("Failed to unmarshal user provided credential", err, lager.Data{"body": bodyBytes}) - writeErrorResponse(w, http.StatusBadRequest, "Invalid credential format") - return - } - if !(userProvidedCredential.Username != "" && userProvidedCredential.Password != "") { - logger.Info("Username or password is missing", lager.Data{"userProvidedCredential": userProvidedCredential}) - writeErrorResponse(w, http.StatusBadRequest, "Username and password are both required") - return - } - } - - logger.Info("Create credential") - cred, err := h.credentials.Create(r.Context(), appId, userProvidedCredential) - if err != nil { - logger.Error("Failed to create credential", err) - writeErrorResponse(w, http.StatusInternalServerError, "Error creating credential") - return - } - handlers.WriteJSONResponse(w, http.StatusOK, struct { - AppId string `json:"app_id"` - *models.Credential - Url string `json:"url"` - }{ - AppId: appId, - Credential: cred, - Url: h.conf.MetricsForwarder.MetricsForwarderUrl, - }) -} - -func (h *PublicApiHandler) DeleteCredential(w http.ResponseWriter, r *http.Request, vars map[string]string) { - appId := vars["appId"] - if appId == "" { - h.logger.Error(ActionCheckAppId, errors.New(ErrorMessageAppidIsRequired), nil) - writeErrorResponse(w, http.StatusBadRequest, ErrorMessageAppidIsRequired) - return - } - logger := h.logger.Session("DeleteCredential", lager.Data{"appId": appId}) - logger.Info("Delete credential") - err := h.credentials.Delete(r.Context(), appId) - if err != nil { - logger.Error("Failed to delete credential", err) - writeErrorResponse(w, http.StatusInternalServerError, "Error deleting credential") - return - } - handlers.WriteJSONResponse(w, http.StatusOK, nil) -} diff --git a/src/autoscaler/api/publicapiserver/public_api_handler_test.go b/src/autoscaler/api/publicapiserver/public_api_handler_test.go index 8f35f0961e..73d526e246 100644 --- a/src/autoscaler/api/publicapiserver/public_api_handler_test.go +++ b/src/autoscaler/api/publicapiserver/public_api_handler_test.go @@ -831,110 +831,4 @@ var _ = Describe("PublicApiHandler", func() { }) }) - Describe("CreateCredential", func() { - var requestBody string - BeforeEach(func() { - pathVariables["appId"] = TEST_APP_ID - }) - JustBeforeEach(func() { - req, _ = http.NewRequest(http.MethodPut, "/v1/apps/"+TEST_APP_ID+"/credential", strings.NewReader(requestBody)) - req.Header.Set("Content-type", "application/json") - handler.CreateCredential(resp, req, pathVariables) - - }) - AfterEach(func() { - requestBody = "" - }) - Context("When appId is not present", func() { - BeforeEach(func() { - delete(pathVariables, "appId") - }) - It("should fail with 400", func() { - Expect(resp.Code).To(Equal(http.StatusBadRequest)) - Expect(resp.Body.String()).To(Equal(`{"code":"Bad Request","message":"AppId is required"}`)) - }) - }) - Context("When user provide credential", func() { - Context("When request body is invalid json", func() { - BeforeEach(func() { - requestBody = "not-json" - }) - It("should fail with 400", func() { - Expect(resp.Code).To(Equal(http.StatusBadRequest)) - Expect(resp.Body.String()).To(Equal(`{"code":"Bad Request","message":"Invalid credential format"}`)) - }) - }) - Context("When credential.username is not provided", func() { - BeforeEach(func() { - requestBody = `{"password":"password"}` - }) - It("should fail with 400", func() { - Expect(resp.Code).To(Equal(http.StatusBadRequest)) - Expect(resp.Body.String()).To(Equal(`{"code":"Bad Request","message":"Username and password are both required"}`)) - }) - }) - Context("When credential.password is not provided", func() { - BeforeEach(func() { - requestBody = `{"username":"username"}` - }) - It("should fail with 400", func() { - Expect(resp.Code).To(Equal(http.StatusBadRequest)) - Expect(resp.Body.String()).To(Equal(`{"code":"Bad Request","message":"Username and password are both required"}`)) - }) - }) - }) - Context("When failed to save credential to a credential store", func() { - BeforeEach(func() { - credentials.CreateReturns(nil, fmt.Errorf("sql db error")) - }) - It("should fails with 500", func() { - Expect(resp.Code).To(Equal(http.StatusInternalServerError)) - Expect(resp.Body.String()).To(Equal(`{"code":"Internal Server Error","message":"Error creating credential"}`)) - }) - }) - Context("When successfully save data to a credential store", func() { - BeforeEach(func() { - credentials.CreateReturns(nil, nil) - }) - It("should succeed with 200", func() { - Expect(resp.Code).To(Equal(http.StatusOK)) - }) - }) - }) - Describe("DeleteCredential", func() { - JustBeforeEach(func() { - handler.DeleteCredential(resp, req, pathVariables) - }) - BeforeEach(func() { - pathVariables["appId"] = TEST_APP_ID - req, _ = http.NewRequest(http.MethodPut, "", nil) - }) - Context("When appId is not present", func() { - BeforeEach(func() { - delete(pathVariables, "appId") - }) - It("should fail with 400", func() { - Expect(resp.Code).To(Equal(http.StatusBadRequest)) - Expect(resp.Body.String()).To(Equal(`{"code":"Bad Request","message":"AppId is required"}`)) - }) - }) - Context("When failed to delete credential from a credential store", func() { - BeforeEach(func() { - credentials.DeleteReturns(fmt.Errorf("sql db error")) - }) - It("should fails with 500", func() { - Expect(resp.Code).To(Equal(http.StatusInternalServerError)) - Expect(resp.Body.String()).To(Equal(`{"code":"Internal Server Error","message":"Error deleting credential"}`)) - }) - }) - Context("When successfully delete data from a credential store", func() { - BeforeEach(func() { - credentials.DeleteReturns(nil) - }) - It("should succeed with 200", func() { - Expect(resp.Code).To(Equal(http.StatusOK)) - }) - }) - - }) }) diff --git a/src/autoscaler/api/publicapiserver/public_api_server.go b/src/autoscaler/api/publicapiserver/public_api_server.go index bd070f2f90..80f5159431 100644 --- a/src/autoscaler/api/publicapiserver/public_api_server.go +++ b/src/autoscaler/api/publicapiserver/public_api_server.go @@ -61,9 +61,8 @@ func NewPublicApiServer(logger lager.Logger, conf *config.Config, policydb db.Po rpolicy.Use(rateLimiterMiddleware.CheckRateLimit) rpolicy.Use(mw.HasClientToken) rpolicy.Use(mw.Oauth) - if !conf.UseBuildInMode { - rpolicy.Use(mw.CheckServiceBinding) - } + rpolicy.Use(mw.CheckServiceBinding) + rpolicy.Use(httpStatusCollectMiddleware.Collect) rpolicy.Get(routes.PublicApiGetPolicyRouteName).Handler(VarsFunc(pah.GetScalingPolicy)) rpolicy.Get(routes.PublicApiAttachPolicyRouteName).Handler(VarsFunc(pah.AttachScalingPolicy)) @@ -71,14 +70,10 @@ func NewPublicApiServer(logger lager.Logger, conf *config.Config, policydb db.Po rcredential := routes.ApiCredentialRoutes() rcredential.Use(rateLimiterMiddleware.CheckRateLimit) - if !conf.UseBuildInMode { - rcredential.Use(mw.RejectCredentialOperationInServiceOffering) - } + rcredential.Use(httpStatusCollectMiddleware.Collect) rcredential.Use(mw.HasClientToken) rcredential.Use(mw.Oauth) - rcredential.Get(routes.PublicApiCreateCredentialRouteName).Handler(VarsFunc(pah.CreateCredential)) - rcredential.Get(routes.PublicApiDeleteCredentialRouteName).Handler(VarsFunc(pah.DeleteCredential)) return helpers.NewHTTPServer(logger, conf.PublicApiServer, r) } diff --git a/src/autoscaler/api/publicapiserver/public_api_server_test.go b/src/autoscaler/api/publicapiserver/public_api_server_test.go index fff263c5c3..7b17a46518 100644 --- a/src/autoscaler/api/publicapiserver/public_api_server_test.go +++ b/src/autoscaler/api/publicapiserver/public_api_server_test.go @@ -132,22 +132,6 @@ var _ = Describe("PublicApiServer", func() { }) - Context("when calling create credential endpoint", func() { - It("should fail with 429", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - nil, http.MethodPut, "", http.StatusTooManyRequests) - }) - - }) - - Context("when calling delete credential endpoint", func() { - It("should fail with 429", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - nil, http.MethodDelete, "", http.StatusTooManyRequests) - }) - - }) - }) Describe("Without AuthorizatioToken", func() { @@ -187,22 +171,6 @@ var _ = Describe("PublicApiServer", func() { }) - Context("when calling create credential endpoint", func() { - It("should fail with 401", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - nil, http.MethodPut, "", http.StatusUnauthorized) - }) - - }) - - Context("when calling delete credential endpoint", func() { - It("should fail with 401", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - nil, http.MethodDelete, "", http.StatusUnauthorized) - }) - - }) - }) Describe("Without Client Token", func() { @@ -262,20 +230,6 @@ var _ = Describe("PublicApiServer", func() { }) }) - Context("when calling create credential endpoint", func() { - It("should fail with 401", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - map[string]string{"Authorization": TEST_USER_TOKEN}, http.MethodPut, "", http.StatusUnauthorized) - }) - - }) - Context("when calling delete credential endpoint", func() { - It("should fail with 401", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - map[string]string{"Authorization": TEST_USER_TOKEN}, http.MethodDelete, "", http.StatusUnauthorized) - }) - - }) }) Describe("With Invalid Client Token", func() { @@ -336,20 +290,6 @@ var _ = Describe("PublicApiServer", func() { }) }) - Context("when calling create credential endpoint", func() { - It("should fail with 401", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - map[string]string{"Authorization": TEST_USER_TOKEN}, http.MethodPut, "", http.StatusUnauthorized) - }) - - }) - Context("when calling delete credential endpoint", func() { - It("should fail with 401", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - map[string]string{"Authorization": TEST_USER_TOKEN}, http.MethodDelete, "", http.StatusUnauthorized) - }) - - }) }) Describe("With Invalid Authorization Token", func() { @@ -409,20 +349,6 @@ var _ = Describe("PublicApiServer", func() { }) }) - Context("when calling create credential endpoint", func() { - It("should fail with 401", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - map[string]string{"Authorization": TEST_INVALID_USER_TOKEN}, http.MethodPut, "", http.StatusUnauthorized) - }) - - }) - Context("when calling delete credential endpoint", func() { - It("should fail with 401", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - map[string]string{"Authorization": TEST_INVALID_USER_TOKEN}, http.MethodDelete, "", http.StatusUnauthorized) - }) - - }) }) Describe("With valid authorization token", func() { @@ -497,21 +423,6 @@ var _ = Describe("PublicApiServer", func() { map[string]string{"Authorization": TEST_USER_TOKEN, "X-Autoscaler-Token": TEST_CLIENT_TOKEN}, http.MethodPut, policy, http.StatusOK) }) }) - - Context("when calling create credential endpoint", func() { - It("should succeed", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - map[string]string{"Authorization": TEST_USER_TOKEN, "X-Autoscaler-Token": TEST_CLIENT_TOKEN}, http.MethodPut, "", http.StatusOK) - }) - - }) - Context("when calling delete credential endpoint", func() { - It("should succeed", func() { - verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/credential", - map[string]string{"Authorization": TEST_USER_TOKEN, "X-Autoscaler-Token": TEST_CLIENT_TOKEN}, http.MethodDelete, "", http.StatusOK) - }) - - }) }) }) Describe("UnProtected Routes", func() { diff --git a/src/autoscaler/api/publicapiserver/publicapiserver_suite_test.go b/src/autoscaler/api/publicapiserver/publicapiserver_suite_test.go index 361b6412ba..4c73bc9d28 100644 --- a/src/autoscaler/api/publicapiserver/publicapiserver_suite_test.go +++ b/src/autoscaler/api/publicapiserver/publicapiserver_suite_test.go @@ -88,7 +88,7 @@ var _ = BeforeSuite(func() { eventGeneratorServer = ghttp.NewServer() schedulerServer = ghttp.NewServer() - conf = CreateConfig(true, apiPort) + conf = CreateConfig(apiPort) // verify MetricCollector certs _, err := os.ReadFile(conf.EventGenerator.TLSClientCerts.KeyFile) @@ -176,7 +176,7 @@ func CheckResponse(resp *httptest.ResponseRecorder, statusCode int, errResponse Expect(errResp).To(Equal(errResponse)) } -func CreateConfig(useBuildInMode bool, apiServerPort int) *config.Config { +func CreateConfig(apiServerPort int) *config.Config { return &config.Config{ Logging: helpers.LoggingConfig{ Level: "debug", @@ -214,7 +214,6 @@ func CreateConfig(useBuildInMode bool, apiServerPort int) *config.Config { Secret: CLIENT_SECRET, ClientConfig: cf.ClientConfig{SkipSSLValidation: true}, }, - UseBuildInMode: useBuildInMode, - APIClientId: "api-client-id", + APIClientId: "api-client-id", } } diff --git a/src/autoscaler/integration/components_test.go b/src/autoscaler/integration/components_test.go index 10d5ca6a30..bce423519d 100644 --- a/src/autoscaler/integration/components_test.go +++ b/src/autoscaler/integration/components_test.go @@ -199,7 +199,7 @@ func (components *Components) MetricsGateway(confPath string, argv ...string) *g }) } -func (components *Components) PrepareGolangApiServerConfig(dbURI string, publicApiPort int, brokerPort int, cfApi string, schedulerUri string, scalingEngineUri string, metricsCollectorUri string, eventGeneratorUri string, metricsForwarderUri string, useBuildInMode bool, tmpDir string) string { +func (components *Components) PrepareGolangApiServerConfig(dbURI string, publicApiPort int, brokerPort int, cfApi string, schedulerUri string, scalingEngineUri string, metricsCollectorUri string, eventGeneratorUri string, metricsForwarderUri string, tmpDir string) string { brokerCred1 := apiConfig.BrokerCredentialsConfig{ BrokerUsername: "broker_username", //BrokerUsernameHash: []byte("$2a$10$WNO1cPko4iDAT6MkhaDojeJMU8ZdNH6gt.SapsFOsC0OF4cQ9qQwu"), // ruby -r bcrypt -e 'puts BCrypt::Password.create("broker_username")' @@ -277,8 +277,7 @@ func (components *Components) PrepareGolangApiServerConfig(dbURI string, publicA ClientID: "admin", Secret: "admin", }, - UseBuildInMode: useBuildInMode, - InfoFilePath: golangAPIInfoFilePath, + InfoFilePath: golangAPIInfoFilePath, MetricsForwarder: apiConfig.MetricsForwarderConfig{ MetricsForwarderUrl: metricsForwarderUri, }, diff --git a/src/autoscaler/integration/integration_golangapi_eventgenerator_test.go b/src/autoscaler/integration/integration_golangapi_eventgenerator_test.go index afcf9131b5..12597a206a 100644 --- a/src/autoscaler/integration/integration_golangapi_eventgenerator_test.go +++ b/src/autoscaler/integration/integration_golangapi_eventgenerator_test.go @@ -37,7 +37,6 @@ var _ = Describe("Integration_GolangApi_EventGenerator", func() { fmt.Sprintf("https://127.0.0.1:%d", components.Ports[MetricsCollector]), fmt.Sprintf("https://127.0.0.1:%d", components.Ports[EventGenerator]), "https://127.0.0.1:8888", - true, tmpDir) startGolangApiServer() appId = getRandomIdRef("appId") diff --git a/src/autoscaler/integration/integration_golangapi_scalingengine_test.go b/src/autoscaler/integration/integration_golangapi_scalingengine_test.go index c3bed3e97a..0550eccbe7 100644 --- a/src/autoscaler/integration/integration_golangapi_scalingengine_test.go +++ b/src/autoscaler/integration/integration_golangapi_scalingengine_test.go @@ -35,7 +35,6 @@ var _ = Describe("Integration_GolangApi_ScalingEngine", func() { fmt.Sprintf("https://127.0.0.1:%d", components.Ports[MetricsCollector]), fmt.Sprintf("https://127.0.0.1:%d", components.Ports[EventGenerator]), "https://127.0.0.1:8888", - true, tmpDir) startGolangApiServer() appId = getUUID() diff --git a/src/autoscaler/integration/integration_golangapi_scheduler_test.go b/src/autoscaler/integration/integration_golangapi_scheduler_test.go index d60e0735c1..a0c46a4450 100644 --- a/src/autoscaler/integration/integration_golangapi_scheduler_test.go +++ b/src/autoscaler/integration/integration_golangapi_scheduler_test.go @@ -63,7 +63,6 @@ var _ = Describe("Integration_GolangApi_Scheduler", func() { fmt.Sprintf("https://127.0.0.1:%d", components.Ports[MetricsCollector]), fmt.Sprintf("https://127.0.0.1:%d", components.Ports[EventGenerator]), "https://127.0.0.1:8888", - false, tmpDir) startGolangApiServer() @@ -484,114 +483,6 @@ var _ = Describe("Integration_GolangApi_Scheduler", func() { }) }) - - Describe("When offered as a built-in experience", func() { - BeforeEach(func() { - golangApiServerConfPath = components.PrepareGolangApiServerConfig( - dbUrl, - components.Ports[GolangAPIServer], - components.Ports[GolangServiceBroker], - fakeCCNOAAUAA.URL(), - fmt.Sprintf("https://127.0.0.1:%d", components.Ports[Scheduler]), - fmt.Sprintf("https://127.0.0.1:%d", components.Ports[ScalingEngine]), - fmt.Sprintf("https://127.0.0.1:%d", components.Ports[MetricsCollector]), - fmt.Sprintf("https://127.0.0.1:%d", components.Ports[EventGenerator]), - "https://127.0.0.1:8888", - true, - tmpDir) - startGolangApiServer() - - resp, err := detachPolicy(appId, components.Ports[GolangAPIServer], httpClientForPublicApi) - Expect(err).NotTo(HaveOccurred()) - defer func() { _ = resp.Body.Close() }() - }) - AfterEach(func() { - stopGolangApiServer() - }) - - Describe("Create policy", func() { - Context("public api", func() { - Context("Policies with schedules", func() { - It("creates a policy and associated schedules", func() { - policyStr = setPolicyRecurringDate(readPolicyFromFile("fakePolicyWithSchedule.json")) - - doAttachPolicy(appId, policyStr, http.StatusOK, components.Ports[GolangAPIServer], httpClientForPublicApi) - checkApiServerContent(appId, policyStr, http.StatusOK, components.Ports[GolangAPIServer], httpClientForPublicApi) - assertScheduleContents(appId, http.StatusOK, map[string]int{"recurring_schedule": 4, "specific_date": 2}) - }) - - It("fails with an invalid policy", func() { - policyStr = readPolicyFromFile("fakeInvalidPolicy.json") - - doAttachPolicy(appId, policyStr, http.StatusBadRequest, components.Ports[GolangAPIServer], httpClientForPublicApi) - checkApiServerStatus(appId, http.StatusNotFound, components.Ports[GolangAPIServer], httpClientForPublicApi) - checkSchedulerStatus(appId, http.StatusNotFound) - }) - - }) - - Context("Policies without schedules", func() { - It("creates only the policy", func() { - policyStr = readPolicyFromFile("fakePolicyWithoutSchedule.json") - - doAttachPolicy(appId, policyStr, http.StatusOK, components.Ports[GolangAPIServer], httpClientForPublicApi) - checkApiServerContent(appId, policyStr, http.StatusOK, components.Ports[GolangAPIServer], httpClientForPublicApi) - checkSchedulerStatus(appId, http.StatusNotFound) - - }) - }) - }) - - }) - - Describe("Update policy", func() { - Context("public api", func() { - Context("Update policies with schedules", func() { - BeforeEach(func() { - //attach a policy first with 4 recurring and 2 specific_date schedules - policyStr = setPolicyRecurringDate(readPolicyFromFile("fakePolicyWithSchedule.json")) - doAttachPolicy(appId, policyStr, http.StatusOK, components.Ports[GolangAPIServer], httpClientForPublicApi) - }) - - It("updates the policy and schedules", func() { - //attach another policy with 3 recurring and 1 specific_date schedules - policyStr = setPolicyRecurringDate(readPolicyFromFile("fakePolicyWithScheduleAnother.json")) - - doAttachPolicy(appId, policyStr, http.StatusOK, components.Ports[GolangAPIServer], httpClientForPublicApi) - checkApiServerContent(appId, policyStr, http.StatusOK, components.Ports[GolangAPIServer], httpClientForPublicApi) - assertScheduleContents(appId, http.StatusOK, map[string]int{"recurring_schedule": 3, "specific_date": 1}) - }) - }) - }) - - }) - - Describe("Delete Policies", func() { - Context("public api", func() { - Context("for a non-existing app", func() { - It("Should return OK", func() { - doDetachPolicy(appId, http.StatusOK, `{}`, components.Ports[GolangAPIServer], httpClientForPublicApi) - }) - }) - - Context("with an existing app", func() { - BeforeEach(func() { - //attach a policy first with 4 recurring and 2 specific_date schedules - policyStr = readPolicyFromFile("fakePolicyWithSchedule.json") - doAttachPolicy(appId, policyStr, http.StatusOK, components.Ports[GolangAPIServer], httpClientForPublicApi) - }) - - It("deletes the policy and schedules", func() { - doDetachPolicy(appId, http.StatusOK, "", components.Ports[GolangAPIServer], httpClientForPublicApi) - checkApiServerStatus(appId, http.StatusNotFound, components.Ports[GolangAPIServer], httpClientForPublicApi) - checkSchedulerStatus(appId, http.StatusNotFound) - }) - }) - }) - - }) - - }) }) func ResponseMessage(resp *http.Response) string { diff --git a/src/autoscaler/integration/integration_operator_others_test.go b/src/autoscaler/integration/integration_operator_others_test.go index 4998a7c8d1..69427abdb2 100644 --- a/src/autoscaler/integration/integration_operator_others_test.go +++ b/src/autoscaler/integration/integration_operator_others_test.go @@ -1,6 +1,7 @@ package integration_test import ( + "encoding/base64" "fmt" "net/http" "time" @@ -19,6 +20,10 @@ var _ = Describe("Integration_Operator_Others", func() { testGuid string initInstanceCount = 2 policyStr string + serviceInstanceId string + bindingId string + orgId string + spaceId string ) BeforeEach(func() { @@ -26,6 +31,11 @@ var _ = Describe("Integration_Operator_Others", func() { testAppId = getUUID() testGuid = getUUID() + serviceInstanceId = getRandomIdRef("serviceInstId") + orgId = getRandomIdRef("orgId") + spaceId = getRandomIdRef("spaceId") + bindingId = getRandomIdRef("bindingId") + startFakeCCNOAAUAA(initInstanceCount) golangApiServerConfPath = components.PrepareGolangApiServerConfig( @@ -38,9 +48,10 @@ var _ = Describe("Integration_Operator_Others", func() { fmt.Sprintf("https://127.0.0.1:%d", components.Ports[MetricsServerHTTP]), fmt.Sprintf("https://127.0.0.1:%d", components.Ports[EventGenerator]), "https://127.0.0.1:8888", - true, tmpDir) startGolangApiServer() + brokerAuth = base64.StdEncoding.EncodeToString([]byte("broker_username:broker_password")) + provisionAndBind(serviceInstanceId, orgId, spaceId, bindingId, testAppId, components.Ports[GolangServiceBroker], httpClientForPublicApi) scalingEngineConfPath = components.PrepareScalingEngineConfig(dbUrl, components.Ports[ScalingEngine], fakeCCNOAAUAA.URL(), defaultHttpClientTimeout, tmpDir) startScalingEngine() diff --git a/src/autoscaler/routes/routes.go b/src/autoscaler/routes/routes.go index 17e73abf34..3cf31a7875 100644 --- a/src/autoscaler/routes/routes.go +++ b/src/autoscaler/routes/routes.go @@ -52,10 +52,6 @@ const ( PublicApiAttachPolicyRouteName = "AttachPolicy" PublicApiDetachPolicyRouteName = "DetachPolicy" - PublicApiCredentialPath = "/v1/apps/{appId:.+}/credential" // #nosec G101 - PublicApiCreateCredentialRouteName = "CreateCredential" // #nosec G101 - PublicApiDeleteCredentialRouteName = "DeleteCredential" // #nosec G101 - PublicApiInfoPath = "/v1/info" PublicApiInfoRouteName = "GetPublicApiInfo" @@ -121,10 +117,6 @@ func newRouters() *AutoScalerRoute { instance.apiPolicyRoutes.Path("").Methods(http.MethodPut).Name(PublicApiAttachPolicyRouteName) instance.apiPolicyRoutes.Path("").Methods(http.MethodDelete).Name(PublicApiDetachPolicyRouteName) - instance.apiCredentialRoutes = instance.apiOpenRoutes.Path(PublicApiCredentialPath).Subrouter() - instance.apiCredentialRoutes.Path("").Methods(http.MethodPut).Name(PublicApiCreateCredentialRouteName) - instance.apiCredentialRoutes.Path("").Methods(http.MethodDelete).Name(PublicApiDeleteCredentialRouteName) - return instance } diff --git a/templates/app-autoscaler-deployment.yml b/templates/app-autoscaler-deployment.yml index 7383969520..8be6b9c98f 100644 --- a/templates/app-autoscaler-deployment.yml +++ b/templates/app-autoscaler-deployment.yml @@ -510,7 +510,6 @@ instance_groups: public_api: server: port: &publicApiServerPort 6101 - use_buildin_mode: false scheduler: host: autoscalerscheduler.service.cf.internal ca_cert: ((scheduler_ca.ca)) diff --git a/templates/app-autoscaler.yml b/templates/app-autoscaler.yml index 5efa2bb159..b27231ae85 100644 --- a/templates/app-autoscaler.yml +++ b/templates/app-autoscaler.yml @@ -249,7 +249,6 @@ instance_groups: public_api: server: port: &publicApiServerPort 6101 - use_buildin_mode: false scheduler: ca_cert: ((!scheduler_client_cert.ca)) client_cert: ((!scheduler_client_cert.certificate)) From 7dbf585e027e19fa34e7817365db672dc1013974 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Fri, 3 May 2024 15:18:41 +0200 Subject: [PATCH 17/42] feat(deps): Add `devbox` config (#2914) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Issue Specifying exact versions for dependencies in Nix is not straightforward. # Fix This commit adds a basic `devbox` configuration for our project. If you want to try it out: [Install devbox] and run `devbox shell` [Install devbox]: https://www.jetpack.io/devbox/docs/installing_devbox/ * fix(deps): Rollback `concourse` version # Issue The required version of the concourse CLI is dictated by the server. concourse.app-runtime-interfaces.ci.cloudfoundry.org is on 7.10.0 # Fix Rollback and disable automated updates through renovate * 🤖🦾🛠️ scripts/asdf2devbox.py --- .devcontainer/Dockerfile | 18 + .devcontainer/devcontainer.json | 16 + .envrc | 14 +- .github/workflows/asdf2devbox.yaml | 87 +++ .tool-versions | 2 +- devbox.json | 46 ++ devbox.lock | 1164 ++++++++++++++++++++++++++++ local-flake/flake.lock | 27 + local-flake/flake.nix | 48 ++ renovate.json | 8 - scripts/asdf2devbox.py | 50 ++ 11 files changed, 1464 insertions(+), 16 deletions(-) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json create mode 100644 .github/workflows/asdf2devbox.yaml create mode 100644 devbox.json create mode 100644 devbox.lock create mode 100644 local-flake/flake.lock create mode 100644 local-flake/flake.nix create mode 100755 scripts/asdf2devbox.py diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000000..120dcb9c6a --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,18 @@ +FROM jetpackio/devbox:latest + +# Installing your devbox project +WORKDIR /code +USER root:root +RUN mkdir -p /code && chown ${DEVBOX_USER}:${DEVBOX_USER} /code +USER ${DEVBOX_USER}:${DEVBOX_USER} +COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} devbox.json devbox.json +COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} devbox.lock devbox.lock + + +# Step 6: Copying local flakes directories +COPY local-flake local-flake +COPY local-flake local-flake + +RUN devbox run -- echo "Installed Packages." + +RUN devbox shellenv --init-hook >> ~/.profile diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..e7ae9f11fe --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,16 @@ +{ + "name": "Devbox Remote Container", + "build": { + "dockerfile": "./Dockerfile", + "context": ".." + }, + "customizations": { + "vscode": { + "settings": {}, + "extensions": [ + "jetpack-io.devbox" + ] + } + }, + "remoteUser": "devbox" +} \ No newline at end of file diff --git a/.envrc b/.envrc index 8b77fd60b6..84fc8e5361 100644 --- a/.envrc +++ b/.envrc @@ -1,7 +1,7 @@ -strict_env -if has nix -then - unset GOPATH # Required for editors to discover the go-tools in the flake. - use flake - layout ruby -fi \ No newline at end of file +# Automatically sets up your devbox environment whenever you cd into this +# directory via our direnv integration: + +eval "$(devbox generate direnv --print-envrc)" + +# check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/ +# for more details diff --git a/.github/workflows/asdf2devbox.yaml b/.github/workflows/asdf2devbox.yaml new file mode 100644 index 0000000000..405a86e316 --- /dev/null +++ b/.github/workflows/asdf2devbox.yaml @@ -0,0 +1,87 @@ +name: "ASDF to Devbox dependency version sync" +# This is only required until https://github.com/renovatebot/renovate/issues/27543 is resolved +on: + pull_request: + paths: + - ".tool-versions" +jobs: + asdf2devbox: + runs-on: ubuntu-latest + permissions: + pull-requests: write + contents: write + steps: + # We potentially want to add at the end a commit by the author of the most recent + # commit in this branch. However github has some protection which prevents workflows + # to run in case a commit has been pushed with the default job-specific github-token. + # For this case we need to use another one here. + # + # For more information, see: + # + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} + token: ${{ secrets.APP_AUTOSCALER_CI_TOKEN }} # With push token that can trigger new PR jobs + + - name: Configure git + id: configure_git + shell: bash + run: | + #! /usr/bin/env bash + set -eu -o pipefail + + git config --global --add safe.directory "${GITHUB_WORKSPACE}" + + commit_author_name="$(git log -1 --pretty=format:'%an')" + commit_author_email="$(git log -1 --pretty=format:'%ae')" + commit_subject="$(git log -1 --pretty=format:'%s')" + readonly commit_author_name commit_author_email commit_subject + + git config user.name "${commit_author_name}" + git config user.email "${commit_author_email}" + + echo "commit_subject=${commit_subject}" >> "$GITHUB_OUTPUT" + + - name: Install devbox + uses: jetify-com/devbox-install-action@v0.9.0 + with: + enable-cache: 'true' + + - name: asdf2devbox.py + shell: bash + run: | + #! /usr/bin/env bash + set -eu -o pipefail + + # We need the subsequent standard-message to determine if the last commit + # has already cleaned up everything. In this case this workflow should not + # change anything and we exit early. + # An alternative would be to use a tag for this. But this does affect the whole + # PR instead of just the latest commit. + tidy_message='🤖🦾🛠️ scripts/asdf2devbox.py' + readonly tidy_message + + commit_message='${{steps.configure_git.outputs.commit_subject}}' + readonly commit_message + + if [[ "${commit_message}" == "${tidy_message}" ]] + then + echo 'This commit was by the asdf2devbox workflow! Exiting …' + exit 0 + fi + + devbox run scripts/asdf2devbox.py + + num_changed_files="$(git status --porcelain | wc --lines)" + declare -i -r num_changed_files + if ((num_changed_files > 0)) + then + echo 'Changes to some files were necessary!' + git add . + git commit --message="${tidy_message}" + git push origin "HEAD:${GITHUB_HEAD_REF}" + else + echo 'No files changed!' + fi + echo '🏁' diff --git a/.tool-versions b/.tool-versions index ddc660fcb5..95c1f81d33 100644 --- a/.tool-versions +++ b/.tool-versions @@ -2,7 +2,7 @@ act 0.2.62 actionlint 1.6.27 bosh 7.5.6 cf 8.7.10 -concourse 7.11.2 +concourse 7.10.0 direnv 2.34.0 gcloud 473.0.0 ginkgo 2.17.2 diff --git a/devbox.json b/devbox.json new file mode 100644 index 0000000000..137c585c81 --- /dev/null +++ b/devbox.json @@ -0,0 +1,46 @@ +{ + "packages": [ + "path:local-flake#bosh-bootloader", + "path:local-flake#app-autoscaler-cli-plugin", + "credhub-cli@latest", + "delve@latest", + "gh@latest", + "go-tools@latest", + "gopls@latest", + "nodejs@latest", + "nodePackages.yaml-language-server@latest", + "rubocop@latest", + "rubyPackages.solargraph@latest", + "swagger-cli@latest", + "go@1.21.4", + "actionlint@1.6.27", + "direnv@2.34.0", + "gnumake@4.4", + "maven@3.8.6", + "pre-commit@latest", + "bosh-cli@7.5.6", + "golangci-lint@1.57.2", + "yq-go@4.43.1", + "which@latest", + "jq@latest", + "fly@7.10.0", + "python@latest", + "act@latest", + "cloudfoundry-cli@8.7.10", + "google-cloud-sdk@latest", + "ginkgo@latest", + "temurin-bin-17@latest", + "ruby@latest", + "shellcheck@0.10.0" + ], + "shell": { + "init_hook": [ + "cf install-plugin -f $(which app-autoscaler-cli-plugin)" + ], + "scripts": { + "test": [ + "echo \"Error: no test specified\" && exit 1" + ] + } + } +} diff --git a/devbox.lock b/devbox.lock new file mode 100644 index 0000000000..a6fd1b8a16 --- /dev/null +++ b/devbox.lock @@ -0,0 +1,1164 @@ +{ + "lockfile_version": "1", + "packages": { + "act@latest": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#act", + "source": "devbox-search", + "version": "0.2.61", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/0vv50cajcl1vsadkz0rwhzzdzcphfym9-act-0.2.61", + "default": true + } + ], + "store_path": "/nix/store/0vv50cajcl1vsadkz0rwhzzdzcphfym9-act-0.2.61" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/cix9yxzisv5vpiz16lq42jm06gksr1lj-act-0.2.61", + "default": true + } + ], + "store_path": "/nix/store/cix9yxzisv5vpiz16lq42jm06gksr1lj-act-0.2.61" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/zsbb15dvpzp9cim1hc1xng201rm9l65r-act-0.2.61", + "default": true + } + ], + "store_path": "/nix/store/zsbb15dvpzp9cim1hc1xng201rm9l65r-act-0.2.61" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/5iz6aqqdyr8drz64ic8vx86kr0hir0vk-act-0.2.61", + "default": true + } + ], + "store_path": "/nix/store/5iz6aqqdyr8drz64ic8vx86kr0hir0vk-act-0.2.61" + } + } + }, + "actionlint@1.6.27": { + "last_modified": "2024-03-17T01:03:25Z", + "resolved": "github:NixOS/nixpkgs/299d4668ba61600311553920d9fd9c102145b2cb#actionlint", + "source": "devbox-search", + "version": "1.6.27", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/nnhjp60w14pdy1hjgxn9dfsg4nbfs93v-actionlint-1.6.27" + }, + "aarch64-linux": { + "store_path": "/nix/store/p8rc44x83sld3wk1m4y27za9n1mjyk48-actionlint-1.6.27" + }, + "x86_64-darwin": { + "store_path": "/nix/store/7v1lh7c3pwlax5fy7pw233czn4hs89hl-actionlint-1.6.27" + }, + "x86_64-linux": { + "store_path": "/nix/store/56xxvs3yijdmhhxbfvps38nz95xdxgyl-actionlint-1.6.27" + } + } + }, + "bosh-cli@7.5.6": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#bosh-cli", + "source": "devbox-search", + "version": "7.5.6", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/p2sm9lj0jlikhh69xi55larmyqh61ryw-bosh-cli-7.5.6", + "default": true + } + ], + "store_path": "/nix/store/p2sm9lj0jlikhh69xi55larmyqh61ryw-bosh-cli-7.5.6" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/w3sby9zipmphdgsjd2xbaqna9qsb3db1-bosh-cli-7.5.6", + "default": true + } + ], + "store_path": "/nix/store/w3sby9zipmphdgsjd2xbaqna9qsb3db1-bosh-cli-7.5.6" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/i7csc1lqbrw76hhibxyi799blf1mi6fm-bosh-cli-7.5.6", + "default": true + } + ], + "store_path": "/nix/store/i7csc1lqbrw76hhibxyi799blf1mi6fm-bosh-cli-7.5.6" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/dila416vvd6zjr1rb54ygl39b84x4mc4-bosh-cli-7.5.6", + "default": true + } + ], + "store_path": "/nix/store/dila416vvd6zjr1rb54ygl39b84x4mc4-bosh-cli-7.5.6" + } + } + }, + "cloudfoundry-cli@8.7.10": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#cloudfoundry-cli", + "source": "devbox-search", + "version": "8.7.10", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/1aigw2nm7is18821nqxpx2ml090ir97j-cloudfoundry-cli-8.7.10", + "default": true + } + ], + "store_path": "/nix/store/1aigw2nm7is18821nqxpx2ml090ir97j-cloudfoundry-cli-8.7.10" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/dy0559nm61x9n1kanibppr1kzrwkbvxc-cloudfoundry-cli-8.7.10", + "default": true + } + ], + "store_path": "/nix/store/dy0559nm61x9n1kanibppr1kzrwkbvxc-cloudfoundry-cli-8.7.10" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/y5wk93kiyank5np7cxfgndp4jhlgnk1d-cloudfoundry-cli-8.7.10", + "default": true + } + ], + "store_path": "/nix/store/y5wk93kiyank5np7cxfgndp4jhlgnk1d-cloudfoundry-cli-8.7.10" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/y80g7qab72ym96bn766x6rpx58bsd9g7-cloudfoundry-cli-8.7.10", + "default": true + } + ], + "store_path": "/nix/store/y80g7qab72ym96bn766x6rpx58bsd9g7-cloudfoundry-cli-8.7.10" + } + } + }, + "credhub-cli@latest": { + "last_modified": "2024-02-24T23:06:34Z", + "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#credhub-cli", + "source": "devbox-search", + "version": "2.9.27", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/7yp4g9gxairkvf2jdx0a22iz6assfnvc-credhub-cli-2.9.27" + }, + "aarch64-linux": { + "store_path": "/nix/store/2aaxi9nxnkr7d3mzqadb8yab2d7p4q3s-credhub-cli-2.9.27" + }, + "x86_64-darwin": { + "store_path": "/nix/store/jb12m850bbkv2w2hfgxranyw8zdzvy0w-credhub-cli-2.9.27" + }, + "x86_64-linux": { + "store_path": "/nix/store/gcqisc7987hwfxhqgrx5lqdprhdpj1xw-credhub-cli-2.9.27" + } + } + }, + "delve@latest": { + "last_modified": "2024-02-24T23:06:34Z", + "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#delve", + "source": "devbox-search", + "version": "1.22.1", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/ll01c177yyphhw32rpfw8v11vbm1rhf7-delve-1.22.1" + }, + "aarch64-linux": { + "store_path": "/nix/store/5njigh11h33wq57qass6a0lb91fjwmnb-delve-1.22.1" + }, + "x86_64-darwin": { + "store_path": "/nix/store/zbzlc5nkyp4mad0cm2gy8ys1jm3qqafa-delve-1.22.1" + }, + "x86_64-linux": { + "store_path": "/nix/store/8nh4mcw7gql6xk3pxp538hi1ndsa51y1-delve-1.22.1" + } + } + }, + "direnv@2.34.0": { + "last_modified": "2024-03-08T13:51:52Z", + "resolved": "github:NixOS/nixpkgs/a343533bccc62400e8a9560423486a3b6c11a23b#direnv", + "source": "devbox-search", + "version": "2.34.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/4bqjfmrf3w2q1aqjmmcq0c012gavc7ci-direnv-2.34.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/yj744ay9rf1nf2wj09sdi64nnvdv4n7r-direnv-2.34.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/ncwb752y0avqkb8kpx7xn5xw8zs0aryg-direnv-2.34.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/3bmgmpaqm8p34hi6xb1y4fisf5n0pbbh-direnv-2.34.0" + } + } + }, + "fly@7.10.0": { + "last_modified": "2023-10-25T16:49:13-04:00", + "resolved": "github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c#fly", + "source": "devbox-search", + "version": "7.10.0", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/8izh5mrp88vpv2p22r5djhg1l3yijcir-fly-7.10.0", + "default": true + } + ], + "store_path": "/nix/store/8izh5mrp88vpv2p22r5djhg1l3yijcir-fly-7.10.0" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/bjhdz4zxq77av8rlvg32agpd8aixh7bh-fly-7.10.0", + "default": true + } + ], + "store_path": "/nix/store/bjhdz4zxq77av8rlvg32agpd8aixh7bh-fly-7.10.0" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/60jgzhcj2s4rchrmqc479gi46fkydjyc-fly-7.10.0", + "default": true + } + ], + "store_path": "/nix/store/60jgzhcj2s4rchrmqc479gi46fkydjyc-fly-7.10.0" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/ddyvlw35d8skg4r7gv732g19ch7bwrh0-fly-7.10.0", + "default": true + } + ], + "store_path": "/nix/store/ddyvlw35d8skg4r7gv732g19ch7bwrh0-fly-7.10.0" + } + } + }, + "gh@latest": { + "last_modified": "2024-03-06T17:57:40Z", + "resolved": "github:NixOS/nixpkgs/58ae79ea707579c40102ddf62d84b902a987c58b#gh", + "source": "devbox-search", + "version": "2.45.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/n5hz2hmaxy8mr4qs91pvqwzbdza53bck-gh-2.45.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/8321g2vjajybabcvl9kyjklknx7bl7qp-gh-2.45.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/7mbb381r18qa1lp9yhrakigypnvvcxd1-gh-2.45.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/yrlmd02lfgzz3f5g2n3s8ink2f72y6j1-gh-2.45.0" + } + } + }, + "ginkgo@latest": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#ginkgo", + "source": "devbox-search", + "version": "2.17.1", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/94622rky2ffpbz6vpyqdmi86knm3czkw-ginkgo-2.17.1", + "default": true + } + ], + "store_path": "/nix/store/94622rky2ffpbz6vpyqdmi86knm3czkw-ginkgo-2.17.1" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/d06nha7nl3f8iw5vf06vsfircmvlj852-ginkgo-2.17.1", + "default": true + } + ], + "store_path": "/nix/store/d06nha7nl3f8iw5vf06vsfircmvlj852-ginkgo-2.17.1" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/ihm49vvp0z4aifblx362ramg8spinkz5-ginkgo-2.17.1", + "default": true + } + ], + "store_path": "/nix/store/ihm49vvp0z4aifblx362ramg8spinkz5-ginkgo-2.17.1" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/rsq6y6wxhdvh6xr5sk39pp9agxd9vvf5-ginkgo-2.17.1", + "default": true + } + ], + "store_path": "/nix/store/rsq6y6wxhdvh6xr5sk39pp9agxd9vvf5-ginkgo-2.17.1" + } + } + }, + "gnumake@4.4": { + "last_modified": "2024-03-18T12:38:16Z", + "resolved": "github:NixOS/nixpkgs/e367f7a1fb93137af22a3908f00b9a35e2d286a7#gnumake", + "source": "devbox-search", + "version": "4.4.1", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/b4jbbx01f3n4r97g49jnxw3clf4p1szv-gnumake-4.4.1" + }, + "aarch64-linux": { + "store_path": "/nix/store/hfyyfn6h7cw2fvdc0jmpfigwi3rp7d2x-gnumake-4.4.1" + }, + "x86_64-darwin": { + "store_path": "/nix/store/ry772inn49ra4vmns2vg67bjpqv29j0k-gnumake-4.4.1" + }, + "x86_64-linux": { + "store_path": "/nix/store/0pkbh7939p7npr02ayama32pa389m5p7-gnumake-4.4.1" + } + } + }, + "go-tools@latest": { + "last_modified": "2024-02-24T23:06:34Z", + "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#go-tools", + "source": "devbox-search", + "version": "2023.1.7", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/rl80in8hbi1rhz9ih6shyy8faxk0mmz8-go-tools-2023.1.7" + }, + "aarch64-linux": { + "store_path": "/nix/store/82cwimrkpyjhqx7wfnilr46a2nlqjana-go-tools-2023.1.7" + }, + "x86_64-darwin": { + "store_path": "/nix/store/z7y51ka323njb7xjza1lkj75bs8v2prx-go-tools-2023.1.7" + }, + "x86_64-linux": { + "store_path": "/nix/store/49qp9pm1nm6vq4jhcxagary4xfwa7hkb-go-tools-2023.1.7" + } + } + }, + "go@1.21.4": { + "last_modified": "2023-11-17T14:14:56Z", + "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#go", + "source": "devbox-search", + "version": "1.21.4", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/02cpvad60np366kmsqc3gnixbsw9jvg1-go-1.21.4" + }, + "aarch64-linux": { + "store_path": "/nix/store/7y75b2ac80chlh6knld3943y46n3v9kf-go-1.21.4" + }, + "x86_64-darwin": { + "store_path": "/nix/store/0djljz0g4s6f55xcnw7fpzcy7af7rxid-go-1.21.4" + }, + "x86_64-linux": { + "store_path": "/nix/store/y7abhs9glxfcg7lgcdc8i4ml5wg5ly92-go-1.21.4" + } + } + }, + "golangci-lint@1.57.2": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#golangci-lint", + "source": "devbox-search", + "version": "1.57.2", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/v65kn6pxwkj281pyx3ns5d7rlp0sp762-golangci-lint-1.57.2", + "default": true + } + ], + "store_path": "/nix/store/v65kn6pxwkj281pyx3ns5d7rlp0sp762-golangci-lint-1.57.2" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/8gn8xyjpw24670wixdy2hrqpy91fjgv5-golangci-lint-1.57.2", + "default": true + } + ], + "store_path": "/nix/store/8gn8xyjpw24670wixdy2hrqpy91fjgv5-golangci-lint-1.57.2" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/ws2rl2l8p4zjqx0zqwm1r57qqjwbzxly-golangci-lint-1.57.2", + "default": true + } + ], + "store_path": "/nix/store/ws2rl2l8p4zjqx0zqwm1r57qqjwbzxly-golangci-lint-1.57.2" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/n2ng9hhfwvr480wvv45837hqsivaaqdp-golangci-lint-1.57.2", + "default": true + } + ], + "store_path": "/nix/store/n2ng9hhfwvr480wvv45837hqsivaaqdp-golangci-lint-1.57.2" + } + } + }, + "google-cloud-sdk@latest": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#google-cloud-sdk", + "source": "devbox-search", + "version": "467.0.0", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/rcgpjzwm11fy37ff03g4qm9lyak8by3q-google-cloud-sdk-467.0.0", + "default": true + } + ], + "store_path": "/nix/store/rcgpjzwm11fy37ff03g4qm9lyak8by3q-google-cloud-sdk-467.0.0" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/d3g4xrjxpz7p4zm6gc3lgfbgqwidqk92-google-cloud-sdk-467.0.0", + "default": true + } + ], + "store_path": "/nix/store/d3g4xrjxpz7p4zm6gc3lgfbgqwidqk92-google-cloud-sdk-467.0.0" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/px0rjif67b8k9lgs9pczbl7v21fxavrg-google-cloud-sdk-467.0.0", + "default": true + } + ], + "store_path": "/nix/store/px0rjif67b8k9lgs9pczbl7v21fxavrg-google-cloud-sdk-467.0.0" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/0wxgc7yl52c5pzda9f7r7hp1fnha4s03-google-cloud-sdk-467.0.0", + "default": true + } + ], + "store_path": "/nix/store/0wxgc7yl52c5pzda9f7r7hp1fnha4s03-google-cloud-sdk-467.0.0" + } + } + }, + "gopls@latest": { + "last_modified": "2024-02-29T18:14:35Z", + "resolved": "github:NixOS/nixpkgs/b5f6e3881acf8ca8a35b8cdb8d4021e5bd469a4e#gopls", + "source": "devbox-search", + "version": "0.15.1", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/5rm9fvahy3xgb4q42rhf6dsggp4r442b-gopls-0.15.1" + }, + "aarch64-linux": { + "store_path": "/nix/store/8rryibahn2i86zb9846j954r3dasyz7c-gopls-0.15.1" + }, + "x86_64-darwin": { + "store_path": "/nix/store/gd5yy3xfjhz4lgf7vw01mzzjp5qb5355-gopls-0.15.1" + }, + "x86_64-linux": { + "store_path": "/nix/store/sa9fczlr6rcip8inlb9z6l3hd2hy9gs2-gopls-0.15.1" + } + } + }, + "jq@latest": { + "last_modified": "2024-04-21T11:44:28-04:00", + "resolved": "github:NixOS/nixpkgs/69ee1d82f1fa4c70a3dc9a64111e7eef3b8e4527#jq", + "source": "devbox-search", + "version": "1.7.1", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "bin", + "path": "/nix/store/cpd390lw7hzsbvsq02d3prxjyj987ykg-jq-1.7.1-bin", + "default": true + }, + { + "name": "man", + "path": "/nix/store/nm26pqk8f9cfdk42x0fzdhccfhijcycd-jq-1.7.1-man", + "default": true + }, + { + "name": "out", + "path": "/nix/store/2il8xa2rsv55i0a86ivm59pndqfardhc-jq-1.7.1" + }, + { + "name": "dev", + "path": "/nix/store/j1rai51ycjm9y5bayrfii1y0rqldbxxv-jq-1.7.1-dev" + }, + { + "name": "doc", + "path": "/nix/store/a1sscyljd5lx674lh8ab7wjlb0d03x86-jq-1.7.1-doc" + }, + { + "name": "lib", + "path": "/nix/store/05mw0b8ririsykj8fpc1dy9lgnnlp77i-jq-1.7.1-lib" + } + ], + "store_path": "/nix/store/cpd390lw7hzsbvsq02d3prxjyj987ykg-jq-1.7.1-bin" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "bin", + "path": "/nix/store/www2wsy5azig3si2mcvcbig36npvz8p0-jq-1.7.1-bin", + "default": true + }, + { + "name": "man", + "path": "/nix/store/f8kd7zxmlciy87xrf1j36q2rymld3a22-jq-1.7.1-man", + "default": true + }, + { + "name": "dev", + "path": "/nix/store/b8ji00dhcknd1p9afa80ydral59z6dzp-jq-1.7.1-dev" + }, + { + "name": "doc", + "path": "/nix/store/xmam34cnczr17warmz692jd3dyip25aq-jq-1.7.1-doc" + }, + { + "name": "lib", + "path": "/nix/store/88miljr5qkqdzlhm7ib26fws4hkz04s8-jq-1.7.1-lib" + }, + { + "name": "out", + "path": "/nix/store/dkpfzwwl049kk1dwnyjacabjvszjknww-jq-1.7.1" + } + ], + "store_path": "/nix/store/www2wsy5azig3si2mcvcbig36npvz8p0-jq-1.7.1-bin" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "bin", + "path": "/nix/store/7v052gsm0fs3n9bcr9hdffspq8fnq872-jq-1.7.1-bin", + "default": true + }, + { + "name": "man", + "path": "/nix/store/dfsyxb7dqxwp3n1bnrzrvbz6lkmz8wyl-jq-1.7.1-man", + "default": true + }, + { + "name": "dev", + "path": "/nix/store/p0q6vmks1ql07g9hv1p63mkvbs7331xq-jq-1.7.1-dev" + }, + { + "name": "doc", + "path": "/nix/store/3mj72b0gx9kz2y04pcbnfvv6sk8y4jbi-jq-1.7.1-doc" + }, + { + "name": "lib", + "path": "/nix/store/j5qzf4k1c747ci0fp2wdp9xa1czkb5s5-jq-1.7.1-lib" + }, + { + "name": "out", + "path": "/nix/store/fni2q2wmlr64d70j0dw97zhhzmay1nm3-jq-1.7.1" + } + ], + "store_path": "/nix/store/7v052gsm0fs3n9bcr9hdffspq8fnq872-jq-1.7.1-bin" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "bin", + "path": "/nix/store/sxmad6bc8j8qgqvcc7278fjsrgm89qkc-jq-1.7.1-bin", + "default": true + }, + { + "name": "man", + "path": "/nix/store/4d9grvh3ssqdqqzycbiyh535ikbs7rg7-jq-1.7.1-man", + "default": true + }, + { + "name": "dev", + "path": "/nix/store/82ma9xbiyybcqxmcqxd625hmv4nig19r-jq-1.7.1-dev" + }, + { + "name": "doc", + "path": "/nix/store/q55rnn9jh9h3r6imb07w53dyk8d9sd1l-jq-1.7.1-doc" + }, + { + "name": "lib", + "path": "/nix/store/rg32apprx9b1bidimbpypjcb3j4zp0vy-jq-1.7.1-lib" + }, + { + "name": "out", + "path": "/nix/store/4isj4w52vpavwfd8yj9r78dmyg4zy48y-jq-1.7.1" + } + ], + "store_path": "/nix/store/sxmad6bc8j8qgqvcc7278fjsrgm89qkc-jq-1.7.1-bin" + } + } + }, + "maven@3.8.6": { + "last_modified": "2023-06-18T07:20:12Z", + "resolved": "github:NixOS/nixpkgs/4d887ae7666a6ffb79e1767d8fd417daf9e4220f#maven", + "source": "devbox-search", + "version": "3.8.6", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/hiliyg5gw445k20qk3p7hd1572i6p1fx-apache-maven-3.8.6" + }, + "aarch64-linux": { + "store_path": "/nix/store/a703r0bwa5d7m217wdnpq40jk9a7gijc-apache-maven-3.8.6" + }, + "x86_64-darwin": { + "store_path": "/nix/store/d784rwc10i3xh4hp17mbvry60jaaxvh4-apache-maven-3.8.6" + }, + "x86_64-linux": { + "store_path": "/nix/store/762jpndgbab1b9nwv2g622gf85v120wh-apache-maven-3.8.6" + } + } + }, + "nodePackages.yaml-language-server@latest": { + "last_modified": "2023-08-30T00:25:28Z", + "resolved": "github:NixOS/nixpkgs/a63a64b593dcf2fe05f7c5d666eb395950f36bc9#nodePackages.yaml-language-server", + "source": "devbox-search", + "version": "1.14.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/y6fas525j1x0g8kpn8aw9wmvpn685a3q-yaml-language-server-1.14.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/nwx1kb9mfmx781jwmrpz10hp30mlgk8j-yaml-language-server-1.14.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/6b2084iqvkpxga9615b5z77rg2xxlb7v-yaml-language-server-1.14.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/lninjw78g05qq8d3bwdrax8m11pxawda-yaml-language-server-1.14.0" + } + } + }, + "nodejs@latest": { + "last_modified": "2024-02-24T23:06:34Z", + "plugin_version": "0.0.2", + "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#nodejs_21", + "source": "devbox-search", + "version": "21.6.2", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/n9xcy53g63rk8vwb2yx5fb7i72rprpd1-nodejs-21.6.2" + }, + "aarch64-linux": { + "store_path": "/nix/store/mqvmpikgnk7bxvi977ysd0z81bjpflzj-nodejs-21.6.2" + }, + "x86_64-darwin": { + "store_path": "/nix/store/mdwxb1kdajvahhbpq3dhnaf3b01h7yb8-nodejs-21.6.2" + }, + "x86_64-linux": { + "store_path": "/nix/store/va3sggfgfb709lm31bzvpjfyapjdy435-nodejs-21.6.2" + } + } + }, + "pre-commit@latest": { + "last_modified": "2024-03-17T01:03:25Z", + "resolved": "github:NixOS/nixpkgs/299d4668ba61600311553920d9fd9c102145b2cb#pre-commit", + "source": "devbox-search", + "version": "3.6.2", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/nwrn3g5v9bsrnd88v84q4q9japllx0jb-pre-commit-3.6.2" + }, + "aarch64-linux": { + "store_path": "/nix/store/61bnh53x2c6laq7vd7ssr23wm85zifs6-pre-commit-3.6.2" + }, + "x86_64-darwin": { + "store_path": "/nix/store/dpimv11qs1l3yyzb5nj94p2inpn35yj7-pre-commit-3.6.2" + }, + "x86_64-linux": { + "store_path": "/nix/store/1n78gswil3nq9fdrff4rb2li4y45y5w4-pre-commit-3.6.2" + } + } + }, + "python@latest": { + "last_modified": "2024-04-19T17:36:04-04:00", + "plugin_version": "0.0.3", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#python312", + "source": "devbox-search", + "version": "3.12.3", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/7bz0d53vngyxzhs6axavfw2dhl9vwlww-python3-3.12.3", + "default": true + } + ], + "store_path": "/nix/store/7bz0d53vngyxzhs6axavfw2dhl9vwlww-python3-3.12.3" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/nw7n1zgfiwxvrlxcn6nkggvxvk6msvl9-python3-3.12.3", + "default": true + }, + { + "name": "debug", + "path": "/nix/store/arq3230cyyd6lnwrjc2h5dz994ar4410-python3-3.12.3-debug" + } + ], + "store_path": "/nix/store/nw7n1zgfiwxvrlxcn6nkggvxvk6msvl9-python3-3.12.3" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/g8jihlbhc9sv3d2i4lnagyn2mj74mmjf-python3-3.12.3", + "default": true + } + ], + "store_path": "/nix/store/g8jihlbhc9sv3d2i4lnagyn2mj74mmjf-python3-3.12.3" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/m51f0kclg01xdc0mjxqs5cpyaxqbqhg5-python3-3.12.3", + "default": true + }, + { + "name": "debug", + "path": "/nix/store/f7z0xg5zf1c2b7lc8qjpd0p48lpc7rf1-python3-3.12.3-debug" + } + ], + "store_path": "/nix/store/m51f0kclg01xdc0mjxqs5cpyaxqbqhg5-python3-3.12.3" + } + } + }, + "rubocop@latest": { + "last_modified": "2024-02-24T23:06:34Z", + "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#rubocop", + "source": "devbox-search", + "version": "1.60.2", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/apma16wkjmhdbdxhzrcg0iq302jfams4-ruby3.1-rubocop-1.60.2" + }, + "aarch64-linux": { + "store_path": "/nix/store/inl276a41s48gd7n22aqbnv27d4d8vjm-ruby3.1-rubocop-1.60.2" + }, + "x86_64-darwin": { + "store_path": "/nix/store/lgcwywmpz7hp9cxpcjjmlbpbfvsr64rz-ruby3.1-rubocop-1.60.2" + }, + "x86_64-linux": { + "store_path": "/nix/store/bhi3dzxgvc577y9pzzsxbm07xj7lsd6s-ruby3.1-rubocop-1.60.2" + } + } + }, + "ruby@latest": { + "last_modified": "2024-04-19T17:36:04-04:00", + "plugin_version": "0.0.2", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#ruby_3_3", + "source": "devbox-search", + "version": "3.3.0", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/v2985rr69yd20k3gpv0h0xfncx7fz7ri-ruby-3.3.0", + "default": true + }, + { + "name": "devdoc", + "path": "/nix/store/ad7zlahvwsdwpy4rl2j4874zm48r9r52-ruby-3.3.0-devdoc" + } + ], + "store_path": "/nix/store/v2985rr69yd20k3gpv0h0xfncx7fz7ri-ruby-3.3.0" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/sb5npxqnf38ganslr4211lwsdakq7vp9-ruby-3.3.0", + "default": true + }, + { + "name": "devdoc", + "path": "/nix/store/ddkprabv23gcxri2hq18mjivjn98s2md-ruby-3.3.0-devdoc" + } + ], + "store_path": "/nix/store/sb5npxqnf38ganslr4211lwsdakq7vp9-ruby-3.3.0" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/qjgy5y7q07naykii8jc4c94kn0bgb8gq-ruby-3.3.0", + "default": true + }, + { + "name": "devdoc", + "path": "/nix/store/j7vfiblaw5mslksm31s6jfc8am832sp8-ruby-3.3.0-devdoc" + } + ], + "store_path": "/nix/store/qjgy5y7q07naykii8jc4c94kn0bgb8gq-ruby-3.3.0" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/sbwg3visqb0njszbkarj645azj00951m-ruby-3.3.0", + "default": true + }, + { + "name": "devdoc", + "path": "/nix/store/3d7k5b5dwl0iyw86id8w1brrlbrd3szj-ruby-3.3.0-devdoc" + } + ], + "store_path": "/nix/store/sbwg3visqb0njszbkarj645azj00951m-ruby-3.3.0" + } + } + }, + "rubyPackages.solargraph@latest": { + "last_modified": "2024-02-24T23:06:34Z", + "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#rubyPackages.solargraph", + "source": "devbox-search", + "version": "0.50.0", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/b5ij391a832x87fphs2m2176bfjnndrv-ruby3.1-solargraph-0.50.0" + }, + "aarch64-linux": { + "store_path": "/nix/store/lw1b56xzrzwpzdwdl4w4qvc0mlcxc4i4-ruby3.1-solargraph-0.50.0" + }, + "x86_64-darwin": { + "store_path": "/nix/store/djw25l2sj8abrxy1fh9qc9jcj2cwn0mk-ruby3.1-solargraph-0.50.0" + }, + "x86_64-linux": { + "store_path": "/nix/store/5ck319amxz2ab48j5gyxgnn6dhsx1f6d-ruby3.1-solargraph-0.50.0" + } + } + }, + "shellcheck@0.10.0": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#shellcheck", + "source": "devbox-search", + "version": "0.10.0", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "bin", + "path": "/nix/store/49ncfws5qrd7rkgwz6dv2gvmqv0rsrrw-shellcheck-0.10.0-bin", + "default": true + }, + { + "name": "man", + "path": "/nix/store/s6j4yx6qbnln5nxmljx0qy8jf59adz5p-shellcheck-0.10.0-man", + "default": true + }, + { + "name": "doc", + "path": "/nix/store/2dfy2v96fv9542s4m7z7yxinwil9ngyp-shellcheck-0.10.0-doc", + "default": true + }, + { + "name": "out", + "path": "/nix/store/q2jz8khcx1a3kfmb77yspp85vlb973iz-shellcheck-0.10.0" + } + ], + "store_path": "/nix/store/49ncfws5qrd7rkgwz6dv2gvmqv0rsrrw-shellcheck-0.10.0-bin" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "bin", + "path": "/nix/store/q1hs93pxrpr388r8b4bj7rpqvd2daq1c-shellcheck-0.10.0-bin", + "default": true + }, + { + "name": "man", + "path": "/nix/store/6hz9inqbkawax0lcdig54sx2fh9ygq1k-shellcheck-0.10.0-man", + "default": true + }, + { + "name": "doc", + "path": "/nix/store/6iv0bbwzc4c4p364474j37acbcj85ncg-shellcheck-0.10.0-doc", + "default": true + }, + { + "name": "out", + "path": "/nix/store/2xlv5aw7b8zj5sn20bn0r7j5xbpq3lqj-shellcheck-0.10.0" + } + ], + "store_path": "/nix/store/q1hs93pxrpr388r8b4bj7rpqvd2daq1c-shellcheck-0.10.0-bin" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "bin", + "path": "/nix/store/jnsl9dzp3smhbkzxjj42spmlbkixzh8k-shellcheck-0.10.0-bin", + "default": true + }, + { + "name": "man", + "path": "/nix/store/yv9i4zbnsbc3f9552718lsxifvz44xzp-shellcheck-0.10.0-man", + "default": true + }, + { + "name": "doc", + "path": "/nix/store/vdggbwa31i0vv021ik69mczg21mf5160-shellcheck-0.10.0-doc", + "default": true + }, + { + "name": "out", + "path": "/nix/store/qdfv3dw1rr5hxygz3h2h17zilkd7fd34-shellcheck-0.10.0" + } + ], + "store_path": "/nix/store/jnsl9dzp3smhbkzxjj42spmlbkixzh8k-shellcheck-0.10.0-bin" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "bin", + "path": "/nix/store/f321hrckks8jq89ipz48jmzdp7d0pj7r-shellcheck-0.10.0-bin", + "default": true + }, + { + "name": "man", + "path": "/nix/store/nc6ym17bdcnv8xm5qixywrlnvyj62qjf-shellcheck-0.10.0-man", + "default": true + }, + { + "name": "doc", + "path": "/nix/store/0csxlgjfdjadv9i1cz5bjmq8mhqyxlkj-shellcheck-0.10.0-doc", + "default": true + }, + { + "name": "out", + "path": "/nix/store/64zid87pr32msyp2i91zf7p08qj5v0bp-shellcheck-0.10.0" + } + ], + "store_path": "/nix/store/f321hrckks8jq89ipz48jmzdp7d0pj7r-shellcheck-0.10.0-bin" + } + } + }, + "swagger-cli@latest": { + "last_modified": "2024-02-24T23:06:34Z", + "resolved": "github:NixOS/nixpkgs/9a9dae8f6319600fa9aebde37f340975cab4b8c0#swagger-cli", + "source": "devbox-search", + "version": "4.0.4", + "systems": { + "aarch64-darwin": { + "store_path": "/nix/store/sq8vajgd81q526ax8j52m1mg8r7q9wwi-swagger-cli-4.0.4" + }, + "aarch64-linux": { + "store_path": "/nix/store/aa8i6vbiqjmc711f0qhbiiiz356j7r5x-swagger-cli-4.0.4" + }, + "x86_64-darwin": { + "store_path": "/nix/store/r2kfmh0f7dzfc460v9nafvpbs792whbh-swagger-cli-4.0.4" + }, + "x86_64-linux": { + "store_path": "/nix/store/r8rrihaysmidw6wam6c85f9sjfv2jq3h-swagger-cli-4.0.4" + } + } + }, + "temurin-bin-17@latest": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#temurin-bin-17", + "source": "devbox-search", + "version": "17.0.9", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/150lqcf9xmjz3543z5my0n4b1kncyr5z-temurin-bin-17.0.9", + "default": true + } + ], + "store_path": "/nix/store/150lqcf9xmjz3543z5my0n4b1kncyr5z-temurin-bin-17.0.9" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/8k4kyhhvlxkzzfpgl0p0yn147585hf60-temurin-bin-17.0.9", + "default": true + } + ], + "store_path": "/nix/store/8k4kyhhvlxkzzfpgl0p0yn147585hf60-temurin-bin-17.0.9" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/j58pbnd0rnfyn3akxb8zx3s1kc5p9dy8-temurin-bin-17.0.9", + "default": true + } + ], + "store_path": "/nix/store/j58pbnd0rnfyn3akxb8zx3s1kc5p9dy8-temurin-bin-17.0.9" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/z16qjcmxxiki2ah8wvg4qp0kp96a5s84-temurin-bin-17.0.9", + "default": true + } + ], + "store_path": "/nix/store/z16qjcmxxiki2ah8wvg4qp0kp96a5s84-temurin-bin-17.0.9" + } + } + }, + "which@latest": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#which", + "source": "devbox-search", + "version": "2.21", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/6fdwardrg3jpmipgysb98vmgs43vkvl3-which-2.21", + "default": true + } + ], + "store_path": "/nix/store/6fdwardrg3jpmipgysb98vmgs43vkvl3-which-2.21" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/8wy729ckp0xf1mk4i4qd7wzlgc0w01vs-which-2.21", + "default": true + } + ], + "store_path": "/nix/store/8wy729ckp0xf1mk4i4qd7wzlgc0w01vs-which-2.21" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/57y8a1gq7yxcf7cmnj04z9rhhqf9q5pg-which-2.21", + "default": true + } + ], + "store_path": "/nix/store/57y8a1gq7yxcf7cmnj04z9rhhqf9q5pg-which-2.21" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/6mz4dj8c5g2z9mpca6l3qf3bjj41vxcz-which-2.21", + "default": true + } + ], + "store_path": "/nix/store/6mz4dj8c5g2z9mpca6l3qf3bjj41vxcz-which-2.21" + } + } + }, + "yq-go@4.43.1": { + "last_modified": "2024-04-19T17:36:04-04:00", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#yq-go", + "source": "devbox-search", + "version": "4.43.1", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/rfiv0y75hj8730n1a6drnjhkk7vhdl9j-yq-go-4.43.1", + "default": true + } + ], + "store_path": "/nix/store/rfiv0y75hj8730n1a6drnjhkk7vhdl9j-yq-go-4.43.1" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/jni4dcywxfmwabxqmadp6lha4bn2sv2a-yq-go-4.43.1", + "default": true + } + ], + "store_path": "/nix/store/jni4dcywxfmwabxqmadp6lha4bn2sv2a-yq-go-4.43.1" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/kd7h15ml6ypamdm65vdw1961zmcrqswk-yq-go-4.43.1", + "default": true + } + ], + "store_path": "/nix/store/kd7h15ml6ypamdm65vdw1961zmcrqswk-yq-go-4.43.1" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/3im0h6slqakpx47p6y87var90hsvxqsy-yq-go-4.43.1", + "default": true + } + ], + "store_path": "/nix/store/3im0h6slqakpx47p6y87var90hsvxqsy-yq-go-4.43.1" + } + } + } + } +} diff --git a/local-flake/flake.lock b/local-flake/flake.lock new file mode 100644 index 0000000000..fa62f4a298 --- /dev/null +++ b/local-flake/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/local-flake/flake.nix b/local-flake/flake.nix new file mode 100644 index 0000000000..2e65bd5eb8 --- /dev/null +++ b/local-flake/flake.nix @@ -0,0 +1,48 @@ +{ + description = "Dependencies of app-autoscaler-release"; + + inputs = { + nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; + }; + + outputs = { self, nixpkgs }: + let + supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + + # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + + # Nixpkgs instantiated for supported system types. + nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); + in { + packages = forAllSystems (system: { + app-autoscaler-cli-plugin = nixpkgsFor.${system}.buildGoModule rec { + pname = "app-autoscaler-cli-plugin"; + gitCommit = "f46dc1ea62c4c7bd426c82f4e2a525b3a3c42300"; + version = "${gitCommit}"; + src = nixpkgsFor.${system}.fetchgit { + url = "https://github.com/cloudfoundry/app-autoscaler-cli-plugin"; + rev = "${gitCommit}"; + hash = "sha256-j8IAUhjYjEFvtRbA6o2vA7P2uUmKVYsd9uJmN0WtVCM="; + fetchSubmodules = true; + }; + doCheck = false; + vendorHash = "sha256-NzEStcOv8ZQsHOA8abLABKy+ZE3/SiYbRD/ZVxo0CEk="; + }; + + # this bosh-bootloader custom build can be removed once https://github.com/cloudfoundry/bosh-bootloader/issues/596 is implemented. + bosh-bootloader = nixpkgsFor.${system}.buildGoModule rec { + pname = "bosh-bootloader"; + version = "9.0.17"; + src = nixpkgsFor.${system}.fetchgit { + url = "https://github.com/cloudfoundry/bosh-bootloader"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-P4rS7Nv/09+9dD198z4NOXnldSE5fx3phEK24Acatps="; + }; + doCheck = false; + vendorHash = null; + }; + }); + }; +} diff --git a/renovate.json b/renovate.json index 67f7ece07a..a0980b7dd1 100644 --- a/renovate.json +++ b/renovate.json @@ -70,14 +70,6 @@ "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" }, - { - "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)concourse (?.+?)\\n"], - "depNameTemplate": "concourse/concourse", - "datasourceTemplate": "github-releases", - "extractVersionTemplate": "^v(?\\S+)" - }, { "customType": "regex", "fileMatch": ["\\.tool-versions$"], diff --git a/scripts/asdf2devbox.py b/scripts/asdf2devbox.py new file mode 100755 index 0000000000..84604416e8 --- /dev/null +++ b/scripts/asdf2devbox.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python3 + +import json +import os +import subprocess + +# Determine the script directory +script_dir = os.path.dirname(os.path.realpath(__file__)) + +# Function to determine the currently installed version of the package and return it +def get_installed_version(package): + with open(os.path.join(script_dir, '..', 'devbox.json'), 'r') as f: + data = json.load(f) + for pkg in data['packages']: + if pkg.startswith(f"{package}@"): + return pkg.split('@')[1] + return None + +# Read the .tool-versions file and process each line +if __name__ == "__main__": + with open(os.path.join(script_dir, '..', '.tool-versions'), 'r') as f: + for line in f: + program, version = line.strip().split(' ') + + # Mapping of ASDF to Nix program names + program_mapping = { + "bosh": "bosh-cli", + "cf": "cloudfoundry-cli", + "concourse": "fly", + "gcloud": "google-cloud-sdk", + "golang": "go", + "java": "temurin-bin-17", + "make": "gnumake", + "yq": "yq-go" + } + program = program_mapping.get(program, program) + + # Check if the package is already installed in the desired version + installed_version = get_installed_version(program) + if installed_version != version: + # Try to add the package with the specified version + try: + subprocess.run(['devbox', 'add', f"{program}@{version}"], check=True) + except subprocess.CalledProcessError: + # Fallback to latest in case the exact version is not available + subprocess.run(['devbox', 'add', f"{program}@latest"], check=True) + print(f"Could not find {program}@{version}, using latest instead:") + subprocess.run(['devbox', 'info', program], check=True) + else: + print(f"{program}@{version} is already installed") From c6271cc67110b88af3813808cca7f83c7100ecdc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 22:59:49 +0000 Subject: [PATCH 18/42] fix(deps): update module github.com/shurcool/githubv4 to v0.0.0-20240429030203-be2daab69064 --- src/changelog/go.mod | 2 +- src/changelog/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/changelog/go.mod b/src/changelog/go.mod index 301b36e69c..85151fba68 100644 --- a/src/changelog/go.mod +++ b/src/changelog/go.mod @@ -4,7 +4,7 @@ go 1.21.4 require ( github.com/Masterminds/semver/v3 v3.2.1 - github.com/shurcooL/githubv4 v0.0.0-20240120211514-18a1ae0e79dc + github.com/shurcooL/githubv4 v0.0.0-20240429030203-be2daab69064 github.com/stretchr/testify v1.9.0 golang.org/x/oauth2 v0.19.0 ) diff --git a/src/changelog/go.sum b/src/changelog/go.sum index 28a96d8b65..65133d70a4 100644 --- a/src/changelog/go.sum +++ b/src/changelog/go.sum @@ -6,8 +6,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 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/shurcooL/githubv4 v0.0.0-20240120211514-18a1ae0e79dc h1:vH0NQbIDk+mJLvBliNGfcQgUmhlniWBDXC79oRxfZA0= -github.com/shurcooL/githubv4 v0.0.0-20240120211514-18a1ae0e79dc/go.mod h1:zqMwyHmnN/eDOZOdiTohqIUKUrTFX62PNlu7IJdu0q8= +github.com/shurcooL/githubv4 v0.0.0-20240429030203-be2daab69064 h1:RCQBSFx5JrsbHltqTtJ+kN3U0Y3a/N/GlVdmRSoxzyE= +github.com/shurcooL/githubv4 v0.0.0-20240429030203-be2daab69064/go.mod h1:zqMwyHmnN/eDOZOdiTohqIUKUrTFX62PNlu7IJdu0q8= github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466 h1:17JxqqJY66GmZVHkmAsGEkcIu0oCe3AM420QDgGwZx0= github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466/go.mod h1:9dIRpgIY7hVhoqfe0/FcYp0bpInZaT7dc3BYOprrIUE= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= From 5ec165cc6e5c9e120122fdba147659901122441a Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Mon, 6 May 2024 16:53:13 +0200 Subject: [PATCH 19/42] feat(direnv): Check if `devbox` is installed before invoking it (#2921) * feat(direnv): Checks if `devbox` is installed before invoking it # Issue If you don't have `devbox` installed the `.envrc` would error out. # Fix First check for `devbox` and then `nix`, restoring plain Nix usage as well. * fix(flake): Reuse `local-flake` package definitions in main flake # Issue The package definitions for `app-autoscaler-cli-plugin` and `bosh-bootloader` were duplicated in the root and `local-flake` flakes. # Fix Reuse `local-flake` package definitions in main flake --- .envrc | 22 ++++++++++++++++------ flake.lock | 40 ++++++++++++++++++++++++++++++++++++---- flake.nix | 39 +++++---------------------------------- 3 files changed, 57 insertions(+), 44 deletions(-) diff --git a/.envrc b/.envrc index 84fc8e5361..2e6e7cbfd9 100644 --- a/.envrc +++ b/.envrc @@ -1,7 +1,17 @@ -# Automatically sets up your devbox environment whenever you cd into this -# directory via our direnv integration: +strict_env -eval "$(devbox generate direnv --print-envrc)" - -# check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/ -# for more details +# Prefers devbox over nix, as nix is a prerequisite for devbox +if has devbox +then + unstrict_env # seems to be required for devbox :( + eval "$(devbox generate direnv --print-envrc)" + # check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/ + # for more details +else + if has nix + then + unset GOPATH # Required for editors to discover the go-tools in the flake. + use flake + layout ruby + fi +fi diff --git a/flake.lock b/flake.lock index fc7baf8c16..b2b2f848e3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,27 @@ { "nodes": { + "local-flake": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-ZmNHp5kO8fEuq3BWOnLr6FDZRLxY8v6QkqtpDQiFG2Y=", + "path": "./local-flake", + "type": "path" + }, + "original": { + "path": "./local-flake", + "type": "path" + } + }, "nixpkgs": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -32,9 +47,26 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { - "nixpkgs": "nixpkgs", + "local-flake": "local-flake", + "nixpkgs": "nixpkgs_2", "nixpkgs-bosh-cli-v7-3-1": "nixpkgs-bosh-cli-v7-3-1" } } diff --git a/flake.nix b/flake.nix index 040b03002c..12107c6f68 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,10 @@ inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; nixpkgs-bosh-cli-v7-3-1.url = github:NixOS/nixpkgs/1179c6c3705509ba25bd35196fca507d2a227bd0; + local-flake.url = "path:./local-flake"; }; - outputs = { self, nixpkgs, nixpkgs-bosh-cli-v7-3-1 }: + outputs = { self, nixpkgs, nixpkgs-bosh-cli-v7-3-1, local-flake }: let supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; @@ -17,36 +18,6 @@ nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); nixpkgsFor-bosh-cli-v7-3-1 = forAllSystems (system: import nixpkgs-bosh-cli-v7-3-1 { inherit system; }); in { - packages = forAllSystems (system: { - app-autoscaler-cli-plugin = nixpkgsFor.${system}.buildGoModule rec { - pname = "app-autoscaler-cli-plugin"; - gitCommit = "f46dc1ea62c4c7bd426c82f4e2a525b3a3c42300"; - version = "${gitCommit}"; - src = nixpkgsFor.${system}.fetchgit { - url = "https://github.com/cloudfoundry/app-autoscaler-cli-plugin"; - rev = "${gitCommit}"; - hash = "sha256-j8IAUhjYjEFvtRbA6o2vA7P2uUmKVYsd9uJmN0WtVCM="; - fetchSubmodules = true; - }; - doCheck = false; - vendorHash = "sha256-NzEStcOv8ZQsHOA8abLABKy+ZE3/SiYbRD/ZVxo0CEk="; - }; - - # this bosh-bootloader custom build can be removed once https://github.com/cloudfoundry/bosh-bootloader/issues/596 is implemented. - bosh-bootloader = nixpkgsFor.${system}.buildGoModule rec { - pname = "bosh-bootloader"; - version = "9.0.17"; - src = nixpkgsFor.${system}.fetchgit { - url = "https://github.com/cloudfoundry/bosh-bootloader"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-P4rS7Nv/09+9dD198z4NOXnldSE5fx3phEK24Acatps="; - }; - doCheck = false; - vendorHash = null; - }; - }); - openapi-specifications = { app-autoscaler-api = let @@ -65,8 +36,8 @@ buildInputs = with pkgs; [ act actionlint - self.packages.${system}.app-autoscaler-cli-plugin - self.packages.${system}.bosh-bootloader + local-flake.packages.${system}.app-autoscaler-cli-plugin + local-flake.packages.${system}.bosh-bootloader # to make `bosh create-release` work in a Nix shell on macOS, use an older bosh-cli version that reuses # a bosh-utils version under the hood that doesn't use the tar option `--no-mac-metadata`. # unfortunately, Nix provides gnutar by default, which doesn't have the `--no-mac-metadata` option. @@ -121,7 +92,7 @@ shellHook = '' # install required CF CLI plugins cf install-plugin -f \ - '${self.packages.${system}.app-autoscaler-cli-plugin}/bin/app-autoscaler-cli-plugin' + '${local-flake.packages.${system}.app-autoscaler-cli-plugin}/bin/app-autoscaler-cli-plugin' aes_terminal_font_yellow='\e[38;2;255;255;0m' aes_terminal_font_blink='\e[5m' From 9502c16f476d341de33fcfaf595725e086ef7a82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 14:54:18 +0000 Subject: [PATCH 20/42] fix(deps): update module golang.org/x/oauth2 to v0.20.0 --- src/changelog/go.mod | 2 +- src/changelog/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/changelog/go.mod b/src/changelog/go.mod index 85151fba68..17b962c815 100644 --- a/src/changelog/go.mod +++ b/src/changelog/go.mod @@ -6,7 +6,7 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 github.com/shurcooL/githubv4 v0.0.0-20240429030203-be2daab69064 github.com/stretchr/testify v1.9.0 - golang.org/x/oauth2 v0.19.0 + golang.org/x/oauth2 v0.20.0 ) require ( diff --git a/src/changelog/go.sum b/src/changelog/go.sum index 65133d70a4..072781d32a 100644 --- a/src/changelog/go.sum +++ b/src/changelog/go.sum @@ -12,8 +12,8 @@ github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466 h1:17JxqqJY66GmZV github.com/shurcooL/graphql v0.0.0-20230722043721-ed46e5a46466/go.mod h1:9dIRpgIY7hVhoqfe0/FcYp0bpInZaT7dc3BYOprrIUE= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg= -golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8= +golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= +golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= 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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= From d6c64c9ff56b52db8b31a8692cefa79cb9bff6b4 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Mon, 13 May 2024 17:29:30 +0200 Subject: [PATCH 21/42] chore(ci): Restore `use_buildin_mode` false until the next major version # Issue The CI job [upgrade-test] requires the current manifest to be able to deploy the previous stable release. The removal of `use_buildin_mode: false` broke this # Fix Restore `use_buildin_mode: false` until v13 is the previous stable release. [upgrade-test]: https://concourse.app-runtime-interfaces.ci.cloudfoundry.org/teams/app-autoscaler/pipelines/app-autoscaler-release/jobs/upgrade-test --- templates/app-autoscaler.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/app-autoscaler.yml b/templates/app-autoscaler.yml index b27231ae85..5efa2bb159 100644 --- a/templates/app-autoscaler.yml +++ b/templates/app-autoscaler.yml @@ -249,6 +249,7 @@ instance_groups: public_api: server: port: &publicApiServerPort 6101 + use_buildin_mode: false scheduler: ca_cert: ((!scheduler_client_cert.ca)) client_cert: ((!scheduler_client_cert.certificate)) From 0e1b3b8b9fe11f996eba70eeeff8c306a9edf9d9 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Wed, 8 May 2024 17:36:34 +0200 Subject: [PATCH 22/42] feat(envrc): Automatically eval bbl env # Issue To access our OSS dev environment's BOSH directory one would have to always execute the `bbl print-env` command. # Fix Automatically execute it on entering the directory if possible. --- .envrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.envrc b/.envrc index 2e6e7cbfd9..6d48b37efb 100644 --- a/.envrc +++ b/.envrc @@ -15,3 +15,9 @@ else layout ruby fi fi + +local bbl_state_dir=../app-autoscaler-env-bbl-state/bbl-state +if has bbl && [[ -d "$bbl_state_dir" ]] +then + eval "$(bbl print-env --state-dir "$bbl_state_dir")" +fi From 28dbf8145dc7f6bcd15362b330671c0668138bb0 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Tue, 14 May 2024 13:31:32 +0200 Subject: [PATCH 23/42] fix(ci): Add ops file to ensure that each deployment gets its own loggregator shard # Issue Due to different deployments in our CI enviroment all setting the same loggrator nozzle shard, logs and metrics generated during a CI run would get distributed across all `metricsgateway`s. This broke the assumption that a deployments get a copy of all logs and metrics and lead to acceptance test failures. # Fix Added an ops file to make the shard ids unique by appending the BOSH deployment name. --- ci/autoscaler/pipeline.yml | 2 ++ ...append-deployment-name-to-loggregator-nozzle-shard-id.yml | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 operations/append-deployment-name-to-loggregator-nozzle-shard-id.yml diff --git a/ci/autoscaler/pipeline.yml b/ci/autoscaler/pipeline.yml index ba46002b6c..d7bb03d2df 100644 --- a/ci/autoscaler/pipeline.yml +++ b/ci/autoscaler/pipeline.yml @@ -7,6 +7,7 @@ anchors: operations/add-postgres-variables.yml operations/enable-nats-tls.yml operations/loggregator-certs-from-cf.yml + operations/append-deployment-name-to-loggregator-nozzle-shard-id.yml operations/add-extra-plan.yml operations/set-release-version.yml operations/enable-scheduler-logging.yml @@ -32,6 +33,7 @@ anchors: operations/add-postgres-variables.yml operations/enable-nats-tls.yml operations/loggregator-certs-from-cf.yml + operations/append-deployment-name-to-loggregator-nozzle-shard-id.yml operations/postgres-persistent-disk.yml operations/add-extra-plan.yml operations/set-release-version.yml diff --git a/operations/append-deployment-name-to-loggregator-nozzle-shard-id.yml b/operations/append-deployment-name-to-loggregator-nozzle-shard-id.yml new file mode 100644 index 0000000000..067bfbc5ab --- /dev/null +++ b/operations/append-deployment-name-to-loggregator-nozzle-shard-id.yml @@ -0,0 +1,5 @@ +# This can be used to make the Loggregator nozzle of the autoscaler unique and is primarily used in our CI where multiple deployments run at the same time in the same CF foundation. +--- +- type: replace + path: /instance_groups/name=metricsgateway/jobs/name=metricsgateway/properties/autoscaler/metricsgateway/nozzle/shard_id? + value: CF_AUTOSCALER_((deployment_name)) From f9941977648ac11f2598d32a6c792777551c6d67 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Tue, 14 May 2024 15:14:59 +0200 Subject: [PATCH 24/42] chore(devbox): Add useful tools to devbox Add the `logcache` CLI plugin, which offers e.g. `cf query` to make PromQL queries to the logcache. Add the `hey` command which can be used to generate requests on an HTTP endpoint. --- devbox.json | 7 +++++-- devbox.lock | 48 +++++++++++++++++++++++++++++++++++++++++++ local-flake/flake.nix | 14 +++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/devbox.json b/devbox.json index 137c585c81..61a1c40fe8 100644 --- a/devbox.json +++ b/devbox.json @@ -2,6 +2,7 @@ "packages": [ "path:local-flake#bosh-bootloader", "path:local-flake#app-autoscaler-cli-plugin", + "path:local-flake#log-cache-cli-plugin", "credhub-cli@latest", "delve@latest", "gh@latest", @@ -31,11 +32,13 @@ "ginkgo@latest", "temurin-bin-17@latest", "ruby@latest", - "shellcheck@0.10.0" + "shellcheck@0.10.0", + "hey@latest" ], "shell": { "init_hook": [ - "cf install-plugin -f $(which app-autoscaler-cli-plugin)" + "cf install-plugin -f $(which app-autoscaler-cli-plugin)", + "cf install-plugin -f $(which log-cache-cli)" ], "scripts": { "test": [ diff --git a/devbox.lock b/devbox.lock index a6fd1b8a16..426c4eae1b 100644 --- a/devbox.lock +++ b/devbox.lock @@ -517,6 +517,54 @@ } } }, + "hey@latest": { + "last_modified": "2024-04-19T21:36:04Z", + "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#hey", + "source": "devbox-search", + "version": "0.1.4", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/cjpydm1gw7ib0vw5kd5fmvr36w2zzi1i-hey-0.1.4", + "default": true + } + ], + "store_path": "/nix/store/cjpydm1gw7ib0vw5kd5fmvr36w2zzi1i-hey-0.1.4" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/7q9x6j3aylz8lb0w9hxqcjw6bidhfbvi-hey-0.1.4", + "default": true + } + ], + "store_path": "/nix/store/7q9x6j3aylz8lb0w9hxqcjw6bidhfbvi-hey-0.1.4" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/c6l9h5wqcmk5sq2ihrg1by7s36w4pi61-hey-0.1.4", + "default": true + } + ], + "store_path": "/nix/store/c6l9h5wqcmk5sq2ihrg1by7s36w4pi61-hey-0.1.4" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/36jj648k5cp8qi0sd4i0ypys6mmdn42m-hey-0.1.4", + "default": true + } + ], + "store_path": "/nix/store/36jj648k5cp8qi0sd4i0ypys6mmdn42m-hey-0.1.4" + } + } + }, "jq@latest": { "last_modified": "2024-04-21T11:44:28-04:00", "resolved": "github:NixOS/nixpkgs/69ee1d82f1fa4c70a3dc9a64111e7eef3b8e4527#jq", diff --git a/local-flake/flake.nix b/local-flake/flake.nix index 2e65bd5eb8..e63f6d75ff 100644 --- a/local-flake/flake.nix +++ b/local-flake/flake.nix @@ -43,6 +43,20 @@ doCheck = false; vendorHash = null; }; + + log-cache-cli-plugin = nixpkgsFor.${system}.buildGoModule rec { + pname = "log-cache-cli"; + version = "6.0.1"; + src = nixpkgsFor.${system}.fetchgit { + url = "https://github.com/cloudfoundry/log-cache-cli"; + rev = "v${version}"; + hash = "sha256-XMxZPmqjOo/yaMFHY+zTjamB2FmPn2eh0zEtwQevt+I="; + fetchSubmodules = true; + }; + doCheck = false; + vendorHash = null; + ldflags = ["-s" "-w" "-X main.version=${version}"]; + }; }); }; } From 5afe934a356a471130797071cf4a7b234a97403b Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Tue, 14 May 2024 15:41:36 +0200 Subject: [PATCH 25/42] fix(acceptance): Fix throughput acceptance test --- src/acceptance/app/dynamic_policy_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/acceptance/app/dynamic_policy_test.go b/src/acceptance/app/dynamic_policy_test.go index 31a279791a..dd23695b4a 100644 --- a/src/acceptance/app/dynamic_policy_test.go +++ b/src/acceptance/app/dynamic_policy_test.go @@ -246,7 +246,7 @@ var _ = Describe("AutoScaler dynamic policy", func() { Context("when throughput is less than scaling in threshold", func() { BeforeEach(func() { - policy = GenerateDynamicScaleInPolicyBetween("throughput", 15, 25) + policy = GenerateDynamicScaleInPolicyBetween("throughput", 5, 15) initialInstanceCount = 2 }) @@ -274,6 +274,8 @@ var _ = Describe("AutoScaler dynamic policy", func() { }) It("should scale in", func() { + // because we are generating 20rps but starting with 2 instances, + // there should be on average 10rps per instance, which should trigger the scale in WaitForNInstancesRunning(appGUID, 1, 5*time.Minute) }) From a61f71aff8ddc6628221382d643fda73adf8c2c8 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Tue, 14 May 2024 16:23:23 +0200 Subject: [PATCH 26/42] chore(log_cache_client): Improve logging --- .../eventgenerator/client/log_cache_client.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/autoscaler/eventgenerator/client/log_cache_client.go b/src/autoscaler/eventgenerator/client/log_cache_client.go index 99eff3ce96..2ca3b47e3f 100644 --- a/src/autoscaler/eventgenerator/client/log_cache_client.go +++ b/src/autoscaler/eventgenerator/client/log_cache_client.go @@ -108,6 +108,7 @@ func (c *LogCacheClient) emptyAppInstanceMetrics(appId string, name string, unit } func (c *LogCacheClient) getMetricsPromQLAPI(appId string, metricType string) ([]models.AppInstanceMetric, error) { + logger := c.logger.Session("getMetricsPromQLAPI", lager.Data{"appId": appId, "metricType": metricType}) collectionInterval := fmt.Sprintf("%.0f", c.CollectionInterval().Seconds()) now := time.Now() @@ -123,12 +124,12 @@ func (c *LogCacheClient) getMetricsPromQLAPI(appId string, metricType string) ([ metricTypeUnit = models.UnitMilliseconds } - c.logger.Info("query-promql-api", lager.Data{"query": query, "appId": appId, "metricType": metricType}) + logger.Debug("query-promql-api", lager.Data{"query": query}) result, err := c.Client.PromQL(context.Background(), query, logcache.WithPromQLTime(now)) if err != nil { return []models.AppInstanceMetric{}, fmt.Errorf("failed getting PromQL result (metricType: %s, appId: %s, collectionInterval: %s, query: %s, time: %s): %w", metricType, appId, collectionInterval, query, now.String(), err) } - c.logger.Info("received-promql-api-result", lager.Data{"result": result}) + logger.Info("received-promql-api-result", lager.Data{"result": result, "query": query}) // safeguard: the query ensures that we get a vector but let's double-check vector := result.GetVector() @@ -179,13 +180,14 @@ func (c *LogCacheClient) getMetricsPromQLAPI(appId string, metricType string) ([ func (c *LogCacheClient) getMetricsRestAPI(appId string, metricType string, startTime time.Time, endTime time.Time) ([]models.AppInstanceMetric, error) { filters := logCacheFiltersFor(endTime, metricType) - c.logger.Info("query-rest-api-with-filters", lager.Data{"filters": valuesFrom(filters)}) + logger := c.logger.Session("getMetricsRestAPI", lager.Data{"appId": appId, "metricType": metricType, "startTime": startTime, "endTime": endTime, "filters": valuesFrom(filters)}) + logger.Debug("query-rest-api-with-filters") envelopes, err := c.Client.Read(context.Background(), appId, startTime, filters...) if err != nil { return []models.AppInstanceMetric{}, fmt.Errorf("fail to Read %s metric from %s GoLogCache client: %w", logcache_v1.EnvelopeType_GAUGE, appId, err) } - c.logger.Info("received-rest-api-result", lager.Data{"envelopes": envelopes}) + logger.Info("received-rest-api-result", lager.Data{"envelopes": envelopes}) collectedAt := c.now().UnixNano() metrics, err := c.envelopeProcessor.GetGaugeMetrics(envelopes, collectedAt) From 8c50ffa0da9892d7f570f0610a02545e062c90b9 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Tue, 14 May 2024 16:38:10 +0200 Subject: [PATCH 27/42] fix(log_cache_client): Only process HTTPStartStopEvents with peerType client # Issue `HTTPStartStop` events with `peerType` `Server` would be counted against instance `0` and thus duplicate the number of requests counted by the App Autoscaler. # Fix Only process `HTTPStartStop` events with `peerType` `Client`, as they contain the app instance index in the `instanceIndex` field. # Note This is the same issue already fixed for loggregator in c2479e26be382148dfdf0363386cc5e6df8239a5 --- src/autoscaler/eventgenerator/client/log_cache_client.go | 4 ++-- src/autoscaler/eventgenerator/client/log_cache_client_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/autoscaler/eventgenerator/client/log_cache_client.go b/src/autoscaler/eventgenerator/client/log_cache_client.go index 2ca3b47e3f..83ffef3f33 100644 --- a/src/autoscaler/eventgenerator/client/log_cache_client.go +++ b/src/autoscaler/eventgenerator/client/log_cache_client.go @@ -115,12 +115,12 @@ func (c *LogCacheClient) getMetricsPromQLAPI(appId string, metricType string) ([ query := "" metricTypeUnit := "" if metricType == models.MetricNameThroughput { - query = fmt.Sprintf("sum by (instance_id) (count_over_time(http{source_id='%s'}[%ss])) / %s", appId, collectionInterval, collectionInterval) + query = fmt.Sprintf("sum by (instance_id) (count_over_time(http{source_id='%s',peer_type='Client'}[%ss])) / %s", appId, collectionInterval, collectionInterval) metricTypeUnit = models.UnitRPS } if metricType == models.MetricNameResponseTime { - query = fmt.Sprintf("avg by (instance_id) (max_over_time(http{source_id='%s'}[%ss])) / (1000 * 1000)", appId, collectionInterval) + query = fmt.Sprintf("avg by (instance_id) (max_over_time(http{source_id='%s',peer_type='Client'}[%ss])) / (1000 * 1000)", appId, collectionInterval) metricTypeUnit = models.UnitMilliseconds } diff --git a/src/autoscaler/eventgenerator/client/log_cache_client_test.go b/src/autoscaler/eventgenerator/client/log_cache_client_test.go index 030488ffb6..d84acc1db8 100644 --- a/src/autoscaler/eventgenerator/client/log_cache_client_test.go +++ b/src/autoscaler/eventgenerator/client/log_cache_client_test.go @@ -366,7 +366,7 @@ var _ = Describe("LogCacheClient", func() { metrics, err := logCacheClient.GetMetrics("app-id", "throughput", startTime, endTime) _, query, _ := fakeGoLogCacheReader.PromQLArgsForCall(0) - Expect(query).To(Equal("sum by (instance_id) (count_over_time(http{source_id='app-id'}[40s])) / 40")) + Expect(query).To(Equal("sum by (instance_id) (count_over_time(http{source_id='app-id',peer_type='Client'}[40s])) / 40")) Expect(err).To(Not(HaveOccurred())) Expect(metrics).To(HaveLen(2)) @@ -438,7 +438,7 @@ var _ = Describe("LogCacheClient", func() { metrics, err := logCacheClient.GetMetrics("app-id", "responsetime", startTime, endTime) _, query, _ := fakeGoLogCacheReader.PromQLArgsForCall(0) - Expect(query).To(Equal("avg by (instance_id) (max_over_time(http{source_id='app-id'}[40s])) / (1000 * 1000)")) + Expect(query).To(Equal("avg by (instance_id) (max_over_time(http{source_id='app-id',peer_type='Client'}[40s])) / (1000 * 1000)")) Expect(err).To(Not(HaveOccurred())) Expect(metrics).To(HaveLen(2)) From c1955c3264e4fdff4417e0bde2e005037a5ce11d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 16:03:16 +0000 Subject: [PATCH 28/42] chore(deps): update dependency com.github.spotbugs:spotbugs-maven-plugin to v4.8.5.0 --- src/scheduler/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scheduler/pom.xml b/src/scheduler/pom.xml index 04fa588dca..db8a3cf08e 100644 --- a/src/scheduler/pom.xml +++ b/src/scheduler/pom.xml @@ -192,7 +192,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.8.4.0 + 4.8.5.0 Max medium From 58893a426b107ff92175c70ff1e0b86d2cf1f5a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 07:04:29 +0000 Subject: [PATCH 29/42] chore(deps): update actions/checkout action to v4.1.5 --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 0fa07f7bfa..7663ae8bca 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -27,7 +27,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: persist-credentials: false From e35ec79cada10b9e9b4032bc0c66885373f68945 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Mon, 29 Apr 2024 15:41:43 +0200 Subject: [PATCH 30/42] fix(operator): Clean up scaling cooldowns # Issue The table `scalingcooldowns` will gain an entry once an app is scaled. This entry is never removed, thus a resource leak is created. The table can get so big, that a simple select starts to take time (as there is no index on the table). # Fix The table is now periodically cleaned by the `operator`. --- .envrc | 2 + src/autoscaler/db/db.go | 1 + .../db/sqldb/scalingengine_sqldb.go | 9 +++ .../db/sqldb/scalingengine_sqldb_test.go | 64 +++++++++++++++++++ src/autoscaler/db/sqldb/sqldb_suite_test.go | 16 ++++- src/autoscaler/operator/scalingenginedb.go | 30 +++++---- .../operator/scalingenginedb_test.go | 20 ++++++ 7 files changed, 128 insertions(+), 14 deletions(-) diff --git a/.envrc b/.envrc index 6d48b37efb..bdc753ffe8 100644 --- a/.envrc +++ b/.envrc @@ -21,3 +21,5 @@ if has bbl && [[ -d "$bbl_state_dir" ]] then eval "$(bbl print-env --state-dir "$bbl_state_dir")" fi + +export DBURL="postgres://postgres:postgres@localhost/autoscaler" diff --git a/src/autoscaler/db/db.go b/src/autoscaler/db/db.go index d38eb19952..5fbe95550e 100644 --- a/src/autoscaler/db/db.go +++ b/src/autoscaler/db/db.go @@ -103,6 +103,7 @@ type ScalingEngineDB interface { CountScalingHistories(ctx context.Context, appId string, start int64, end int64, includeAll bool) (int, error) RetrieveScalingHistories(ctx context.Context, appId string, start int64, end int64, orderType OrderType, includeAll bool, page int, resultsPerPAge int) ([]*models.AppScalingHistory, error) PruneScalingHistories(ctx context.Context, before int64) error + PruneCooldowns(ctx context.Context, before int64) error UpdateScalingCooldownExpireTime(appId string, expireAt int64) error CanScaleApp(appId string) (bool, int64, error) GetActiveSchedule(appId string) (*models.ActiveSchedule, error) diff --git a/src/autoscaler/db/sqldb/scalingengine_sqldb.go b/src/autoscaler/db/sqldb/scalingengine_sqldb.go index a14595fa72..929a9ec808 100644 --- a/src/autoscaler/db/sqldb/scalingengine_sqldb.go +++ b/src/autoscaler/db/sqldb/scalingengine_sqldb.go @@ -170,6 +170,15 @@ func (sdb *ScalingEngineSQLDB) PruneScalingHistories(ctx context.Context, before return err } +func (sdb *ScalingEngineSQLDB) PruneCooldowns(ctx context.Context, before int64) error { + query := sdb.sqldb.Rebind("DELETE FROM scalingcooldown WHERE expireat < ?") + _, err := sdb.sqldb.ExecContext(ctx, query, before) + if err != nil { + sdb.logger.Error("failed-prune-scaling-cooldowns-from-scalingcooldown-table", err, lager.Data{"query": query, "before": before}) + } + return err +} + func (sdb *ScalingEngineSQLDB) CanScaleApp(appId string) (bool, int64, error) { query := sdb.sqldb.Rebind("SELECT expireat FROM scalingcooldown WHERE appid = ?") rows, err := sdb.sqldb.Query(query, appId) diff --git a/src/autoscaler/db/sqldb/scalingengine_sqldb_test.go b/src/autoscaler/db/sqldb/scalingengine_sqldb_test.go index 94d1a22e51..ccf880ecb3 100644 --- a/src/autoscaler/db/sqldb/scalingengine_sqldb_test.go +++ b/src/autoscaler/db/sqldb/scalingengine_sqldb_test.go @@ -3,6 +3,7 @@ package sqldb_test import ( "context" "os" + "strconv" "strings" "time" @@ -72,10 +73,12 @@ var _ = Describe("ScalingEngineSqldb", func() { cleanupForApp(appId) cleanupForApp(appId2) cleanupForApp(appId3) + cleanUpCooldownTable() DeferCleanup(func() { cleanupForApp(appId) cleanupForApp(appId2) cleanupForApp(appId3) + cleanUpCooldownTable() }) }) @@ -545,6 +548,67 @@ var _ = Describe("ScalingEngineSqldb", func() { }) }) + Describe("PruneCooldowns", Serial, func() { + var appIds []string + + BeforeEach(func() { + + appIds = make([]string, 10) + for i := 0; i < 10; i++ { + appIds[i] = addProcessIdTo("an-app-id-" + strconv.Itoa(i)) + err := sdb.UpdateScalingCooldownExpireTime(appIds[i], 111111*int64(i+1)) + Expect(err).NotTo(HaveOccurred()) + } + + }) + + JustBeforeEach(func() { + err = sdb.PruneCooldowns(context.TODO(), before) + }) + + Context("when pruning cooldowns before all the timestamps", func() { + BeforeEach(func() { + before = 111111 + }) + + It("does not remove any cooldowns", func() { + Expect(err).NotTo(HaveOccurred()) + Expect(getNumberOfCooldownEntries()).To(Equal(10)) + }) + }) + + Context("when pruning all the cooldowns", func() { + BeforeEach(func() { + before = time.Now().UnixNano() + }) + + It("empties the scalingcooldowns table", func() { + Expect(err).NotTo(HaveOccurred()) + Expect(getNumberOfCooldownEntries()).To(Equal(0)) + }) + }) + + Context("when pruning part of the cooldowns", func() { + BeforeEach(func() { + before = 333333 + }) + + It("removes cooldowns before the time specified", func() { + Expect(err).NotTo(HaveOccurred()) + Expect(getNumberOfCooldownEntries()).To(Equal(8)) + }) + }) + + Context("when db fails", func() { + BeforeEach(func() { + _ = sdb.Close() + }) + It("should error", func() { + Expect(err).To(MatchError(MatchRegexp("sql: .*"))) + }) + }) + }) + Describe("UpdateScalingCooldownExpireTime", func() { JustBeforeEach(func() { diff --git a/src/autoscaler/db/sqldb/sqldb_suite_test.go b/src/autoscaler/db/sqldb/sqldb_suite_test.go index c870f6b9b9..9a118ecf5e 100644 --- a/src/autoscaler/db/sqldb/sqldb_suite_test.go +++ b/src/autoscaler/db/sqldb/sqldb_suite_test.go @@ -220,15 +220,29 @@ func removeScalingHistoryForApp(appId string) { FailOnError("can not clean table scalinghistory", err) } +func getNumberOfCooldownEntries() int { + var num int + query := dbHelper.Rebind("SELECT COUNT(*) FROM scalingcooldown") + err := dbHelper.QueryRow(query).Scan(&num) + FailOnError("can not count the number of records in table scalingcooldown", err) + return num +} + func removeCooldownForApp(appId string) { query := dbHelper.Rebind("DELETE from scalingcooldown where appId = ?") _, err := dbHelper.Exec(query, appId) + FailOnError("can not remove scalingcooldown for app", err) +} + +func cleanUpCooldownTable() { + _, err := dbHelper.Exec("DELETE from scalingcooldown") FailOnError("can not clean table scalingcooldown", err) } + func removeActiveScheduleForApp(appId string) { query := dbHelper.Rebind("DELETE from activeschedule where appId = ?") _, err := dbHelper.Exec(query, appId) - FailOnError("can not clean table scalingcooldown", err) + FailOnError("can not remove actives schedules for app", err) } func hasScalingHistory(appId string, timestamp int64) bool { diff --git a/src/autoscaler/operator/scalingenginedb.go b/src/autoscaler/operator/scalingenginedb.go index 4bd1416bf5..9572dc1be8 100644 --- a/src/autoscaler/operator/scalingenginedb.go +++ b/src/autoscaler/operator/scalingenginedb.go @@ -10,31 +10,35 @@ import ( ) type ScalingEngineDbPruner struct { - scalingEngineDb db.ScalingEngineDB - cutoffDuration time.Duration - clock clock.Clock - logger lager.Logger + scalingEngineDb db.ScalingEngineDB + scalingHistoriesCutoffDuration time.Duration + clock clock.Clock + logger lager.Logger } -func NewScalingEngineDbPruner(scalingEngineDb db.ScalingEngineDB, cutoffDuration time.Duration, clock clock.Clock, logger lager.Logger) *ScalingEngineDbPruner { +func NewScalingEngineDbPruner(scalingEngineDb db.ScalingEngineDB, scalingHistoriesCutoffDuration time.Duration, clock clock.Clock, logger lager.Logger) *ScalingEngineDbPruner { return &ScalingEngineDbPruner{ - scalingEngineDb: scalingEngineDb, - cutoffDuration: cutoffDuration, - clock: clock, - logger: logger.Session("scaling_engine_db_pruner"), + scalingEngineDb: scalingEngineDb, + scalingHistoriesCutoffDuration: scalingHistoriesCutoffDuration, + clock: clock, + logger: logger.Session("scaling_engine_db_pruner"), } } func (sdp ScalingEngineDbPruner) Operate(ctx context.Context) { - timestamp := sdp.clock.Now().Add(-sdp.cutoffDuration).UnixNano() + historyCutoffTimestamp := sdp.clock.Now().Add(-sdp.scalingHistoriesCutoffDuration).UnixNano() - logger := sdp.logger.Session("pruning-scaling-histories", lager.Data{"cutoff-time": timestamp}) + logger := sdp.logger.Session("pruning-scaling-histories-and-cooldowns", lager.Data{"history-cutoff-time": historyCutoffTimestamp}) logger.Info("starting") defer logger.Info("completed") - err := sdp.scalingEngineDb.PruneScalingHistories(ctx, timestamp) + err := sdp.scalingEngineDb.PruneScalingHistories(ctx, historyCutoffTimestamp) if err != nil { sdp.logger.Error("failed-prune-scaling-histories", err) - return + } + + err = sdp.scalingEngineDb.PruneCooldowns(ctx, sdp.clock.Now().UnixNano()) + if err != nil { + sdp.logger.Error("failed-prune-scaling-cooldowns", err) } } diff --git a/src/autoscaler/operator/scalingenginedb_test.go b/src/autoscaler/operator/scalingenginedb_test.go index 3e56a506ae..97d00b49ca 100644 --- a/src/autoscaler/operator/scalingenginedb_test.go +++ b/src/autoscaler/operator/scalingenginedb_test.go @@ -57,5 +57,25 @@ var _ = Describe("ScalingEngineDbPruner", func() { Eventually(buffer).Should(gbytes.Say("test error")) }) }) + + Context("when pruning records from scalingcooldown table", func() { + It("prunes expired cooldowns", func() { + Eventually(scalingEngineDB.PruneCooldownsCallCount).Should(Equal(1)) + _, cutoffTime := scalingEngineDB.PruneCooldownsArgsForCall(0) + Expect(cutoffTime).To(Equal(fclock.Now().UnixNano())) + }) + }) + + Context("when pruning records from scalingcooldown table fails", func() { + BeforeEach(func() { + scalingEngineDB.PruneCooldownsReturns(errors.New("test error")) + }) + + It("should error", func() { + Eventually(scalingEngineDB.PruneCooldownsCallCount).Should(Equal(1)) + Eventually(buffer).Should(gbytes.Say("test error")) + }) + }) + }) }) From bc68d43ce886c6175996273dc1023a886b73ac85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 23:34:39 +0000 Subject: [PATCH 31/42] chore(deps): update dependency credhub-cli to v2.9.30 --- ci/dockerfiles/autoscaler-tools/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dockerfiles/autoscaler-tools/Dockerfile b/ci/dockerfiles/autoscaler-tools/Dockerfile index c15d83bc6b..24eb563dd0 100644 --- a/ci/dockerfiles/autoscaler-tools/Dockerfile +++ b/ci/dockerfiles/autoscaler-tools/Dockerfile @@ -78,7 +78,7 @@ RUN wget -q https://github.com/cloudfoundry/bosh-bootloader/releases/download/${ # Install credhub # renovate: datasource=github-releases depName=credhub-cli lookupName=cloudfoundry/credhub-cli -ARG CREDHUB_VERSION=2.9.29 +ARG CREDHUB_VERSION=2.9.30 RUN wget -q https://github.com/cloudfoundry/credhub-cli/releases/download/${CREDHUB_VERSION}/credhub-linux-amd64-${CREDHUB_VERSION}.tgz && \ tar xvfz credhub-linux-amd64-${CREDHUB_VERSION}.tgz && \ mv credhub /usr/local/bin/credhub &&\ From c81f492becd0fe4c10993de2dcf1f033f7dcc433 Mon Sep 17 00:00:00 2001 From: Application Autoscaler CI Bot Date: Thu, 16 May 2024 14:21:02 +0200 Subject: [PATCH 32/42] Update golang version to 1.21.5 (#2931) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update golang version to 1.21.5 * 🤖🦾🛠️ scripts/asdf2devbox.py --- .../packages/golang-1-linux/index.yml | 4 + .tool-versions | 2 +- .../concourse/pipelines/api-tester/src/go.mod | 2 +- devbox.json | 12 +- devbox.lock | 165 ++++++++++-------- go.work | 2 +- packages/golang-1-linux/spec.lock | 2 +- packages/golang-1-linux/vendored-commit | 2 +- packages/golang-1-linux/version | 2 +- src/acceptance/assets/app/go_app/go.mod | 2 +- src/acceptance/go.mod | 2 +- src/autoscaler/go.mod | 2 +- src/changelog/go.mod | 2 +- src/changeloglockcleaner/go.mod | 2 +- 14 files changed, 117 insertions(+), 86 deletions(-) diff --git a/.final_builds/packages/golang-1-linux/index.yml b/.final_builds/packages/golang-1-linux/index.yml index 8e2b072530..36e31e3962 100644 --- a/.final_builds/packages/golang-1-linux/index.yml +++ b/.final_builds/packages/golang-1-linux/index.yml @@ -51,6 +51,10 @@ builds: version: 8c04109541f4d504f5be559da433998bd459b0f45cd3654557cc3642cc4d2f60 blobstore_id: d2723887-4744-43c2-64e3-289fe6483132 sha1: sha256:efdf65bca81264d9110ec764be7edea1de341781a1ffe59c219db064d71d9fc3 + a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0: + version: a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0 + blobstore_id: 39ce080a-6129-4622-6d8a-f07e063992eb + sha1: sha256:7e0fc0e87c06d8aabcb0f84c83fa15fb8f0565e60afbb7f0236050412cb8628e a54b33c812a8cfc39ba82782a23d74bf33f5a0a92012b41a101cc9d9d48d345c: version: a54b33c812a8cfc39ba82782a23d74bf33f5a0a92012b41a101cc9d9d48d345c blobstore_id: 5a8680dd-9f44-40ac-400b-52753e7c9b25 diff --git a/.tool-versions b/.tool-versions index 95c1f81d33..28c8a95033 100644 --- a/.tool-versions +++ b/.tool-versions @@ -6,7 +6,7 @@ concourse 7.10.0 direnv 2.34.0 gcloud 473.0.0 ginkgo 2.17.2 -golang 1.21.4 +golang 1.21.5 golangci-lint 1.57.2 java temurin-21.0.3+9.0.LTS make 4.4 diff --git a/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod b/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod index adaec751c3..697d476ebc 100644 --- a/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod +++ b/ci/terragrunt/app-autoscaler/concourse/pipelines/api-tester/src/go.mod @@ -1,3 +1,3 @@ module apitester -go 1.21.4 +go 1.21.5 diff --git a/devbox.json b/devbox.json index 61a1c40fe8..002f052328 100644 --- a/devbox.json +++ b/devbox.json @@ -13,7 +13,6 @@ "rubocop@latest", "rubyPackages.solargraph@latest", "swagger-cli@latest", - "go@1.21.4", "actionlint@1.6.27", "direnv@2.34.0", "gnumake@4.4", @@ -26,14 +25,15 @@ "jq@latest", "fly@7.10.0", "python@latest", - "act@latest", "cloudfoundry-cli@8.7.10", + "shellcheck@0.10.0", + "hey@latest", + "act@0.2.62", "google-cloud-sdk@latest", - "ginkgo@latest", + "ginkgo@2.17.2", + "go@1.21.5", "temurin-bin-17@latest", - "ruby@latest", - "shellcheck@0.10.0", - "hey@latest" + "ruby@3.3.1" ], "shell": { "init_hook": [ diff --git a/devbox.lock b/devbox.lock index 426c4eae1b..53db02011c 100644 --- a/devbox.lock +++ b/devbox.lock @@ -1,51 +1,51 @@ { "lockfile_version": "1", "packages": { - "act@latest": { - "last_modified": "2024-04-19T17:36:04-04:00", - "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#act", + "act@0.2.62": { + "last_modified": "2024-05-13T18:06:16Z", + "resolved": "github:NixOS/nixpkgs/1daef0114a6074be56586f2cf81898ed142e1e44#act", "source": "devbox-search", - "version": "0.2.61", + "version": "0.2.62", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/0vv50cajcl1vsadkz0rwhzzdzcphfym9-act-0.2.61", + "path": "/nix/store/75bq6y1b2yzhd0ikpl1dh2qy8n1jl6f6-act-0.2.62", "default": true } ], - "store_path": "/nix/store/0vv50cajcl1vsadkz0rwhzzdzcphfym9-act-0.2.61" + "store_path": "/nix/store/75bq6y1b2yzhd0ikpl1dh2qy8n1jl6f6-act-0.2.62" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/cix9yxzisv5vpiz16lq42jm06gksr1lj-act-0.2.61", + "path": "/nix/store/gvv6azi73f613vjpaqf359bba4xqdwlq-act-0.2.62", "default": true } ], - "store_path": "/nix/store/cix9yxzisv5vpiz16lq42jm06gksr1lj-act-0.2.61" + "store_path": "/nix/store/gvv6azi73f613vjpaqf359bba4xqdwlq-act-0.2.62" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/zsbb15dvpzp9cim1hc1xng201rm9l65r-act-0.2.61", + "path": "/nix/store/wy1cd4gmf0rm2j4mylswmrmnb02ymj6n-act-0.2.62", "default": true } ], - "store_path": "/nix/store/zsbb15dvpzp9cim1hc1xng201rm9l65r-act-0.2.61" + "store_path": "/nix/store/wy1cd4gmf0rm2j4mylswmrmnb02ymj6n-act-0.2.62" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/5iz6aqqdyr8drz64ic8vx86kr0hir0vk-act-0.2.61", + "path": "/nix/store/8jrwy52sp5ffzcf1mw7za92jd3vxlmw9-act-0.2.62", "default": true } ], - "store_path": "/nix/store/5iz6aqqdyr8drz64ic8vx86kr0hir0vk-act-0.2.61" + "store_path": "/nix/store/8jrwy52sp5ffzcf1mw7za92jd3vxlmw9-act-0.2.62" } } }, @@ -293,51 +293,51 @@ } } }, - "ginkgo@latest": { - "last_modified": "2024-04-19T17:36:04-04:00", - "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#ginkgo", + "ginkgo@2.17.2": { + "last_modified": "2024-05-01T11:18:24Z", + "resolved": "github:NixOS/nixpkgs/bcd44e224fd68ce7d269b4f44d24c2220fd821e7#ginkgo", "source": "devbox-search", - "version": "2.17.1", + "version": "2.17.2", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/94622rky2ffpbz6vpyqdmi86knm3czkw-ginkgo-2.17.1", + "path": "/nix/store/x04nfxlvg8zrhs2ys2rh7cwj0brcvsry-ginkgo-2.17.2", "default": true } ], - "store_path": "/nix/store/94622rky2ffpbz6vpyqdmi86knm3czkw-ginkgo-2.17.1" + "store_path": "/nix/store/x04nfxlvg8zrhs2ys2rh7cwj0brcvsry-ginkgo-2.17.2" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/d06nha7nl3f8iw5vf06vsfircmvlj852-ginkgo-2.17.1", + "path": "/nix/store/pzgnys3gmi4f25nn007x4amc20ymd1cs-ginkgo-2.17.2", "default": true } ], - "store_path": "/nix/store/d06nha7nl3f8iw5vf06vsfircmvlj852-ginkgo-2.17.1" + "store_path": "/nix/store/pzgnys3gmi4f25nn007x4amc20ymd1cs-ginkgo-2.17.2" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/ihm49vvp0z4aifblx362ramg8spinkz5-ginkgo-2.17.1", + "path": "/nix/store/1v7rww0nbr72p0ipwiag920z9a3s88zq-ginkgo-2.17.2", "default": true } ], - "store_path": "/nix/store/ihm49vvp0z4aifblx362ramg8spinkz5-ginkgo-2.17.1" + "store_path": "/nix/store/1v7rww0nbr72p0ipwiag920z9a3s88zq-ginkgo-2.17.2" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/rsq6y6wxhdvh6xr5sk39pp9agxd9vvf5-ginkgo-2.17.1", + "path": "/nix/store/s1zwzxjiizp6pv2wf487jskilfpnqvf9-ginkgo-2.17.2", "default": true } ], - "store_path": "/nix/store/rsq6y6wxhdvh6xr5sk39pp9agxd9vvf5-ginkgo-2.17.1" + "store_path": "/nix/store/s1zwzxjiizp6pv2wf487jskilfpnqvf9-ginkgo-2.17.2" } } }, @@ -381,23 +381,51 @@ } } }, - "go@1.21.4": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#go", + "go@1.21.5": { + "last_modified": "2024-01-14T03:55:27Z", + "resolved": "github:NixOS/nixpkgs/dd5621df6dcb90122b50da5ec31c411a0de3e538#go", "source": "devbox-search", - "version": "1.21.4", + "version": "1.21.5", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/02cpvad60np366kmsqc3gnixbsw9jvg1-go-1.21.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/z6p2j8shdwi74kbm86jwdh03vxq91l0q-go-1.21.5", + "default": true + } + ], + "store_path": "/nix/store/z6p2j8shdwi74kbm86jwdh03vxq91l0q-go-1.21.5" }, "aarch64-linux": { - "store_path": "/nix/store/7y75b2ac80chlh6knld3943y46n3v9kf-go-1.21.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/1p00q366rk2j7w9lnflrl7xaks7wfq5d-go-1.21.5", + "default": true + } + ], + "store_path": "/nix/store/1p00q366rk2j7w9lnflrl7xaks7wfq5d-go-1.21.5" }, "x86_64-darwin": { - "store_path": "/nix/store/0djljz0g4s6f55xcnw7fpzcy7af7rxid-go-1.21.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/brv7d6mlrclkzywf1vaf35wqhq4c0c82-go-1.21.5", + "default": true + } + ], + "store_path": "/nix/store/brv7d6mlrclkzywf1vaf35wqhq4c0c82-go-1.21.5" }, "x86_64-linux": { - "store_path": "/nix/store/y7abhs9glxfcg7lgcdc8i4ml5wg5ly92-go-1.21.4" + "outputs": [ + { + "name": "out", + "path": "/nix/store/rccpgf2bnh58hhh4908p78i1rln9gzvp-go-1.21.5", + "default": true + } + ], + "store_path": "/nix/store/rccpgf2bnh58hhh4908p78i1rln9gzvp-go-1.21.5" } } }, @@ -450,8 +478,8 @@ } }, "google-cloud-sdk@latest": { - "last_modified": "2024-04-19T17:36:04-04:00", - "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#google-cloud-sdk", + "last_modified": "2024-05-13T18:06:16Z", + "resolved": "github:NixOS/nixpkgs/1daef0114a6074be56586f2cf81898ed142e1e44#google-cloud-sdk", "source": "devbox-search", "version": "467.0.0", "systems": { @@ -459,41 +487,41 @@ "outputs": [ { "name": "out", - "path": "/nix/store/rcgpjzwm11fy37ff03g4qm9lyak8by3q-google-cloud-sdk-467.0.0", + "path": "/nix/store/ljlk4yxw84srzkxn0m97r1jy6yxv7f75-google-cloud-sdk-467.0.0", "default": true } ], - "store_path": "/nix/store/rcgpjzwm11fy37ff03g4qm9lyak8by3q-google-cloud-sdk-467.0.0" + "store_path": "/nix/store/ljlk4yxw84srzkxn0m97r1jy6yxv7f75-google-cloud-sdk-467.0.0" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/d3g4xrjxpz7p4zm6gc3lgfbgqwidqk92-google-cloud-sdk-467.0.0", + "path": "/nix/store/ahsa2zpdygga8ck1xivfbnkrkqcd0bgd-google-cloud-sdk-467.0.0", "default": true } ], - "store_path": "/nix/store/d3g4xrjxpz7p4zm6gc3lgfbgqwidqk92-google-cloud-sdk-467.0.0" + "store_path": "/nix/store/ahsa2zpdygga8ck1xivfbnkrkqcd0bgd-google-cloud-sdk-467.0.0" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/px0rjif67b8k9lgs9pczbl7v21fxavrg-google-cloud-sdk-467.0.0", + "path": "/nix/store/8a0s7gdn4mrk76ll31gd68g7nqcx0pv1-google-cloud-sdk-467.0.0", "default": true } ], - "store_path": "/nix/store/px0rjif67b8k9lgs9pczbl7v21fxavrg-google-cloud-sdk-467.0.0" + "store_path": "/nix/store/8a0s7gdn4mrk76ll31gd68g7nqcx0pv1-google-cloud-sdk-467.0.0" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/0wxgc7yl52c5pzda9f7r7hp1fnha4s03-google-cloud-sdk-467.0.0", + "path": "/nix/store/8zlx564av0pcy783g49np4avikni61vl-google-cloud-sdk-467.0.0", "default": true } ], - "store_path": "/nix/store/0wxgc7yl52c5pzda9f7r7hp1fnha4s03-google-cloud-sdk-467.0.0" + "store_path": "/nix/store/8zlx564av0pcy783g49np4avikni61vl-google-cloud-sdk-467.0.0" } } }, @@ -855,68 +883,67 @@ } } }, - "ruby@latest": { - "last_modified": "2024-04-19T17:36:04-04:00", - "plugin_version": "0.0.2", - "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#ruby_3_3", + "ruby@3.3.1": { + "last_modified": "2024-05-13T18:06:16Z", + "resolved": "github:NixOS/nixpkgs/1daef0114a6074be56586f2cf81898ed142e1e44#ruby_3_3", "source": "devbox-search", - "version": "3.3.0", + "version": "3.3.1", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/v2985rr69yd20k3gpv0h0xfncx7fz7ri-ruby-3.3.0", + "path": "/nix/store/g84fk6i3alpkd8m7gq31fcwykihmfdm9-ruby-3.3.1", "default": true }, { "name": "devdoc", - "path": "/nix/store/ad7zlahvwsdwpy4rl2j4874zm48r9r52-ruby-3.3.0-devdoc" + "path": "/nix/store/h8qihxdi9jh6x6zn7wx6880z5xh856s6-ruby-3.3.1-devdoc" } ], - "store_path": "/nix/store/v2985rr69yd20k3gpv0h0xfncx7fz7ri-ruby-3.3.0" + "store_path": "/nix/store/g84fk6i3alpkd8m7gq31fcwykihmfdm9-ruby-3.3.1" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/sb5npxqnf38ganslr4211lwsdakq7vp9-ruby-3.3.0", + "path": "/nix/store/c7g40p7m9qblj7g79bmbgs2fdwzpxvbf-ruby-3.3.1", "default": true }, { "name": "devdoc", - "path": "/nix/store/ddkprabv23gcxri2hq18mjivjn98s2md-ruby-3.3.0-devdoc" + "path": "/nix/store/fsg4x9g1sc8vnfp9nnd681gbgw00vi95-ruby-3.3.1-devdoc" } ], - "store_path": "/nix/store/sb5npxqnf38ganslr4211lwsdakq7vp9-ruby-3.3.0" + "store_path": "/nix/store/c7g40p7m9qblj7g79bmbgs2fdwzpxvbf-ruby-3.3.1" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/qjgy5y7q07naykii8jc4c94kn0bgb8gq-ruby-3.3.0", + "path": "/nix/store/k3np8iw8rgvnvzahw90k692kvvk7arzc-ruby-3.3.1", "default": true }, { "name": "devdoc", - "path": "/nix/store/j7vfiblaw5mslksm31s6jfc8am832sp8-ruby-3.3.0-devdoc" + "path": "/nix/store/v9m76yxmckdsvy4yk77fbsah38yvf678-ruby-3.3.1-devdoc" } ], - "store_path": "/nix/store/qjgy5y7q07naykii8jc4c94kn0bgb8gq-ruby-3.3.0" + "store_path": "/nix/store/k3np8iw8rgvnvzahw90k692kvvk7arzc-ruby-3.3.1" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/sbwg3visqb0njszbkarj645azj00951m-ruby-3.3.0", + "path": "/nix/store/l7i7nszmnx5dxn0bvdf838r2nzviydwn-ruby-3.3.1", "default": true }, { "name": "devdoc", - "path": "/nix/store/3d7k5b5dwl0iyw86id8w1brrlbrd3szj-ruby-3.3.0-devdoc" + "path": "/nix/store/57c2xsirc0nz182gcl62ab14igpxsndj-ruby-3.3.1-devdoc" } ], - "store_path": "/nix/store/sbwg3visqb0njszbkarj645azj00951m-ruby-3.3.0" + "store_path": "/nix/store/l7i7nszmnx5dxn0bvdf838r2nzviydwn-ruby-3.3.1" } } }, @@ -1065,8 +1092,8 @@ } }, "temurin-bin-17@latest": { - "last_modified": "2024-04-19T17:36:04-04:00", - "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#temurin-bin-17", + "last_modified": "2024-05-13T18:06:16Z", + "resolved": "github:NixOS/nixpkgs/1daef0114a6074be56586f2cf81898ed142e1e44#temurin-bin-17", "source": "devbox-search", "version": "17.0.9", "systems": { @@ -1074,41 +1101,41 @@ "outputs": [ { "name": "out", - "path": "/nix/store/150lqcf9xmjz3543z5my0n4b1kncyr5z-temurin-bin-17.0.9", + "path": "/nix/store/5wm01i1h0i2c4sknbh5mwkiv97k75f5n-temurin-bin-17.0.9", "default": true } ], - "store_path": "/nix/store/150lqcf9xmjz3543z5my0n4b1kncyr5z-temurin-bin-17.0.9" + "store_path": "/nix/store/5wm01i1h0i2c4sknbh5mwkiv97k75f5n-temurin-bin-17.0.9" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/8k4kyhhvlxkzzfpgl0p0yn147585hf60-temurin-bin-17.0.9", + "path": "/nix/store/65kkm5540gi1955xgwi4dyy54c0g8sap-temurin-bin-17.0.9", "default": true } ], - "store_path": "/nix/store/8k4kyhhvlxkzzfpgl0p0yn147585hf60-temurin-bin-17.0.9" + "store_path": "/nix/store/65kkm5540gi1955xgwi4dyy54c0g8sap-temurin-bin-17.0.9" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/j58pbnd0rnfyn3akxb8zx3s1kc5p9dy8-temurin-bin-17.0.9", + "path": "/nix/store/nb6883hq2789nyb68j3d1m3rmbh4j0qf-temurin-bin-17.0.9", "default": true } ], - "store_path": "/nix/store/j58pbnd0rnfyn3akxb8zx3s1kc5p9dy8-temurin-bin-17.0.9" + "store_path": "/nix/store/nb6883hq2789nyb68j3d1m3rmbh4j0qf-temurin-bin-17.0.9" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/z16qjcmxxiki2ah8wvg4qp0kp96a5s84-temurin-bin-17.0.9", + "path": "/nix/store/sf0qsq60dz95mzz82sf32v6wrzp3h32l-temurin-bin-17.0.9", "default": true } ], - "store_path": "/nix/store/z16qjcmxxiki2ah8wvg4qp0kp96a5s84-temurin-bin-17.0.9" + "store_path": "/nix/store/sf0qsq60dz95mzz82sf32v6wrzp3h32l-temurin-bin-17.0.9" } } }, diff --git a/go.work b/go.work index b7455279b5..6dd2e0c8ba 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.21.4 +go 1.21.5 use ( ./src/acceptance diff --git a/packages/golang-1-linux/spec.lock b/packages/golang-1-linux/spec.lock index b79741c5ef..6a23a78647 100644 --- a/packages/golang-1-linux/spec.lock +++ b/packages/golang-1-linux/spec.lock @@ -1,2 +1,2 @@ name: golang-1-linux -fingerprint: 48a59edbcdab872874d3b1851402c38b62fbf4a70ebfbd055a9d63865f021a69 +fingerprint: a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0 diff --git a/packages/golang-1-linux/vendored-commit b/packages/golang-1-linux/vendored-commit index ea71a42d62..71e8079258 100644 --- a/packages/golang-1-linux/vendored-commit +++ b/packages/golang-1-linux/vendored-commit @@ -1 +1 @@ -23f9a006037c088ef7354f1f13be3f3de771c500 +5dcfbfc3789c847c524993c9c4fbeb085c0f87ec diff --git a/packages/golang-1-linux/version b/packages/golang-1-linux/version index 3d8ac63718..d6a49eb373 100644 --- a/packages/golang-1-linux/version +++ b/packages/golang-1-linux/version @@ -1 +1 @@ -1.21.4 \ No newline at end of file +1.21.5 \ No newline at end of file diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index bd30c0ed40..ab2a42a3d9 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -1,6 +1,6 @@ module code.cloudfoundry.org/app-autoscaler-release/src/acceptance/assets/app/go_app -go 1.21.4 +go 1.21.5 require ( github.com/cloudfoundry-community/go-cfenv v1.18.0 diff --git a/src/acceptance/go.mod b/src/acceptance/go.mod index 0216220dfa..74a970e81e 100644 --- a/src/acceptance/go.mod +++ b/src/acceptance/go.mod @@ -1,6 +1,6 @@ module acceptance -go 1.21.4 +go 1.21.5 require ( github.com/cloudfoundry/cf-test-helpers/v2 v2.9.0 diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 1df5510725..1bfccf522e 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -1,6 +1,6 @@ module code.cloudfoundry.org/app-autoscaler/src/autoscaler -go 1.21.4 +go 1.21.5 require ( code.cloudfoundry.org/cfhttp/v2 v2.0.1 diff --git a/src/changelog/go.mod b/src/changelog/go.mod index 17b962c815..e234623981 100644 --- a/src/changelog/go.mod +++ b/src/changelog/go.mod @@ -1,6 +1,6 @@ module changelog -go 1.21.4 +go 1.21.5 require ( github.com/Masterminds/semver/v3 v3.2.1 diff --git a/src/changeloglockcleaner/go.mod b/src/changeloglockcleaner/go.mod index 68dbaedd59..2981bb933b 100644 --- a/src/changeloglockcleaner/go.mod +++ b/src/changeloglockcleaner/go.mod @@ -1,6 +1,6 @@ module changeloglockcleaner -go 1.21.4 +go 1.21.5 require ( github.com/go-sql-driver/mysql v1.8.1 From 1d95a9f81157f85b95aecd45142a35f9346b2fe1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 14:19:35 +0000 Subject: [PATCH 33/42] fix(deps): update module github.com/gin-contrib/zap to v1.1.3 --- src/acceptance/assets/app/go_app/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index ab2a42a3d9..1640e8d19e 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -5,7 +5,7 @@ go 1.21.5 require ( github.com/cloudfoundry-community/go-cfenv v1.18.0 github.com/fgrosse/zaptest v1.2.1 - github.com/gin-contrib/zap v1.1.1 + github.com/gin-contrib/zap v1.1.3 github.com/gin-gonic/gin v1.9.1 github.com/go-faster/errors v0.7.1 github.com/go-faster/jx v1.1.0 From 112b70712b2b9faca7da487c58959142dafbf048 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 15:25:00 +0100 Subject: [PATCH 34/42] =?UTF-8?q?=F0=9F=A4=96=F0=9F=A6=BE=F0=9F=9B=A0?= =?UTF-8?q?=EF=B8=8F=20go=20mod=20tidy=20&=20make=20package-specs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/metricsgateway/spec | 1 + packages/metricsserver/spec | 1 + src/acceptance/assets/app/go_app/go.mod | 10 +++++----- src/acceptance/assets/app/go_app/go.sum | 25 ++++++++++++------------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/metricsgateway/spec b/packages/metricsgateway/spec index de5c013246..8277ca0bac 100644 --- a/packages/metricsgateway/spec +++ b/packages/metricsgateway/spec @@ -184,6 +184,7 @@ files: - autoscaler/vendor/google.golang.org/protobuf/internal/descopts/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/detrand/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/editiondefaults/* # gosub +- autoscaler/vendor/google.golang.org/protobuf/internal/editionssupport/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/encoding/defval/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/encoding/json/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/encoding/messageset/* # gosub diff --git a/packages/metricsserver/spec b/packages/metricsserver/spec index 682b242816..533e0fe475 100644 --- a/packages/metricsserver/spec +++ b/packages/metricsserver/spec @@ -186,6 +186,7 @@ files: - autoscaler/vendor/google.golang.org/protobuf/internal/descopts/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/detrand/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/editiondefaults/* # gosub +- autoscaler/vendor/google.golang.org/protobuf/internal/editionssupport/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/encoding/defval/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/encoding/json/* # gosub - autoscaler/vendor/google.golang.org/protobuf/internal/encoding/messageset/* # gosub diff --git a/src/acceptance/assets/app/go_app/go.mod b/src/acceptance/assets/app/go_app/go.mod index 1640e8d19e..bd5296f1e2 100644 --- a/src/acceptance/assets/app/go_app/go.mod +++ b/src/acceptance/assets/app/go_app/go.mod @@ -28,9 +28,9 @@ require ( ) require ( - github.com/bytedance/sonic v1.11.5 // indirect + github.com/bytedance/sonic v1.11.6 // indirect github.com/bytedance/sonic/loader v0.1.1 // indirect - github.com/cloudwego/base64x v0.1.3 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dlclark/regexp2 v1.11.0 // indirect @@ -42,7 +42,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.19.0 // indirect + github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -54,7 +54,7 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.2.1 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect @@ -68,7 +68,7 @@ require ( golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.20.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/src/acceptance/assets/app/go_app/go.sum b/src/acceptance/assets/app/go_app/go.sum index 7968a18796..cdb678d9d7 100644 --- a/src/acceptance/assets/app/go_app/go.sum +++ b/src/acceptance/assets/app/go_app/go.sum @@ -1,12 +1,11 @@ -github.com/bytedance/sonic v1.11.5 h1:G00FYjjqll5iQ1PYXynbg/hyzqBqavH8Mo9/oTopd9k= -github.com/bytedance/sonic v1.11.5/go.mod h1:X2PC2giUdj/Cv2lliWFLk6c/DUQok5rViJSemeB0wDw= -github.com/bytedance/sonic/loader v0.1.0/go.mod h1:UmRT+IRTGKz/DAkzcEGzyVqQFJ7H9BqwBO3pm9H/+HY= +github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= +github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/cloudfoundry-community/go-cfenv v1.18.0 h1:dOIRSHUSaj4r6Q9Cx+nzz2OytHt+QNKqtOuKTQsa+zw= github.com/cloudfoundry-community/go-cfenv v1.18.0/go.mod h1:qGMSI6lygPzqugFs9M1NFjJBtEPgl0MgT6drMFZGUoU= -github.com/cloudwego/base64x v0.1.3 h1:b5J/l8xolB7dyDTTmhJP2oTs5LdrjyrUFuNxdfq5hAg= -github.com/cloudwego/base64x v0.1.3/go.mod h1:1+1K5BUHIQzyapgpF7LwvOGAEDicKtt1umPV+aN8pi8= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -25,8 +24,8 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-contrib/zap v1.1.1 h1:DDyIF9YQorl3gZzAabIowRywHJuohDfiLnhwvWKl6SY= -github.com/gin-contrib/zap v1.1.1/go.mod h1:YW8KOko2kYLy8g6k9YgVNTj7SIcrUEzYiAd9IjiBPs0= +github.com/gin-contrib/zap v1.1.3 h1:9e/U9fYd4/OBfmSEBs5hHZq114uACn7bpuzvCkcJySA= +github.com/gin-contrib/zap v1.1.3/go.mod h1:+BD/6NYZKJyUpqVoJEvgeq9GLz8pINEQvak9LHNOTSE= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= @@ -48,8 +47,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4= -github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= +github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= @@ -103,8 +102,8 @@ github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= -github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg= -github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= 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/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= @@ -178,8 +177,8 @@ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= +google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From c089c82aa9e62807625c20ccb5eb05e00ef0357b Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Wed, 15 May 2024 18:01:08 +0200 Subject: [PATCH 35/42] chore(deps): bump `google.golang.org/protobuf` in `src/autoscaler` --- src/autoscaler/go.mod | 2 +- src/autoscaler/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 1bfccf522e..61c89081a8 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -98,6 +98,6 @@ require ( golang.org/x/tools v0.20.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum index d34a2ad93c..51575c4e23 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -1739,8 +1739,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= From 920c25b89b8608748f7fc09ddc399f89ca55148d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 14:19:42 +0000 Subject: [PATCH 36/42] chore(config): migrate config renovate.json --- renovate.json | 127 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 95 insertions(+), 32 deletions(-) diff --git a/renovate.json b/renovate.json index a0980b7dd1..df238c0dc0 100644 --- a/renovate.json +++ b/renovate.json @@ -2,129 +2,192 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:best-practices", - "regexManagers:dockerfileVersions", + "customManagers:dockerfileVersions", ":label(dependencies)", ":automergeAll", "schedule:nonOfficeHours" ], "transitiveRemediation": true, - "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths"], + "postUpdateOptions": [ + "gomodTidy", + "gomodUpdateImportPaths" + ], "platformAutomerge": true, "automergeStrategy": "squash", "prConcurrentLimit": 2, "packageRules": [ { "description": "Opt-out minimum Go version updates: https://github.com/renovatebot/renovate/issues/16715", - "matchManagers": ["gomod"], - "matchDepTypes": ["golang"], + "matchManagers": [ + "gomod" + ], + "matchDepTypes": [ + "golang" + ], "enabled": false }, { "description": "Disable asdf Go version updates, as they are taken care by our bosh-package-golang-release-based automation", - "matchManagers": ["asdf"], - "matchDepNames": ["golang"], + "matchManagers": [ + "asdf" + ], + "matchDepNames": [ + "golang" + ], "enabled": false }, { "description": "Strip of v prefix from version number in certain github releases", - "matchPackageNames": ["bosh-cli"], + "matchPackageNames": [ + "bosh-cli" + ], "extractVersion": "^v(?.*)$" }, { "description": "Group Ginkgo CLI and library updates together", "groupName": "ginkgo updates", - "matchPackagePatterns": ["onsi/ginkgo"] + "matchPackagePatterns": [ + "onsi/ginkgo" + ] } ], - "nix": {"enabled": true}, + "nix": { + "enabled": true + }, "customManagers": [ { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)act (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)act (?.+?)\\n" + ], "depNameTemplate": "nektos/act", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)actionlint (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)actionlint (?.+?)\\n" + ], "depNameTemplate": "rhysd/actionlint", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)bosh (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)bosh (?.+?)\\n" + ], "depNameTemplate": "cloudfoundry/bosh-cli", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)cf (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)cf (?.+?)\\n" + ], "depNameTemplate": "cloudfoundry/cli", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)gcloud (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)gcloud (?.+?)\\n" + ], "depNameTemplate": "google/cloud-sdk", "datasourceTemplate": "docker" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)ginkgo (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)ginkgo (?.+?)\\n" + ], "depNameTemplate": "onsi/ginkgo", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)golangci-lint (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)golangci-lint (?.+?)\\n" + ], "depNameTemplate": "golangci/golangci-lint", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)maven (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)maven (?.+?)\\n" + ], "depNameTemplate": "apache/maven", "datasourceTemplate": "github-releases" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)terraform-lsp (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)terraform-lsp (?.+?)\\n" + ], "depNameTemplate": "juliosueiras/terraform-lsp", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)terragrunt (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)terragrunt (?.+?)\\n" + ], "depNameTemplate": "gruntwork-io/terragrunt", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" }, { "customType": "regex", - "fileMatch": ["\\.tool-versions$"], - "matchStrings": ["(^|\\n)yq (?.+?)\\n"], + "fileMatch": [ + "\\.tool-versions$" + ], + "matchStrings": [ + "(^|\\n)yq (?.+?)\\n" + ], "depNameTemplate": "mikefarah/yq", "datasourceTemplate": "github-releases", "extractVersionTemplate": "^v(?\\S+)" } ], - "lockFileMaintenance": {"enabled": true}, + "lockFileMaintenance": { + "enabled": true + }, "timezone": "Europe/Berlin" } From 16c05cd0c05cc70c09f3ec6750fa416971dd2cba Mon Sep 17 00:00:00 2001 From: app-autoscaler-ci-bot Date: Thu, 16 May 2024 16:02:10 +0100 Subject: [PATCH 37/42] Updated release version to 13.0.0 in golangapiserver --- jobs/golangapiserver/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/golangapiserver/spec b/jobs/golangapiserver/spec index 5c469fa43e..856514ab5d 100644 --- a/jobs/golangapiserver/spec +++ b/jobs/golangapiserver/spec @@ -92,7 +92,7 @@ properties: default: "Autoscaler" autoscaler.apiserver.info.build: description: "Autoscaler application build number" - default: "12.2.2" + default: "13.0.0" autoscaler.apiserver.info.support_url: description: "Autoscaler application support page URL" default: "https://github.com/cloudfoundry/app-autoscaler-release" From e1005e05f96cc29128527907c85a894bf9a36b3f Mon Sep 17 00:00:00 2001 From: app-autoscaler-ci-bot Date: Thu, 16 May 2024 16:04:50 +0100 Subject: [PATCH 38/42] created release v13.0.0 --- .final_builds/jobs/golangapiserver/index.yml | 4 + .../packages/changeloglockcleaner/index.yml | 4 + .final_builds/packages/db/index.yml | 4 + .../packages/eventgenerator/index.yml | 4 + .../packages/golangapiserver/index.yml | 4 + .../packages/metricsforwarder/index.yml | 4 + .../packages/metricsgateway/index.yml | 4 + .../packages/metricsserver/index.yml | 4 + .final_builds/packages/operator/index.yml | 4 + .../packages/scalingengine/index.yml | 4 + .final_builds/packages/scheduler/index.yml | 4 + .../app-autoscaler/app-autoscaler-13.0.0.yml | 163 ++++++++++++++++++ releases/app-autoscaler/index.yml | 2 + 13 files changed, 209 insertions(+) create mode 100644 releases/app-autoscaler/app-autoscaler-13.0.0.yml diff --git a/.final_builds/jobs/golangapiserver/index.yml b/.final_builds/jobs/golangapiserver/index.yml index c7ff75d74a..1a181d49f1 100644 --- a/.final_builds/jobs/golangapiserver/index.yml +++ b/.final_builds/jobs/golangapiserver/index.yml @@ -147,6 +147,10 @@ builds: version: 693f150065f0473b24a36fe25eee38b58dc97939705d3ca84eb131b22a1abb8f blobstore_id: 20d874da-60fb-4cad-759d-00d2f127713b sha1: sha256:f006f6b9128f5b146588f70a20205d01f935f7ff1182b5138259b0c0ac92f759 + 6a1ef29a6aa9cfed39fdafc589db01c477bf66ccf0936f90f8234956d22734b2: + version: 6a1ef29a6aa9cfed39fdafc589db01c477bf66ccf0936f90f8234956d22734b2 + blobstore_id: aa04275a-fca9-4499-4e2d-9ab935133f27 + sha1: sha256:7108de914550db324919e3c980137968eb7548375c99c50e1eefebbed0f74637 71aafdfbb79d7f0da5c0f9640fdaf2ef9a55f62f0b9dc96c132752ba0715fc08: version: 71aafdfbb79d7f0da5c0f9640fdaf2ef9a55f62f0b9dc96c132752ba0715fc08 blobstore_id: e387d92e-d118-4e2f-4242-36844197fed2 diff --git a/.final_builds/packages/changeloglockcleaner/index.yml b/.final_builds/packages/changeloglockcleaner/index.yml index b61fc6890a..2f249ff9af 100644 --- a/.final_builds/packages/changeloglockcleaner/index.yml +++ b/.final_builds/packages/changeloglockcleaner/index.yml @@ -167,6 +167,10 @@ builds: version: e4f3dd1fd1d4f6d17fe05bcc91f6077591426d8b013019f948625da20844494e blobstore_id: e5291802-c122-420f-6490-bf13c6c4ff7b sha1: sha256:8e3a81709ffbf170e05f779e68f5da792de230377c455cc9a1dc6eb4d48e3964 + e6309f835141fd86bbfc75b9a77e7d3e927e753496b953187ba93a19b2efd883: + version: e6309f835141fd86bbfc75b9a77e7d3e927e753496b953187ba93a19b2efd883 + blobstore_id: f24b2646-ed76-483b-49ef-000459a8d519 + sha1: sha256:edf14ee1a37bb7467302c871b063fddda028cf2b31ec755e718908a203d6067b ea399787780c3eaaf74d41a7c64809216bbada67515eb7224e4ae8436f34ff49: version: ea399787780c3eaaf74d41a7c64809216bbada67515eb7224e4ae8436f34ff49 blobstore_id: e581693a-d761-42f1-4219-695bc3aae3de diff --git a/.final_builds/packages/db/index.yml b/.final_builds/packages/db/index.yml index b2eb9ad388..a69700aa64 100644 --- a/.final_builds/packages/db/index.yml +++ b/.final_builds/packages/db/index.yml @@ -279,6 +279,10 @@ builds: version: f3bd7440d9aaaa145e8fd4081c603b0e6587cf5e86c5346ec84a3c00fa4c3b75 blobstore_id: 0c836920-d6da-40ad-7aed-2a6de2424135 sha1: sha256:be4ea4ee62b13eac0b72c075f1035fec38ddd5dd9c4d4c72248d0d80f3c71561 + f4b520784d8b4468533e077ba7f3def7e5e09949dbf96fc31f3ec46c9290b1a7: + version: f4b520784d8b4468533e077ba7f3def7e5e09949dbf96fc31f3ec46c9290b1a7 + blobstore_id: d78f3b13-030f-441c-6762-b0271c2a07ba + sha1: sha256:d05d7d187f161e2aa1f16eda77c75e38f2bba496b58f82971cab03a1562c6d70 f4d0b419b4c601e6d06b40cbdde5a7af7fbb09db1c51e76c8fbc414833734bbc: version: f4d0b419b4c601e6d06b40cbdde5a7af7fbb09db1c51e76c8fbc414833734bbc blobstore_id: a220577e-29dd-430e-6fa6-d17ac262d393 diff --git a/.final_builds/packages/eventgenerator/index.yml b/.final_builds/packages/eventgenerator/index.yml index 561b76e804..c06868c8c1 100644 --- a/.final_builds/packages/eventgenerator/index.yml +++ b/.final_builds/packages/eventgenerator/index.yml @@ -167,6 +167,10 @@ builds: version: c9ae71008ae626df45396d1f46af07a9d28eb87d0e70077bcb2dd342f4c09d2f blobstore_id: aaf3b97e-a18e-40df-757f-d64fccbf9e73 sha1: sha256:7e6b0ea2d2eaedacff5fff58ee56bceb43090d280d58da7d001a5e2ac79a6863 + caf26f454504445ac505649a2a9b2af07401fa695f2d4fbc947c1061e85fdc98: + version: caf26f454504445ac505649a2a9b2af07401fa695f2d4fbc947c1061e85fdc98 + blobstore_id: 96231a80-87cd-43b6-4faf-707e164019cb + sha1: sha256:220f13404191fb927d68487fd56d17ee5d3ce08dca5124f74ce6158a12bd1e71 ce291dac5e126a378311e4c44e14ba7a2cb358a9f90d9a07b5a1721a0c2dd874: version: ce291dac5e126a378311e4c44e14ba7a2cb358a9f90d9a07b5a1721a0c2dd874 blobstore_id: 568153a3-5d57-43ad-5efa-d5824ce9d013 diff --git a/.final_builds/packages/golangapiserver/index.yml b/.final_builds/packages/golangapiserver/index.yml index 3d641562dd..ab3667c564 100644 --- a/.final_builds/packages/golangapiserver/index.yml +++ b/.final_builds/packages/golangapiserver/index.yml @@ -51,6 +51,10 @@ builds: version: 3e301d1d0bbfa63c267ab29dd55dae5368b45e1bba19a0f4a6a59cde790cbbd8 blobstore_id: 94ad2bea-d151-4854-6409-103543a8c808 sha1: sha256:1d0cdfd66c7a9034fba42a162275a008d22284ebb64a69faaee461f13661f41f + 3eec59f6dea2f1fbec4467a647f8f16b38e70abcfab571240cb4d24b9b4d3d61: + version: 3eec59f6dea2f1fbec4467a647f8f16b38e70abcfab571240cb4d24b9b4d3d61 + blobstore_id: 210b8ef6-02c8-4b9d-574b-697b6e889fcb + sha1: sha256:bd9270f8bbbd10c6afb9897ca0c96dcb9545af100644d12f078bc3185bdb2dd0 421cbd1f220ade05a9f1b2c2c87b73ebf1b7a54f027410791cbf20093657556e: version: 421cbd1f220ade05a9f1b2c2c87b73ebf1b7a54f027410791cbf20093657556e blobstore_id: fba0fc7f-acfd-4cfb-6da9-a5a0faf03305 diff --git a/.final_builds/packages/metricsforwarder/index.yml b/.final_builds/packages/metricsforwarder/index.yml index 668efb7fc3..7a66c02f30 100644 --- a/.final_builds/packages/metricsforwarder/index.yml +++ b/.final_builds/packages/metricsforwarder/index.yml @@ -143,6 +143,10 @@ builds: version: a791b011a6205124b2bcd1cad9182d2808f2027673563f44fea962185ca1da06 blobstore_id: 9767fe09-1b64-4df2-7db4-283e5e6a0baa sha1: sha256:379ebc84b5dd1c1fbd75500e6ad7dc8e30f06ad969b8bf561e12c72dac79cd43 + aaf5a77db73c353879012dac599a6e350ca05e6e0d7283790cec230db1ec0f64: + version: aaf5a77db73c353879012dac599a6e350ca05e6e0d7283790cec230db1ec0f64 + blobstore_id: b4087524-f473-4264-4729-8139e9e66ab7 + sha1: sha256:dcd5954ad66dc9d1f28e7a8ebd284ddd5c34c622abc9151821d820bcfcd95745 ab0fe4cff6ca72f2378ff923d8f14f91384a7729fb47db7c198bfd7628bde9a3: version: ab0fe4cff6ca72f2378ff923d8f14f91384a7729fb47db7c198bfd7628bde9a3 blobstore_id: 3a07fe89-4a52-4711-5a42-01729fde0ea2 diff --git a/.final_builds/packages/metricsgateway/index.yml b/.final_builds/packages/metricsgateway/index.yml index 3c239207bb..879fe718fd 100644 --- a/.final_builds/packages/metricsgateway/index.yml +++ b/.final_builds/packages/metricsgateway/index.yml @@ -123,6 +123,10 @@ builds: version: 7b9b4063ce7b24e6d5e47b7664201c4d9678c6ebc65cd3265f6feac251aa2a11 blobstore_id: 41749e6f-29bb-4b94-6ac4-f554cf688d83 sha1: sha256:a6e242235d2572e78aebdcbbebf0f7bd8db0e6d6227c5e8b7db1c2560dcde1ec + 7d96bc4da62b05b72ca313c0e1e0bbcb1c2f248a6f1c26a143202d4d935f4d4b: + version: 7d96bc4da62b05b72ca313c0e1e0bbcb1c2f248a6f1c26a143202d4d935f4d4b + blobstore_id: d3045f3d-2093-43af-56e9-808933efd50d + sha1: sha256:beba1ae73b01636291a4ba9fb03a5b4277b1850366fe7d13c7b9dcde68f6474e 8148327fb555e43ba6e70a98f42d1b856909e8d18dbd8a3ebb33c35d27b2e15d: version: 8148327fb555e43ba6e70a98f42d1b856909e8d18dbd8a3ebb33c35d27b2e15d blobstore_id: def90c45-af43-4776-4aed-f40574ddb152 diff --git a/.final_builds/packages/metricsserver/index.yml b/.final_builds/packages/metricsserver/index.yml index d407881147..b21da7e94f 100644 --- a/.final_builds/packages/metricsserver/index.yml +++ b/.final_builds/packages/metricsserver/index.yml @@ -95,6 +95,10 @@ builds: version: 53bfac1c3279dad9f1b545423c2d99a0ee0b53e680831275e0f0711c8a86543f blobstore_id: 59f984f9-a736-4573-7651-39ce6a72ac51 sha1: sha256:a1bbc920a53a48b2a9b2c7819b10a5a2f613d0335dd8e05973929a83a01f1dc1 + 57a355e7b888701441fc196d3214933bd3d12545620b7e66cb13285abc9a0fcf: + version: 57a355e7b888701441fc196d3214933bd3d12545620b7e66cb13285abc9a0fcf + blobstore_id: 8b8e4ebe-22c5-49ea-7145-fbcd808e84fb + sha1: sha256:ae05c04daf5cb2c6e4a33009f9d1a6b2957b1d88b7a17a37a825857626ffe058 5c4c9715ad065a9a0d1019c865dc97213d0fc6b95c0da09a0809f6c8db562ed9: version: 5c4c9715ad065a9a0d1019c865dc97213d0fc6b95c0da09a0809f6c8db562ed9 blobstore_id: d64cdbcd-bb69-4e51-62ce-7a5596cc4d3e diff --git a/.final_builds/packages/operator/index.yml b/.final_builds/packages/operator/index.yml index 142aafd4f6..3187b97f0f 100644 --- a/.final_builds/packages/operator/index.yml +++ b/.final_builds/packages/operator/index.yml @@ -67,6 +67,10 @@ builds: version: 4b77cff680a7d9fc84ecf13a6262dc9720afbdb534d0ad2c3aaa081be788f631 blobstore_id: b2c28cf2-99af-422b-78af-242bc6b6d94f sha1: sha256:d534c6415b3a2d31abfb64654f2feec6df36bc7b90a31f5b313b6bc55b78b944 + 4d95c85b947a460c49ba2fb397feb73fc4b7899999356bed2b178f77a231546d: + version: 4d95c85b947a460c49ba2fb397feb73fc4b7899999356bed2b178f77a231546d + blobstore_id: 9730820a-c375-42bf-745a-d2b606a9b8f5 + sha1: sha256:1589afcbf365e737cc8828ffd3bbf2dc22c100aec4140bda877df6265bb35bc4 501e226569603edf5648b3c9b7a8bcd0757f3294001f3807603bed573080035a: version: 501e226569603edf5648b3c9b7a8bcd0757f3294001f3807603bed573080035a blobstore_id: 5e20a337-6d6e-4974-6641-3474cc678afa diff --git a/.final_builds/packages/scalingengine/index.yml b/.final_builds/packages/scalingengine/index.yml index 0637fbd493..7caabe2221 100644 --- a/.final_builds/packages/scalingengine/index.yml +++ b/.final_builds/packages/scalingengine/index.yml @@ -135,6 +135,10 @@ builds: version: 910b6b5c0ddf3c58ae8585ea02cb19da4891900bb38513f6d73de7379f7389d4 blobstore_id: b13d8d33-64e1-42b9-7e78-6cdf94ec869d sha1: sha256:f821b09d1067dc1208b7ae4b7d675657ef21369bc2f3dd291b35d0db30964074 + 914e5d0eb97437834b847ecf1da8dd608bd26c688b237591c7c3b2d60615402a: + version: 914e5d0eb97437834b847ecf1da8dd608bd26c688b237591c7c3b2d60615402a + blobstore_id: d51edfda-a386-48ae-452c-39be850dc667 + sha1: sha256:da3cbd45c30e7a6a9417cd60456a1e68ac07bbe82b4f31044570f48818c68acb 945e99cf13688cbf9ab5f0f8dc7ba578cc8137b0fa0363a01b05cfe9a7300509: version: 945e99cf13688cbf9ab5f0f8dc7ba578cc8137b0fa0363a01b05cfe9a7300509 blobstore_id: b5331fb7-a589-4136-46cb-c83f64a0e21a diff --git a/.final_builds/packages/scheduler/index.yml b/.final_builds/packages/scheduler/index.yml index 6a9c511fbd..afc319a571 100644 --- a/.final_builds/packages/scheduler/index.yml +++ b/.final_builds/packages/scheduler/index.yml @@ -299,4 +299,8 @@ builds: version: eb2fb438ab82a5ad95c47614470d6c34b0d45dd2c85316f4d23164655722e157 blobstore_id: 22269c39-57e7-492c-5500-78162fafa579 sha1: sha256:f2ab9dddf88d36090a75a4d46ba4fbd29d73e0884b6a88d40da697241ef5d0e3 + f26386698b4f7693f34ce27f27182d00b700a9e599429f7728cc2be0ea797c6f: + version: f26386698b4f7693f34ce27f27182d00b700a9e599429f7728cc2be0ea797c6f + blobstore_id: 5e542e41-a949-4a3f-4873-a103c7f41309 + sha1: sha256:aafcf388d0970473f6b17b3d18aec4ff5f769931fa3de59877a5e249c33c5260 format-version: "2" diff --git a/releases/app-autoscaler/app-autoscaler-13.0.0.yml b/releases/app-autoscaler/app-autoscaler-13.0.0.yml new file mode 100644 index 0000000000..ba76a02102 --- /dev/null +++ b/releases/app-autoscaler/app-autoscaler-13.0.0.yml @@ -0,0 +1,163 @@ +name: app-autoscaler +version: 13.0.0 +commit_hash: a2bea10f4 +uncommitted_changes: false +jobs: +- name: eventgenerator + version: 292a7e23aaaeabdf009f1aa735e7ab98517faecdaadf387a8309832c8404deda + fingerprint: 292a7e23aaaeabdf009f1aa735e7ab98517faecdaadf387a8309832c8404deda + sha1: sha256:a55c01ef25e26d61a43fc7cd035ac13156520db3da4e510f527ac2be67767953 + packages: + - openjdk-17 + - db + - eventgenerator + - common + - changeloglockcleaner +- name: golangapiserver + version: 6a1ef29a6aa9cfed39fdafc589db01c477bf66ccf0936f90f8234956d22734b2 + fingerprint: 6a1ef29a6aa9cfed39fdafc589db01c477bf66ccf0936f90f8234956d22734b2 + sha1: sha256:7108de914550db324919e3c980137968eb7548375c99c50e1eefebbed0f74637 + packages: + - golang-1-linux + - golangapiserver + - db + - openjdk-17 + - common + - changeloglockcleaner +- name: metricsforwarder + version: 8af6f7ef09c0f11be0bd4972f0ca2b9074a8eb8b5045ad7aca43cf4b177152d6 + fingerprint: 8af6f7ef09c0f11be0bd4972f0ca2b9074a8eb8b5045ad7aca43cf4b177152d6 + sha1: sha256:6d857a2ddd988cbee9c1870b1d2f2b3f331916576f38371f445d04124e9ac0e8 + packages: + - db + - metricsforwarder + - common +- name: metricsgateway + version: 6b2fd6c39c12b3ce1b774a4f3eb634939347df02d4921b1a374bca027dae112c + fingerprint: 6b2fd6c39c12b3ce1b774a4f3eb634939347df02d4921b1a374bca027dae112c + sha1: sha256:83f07a5b73bd18a48bce412b258e0361a87bc5a1db6975a04166850a11dfd588 + packages: + - openjdk-17 + - db + - metricsgateway + - common +- name: metricsserver + version: fb43940973167724049f2524b3e35f93eba92f576fb7c4665db1b309b6944b25 + fingerprint: fb43940973167724049f2524b3e35f93eba92f576fb7c4665db1b309b6944b25 + sha1: sha256:de4dfcbfe7f28689377ee83f74886d76f7014dbd677f1bca02267fcc58d59572 + packages: + - openjdk-17 + - db + - metricsserver + - common + - changeloglockcleaner +- name: operator + version: 11ffdb19acd96f1099e42bdce522013ee7440519f746be68d99d7b1c37581375 + fingerprint: 11ffdb19acd96f1099e42bdce522013ee7440519f746be68d99d7b1c37581375 + sha1: sha256:3502913539aebf8f2e0b3a117ca5dc10c69bb87ead1d4939d538e1c869361bc1 + packages: + - operator + - common + - db + - openjdk-17 + - changeloglockcleaner +- name: scalingengine + version: fbd7ee3f304cf1ac2ec8fdc10e67f003d50d949ab25a58df838f0497ac503f5f + fingerprint: fbd7ee3f304cf1ac2ec8fdc10e67f003d50d949ab25a58df838f0497ac503f5f + sha1: sha256:d55638d6a6f8ebc26ea9fd29a5aa3dd83db59be9aa3f0fad2a4d3dda3721941f + packages: + - openjdk-17 + - db + - scalingengine + - common + - changeloglockcleaner +- name: scheduler + version: 81741f07889700443355701c5afdaa04c492acf69d5f89b94dc32b4b997bc288 + fingerprint: 81741f07889700443355701c5afdaa04c492acf69d5f89b94dc32b4b997bc288 + sha1: sha256:57067b1b7c6884b17db77bc691cce8de2a71db5ca5076d619d158a9be608e514 + packages: + - scheduler + - db + - openjdk-17 + - common + - changeloglockcleaner +packages: +- name: changeloglockcleaner + version: e6309f835141fd86bbfc75b9a77e7d3e927e753496b953187ba93a19b2efd883 + fingerprint: e6309f835141fd86bbfc75b9a77e7d3e927e753496b953187ba93a19b2efd883 + sha1: sha256:edf14ee1a37bb7467302c871b063fddda028cf2b31ec755e718908a203d6067b + dependencies: + - golang-1-linux +- name: common + version: 9d7726aa454227e3087cd4a04425acae72d883a5bb19d314930ab58e83f04d0e + fingerprint: 9d7726aa454227e3087cd4a04425acae72d883a5bb19d314930ab58e83f04d0e + sha1: sha256:979ff40c6e44031bec55344aa4a522cac3d265ab23deaea0f7bc7541aa2b4124 + dependencies: [] +- name: db + version: f4b520784d8b4468533e077ba7f3def7e5e09949dbf96fc31f3ec46c9290b1a7 + fingerprint: f4b520784d8b4468533e077ba7f3def7e5e09949dbf96fc31f3ec46c9290b1a7 + sha1: sha256:d05d7d187f161e2aa1f16eda77c75e38f2bba496b58f82971cab03a1562c6d70 + dependencies: + - openjdk-17 +- name: eventgenerator + version: caf26f454504445ac505649a2a9b2af07401fa695f2d4fbc947c1061e85fdc98 + fingerprint: caf26f454504445ac505649a2a9b2af07401fa695f2d4fbc947c1061e85fdc98 + sha1: sha256:220f13404191fb927d68487fd56d17ee5d3ce08dca5124f74ce6158a12bd1e71 + dependencies: + - golang-1-linux +- name: golang-1-linux + version: a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0 + fingerprint: a53d60ed79d278964faa9bc17836ed3bc5f084c0f3d41110c8a6e0b2de5f2dc0 + sha1: sha256:7e0fc0e87c06d8aabcb0f84c83fa15fb8f0565e60afbb7f0236050412cb8628e + dependencies: [] +- name: golangapiserver + version: 3eec59f6dea2f1fbec4467a647f8f16b38e70abcfab571240cb4d24b9b4d3d61 + fingerprint: 3eec59f6dea2f1fbec4467a647f8f16b38e70abcfab571240cb4d24b9b4d3d61 + sha1: sha256:bd9270f8bbbd10c6afb9897ca0c96dcb9545af100644d12f078bc3185bdb2dd0 + dependencies: + - golang-1-linux +- name: metricsforwarder + version: aaf5a77db73c353879012dac599a6e350ca05e6e0d7283790cec230db1ec0f64 + fingerprint: aaf5a77db73c353879012dac599a6e350ca05e6e0d7283790cec230db1ec0f64 + sha1: sha256:dcd5954ad66dc9d1f28e7a8ebd284ddd5c34c622abc9151821d820bcfcd95745 + dependencies: + - golang-1-linux +- name: metricsgateway + version: 7d96bc4da62b05b72ca313c0e1e0bbcb1c2f248a6f1c26a143202d4d935f4d4b + fingerprint: 7d96bc4da62b05b72ca313c0e1e0bbcb1c2f248a6f1c26a143202d4d935f4d4b + sha1: sha256:beba1ae73b01636291a4ba9fb03a5b4277b1850366fe7d13c7b9dcde68f6474e + dependencies: + - golang-1-linux +- name: metricsserver + version: 57a355e7b888701441fc196d3214933bd3d12545620b7e66cb13285abc9a0fcf + fingerprint: 57a355e7b888701441fc196d3214933bd3d12545620b7e66cb13285abc9a0fcf + sha1: sha256:ae05c04daf5cb2c6e4a33009f9d1a6b2957b1d88b7a17a37a825857626ffe058 + dependencies: + - golang-1-linux +- name: openjdk-17 + version: be13f95495365f8879a75d9237320cd587774f6cbc087020bd6508fb8a82184a + fingerprint: be13f95495365f8879a75d9237320cd587774f6cbc087020bd6508fb8a82184a + sha1: sha256:99e2ef396973d7bbbfddffad6968b419627c20bb426117f8c3115cad5b206227 + dependencies: [] +- name: operator + version: 4d95c85b947a460c49ba2fb397feb73fc4b7899999356bed2b178f77a231546d + fingerprint: 4d95c85b947a460c49ba2fb397feb73fc4b7899999356bed2b178f77a231546d + sha1: sha256:1589afcbf365e737cc8828ffd3bbf2dc22c100aec4140bda877df6265bb35bc4 + dependencies: + - golang-1-linux +- name: scalingengine + version: 914e5d0eb97437834b847ecf1da8dd608bd26c688b237591c7c3b2d60615402a + fingerprint: 914e5d0eb97437834b847ecf1da8dd608bd26c688b237591c7c3b2d60615402a + sha1: sha256:da3cbd45c30e7a6a9417cd60456a1e68ac07bbe82b4f31044570f48818c68acb + dependencies: + - golang-1-linux +- name: scheduler + version: f26386698b4f7693f34ce27f27182d00b700a9e599429f7728cc2be0ea797c6f + fingerprint: f26386698b4f7693f34ce27f27182d00b700a9e599429f7728cc2be0ea797c6f + sha1: sha256:aafcf388d0970473f6b17b3d18aec4ff5f769931fa3de59877a5e249c33c5260 + dependencies: + - openjdk-17 +license: + version: 15eb386a0db48f190d29bd28058f5d0d6605f5acde7c6cfc6f014d57747e41f9 + fingerprint: 15eb386a0db48f190d29bd28058f5d0d6605f5acde7c6cfc6f014d57747e41f9 + sha1: sha256:6c7a834097b96efc340787fbe5876c1e366de0235def5e2b93fa016c8655535c diff --git a/releases/app-autoscaler/index.yml b/releases/app-autoscaler/index.yml index 82d880b510..e3c0c0edfa 100644 --- a/releases/app-autoscaler/index.yml +++ b/releases/app-autoscaler/index.yml @@ -65,6 +65,8 @@ builds: version: 5.3.2 7e1c76c0-16ba-43ab-4eb4-438ab907ed37: version: 3.7.3 + 836b0451-26c5-449c-7413-2b954f15ce2b: + version: 13.0.0 8b04ebf3-1984-4e90-40ae-12514ff970d4: version: 5.2.3 8b453a8e-5bee-4d06-5431-cacbadba5336: From 10809c3691af5288fefcf7f6a2ccb599bbe5f590 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 01:13:07 +0000 Subject: [PATCH 39/42] chore(deps): update actions/checkout action to v4.1.6 --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 7663ae8bca..2835189514 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -27,7 +27,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: persist-credentials: false From d939d67a7ef50b74b57ae610c88c2880259b151f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 01:13:12 +0000 Subject: [PATCH 40/42] chore(deps): update dependency golang to v1.22.3 --- ci/dockerfiles/autoscaler-tools/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dockerfiles/autoscaler-tools/Dockerfile b/ci/dockerfiles/autoscaler-tools/Dockerfile index 24eb563dd0..115f0e0103 100644 --- a/ci/dockerfiles/autoscaler-tools/Dockerfile +++ b/ci/dockerfiles/autoscaler-tools/Dockerfile @@ -46,7 +46,7 @@ RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg m # install golang # renovate: datasource=golang-version depName=golang -ARG GO_VERSION=1.22.2 +ARG GO_VERSION=1.22.3 ENV GOPATH $HOME/go ENV PATH $HOME/go/bin:/usr/local/go/bin:$PATH RUN wget -q https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz -P /tmp &&\ From f7c58b6b843f50a0f3b76efcc4afd4b1aba6084d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 May 2024 20:52:49 +0000 Subject: [PATCH 41/42] chore(deps): update dependency gruntwork-io/terragrunt to v0.58.7 --- ci/terragrunt/.tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/terragrunt/.tool-versions b/ci/terragrunt/.tool-versions index a047acc064..e5e5097aca 100644 --- a/ci/terragrunt/.tool-versions +++ b/ci/terragrunt/.tool-versions @@ -3,4 +3,4 @@ helm 3.14.4 python 3.12.3 terraform 1.8.2 terraform-lsp -terragrunt 0.58.2 +terragrunt 0.58.7 From d689baf1f43878205c124de3524ce1e4cdb17216 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 May 2024 23:23:16 +0000 Subject: [PATCH 42/42] chore(deps): update dependency terraform to v1.8.3 --- ci/terragrunt/.tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/terragrunt/.tool-versions b/ci/terragrunt/.tool-versions index e5e5097aca..3a48f9cb10 100644 --- a/ci/terragrunt/.tool-versions +++ b/ci/terragrunt/.tool-versions @@ -1,6 +1,6 @@ gcloud 473.0.0 helm 3.14.4 python 3.12.3 -terraform 1.8.2 +terraform 1.8.3 terraform-lsp terragrunt 0.58.7