move SsmEnvironmentEntriesGenerator to generateContainerEntry props

packages/backend-storage/src/factory.ts

@@ -1,10 +1,11 @@
-import { Construct } from 'constructs';
 import {
   ConstructContainerEntryGenerator,
   ConstructFactory,
   ConstructFactoryGetInstanceProps,
+  GenerateContainerEntryProps,
   ResourceAccessAcceptor,
   ResourceProvider,
+  SsmEnvironmentEntriesGenerator,
 } from '@aws-amplify/plugin-types';
 import * as path from 'path';
 import {
@@ -80,13 +81,17 @@ class AmplifyStorageGenerator implements ConstructContainerEntryGenerator {
     private readonly getInstanceProps: ConstructFactoryGetInstanceProps
   ) {}
 
-  generateContainerEntry = (scope: Construct) => {
+  generateContainerEntry = ({
+    scope,
+    ssmEnvironmentEntriesGenerator,
+  }: GenerateContainerEntryProps) => {
     const amplifyStorage = new AmplifyStorage(scope, this.defaultName, {
       ...this.props,
       outputStorageStrategy: this.getInstanceProps.outputStorageStrategy,
     });
 
     this.generateAndAttachAccessPolicies(
+      ssmEnvironmentEntriesGenerator,
       this.getInstanceProps,
       amplifyStorage.resources.bucket
     );
@@ -95,10 +100,10 @@ class AmplifyStorageGenerator implements ConstructContainerEntryGenerator {
   };
 
   private generateAndAttachAccessPolicies = (
+    ssmEnvironmentEntriesGenerator: SsmEnvironmentEntriesGenerator,
     getInstanceProps: ConstructFactoryGetInstanceProps,
     bucket: IBucket
   ) => {
-    const { ssmEnvironmentEntriesGenerator } = getInstanceProps;
     const accessDefinition = this.props.access?.(storageAccessBuilder) || {};
 
     const accessMap: Map<ResourceAccessAcceptor, Permission[]> = new Map();

packages/plugin-types/src/construct_container.ts

@@ -2,6 +2,7 @@ import { Construct } from 'constructs';
 import { ConstructFactory } from './construct_factory.js';
 import { BackendSecretResolver } from './backend_secret_resolver.js';
 import { ResourceProvider } from './resource_provider.js';
+import { SsmEnvironmentEntriesGenerator } from './ssm_environment_entries_generator.js';
 
 /**
  * Initializes a CDK Construct in a given scope
@@ -17,11 +18,16 @@ export type ConstructContainerEntryGenerator<T extends object = object> = {
    * Create a new instance of a CDK construct in the provided scope.
    */
   generateContainerEntry: (
-    scope: Construct,
-    backendSecretResolver: BackendSecretResolver
+    props: GenerateContainerEntryProps
   ) => ResourceProvider<T>;
 };
 
+export type GenerateContainerEntryProps = {
+  scope: Construct;
+  backendSecretResolver: BackendSecretResolver;
+  ssmEnvironmentEntriesGenerator: SsmEnvironmentEntriesGenerator;
+};
+
 /**
  * Vends Constructs based on an initializer function
  */

packages/plugin-types/src/construct_factory.ts

@@ -3,12 +3,10 @@ import { BackendOutputStorageStrategy } from './output_storage_strategy.js';
 import { BackendOutputEntry } from './backend_output.js';
 import { ImportPathVerifier } from './import_path_verifier.js';
 import { ResourceProvider } from './resource_provider.js';
-import { SsmEnvironmentEntriesGenerator } from './ssm_environment_entries_generator.js';
 
 export type ConstructFactoryGetInstanceProps = {
   constructContainer: ConstructContainer;
   outputStorageStrategy: BackendOutputStorageStrategy<BackendOutputEntry>;
-  ssmEnvironmentEntriesGenerator: SsmEnvironmentEntriesGenerator;
   importPathVerifier?: ImportPathVerifier;
 };