Merge branch 'main' into metricforwarder-on-cf

cloudfoundry · May 22, 2024 · 894aaa7 · 894aaa7
2 parents 33a9212 + b44b05f
commit 894aaa7
Show file tree

Hide file tree

Showing 40 changed files with 574 additions and 335 deletions.
diff --git 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
-      service_offering_enabled:
-        required: false
-        type: boolean
-        default: true
       suites:
         required: false
         type: string
@@ -25,7 +21,6 @@ defaults:
     shell: bash
 
 env:
-  SERVICE_OFFERING_ENABLED: "${{ inputs.service_offering_enabled }}"
   PR_NUMBER: "${{ github.event.pull_request.number }}"
   DEPLOYMENT_NAME: "${{ inputs.deployment_name }}"
   BBL_STATE_PATH: "${{ github.workspace }}/bbl/bbl-state"

diff --git a/ci/autoscaler/scripts/common.sh b/ci/autoscaler/scripts/common.sh
@@ -89,6 +89,5 @@ function unset_vars() {
   unset SERVICE_NAME
   unset SERVICE_BROKER_NAME
   unset NAME_PREFIX
-  unset SERVICE_OFFERING_ENABLED
   unset GINKGO_OPTS
 }
diff --git a/ci/autoscaler/scripts/run-acceptance-tests.sh b/ci/autoscaler/scripts/run-acceptance-tests.sh
@@ -5,7 +5,6 @@ script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "${script_dir}/vars.source.sh"
 
 cf_admin_password="${CF_ADMIN_PASSWORD:-}"
-service_offering_enabled="${SERVICE_OFFERING_ENABLED:-true}"
 skip_ssl_validation="${SKIP_SSL_VALIDATION:-true}"
 skip_teardown="${SKIP_TEARDOWN:-false}"
 use_existing_organization="${USE_EXISTING_ORGANIZATION:-false}"
@@ -56,7 +55,6 @@ cat > acceptance_config.json <<EOF
 	"cpu_upper_threshold": ${cpu_upper_threshold},
   "name_prefix": "${name_prefix}",
   "autoscaler_api": "${deployment_name}.${system_domain}",
-  "service_offering_enabled": ${service_offering_enabled},
 
   "performance": {
     "app_count": ${performance_app_count},

diff --git a/ci/autoscaler/scripts/vars.source.sh b/ci/autoscaler/scripts/vars.source.sh
@@ -94,9 +94,6 @@ debug "NAME_PREFIX: ${NAME_PREFIX}"
 # shellcheck disable=SC2034
 name_prefix="${NAME_PREFIX}"
 
-export SERVICE_OFFERING_ENABLED=${SERVICE_OFFERING_ENABLED:-true}
-debug "SERVICE_OFFERING_ENABLED: ${SERVICE_OFFERING_ENABLED}"
-
 export GINKGO_OPTS=${GINKGO_OPTS:-"--fail-fast"}
 
 export PERFORMANCE_APP_COUNT="${PERFORMANCE_APP_COUNT:-50}"

diff --git a/ci/autoscaler/tasks/register-broker.yml b/ci/autoscaler/tasks/register-broker.yml
@@ -9,7 +9,6 @@ image_resource:
 
 params:
   SYSTEM_DOMAIN:
-  SERVICE_OFFERING_ENABLED: false
   SKIP_SSL_VALIDATION: false
   AUTOSCALER_DIR: app-autoscaler-release
 

diff --git a/devbox.json b/devbox.json
@@ -3,6 +3,7 @@
     "path:local-flake#bosh-bootloader",
     "path:local-flake#app-autoscaler-cli-plugin",
     "path:local-flake#log-cache-cli-plugin",
+    "path:local-flake#uaac",
     "credhub-cli@latest",
     "delve@latest",
     "gh@latest",
@@ -27,13 +28,14 @@
     "python@latest",
     "[email protected]",
     "[email protected]",
-    "hey@latest",
     "[email protected]",
     "[email protected]",
     "[email protected]",
     "[email protected]",
     "google-cloud-sdk@latest",
-    "temurin-bin-17@latest"
+    "temurin-bin-17@latest",
+    "bundix@latest",
+    "oha@latest"
   ],
   "shell": {
     "init_hook": [

diff --git a/devbox.lock b/devbox.lock
@@ -117,6 +117,54 @@
         }
       }
     },
+    "bundix@latest": {
+      "last_modified": "2024-05-13T18:06:16Z",
+      "resolved": "github:NixOS/nixpkgs/1daef0114a6074be56586f2cf81898ed142e1e44#bundix",
+      "source": "devbox-search",
+      "version": "2.5.2",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/z6i8bpx563s6vk4n41n3bs5zwxc547yh-bundix-2.5.2",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/z6i8bpx563s6vk4n41n3bs5zwxc547yh-bundix-2.5.2"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/5nx02x3njcypwcq71kqfri1i6p8dldag-bundix-2.5.2",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/5nx02x3njcypwcq71kqfri1i6p8dldag-bundix-2.5.2"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/nprjv4nqk72g8sc0yngjw28f31qbs1m3-bundix-2.5.2",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/nprjv4nqk72g8sc0yngjw28f31qbs1m3-bundix-2.5.2"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/ygc5d4xay2hm8d2lrlxy01lgzfxhlzag-bundix-2.5.2",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/ygc5d4xay2hm8d2lrlxy01lgzfxhlzag-bundix-2.5.2"
+        }
+      }
+    },
     "[email protected]": {
       "last_modified": "2024-04-19T17:36:04-04:00",
       "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#cloudfoundry-cli",
@@ -545,54 +593,6 @@
         }
       }
     },
-    "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",
@@ -786,6 +786,54 @@
         }
       }
     },
+    "oha@latest": {
+      "last_modified": "2024-05-12T16:19:40Z",
+      "resolved": "github:NixOS/nixpkgs/3281bec7174f679eabf584591e75979a258d8c40#oha",
+      "source": "devbox-search",
+      "version": "1.4.4",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/ffmzinm475nq5wk4805sl180qmyy5yps-oha-1.4.4",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/ffmzinm475nq5wk4805sl180qmyy5yps-oha-1.4.4"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/6k6hsmq2fiij7hlxv4bn9f8sy9qjjyg2-oha-1.4.4",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/6k6hsmq2fiij7hlxv4bn9f8sy9qjjyg2-oha-1.4.4"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/8hj0f5yywbxchxl3qha1zwv0aqxpxwri-oha-1.4.4",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/8hj0f5yywbxchxl3qha1zwv0aqxpxwri-oha-1.4.4"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/pqj46rbqw29j4h8hadhm2d2k0xibsqnc-oha-1.4.4",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/pqj46rbqw29j4h8hadhm2d2k0xibsqnc-oha-1.4.4"
+        }
+      }
+    },
     "pre-commit@latest": {
       "last_modified": "2024-03-17T01:03:25Z",
       "resolved": "github:NixOS/nixpkgs/299d4668ba61600311553920d9fd9c102145b2cb#pre-commit",

diff --git a/local-flake/Gemfile b/local-flake/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "cf-uaac"
diff --git a/local-flake/Gemfile.lock b/local-flake/Gemfile.lock
@@ -0,0 +1,48 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    cf-uaa-lib (4.0.4)
+      addressable (~> 2.8, >= 2.8.0)
+      httpclient (~> 2.8, >= 2.8.2.4)
+      multi_json (>= 1.12.1, < 1.16)
+    cf-uaac (4.23.0)
+      cf-uaa-lib (~> 4.0.4)
+      em-http-request (~> 1.1, >= 1.1.2)
+      eventmachine (~> 1.2)
+      highline (>= 2, < 4)
+      json_pure (~> 2.6)
+      launchy (>= 2.5, < 4.0)
+      rack (~> 3.0)
+    childprocess (5.0.0)
+    cookiejar (0.3.4)
+    em-http-request (1.1.7)
+      addressable (>= 2.3.4)
+      cookiejar (!= 0.3.1)
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.2)
+      eventmachine (>= 1.0.0.beta.4)
+    eventmachine (1.2.7)
+    highline (3.0.1)
+    http_parser.rb (0.8.0)
+    httpclient (2.8.3)
+    json_pure (2.7.2)
+    launchy (3.0.1)
+      addressable (~> 2.8)
+      childprocess (~> 5.0)
+    multi_json (1.15.0)
+    public_suffix (5.0.5)
+    rack (3.0.11)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  cf-uaac
+
+BUNDLED WITH
+   2.5.9
diff --git a/local-flake/flake.nix b/local-flake/flake.nix
@@ -57,6 +57,18 @@
           vendorHash = null;
           ldflags = ["-s" "-w" "-X main.version=${version}"];
         };
+
+        uaac =  nixpkgsFor.${system}.bundlerApp rec {
+          pname = "cf-uaac";
+          gemdir = ./.;
+          exes = ["uaac"];
+
+          meta = {
+            description = "CloudFoundry UAA Command Line Client";
+            homepage = "https://github.com/cloudfoundry/cf-uaac";
+            mainProgram = "uaac";
+          };
+        };
       });
   };
 }