From 297dbc17349830b8e848cde820685c72930b74a2 Mon Sep 17 00:00:00 2001 From: Ramkumar Vengadakrishnan Date: Tue, 5 Dec 2023 10:30:14 -0600 Subject: [PATCH] feat: Migrating from AWS S3 to Google Cloud Storage Authored-by: Ramkumar Vengadakrishnan [#186620968] - Check if AWS Account used by Tile generator can be closed --- ci/pipeline.yml.jinja2 | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/ci/pipeline.yml.jinja2 b/ci/pipeline.yml.jinja2 index 30fe2a1..cf8c9ea 100644 --- a/ci/pipeline.yml.jinja2 +++ b/ci/pipeline.yml.jinja2 @@ -27,6 +27,10 @@ groups: - create-release resource_types: +- name: gcs-resource + type: docker-image + source: + repository: frodenas/gcs-resource - name: slack-notification type: docker-image @@ -91,40 +95,32 @@ resources: uri: http://github.com/cf-platform-eng/tile-generator.git - name: tile-generator-package - type: s3 + type: gcs-resource source: - bucket: ((s3_tile_generator.bucket)) + bucket: ((gcp_tile_generator.bucket)) regexp: tile-generator-(?P.*).tar.gz - aws_role_arn: ((s3_tile_generator.assume_role_arn)) - access_key_id: ((s3_tile_generator.access_key)) - secret_access_key: ((s3_tile_generator.secret_access_key)) + json_key: ((private_pool_service_account_keys.pool_1)) - name: tile-generator-package-release - type: s3 + type: gcs-resource source: - bucket: ((s3_tile_generator.bucket)) + bucket: ((gcp_tile_generator.bucket)) regexp: release/bundle-(?P.*).tar.gz - aws_role_arn: ((s3_tile_generator.assume_role_arn)) - access_key_id: ((s3_tile_generator.access_key)) - secret_access_key: ((s3_tile_generator.secret_access_key)) + json_key: ((private_pool_service_account_keys.pool_1)) - name: generated-tile - type: s3 + type: gcs-resource source: - bucket: ((s3_tile_generator.bucket)) + bucket: ((gcp_tile_generator.bucket)) regexp: test-tile-(?P.*)\.pivotal - aws_role_arn: ((s3_tile_generator.assume_role_arn)) - access_key_id: ((s3_tile_generator.access_key)) - secret_access_key: ((s3_tile_generator.secret_access_key)) + json_key: ((private_pool_service_account_keys.pool_1)) - name: tile-history - type: s3 + type: gcs-resource source: - bucket: ((s3_tile_generator.bucket)) + bucket: ((gcp_tile_generator.bucket)) regexp: tile\-history-(?P.*)\.yml - access_key_id: ((s3_tile_generator.access_key)) - aws_role_arn: ((s3_tile_generator.assume_role_arn)) - secret_access_key: ((s3_tile_generator.secret_access_key)) + json_key: ((private_pool_service_account_keys.pool_1)) - name: tile-generator-docker-image type: docker-image