Refactor to not use expeditor.

Signed-off-by: Gregory Schofield <[email protected]>

Author: Gregory Schofield

.buildkite/hooks/pre-command

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eu
+
+if [[ $BUILDKITE_ORGANIZATION_SLUG != "chef-oss" ]]; then
+  export VAULT_ADDR="https://vault.ps.chef.co"
+  export VAULT_TOKEN=$(vault login -method=aws -path=aws/private-cd -token-only header_value=vault.ps.chef.co role=ci)
+  export ARTIFACTORY_PASSWORD=$(vault kv get -field password account/static/artifactory/buildkite)
+fi

.expeditor/software_upload.pipeline.yml

@@ -1,13 +1,17 @@
 ---
 steps:
 - label: ":file_folder: upload software to internal sources"
-  command: export PATH=/opt/omnibus-toolchain/bin/:$PATH && ./scripts/internal_sources.rb ./scripts/internal_sources.yml
-  expeditor:
-    executor:
-      docker:
-        image: chefes/omnibus-toolchain-ubuntu-2204-x86
-    secrets:
-      ARTIFACTORY_TOKEN:
-        path: account/static/artifactory/buildkite
-        field: token
-
+  agents:
+    queue: default
+  plugins:
+  - docker#v3.5.0:
+      image: chefes/omnibus-toolchain-ubuntu-2204-x86
+      shell:
+      - "/bin/bash"
+      - "-e"
+      - "-c"
+      propagate-environment: true
+  commands:
+  - export PATH=/opt/omnibus-toolchain/bin/:/app/bin:/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+    && ./scripts/internal_sources.rb ./scripts/internal_sources.yml
+  timeout_in_minutes: 20

scripts/internal_sources.rb

@@ -5,7 +5,7 @@
 require "yaml"
 
 ARTIFACTORY_REPO_URL = ENV["ARTIFACTORY_REPO_URL"] || "https://artifactory-internal.ps.chef.co/artifactory/omnibus-software-local"
-ARTIFACTORY_TOKEN = ENV["ARTIFACTORY_TOKEN"]
+ARTIFACTORY_PASSWORD = ENV["ARTIFACTORY_PASSWORD"]
 
 def print_usage
   puts "Must provide path to internal_sources.yml file."
@@ -48,7 +48,7 @@ def maybe_upload(name, source)
       downloaded_file = File.join(dir, file_name)
       repo_url = File.join(ARTIFACTORY_REPO_URL, name, file_name)
       puts "Uploading #{downloaded_file} to #{repo_url}"
-      raise "Failed to upload" unless system("curl -s -H 'X-JFrog-Art-Api:#{ARTIFACTORY_TOKEN}' -T '#{downloaded_file}' #{repo_url}")
+      raise "Failed to upload" unless system("curl -s -H 'X-JFrog-Art-Api:#{ARTIFACTORY_PASSWORD}' -T '#{downloaded_file}' #{repo_url}")
 
       puts ""
     end