Revert "Merge pull request #1 from cloudfoundry/master"

This reverts commit 64d5c11, reversing changes made to 28b81d0.
cloudfoundry · Feb 1, 2023 · 2eedb50 · 2eedb50
1 parent 64d5c11
commit 2eedb50
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/ci/configure.sh b/ci/configure.sh
@@ -3,5 +3,6 @@
 set -eu
 
 fly -t bosh-ecosystem sp -p bosh-aws-cpi \
-  -c ci/pipeline.yml
+  -c ci/pipeline.yml \
+  -l <( lpass show --notes "aws cpi concourse secrets")
 
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -6,10 +6,7 @@ shared:
   image: aws-cpi-image
   params: &prepare-director-params
     INFRASTRUCTURE:     aws
-    DIRECTOR_VARS_FILE: |
-      access_key_id: ((aws-cpi-integration-tests_aws_access_key.username))
-      secret_access_key: ((aws-cpi-integration-tests_aws_access_key.password))
-      region: us-west-1
+    DIRECTOR_VARS_FILE: {{aws_director_vars_file}}
 
 - &deploy-director
   task: deploy-director
@@ -32,7 +29,7 @@ shared:
   file: bosh-cpi-src/ci/tasks/run-e2e.yml
   image: aws-cpi-image
   params:
-    BOSH_AWS_KMS_KEY_ARN: ((arn_keys.aws_kms_key_arn))
+    BOSH_AWS_KMS_KEY_ARN: {{aws_kms_key_arn}}
 
 - &ensure-terminated
   task: ensure-terminated
@@ -41,7 +38,7 @@ shared:
   params:
     AWS_ACCESS_KEY_ID:     ((bosh_cpis_aws_access_key.username))
     AWS_SECRET_ACCESS_KEY: ((bosh_cpis_aws_access_key.password))
-    AWS_DEFAULT_REGION:    us-west-1
+    AWS_DEFAULT_REGION:    {{aws_region__primary}}
 
 - &teardown
   task: teardown
@@ -84,13 +81,13 @@ jobs:
     file: bosh-cpi-src/ci/tasks/run-integration.yml
     image: aws-cpi-image
     params:
-      AWS_ACCESS_KEY_ID:                       ((aws-cpi-integration-tests_aws_access_key.username))
-      AWS_SECRET_ACCESS_KEY:                   ((aws-cpi-integration-tests_aws_access_key.password))
-      BOSH_AWS_PERMISSIONS_AUDITOR_KEY_ID:     ((iam-permission-auditor_aws_access_key.username))
-      BOSH_AWS_PERMISSIONS_AUDITOR_SECRET_KEY: ((iam-permission-auditor_aws_access_key.password))
-      AWS_DEFAULT_REGION:                      us-west-1
-      BOSH_AWS_KMS_KEY_ARN:                    ((arn_keys.aws_kms_key_arn))
-      BOSH_AWS_KMS_KEY_ARN_OVERRIDE:           ((arn_keys.aws_kms_key_arn_override))
+      AWS_ACCESS_KEY_ID:                       {{aws_access_key__cpi}}
+      AWS_SECRET_ACCESS_KEY:                   {{aws_secret_key__cpi}}
+      BOSH_AWS_PERMISSIONS_AUDITOR_KEY_ID:     {{aws_access_key__auditor}}
+      BOSH_AWS_PERMISSIONS_AUDITOR_SECRET_KEY: {{aws_secret_key__auditor}}
+      AWS_DEFAULT_REGION:                      {{aws_region__primary}}
+      BOSH_AWS_KMS_KEY_ARN:                    {{aws_kms_key_arn}}
+      BOSH_AWS_KMS_KEY_ARN_OVERRIDE:           {{aws_kms_key_arn_override}}
       BOSH_AWS_WINDOWS_IMAGE_ID:               ami-01073c012a14da808 # This is the us-west-1 AMI inside the Windows 2019.53 stemcell
     ensure:
       do:
@@ -238,23 +235,24 @@ resources:
   type: s3
   source:
     regexp: bosh-aws-cpi-(\d+\.\d+\.\d+)\.tgz
-    bucket: bosh-aws-cpi-pipeline
-    region_name: us-east-1
+    bucket: {{s3_aws_cpi_pipeline_bucket}}
+    region_name: {{s3_aws_cpi_pipeline_bucket_region}}
     access_key_id: ((bosh_cpis_aws_access_key.username))
     secret_access_key: ((bosh_cpis_aws_access_key.password))
 - name: bosh-cpi-src-in
   type: git
   source:
     uri: https://github.com/cloudfoundry-incubator/bosh-aws-cpi-release.git
-    private_key: ((github_deploy_key_bosh-aws-cpi-release.private_key))
+    branch: master
     ignore_paths:
       - .final_builds/**/*.yml
       - releases/**/*.yml
 - name: bosh-cpi-src-out
   type: git
   source:
     uri: git@github.com:cloudfoundry-incubator/bosh-aws-cpi-release.git
-    private_key: ((github_deploy_key_bosh-aws-cpi-release.private_key))
+    branch: master
+    private_key: {{github_deployment_key__bosh-aws-cpi-release}}
 - name: bosh-cpi-src-dockerfiles
   type: git
   source:
@@ -266,14 +264,14 @@ resources:
   type: semver
   source:
     key:               current-version # dev-release version
-    bucket:            bosh-aws-cpi-pipeline
+    bucket:            {{s3_aws_cpi_pipeline_bucket}}
     access_key_id:     ((bosh_cpis_aws_access_key.username))
     secret_access_key: ((bosh_cpis_aws_access_key.password))
 - name: release-version-semver
   type: semver
   source:
     key:               release-current-version
-    bucket:            bosh-aws-cpi-pipeline
+    bucket:            {{s3_aws_cpi_pipeline_bucket}}
     access_key_id:     ((bosh_cpis_aws_access_key.username))
     secret_access_key: ((bosh_cpis_aws_access_key.password))
 - name: environment
@@ -284,18 +282,18 @@ resources:
       access_key:  ((bosh_cpis_aws_access_key.username))
       secret_key:  ((bosh_cpis_aws_access_key.password))
       region: us-east-1
-      bucket:      bosh-aws-cpi-terraform
+      bucket:      {{terraform_bucket}}
       key:         terraform.tfstate
     migrate_from_storage:
       access_key_id:     ((bosh_cpis_aws_access_key.username))
       secret_access_key: ((bosh_cpis_aws_access_key.password))
-      bucket:            bosh-aws-cpi-terraform
+      bucket:            {{terraform_bucket}}
       bucket_path:       terraform-state
     vars:
       access_key: ((bosh_cpis_aws_access_key.username))
       secret_key: ((bosh_cpis_aws_access_key.password))
-      region:     us-west-1
-      public_key: ((integration_vm_keypair.public_key))
+      region:     {{aws_region__primary}}
+      public_key: {{cpi_pipeline_public_key}}
 - name: bosh-cli
   type: s3
   source: