From b144d066f61232997ce17a4e833f2c079f9eea70 Mon Sep 17 00:00:00 2001
From: Ryan Hall <hallr@vmware.com>
Date: Wed, 19 Jul 2023 11:21:06 -0400
Subject: [PATCH 1/2] feat: add s3-with-arn resource

---
 pipelines/pipeline.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pipelines/pipeline.yml b/pipelines/pipeline.yml
index 7d0993b..960bd09 100644
--- a/pipelines/pipeline.yml
+++ b/pipelines/pipeline.yml
@@ -35,12 +35,20 @@ groups:
 # Groups end yaml
 
 # code_snippet reference-resources-s3 start yaml
+resource_types:
+- name: s3-with-arn
+  type: docker-image
+  source:
+    repository: concourse/s3-resource
+    tag: 1.2.1-ubuntu
+
 resources:
 - name: platform-automation-tasks
-  type: s3
+  type: s3-with-arn
   source:
-    access_key_id: ((s3_access_key_id))
-    secret_access_key: ((s3_secret_access_key))
+    access_key_id: ((s3_with_role.access_key_id))
+    secret_access_key: ((s3_with_role.secret_access_key))
+    aws_role_arn: ((s3_with_role.role_arn)
     region_name: ((s3_region_name))
     bucket: ((s3_pivnet_products_bucket))
     regexp: .*tasks-(.*).zip

From eba05a479c8e65e1c6f6835a0ab9fdd62d280074 Mon Sep 17 00:00:00 2001
From: Ryan Hall <hallr@vmware.com>
Date: Wed, 19 Jul 2023 11:50:14 -0400
Subject: [PATCH 2/2] Updated S3 resources to utilize ARN!

Signed-off-by: David Timm <dtimm@vmware.com>
---
 pipelines/pipeline.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pipelines/pipeline.yml b/pipelines/pipeline.yml
index 960bd09..53ba279 100644
--- a/pipelines/pipeline.yml
+++ b/pipelines/pipeline.yml
@@ -48,25 +48,27 @@ resources:
   source:
     access_key_id: ((s3_with_role.access_key_id))
     secret_access_key: ((s3_with_role.secret_access_key))
-    aws_role_arn: ((s3_with_role.role_arn)
+    aws_role_arn: ((s3_with_role.role_arn))
     region_name: ((s3_region_name))
     bucket: ((s3_pivnet_products_bucket))
     regexp: .*tasks-(.*).zip
 
 - name: platform-automation-image
-  type: s3
+  type: s3-with-arn
   source:
-    access_key_id: ((s3_access_key_id))
-    secret_access_key: ((s3_secret_access_key))
+    access_key_id: ((s3_with_role.access_key_id))
+    secret_access_key: ((s3_with_role.secret_access_key))
+    aws_role_arn: ((s3_with_role.role_arn))
     region_name: ((s3_region_name))
     bucket: ((s3_pivnet_products_bucket))
     regexp: .*image-(.*).tgz
 
 - name: telemetry-collector-binary
-  type: s3
+  type: s3-with-arn
   source:
-    access_key_id: ((s3_access_key_id))
-    secret_access_key: ((s3_secret_access_key))
+    access_key_id: ((s3_with_role.access_key_id))
+    secret_access_key: ((s3_with_role.secret_access_key))
+    aws_role_arn: ((s3_with_role.role_arn))
     region_name: ((s3_region_name))
     bucket: ((s3_pivnet_products_bucket))
     regexp: .*telemetry-(.*).tgz
@@ -74,10 +76,11 @@ resources:
 
 # code_snippet export-installation-resource-usage start yaml
 - name: installation
-  type: s3
+  type: s3-with-arn
   source:
-    access_key_id: ((s3_access_key_id))
-    secret_access_key: ((s3_secret_access_key))
+    access_key_id: ((s3_with_role.access_key_id))
+    secret_access_key: ((s3_with_role.secret_access_key))
+    aws_role_arn: ((s3_with_role.role_arn))
     region_name: ((s3_region_name))
     bucket: ((s3_installation_bucket))
     regexp: ((foundation))-installation-(.*).zip
@@ -86,12 +89,13 @@ resources:
 # code_snippet resources-configurations start yaml
 # VM state and foundation configuration
 - name: state
-  type: s3
+  type: s3-with-arn
   source:
-    access_key_id: ((s3_access_key_id))
+    access_key_id: ((s3_with_role.access_key_id))
+    secret_access_key: ((s3_with_role.secret_access_key))
+    aws_role_arn: ((s3_with_role.role_arn))
     bucket: ((s3_foundation_state_bucket))
     region_name: ((s3_region_name))
-    secret_access_key: ((s3_secret_access_key))
     versioned_file: state-((foundation)).yml
     initial_content_text: '{}'
     initial_version: 'empty-start'