Upgrade buildkite testing (#48)

* upgrade to v2

* bump to latest

* fix tests

* comment out

* fix stubs

* add workflow

* update triggers

Author: samchungy

.github/workflows/validate.yml

@@ -0,0 +1,23 @@
+name: Validate
+
+on:
+  - pull_request
+  - push
+
+permissions: {}
+
+jobs:
+  core:
+    name: Lint & Test
+    permissions:
+      checks: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Test
+        run: docker compose run --rm tests
+
+      - name: Lint
+        run: docker compose run --rm lint

docker-compose.yml

@@ -1,15 +1,14 @@
 version: '3.4'
 services:
   tests:
-    image: buildkite/plugin-tester
+    image: buildkite/plugin-tester:v4.1.0
     volumes:
-      - ".:/plugin:ro"
+      - '.:/plugin:ro'
     environment:
       - BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_ECR_TAGS_SEEK:OWNER:TEAM=Candidate
       - BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_ECR_TAGS_MYKEY2=mykeyvalue2
   lint:
     image: buildkite/plugin-linter
     command: ['--name', 'seek-oss/docker-ecr-cache']
     volumes:
-      - ".:/plugin:ro"
-
+      - '.:/plugin:ro'

tests/ecr-registry-provider.bats

@@ -3,7 +3,7 @@
 # export AWS_STUB_DEBUG=/dev/tty
 # export DOCKER_STUB_DEBUG=/dev/tty
 
-load "$BATS_PATH/load.bash"
+load "$BATS_PLUGIN_PATH/load.bash"
 load "$PWD/hooks/lib/stdlib.bash"
 load "$PWD/hooks/lib/ecr-registry-provider.bash"
 
@@ -20,13 +20,13 @@ pre_command_hook="$PWD/hooks/pre-command"
     "ecr get-login-password --region ap-southeast-2 : echo secure-ecr-password" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].registryId : echo looked up repository" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryArn : echo arn:aws:ecr:ap-southeast-2:1234567891012:repository/${expected_repository_name}" \
-    "ecr tag-resource * : echo tag existing resource" \
-    "ecr put-lifecycle-policy * : echo put lifecycle policy" \
+    "ecr tag-resource --resource-arn arn:aws:ecr:ap-southeast-2:1234567891012:repository/build-cache/example-org/example-pipeline --cli-input-json \* : echo tag existing resource" \
+    "ecr put-lifecycle-policy --repository-name build-cache/example-org/example-pipeline --lifecycle-policy-text \* : echo put lifecycle policy" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryUri : echo https://1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com" 
 
   stub docker \
     "login --username AWS --password-stdin 1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com : echo logging in to docker" \
-    "pull : echo pulled image"
+    "pull https://1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com:sha1sum : echo pulled image"
 
   stub sha1sum \
     "Dockerfile : echo 'sha1sum(Dockerfile)'" \
@@ -60,14 +60,14 @@ pre_command_hook="$PWD/hooks/pre-command"
     "ecr get-login-password --region ap-southeast-2 : echo secure-ecr-password" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].registryId : echo looked up repository" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryArn : echo arn:aws:ecr:ap-southeast-2:1234567891012:repository/${expected_repository_name}" \
-    "ecr tag-resource * : echo tag existing resource" \
-    "ecr put-lifecycle-policy * : echo put lifecycle policy" \
+    "ecr tag-resource --resource-arn arn:aws:ecr:ap-southeast-2:1234567891012:repository/build-cache/example-org/example-pipeline --cli-input-json \* : echo tag existing resource" \
+    "ecr put-lifecycle-policy --repository-name build-cache/example-org/example-pipeline --lifecycle-policy-text \* : echo put lifecycle policy" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryUri : echo ${repository_uri}" \
 
   stub docker \
     "login --username AWS --password-stdin 1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com : echo logging in to docker" \
-    "pull : echo not found && false" \
-    "build * : echo building docker image" \
+    "pull 1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com/build-cache/example-org/example-pipeline:deadbee : echo not found && false" \
+    "build --file=Dockerfile --tag=1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com/build-cache/example-org/example-pipeline:deadbee . : echo building docker image" \
     "tag ${repository_uri}:deadbee ${repository_uri}:latest : echo tagged latest" \
     "push ${repository_uri}:deadbee : echo pushed deadbeef" \
     "push ${repository_uri}:latest : echo pushed latest"
@@ -106,14 +106,14 @@ pre_command_hook="$PWD/hooks/pre-command"
     "ecr get-login-password --region eu-west-1 : echo secure-ecr-password" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].registryId : echo looked up repository" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryArn : echo arn:aws:ecr:eu-west-1:1234567891012:repository/${expected_repository_name}" \
-    "ecr tag-resource * : echo tag existing resource" \
-    "ecr put-lifecycle-policy * : echo put lifecycle policy" \
+    "ecr tag-resource --resource-arn arn:aws:ecr:eu-west-1:1234567891012:repository/build-cache/example-org/example-pipeline --cli-input-json \* : echo tag existing resource" \
+    "ecr put-lifecycle-policy --repository-name build-cache/example-org/example-pipeline --lifecycle-policy-text \* : echo put lifecycle policy" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryUri : echo ${repository_uri}" \
 
   stub docker \
     "login --username AWS --password-stdin 1234567891012.dkr.ecr.eu-west-1.amazonaws.com : echo logging in to docker" \
-    "pull : echo not found && false" \
-    "build * : echo building docker image" \
+    "pull 1234567891012.dkr.ecr.eu-west-1.amazonaws.com/build-cache/example-org/example-pipeline:deadbee : echo not found && false" \
+    "build --file=Dockerfile --tag=1234567891012.dkr.ecr.eu-west-1.amazonaws.com/build-cache/example-org/example-pipeline:deadbee . : echo building docker image" \
     "tag ${repository_uri}:deadbee ${repository_uri}:latest : echo tagged latest" \
     "push ${repository_uri}:deadbee : echo pushed deadbeef" \
     "push ${repository_uri}:latest : echo pushed latest"
@@ -154,14 +154,14 @@ pre_command_hook="$PWD/hooks/pre-command"
     "ecr get-login-password --region ap-southeast-1 : echo secure-ecr-password" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].registryId : echo looked up repository" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryArn : echo arn:aws:ecr:ap-southeast-1:1234567891012:repository/${expected_repository_name}" \
-    "ecr tag-resource * : echo tag existing resource" \
-    "ecr put-lifecycle-policy * : echo put lifecycle policy" \
+    "ecr tag-resource --resource-arn arn:aws:ecr:ap-southeast-1:1234567891012:repository/build-cache/example-org/example-pipeline --cli-input-json \* : echo tag existing resource" \
+    "ecr put-lifecycle-policy --repository-name build-cache/example-org/example-pipeline --lifecycle-policy-text \* : echo put lifecycle policy" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryUri : echo ${repository_uri}" \
 
   stub docker \
     "login --username AWS --password-stdin 1234567891012.dkr.ecr.ap-southeast-1.amazonaws.com : echo logging in to docker" \
-    "pull : echo not found && false" \
-    "build * : echo building docker image" \
+    "pull 1234567891012.dkr.ecr.ap-southeast-1.amazonaws.com/build-cache/example-org/example-pipeline:deadbee : echo not found && false" \
+    "build --file=Dockerfile --tag=1234567891012.dkr.ecr.ap-southeast-1.amazonaws.com/build-cache/example-org/example-pipeline:deadbee . : echo building docker image" \
     "tag ${repository_uri}:deadbee ${repository_uri}:latest : echo tagged latest" \
     "push ${repository_uri}:deadbee : echo pushed deadbeef" \
     "push ${repository_uri}:latest : echo pushed latest"

tests/gcr-registry-provider.bats

@@ -1,6 +1,6 @@
 #!/usr/bin/env bats
 
-load "$BATS_PATH/load.bash"
+load "$BATS_PLUGIN_PATH/load.bash"
 load "$PWD/hooks/lib/stdlib.bash"
 load "$PWD/hooks/lib/gcr-registry-provider.bash"
 

tests/pre-command.bats

@@ -1,6 +1,6 @@
 #!/usr/bin/env bats
 
-load "$BATS_PATH/load.bash"
+load "$BATS_PLUGIN_PATH/load.bash"
 
 # export DOCKER_STUB_DEBUG=/dev/tty
 
@@ -20,7 +20,7 @@ pre_command_hook="$PWD/hooks/pre-command"
   local repository_uri="pretend.host/path/segment/image"
 
   stub docker \
-    "pull * : true"
+    "pull pretend.host/path/segment/image:stubbed-computed-tag : true"
 
   run "${pre_command_hook}"
 
@@ -34,8 +34,8 @@ pre_command_hook="$PWD/hooks/pre-command"
   export BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_REGISTRY_PROVIDER="stub"
 
   stub docker \
-    "pull * : false" \
-    "build * : exit 242"
+    "pull pretend.host/path/segment/image:stubbed-computed-tag : false" \
+    "build --file=Dockerfile --tag=pretend.host/path/segment/image:stubbed-computed-tag . : exit 242"
 
   run "${pre_command_hook}"
 
@@ -52,8 +52,8 @@ pre_command_hook="$PWD/hooks/pre-command"
   local repository_uri="pretend.host/path/segment/image"
 
   stub docker \
-    "pull * : false" \
-    "build * : echo building docker image" \
+    "pull pretend.host/path/segment/image:stubbed-computed-tag : false" \
+    "build --file=Dockerfile --tag=pretend.host/path/segment/image:stubbed-computed-tag . : echo building docker image" \
     "tag ${repository_uri}:stubbed-computed-tag ${repository_uri}:latest : echo tagged latest" \
     "push ${repository_uri}:stubbed-computed-tag : echo pushed stubbed-computed-tag" \
     "push ${repository_uri}:latest : echo pushed latest"
@@ -79,8 +79,8 @@ pre_command_hook="$PWD/hooks/pre-command"
     "-d : echo $one_time_mktemp"
 
   stub docker \
-    "pull * : false" \
-    "build --file=$one_time_mktemp/Dockerfile * : echo building docker image" \
+    "pull pretend.host/path/segment/image:stubbed-computed-tag : false" \
+    "build --file=$one_time_mktemp/Dockerfile --tag=pretend.host/path/segment/image:stubbed-computed-tag . : echo building docker image" \
     "tag ${repository_uri}:stubbed-computed-tag ${repository_uri}:latest : echo tagged latest" \
     "push ${repository_uri}:stubbed-computed-tag : echo pushed stubbed-computed-tag" \
     "push ${repository_uri}:latest : echo pushed latest"

tests/stdlib.bats

@@ -3,7 +3,7 @@
 # export UNAME_STUB_DEBUG=/dev/tty
 # export SHA1SUM_STUB_DEBUG=/dev/tty
 
-load "$BATS_PATH/load.bash"
+load "$BATS_PLUGIN_PATH/load.bash"
 load "$PWD/hooks/lib/stdlib.bash"
 
 pre_command_hook="$PWD/hooks/pre-command"