fix(redshiftserverless): from method generates invalid ARN (#58)

fix from method
open-constructs · Oct 14, 2024 · c36585e · c36585e
1 parent f19707e
commit c36585e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/aws-redshiftserverless/namespace.ts b/src/aws-redshiftserverless/namespace.ts
@@ -170,8 +170,8 @@ export class Namespace extends Resource implements INamespace {
       public readonly namespaceName = attrs.namespaceName;
       public readonly namespaceId = attrs.namespaceId;
       public readonly namespaceArn = Stack.of(this).formatArn({
-        resource: 'redshift-serverless',
-        service: 'namespace',
+        service: 'redshift-serverless',
+        resource: 'namespace',
         resourceName: attrs.namespaceId,
       });
     }

diff --git a/src/aws-redshiftserverless/workgroup.ts b/src/aws-redshiftserverless/workgroup.ts
@@ -180,8 +180,8 @@ export class Workgroup extends Resource implements IWorkgroup {
         defaultPort: aws_ec2.Port.tcp(attrs.port),
       });
       public readonly workgroupArn = Stack.of(this).formatArn({
-        resource: 'redshift-serverless',
-        service: 'workgroup',
+        service: 'redshift-serverless',
+        resource: 'workgroup',
         resourceName: attrs.workgroupId,
       });
     }

diff --git a/test/aws-redshiftserverless/namespace.test.ts b/test/aws-redshiftserverless/namespace.test.ts
@@ -77,8 +77,8 @@ describe('Redshift Serverless Namespace', () => {
     test('should correctly format namespaceArn', () => {
       expect(existingNamespace.namespaceArn).toEqual(
         Stack.of(stack).formatArn({
-          resource: 'redshift-serverless',
-          service: 'namespace',
+          service: 'redshift-serverless',
+          resource: 'namespace',
           resourceName: 'my-namespace-id',
         }),
       );

diff --git a/test/aws-redshiftserverless/workgroup.test.ts b/test/aws-redshiftserverless/workgroup.test.ts
@@ -119,8 +119,8 @@ describe('Redshift Serverless Workgroup', () => {
     test('should correctly format workgroupArn', () => {
       expect(importedWorkgroup.workgroupArn).toEqual(
         Stack.of(stack).formatArn({
-          resource: 'redshift-serverless',
-          service: 'workgroup',
+          service: 'redshift-serverless',
+          resource: 'workgroup',
           resourceName: 'my-workgroup-id',
         }),
       );