WIP

guardian · Nov 29, 2024 · eb92e8a · eb92e8a
1 parent aec41f1
commit eb92e8a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 27 deletions.
diff --git a/packages/cdk/lib/__snapshots__/service-catalogue.test.ts.snap b/packages/cdk/lib/__snapshots__/service-catalogue.test.ts.snap
@@ -63,7 +63,7 @@ exports[`The ServiceCatalogue stack matches the snapshot 1`] = `
       "Description": "Virtual Private Cloud to run EC2 instances within. Should NOT be the account default VPC.",
       "Type": "AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>",
     },
-    "packagesBucketArnParam": {
+    "packagesBucketNameParam": {
       "Default": "/TEST/deploy/amigo/amigo.data.bucket",
       "Type": "AWS::SSM::Parameter::Value<String>",
     },
@@ -379,27 +379,7 @@ spec:
     bakes_table: amigo-TEST-bakes
     bucket: ",
                     {
-                      "Fn::Select": [
-                        0,
-                        {
-                          "Fn::Split": [
-                            "/",
-                            {
-                              "Fn::Select": [
-                                5,
-                                {
-                                  "Fn::Split": [
-                                    ":",
-                                    {
-                                      "Ref": "packagesBucketArnParam",
-                                    },
-                                  ],
-                                },
-                              ],
-                            },
-                          ],
-                        },
-                      ],
+                      "Ref": "packagesBucketNameParam",
                     },
                     "
 ' > /usr/share/cloudquery/source.yaml;printf 'kind: destination
@@ -24405,8 +24385,13 @@ spec:
                 "Fn::Join": [
                   "",
                   [
+                    "arn:",
+                    {
+                      "Ref": "AWS::Partition",
+                    },
+                    ":s3:::",
                     {
-                      "Ref": "packagesBucketArnParam",
+                      "Ref": "packagesBucketNameParam",
                     },
                     "/packagelists/*",
                   ],

diff --git a/packages/cdk/lib/cloudquery/index.ts b/packages/cdk/lib/cloudquery/index.ts
@@ -594,19 +594,19 @@ export function addCloudqueryEcsCluster(
 		config: ns1SourceConfig(),
 	};
 
-	const packagesBucketArn = new GuStringParameter(
+	const packagesBucketName = new GuStringParameter(
 		scope,
-		'packagesBucketArnParam',
+		'packagesBucketNameParam',
 		{
 			fromSSM: true,
 			default: `/${stage}/deploy/amigo/amigo.data.bucket`,
 		},
 	).valueAsString;
 
-	const packagesBucket = GuS3Bucket.fromBucketArn(
+	const packagesBucket = GuS3Bucket.fromBucketName(
 		scope,
 		'packagesBucket',
-		packagesBucketArn,
+		packagesBucketName,
 	);
 
 	const baseImagesTableName = `amigo-${stage}-base-images`;