resolve conflicts

aws · Jun 12, 2024 · 90520ad · 90520ad
1 parent cebc4f3
commit 90520ad
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 4 deletions.
diff --git a/...rs/test/custom-resources-framework/expected/node-runtime/custom-resource-provider-core.ts b/...rs/test/custom-resources-framework/expected/node-runtime/custom-resource-provider-core.ts
@@ -12,14 +12,37 @@ export class TestProvider extends CustomResourceProviderBase {
     return this.getOrCreateProvider(scope, uniqueid, props).serviceToken;
   }
 
+  /**
+   * Returns the stack-level singleton provider or undefined
+   */
+  public static getProvider(scope: Construct, uniqueid: string): TestProvider {
+    const id = `${uniqueid}CustomResourceProvider`;
+    const stack = Stack.of(scope);
+    return stack.node.tryFindChild(id) as TestProvider;
+  }
+
+  /**
+   * Set the log group to be used by the singleton provider
+   */
+  public static useLogGroup(scope: Construct, uniqueid: string, logGroupName: string): void {
+    const stack = Stack.of(scope);
+    const key = `${uniqueid}CustomResourceLogGroup`;
+    stack.node.addMetadata(key, logGroupName);
+    const existing = this.getProvider(scope, uniqueid);
+    if (existing) existing.configureLambdaLogGroup(logGroupName);
+  }
+
   /**
    * Returns a stack-level singleton for the custom resource provider.
    */
   public static getOrCreateProvider(scope: Construct, uniqueid: string, props?: CustomResourceProviderOptions): TestProvider {
     const id = `${uniqueid}CustomResourceProvider`;
     const stack = Stack.of(scope);
-    const existing = stack.node.tryFindChild(id) as TestProvider;
-    return existing ?? new TestProvider(stack, id, props);
+    const provider = this.getProvider(scope, uniqueid) ?? new TestProvider(stack, id, props);
+    const key = `${uniqueid}CustomResourceLogGroup`;
+    const logGroupMetadata = stack.node.metadata.find(m => m.type === key);
+    if (logGroupMetadata?.data) provider.configureLambdaLogGroup(logGroupMetadata.data);
+    return provider;
   }
 
   public constructor(scope: Construct, id: string, props?: CustomResourceProviderOptions) {

diff --git a/...andlers/test/custom-resources-framework/expected/node-runtime/custom-resource-provider.ts b/...andlers/test/custom-resources-framework/expected/node-runtime/custom-resource-provider.ts
@@ -11,14 +11,37 @@ export class TestProvider extends CustomResourceProviderBase {
     return this.getOrCreateProvider(scope, uniqueid, props).serviceToken;
   }
 
+  /**
+   * Returns the stack-level singleton provider or undefined
+   */
+  public static getProvider(scope: Construct, uniqueid: string): TestProvider {
+    const id = `${uniqueid}CustomResourceProvider`;
+    const stack = Stack.of(scope);
+    return stack.node.tryFindChild(id) as TestProvider;
+  }
+
+  /**
+   * Set the log group to be used by the singleton provider
+   */
+  public static useLogGroup(scope: Construct, uniqueid: string, logGroupName: string): void {
+    const stack = Stack.of(scope);
+    const key = `${uniqueid}CustomResourceLogGroup`;
+    stack.node.addMetadata(key, logGroupName);
+    const existing = this.getProvider(scope, uniqueid);
+    if (existing) existing.configureLambdaLogGroup(logGroupName);
+  }
+
   /**
    * Returns a stack-level singleton for the custom resource provider.
    */
   public static getOrCreateProvider(scope: Construct, uniqueid: string, props?: CustomResourceProviderOptions): TestProvider {
     const id = `${uniqueid}CustomResourceProvider`;
     const stack = Stack.of(scope);
-    const existing = stack.node.tryFindChild(id) as TestProvider;
-    return existing ?? new TestProvider(stack, id, props);
+    const provider = this.getProvider(scope, uniqueid) ?? new TestProvider(stack, id, props);
+    const key = `${uniqueid}CustomResourceLogGroup`;
+    const logGroupMetadata = stack.node.metadata.find(m => m.type === key);
+    if (logGroupMetadata?.data) provider.configureLambdaLogGroup(logGroupMetadata.data);
+    return provider;
   }
 
   public constructor(scope: Construct, id: string, props?: CustomResourceProviderOptions) {