chore: cleanup

Author: awsluja

packages/backend/src/engine/backend-secret/backend_secret.ts

@@ -28,8 +28,8 @@ export class CfnTokenBackendSecret implements BackendSecret {
   ): SecretValue => {
     const secretResource = this.secretResourceFactory.getOrCreate(
       scope,
-      backendIdentifier,
-      this.secretName
+      this.secretName,
+      backendIdentifier
     );
 
     const val = secretResource.getAttString(`${this.secretName}`);

packages/backend/src/engine/backend-secret/backend_secret_fetcher_factory.test.ts

@@ -29,8 +29,8 @@ void describe('getOrCreate', () => {
     const app = new App();
     const stack = new Stack(app);
     stack.node.setContext('secretLastUpdated', secretLastUpdated);
-    resourceFactory.getOrCreate(stack, backendId, secretName1);
-    resourceFactory.getOrCreate(stack, backendId, secretName2);
+    resourceFactory.getOrCreate(stack, secretName1, backendId);
+    resourceFactory.getOrCreate(stack, secretName2, backendId);
 
     const template = Template.fromStack(stack);
     // only one custom resource is created that fetches all secrets
@@ -61,8 +61,8 @@ void describe('getOrCreate', () => {
     const stack = new Stack(app);
 
     // ensure only 1 resource is created even if this is called twice
-    resourceFactory.getOrCreate(stack, backendId, secretName1);
-    resourceFactory.getOrCreate(stack, backendId, secretName1);
+    resourceFactory.getOrCreate(stack, secretName1, backendId);
+    resourceFactory.getOrCreate(stack, secretName1, backendId);
 
     const template = Template.fromStack(stack);
     template.resourceCountIs(secretResourceType, 1);

packages/backend/src/engine/backend-secret/backend_secret_fetcher_factory.ts

@@ -50,8 +50,8 @@ export class BackendSecretFetcherFactory {
    */
   getOrCreate = (
     scope: Construct,
-    backendIdentifier: BackendIdentifier,
-    secretName: string
+    secretName: string,
+    backendIdentifier: BackendIdentifier
   ): SecretFetcherCustomResource => {
     const secretResourceId = `SecretFetcherResource`;
     const existingResource = scope.node.tryFindChild(

packages/backend/src/secret.ts

@@ -1,7 +1,7 @@
 import { BackendSecret } from '@aws-amplify/plugin-types';
 import { CfnTokenBackendSecret } from './engine/backend-secret/backend_secret.js';
-import { BackendSecretFetcherFactory } from './engine/backend-secret/backend_secret_fetcher_factory.js';
 import { BackendSecretFetcherProviderFactory } from './engine/backend-secret/backend_secret_fetcher_provider_factory.js';
+import { BackendSecretFetcherFactory } from './engine/backend-secret/backend_secret_fetcher_factory.js';
 
 /**
  * Use a secret from AWS Systems Manager (SSM) Parameter Store