@aws-amplify/graphql-transformer 1.3.0-rds-3.0 → 1.3.0-rds-4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/API.md +3 -3
  2. package/CHANGELOG.md +15 -1
  3. package/lib/graphql-transformer.d.ts +3 -3
  4. package/lib/graphql-transformer.d.ts.map +1 -1
  5. package/lib/graphql-transformer.js +10 -5
  6. package/lib/graphql-transformer.js.map +1 -1
  7. package/package.json +15 -15
  8. package/src/graphql-transformer.ts +12 -5
package/API.md CHANGED
@@ -20,7 +20,7 @@ import { TransformerPluginProvider } from '@aws-amplify/graphql-transformer-inte
20
20
  import { TransformParameterProvider } from '@aws-amplify/graphql-transformer-interfaces';
21
21
  import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
22
22
  import { UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
23
- import { VpcSubnetConfig } from '@aws-amplify/graphql-transformer-interfaces';
23
+ import { VpcConfig } from '@aws-amplify/graphql-transformer-interfaces';
24
24
 
25
25
  // @public (undocumented)
26
26
  export const constructTransform: (config: TransformConfig) => GraphQLTransform;
@@ -38,7 +38,7 @@ export type ExecuteTransformConfig = TransformConfig & {
38
38
  customQueries?: Map<string, string>;
39
39
  datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
40
40
  printTransformerLog?: (log: TransformerLog) => void;
41
- sqlLambdaVpcConfig?: VpcSubnetConfig;
41
+ sqlLambdaVpcConfig?: VpcConfig;
42
42
  rdsLayerMapping?: RDSLayerMapping;
43
43
  scope: Construct;
44
44
  nestedStackProvider: NestedStackProvider;
@@ -55,7 +55,7 @@ export type TransformConfig = {
55
55
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
56
56
  stackMapping?: Record<string, string>;
57
57
  transformParameters: TransformParameters;
58
- sqlLambdaVpcConfig?: VpcSubnetConfig;
58
+ sqlLambdaVpcConfig?: VpcConfig;
59
59
  rdsLayerMapping?: RDSLayerMapping;
60
60
  };
61
61
 
package/CHANGELOG.md CHANGED
@@ -3,7 +3,7 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- # [1.3.0-rds-3.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.2.1...@aws-amplify/graphql-transformer@1.3.0-rds-3.0) (2023-10-03)
6
+ # [1.3.0-rds-4.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.2.4...@aws-amplify/graphql-transformer@1.3.0-rds-4.0) (2023-10-19)
7
7
 
8
8
  ### Bug Fixes
9
9
 
@@ -15,6 +15,20 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
15
15
  - **api:** add vpc endpoints for ssm ([5a4ffc4](https://github.com/aws-amplify/amplify-category-api/commit/5a4ffc4c1889536c8e1fdd1f31fe28ca4326100f))
16
16
  - **api:** custom queries support using sql directive ([5214037](https://github.com/aws-amplify/amplify-category-api/commit/52140374ca974956c5d5eac09fec91a51cfc9027))
17
17
 
18
+ ## [1.2.4](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.2.3...@aws-amplify/graphql-transformer@1.2.4) (2023-10-12)
19
+
20
+ **Note:** Version bump only for package @aws-amplify/graphql-transformer
21
+
22
+ ## [1.2.3](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.2.2...@aws-amplify/graphql-transformer@1.2.3) (2023-10-05)
23
+
24
+ ### Bug Fixes
25
+
26
+ - iam auth values can be passed as cdk tokens ([#1919](https://github.com/aws-amplify/amplify-category-api/issues/1919)) ([9297fa5](https://github.com/aws-amplify/amplify-category-api/commit/9297fa5cda87697645ad0c78b84c3004b32ac319))
27
+
28
+ ## [1.2.2](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.2.1...@aws-amplify/graphql-transformer@1.2.2) (2023-10-03)
29
+
30
+ **Note:** Version bump only for package @aws-amplify/graphql-transformer
31
+
18
32
  ## [1.2.1](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/graphql-transformer@1.2.0...@aws-amplify/graphql-transformer@1.2.1) (2023-10-02)
19
33
 
20
34
  **Note:** Version bump only for package @aws-amplify/graphql-transformer
package/lib/graphql-transformer.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLog, VpcSubnetConfig, RDSLayerMapping, NestedStackProvider, AssetProvider, SynthParameters, TransformParameterProvider } from '@aws-amplify/graphql-transformer-interfaces';
1
+ import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLog, VpcConfig, RDSLayerMapping, NestedStackProvider, AssetProvider, SynthParameters, TransformParameterProvider } from '@aws-amplify/graphql-transformer-interfaces';
2
2
  import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces/src';
3
3
  import { DatasourceType, GraphQLTransform, RDSConnectionSecrets, ResolverConfig, UserDefinedSlot } from '@aws-amplify/graphql-transformer-core';
4
4
  import { Construct } from 'constructs';
@@ -18,7 +18,7 @@ export type TransformConfig = {
18
18
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
19
19
  stackMapping?: Record<string, string>;
20
20
  transformParameters: TransformParameters;
21
- sqlLambdaVpcConfig?: VpcSubnetConfig;
21
+ sqlLambdaVpcConfig?: VpcConfig;
22
22
  rdsLayerMapping?: RDSLayerMapping;
23
23
  };
24
24
  export declare const constructTransformerChain: (options?: TransformerFactoryArgs) => TransformerPluginProvider[];
@@ -29,7 +29,7 @@ export type ExecuteTransformConfig = TransformConfig & {
29
29
  customQueries?: Map<string, string>;
30
30
  datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
31
31
  printTransformerLog?: (log: TransformerLog) => void;
32
- sqlLambdaVpcConfig?: VpcSubnetConfig;
32
+ sqlLambdaVpcConfig?: VpcConfig;
33
33
  rdsLayerMapping?: RDSLayerMapping;
34
34
  scope: Construct;
35
35
  nestedStackProvider: NestedStackProvider;
package/lib/graphql-transformer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,cAAc,EAEd,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,eAAe,EAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACjD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC7C,CAAC;AAKF,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,CAAC,EAAE,eAAe,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,sBAAsB,KAAG,yBAAyB,EA4BrG,CAAC;AAOF,eAAO,MAAM,kBAAkB,WAAY,eAAe,KAAG,gBAwB5D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAAG;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnD,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,kCAAkC,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACvE,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IACpD,kBAAkB,CAAC,EAAE,eAAe,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,SAAS,CAAC;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,CAAC,EAAE,0BAA0B,CAAC;IAC/C,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAMF,eAAO,MAAM,0BAA0B,QAAS,cAAc,KAAG,IAiBhE,CAAC;AAOF,eAAO,MAAM,gBAAgB,WAAY,sBAAsB,KAAG,IAoCjE,CAAC"}
1
+ {"version":3,"file":"graphql-transformer.d.ts","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,cAAc,EAEd,SAAS,EACT,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,eAAe,EAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMnD,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACjD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC7C,CAAC;AAKF,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,wBAAwB,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,sBAAsB,KAAG,yBAAyB,EA4BrG,CAAC;AAOF,eAAO,MAAM,kBAAkB,WAAY,eAAe,KAAG,gBAwB5D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,eAAe,GAAG;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACnD,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,kCAAkC,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACvE,mBAAmB,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IACpD,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,SAAS,CAAC;IACjB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,CAAC,EAAE,0BAA0B,CAAC;IAC/C,aAAa,EAAE,aAAa,CAAC;IAC7B,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAMF,eAAO,MAAM,0BAA0B,QAAS,cAAc,KAAG,IAiBhE,CAAC;AAOF,eAAO,MAAM,gBAAgB,WAAY,sBAAsB,KAAG,IA2CjE,CAAC"}
package/lib/graphql-transformer.js CHANGED
@@ -15,10 +15,10 @@ const graphql_searchable_transformer_1 = require("@aws-amplify/graphql-searchabl
15
15
  const graphql_transformer_interfaces_1 = require("@aws-amplify/graphql-transformer-interfaces");
16
16
  const graphql_transformer_core_1 = require("@aws-amplify/graphql-transformer-core");
17
17
  const constructTransformerChain = (options) => {
18
- var _a, _b;
18
+ var _a;
19
19
  const modelTransformer = new graphql_model_transformer_1.ModelTransformer();
20
20
  const authTransformer = new graphql_auth_transformer_1.AuthTransformer({
21
- adminRoles: (_a = options === null || options === void 0 ? void 0 : options.adminRoles) !== null && _a !== void 0 ? _a : [],
21
+ adminRoles: options === null || options === void 0 ? void 0 : options.adminRoles,
22
22
  identityPoolId: options === null || options === void 0 ? void 0 : options.identityPoolId,
23
23
  });
24
24
  const indexTransformer = new graphql_index_transformer_1.IndexTransformer();
@@ -40,7 +40,7 @@ const constructTransformerChain = (options) => {
40
40
  new graphql_sql_transformer_1.SqlTransformer(),
41
41
  new graphql_maps_to_transformer_1.RefersToTransformer(),
42
42
  new graphql_searchable_transformer_1.SearchableModelTransformer(),
43
- ...((_b = options === null || options === void 0 ? void 0 : options.customTransformers) !== null && _b !== void 0 ? _b : []),
43
+ ...((_a = options === null || options === void 0 ? void 0 : options.customTransformers) !== null && _a !== void 0 ? _a : []),
44
44
  ];
45
45
  };
46
46
  exports.constructTransformerChain = constructTransformerChain;
@@ -79,7 +79,12 @@ const defaultPrintTransformerLog = (log) => {
79
79
  };
80
80
  exports.defaultPrintTransformerLog = defaultPrintTransformerLog;
81
81
  const executeTransform = (config) => {
82
- const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping, scope, nestedStackProvider, assetProvider, synthParameters, customQueries, parameterProvider, } = config;
82
+ const { schema, modelToDatasourceMap, datasourceSecretParameterLocations, printTransformerLog, rdsLayerMapping, scope, nestedStackProvider, assetProvider, synthParameters, customQueries, parameterProvider, transformersFactoryArgs, } = config;
83
+ const mergedSynthParameters = {
84
+ ...synthParameters,
85
+ ...(transformersFactoryArgs.adminRoles ? { adminRoles: transformersFactoryArgs.adminRoles } : {}),
86
+ ...(transformersFactoryArgs.identityPoolId ? { identityPoolId: transformersFactoryArgs.identityPoolId } : {}),
87
+ };
83
88
  const printLog = printTransformerLog !== null && printTransformerLog !== void 0 ? printTransformerLog : exports.defaultPrintTransformerLog;
84
89
  const transform = (0, exports.constructTransform)(config);
85
90
  try {
@@ -88,7 +93,7 @@ const executeTransform = (config) => {
88
93
  nestedStackProvider,
89
94
  parameterProvider,
90
95
  assetProvider,
91
- synthParameters,
96
+ synthParameters: mergedSynthParameters,
92
97
  schema,
93
98
  datasourceConfig: {
94
99
  modelToDatasourceMap,
package/lib/graphql-transformer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"graphql-transformer.js","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"graphql-transformer.js","sourceRoot":"","sources":["../src/graphql-transformer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-amplify/graphql-transformer",
3
- "version": "1.3.0-rds-3.0",
3
+ "version": "1.3.0-rds-4.0",
4
4
  "description": "Amplify GraphQL Transformer Root Package",
5
5
  "repository": {
6
6
  "type": "git",
@@ -28,19 +28,19 @@
28
28
  "access": "public"
29
29
  },
30
30
  "dependencies": {
31
- "@aws-amplify/graphql-auth-transformer": "3.2.0-rds-3.0",
32
- "@aws-amplify/graphql-default-value-transformer": "2.1.6-rds-3.0",
33
- "@aws-amplify/graphql-function-transformer": "2.1.5-rds-3.0",
34
- "@aws-amplify/graphql-http-transformer": "2.1.5-rds-3.0",
35
- "@aws-amplify/graphql-index-transformer": "2.2.0-rds-3.0",
36
- "@aws-amplify/graphql-maps-to-transformer": "3.3.0-rds-3.0",
37
- "@aws-amplify/graphql-model-transformer": "2.3.0-rds-3.0",
38
- "@aws-amplify/graphql-predictions-transformer": "2.1.5-rds-3.0",
39
- "@aws-amplify/graphql-relational-transformer": "2.2.0-rds-3.0",
40
- "@aws-amplify/graphql-searchable-transformer": "2.3.0-rds-3.0",
41
- "@aws-amplify/graphql-sql-transformer": "0.1.0-rds-3.0",
42
- "@aws-amplify/graphql-transformer-core": "2.3.0-rds-3.0",
43
- "@aws-amplify/graphql-transformer-interfaces": "3.3.0-rds-3.0"
31
+ "@aws-amplify/graphql-auth-transformer": "3.2.0-rds-4.0",
32
+ "@aws-amplify/graphql-default-value-transformer": "2.1.8-rds-4.0",
33
+ "@aws-amplify/graphql-function-transformer": "2.1.7-rds-4.0",
34
+ "@aws-amplify/graphql-http-transformer": "2.1.7-rds-4.0",
35
+ "@aws-amplify/graphql-index-transformer": "2.2.0-rds-4.0",
36
+ "@aws-amplify/graphql-maps-to-transformer": "3.3.0-rds-4.0",
37
+ "@aws-amplify/graphql-model-transformer": "2.3.0-rds-4.0",
38
+ "@aws-amplify/graphql-predictions-transformer": "2.1.7-rds-4.0",
39
+ "@aws-amplify/graphql-relational-transformer": "2.2.0-rds-4.0",
40
+ "@aws-amplify/graphql-searchable-transformer": "2.3.0-rds-4.0",
41
+ "@aws-amplify/graphql-sql-transformer": "0.1.0-rds-4.0",
42
+ "@aws-amplify/graphql-transformer-core": "2.3.0-rds-4.0",
43
+ "@aws-amplify/graphql-transformer-interfaces": "3.3.0-rds-4.0"
44
44
  },
45
45
  "devDependencies": {
46
46
  "@types/node": "^12.12.6",
@@ -75,5 +75,5 @@
75
75
  }
76
76
  }
77
77
  },
78
- "gitHead": "c1efd4e687969d2cb64361ee656b7ce99a5eebb8"
78
+ "gitHead": "6061315de250612308d4517fe794d28a97d3a961"
79
79
  }
package/src/graphql-transformer.ts CHANGED
@@ -19,7 +19,7 @@ import {
19
19
  TransformerPluginProvider,
20
20
  TransformerLog,
21
21
  TransformerLogLevel,
22
- VpcSubnetConfig,
22
+ VpcConfig,
23
23
  RDSLayerMapping,
24
24
  NestedStackProvider,
25
25
  AssetProvider,
@@ -60,14 +60,14 @@ export type TransformConfig = {
60
60
  userDefinedSlots?: Record<string, UserDefinedSlot[]>;
61
61
  stackMapping?: Record<string, string>;
62
62
  transformParameters: TransformParameters;
63
- sqlLambdaVpcConfig?: VpcSubnetConfig;
63
+ sqlLambdaVpcConfig?: VpcConfig;
64
64
  rdsLayerMapping?: RDSLayerMapping;
65
65
  };
66
66
 
67
67
  export const constructTransformerChain = (options?: TransformerFactoryArgs): TransformerPluginProvider[] => {
68
68
  const modelTransformer = new ModelTransformer();
69
69
  const authTransformer = new AuthTransformer({
70
- adminRoles: options?.adminRoles ?? [],
70
+ adminRoles: options?.adminRoles,
71
71
  identityPoolId: options?.identityPoolId,
72
72
  });
73
73
  const indexTransformer = new IndexTransformer();
@@ -131,7 +131,7 @@ export type ExecuteTransformConfig = TransformConfig & {
131
131
  customQueries?: Map<string, string>;
132
132
  datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
133
133
  printTransformerLog?: (log: TransformerLog) => void;
134
- sqlLambdaVpcConfig?: VpcSubnetConfig;
134
+ sqlLambdaVpcConfig?: VpcConfig;
135
135
  rdsLayerMapping?: RDSLayerMapping;
136
136
  scope: Construct;
137
137
  nestedStackProvider: NestedStackProvider;
@@ -181,8 +181,15 @@ export const executeTransform = (config: ExecuteTransformConfig): void => {
181
181
  synthParameters,
182
182
  customQueries,
183
183
  parameterProvider,
184
+ transformersFactoryArgs,
184
185
  } = config;
185
186
 
187
+ const mergedSynthParameters = {
188
+ ...synthParameters,
189
+ ...(transformersFactoryArgs.adminRoles ? { adminRoles: transformersFactoryArgs.adminRoles } : {}),
190
+ ...(transformersFactoryArgs.identityPoolId ? { identityPoolId: transformersFactoryArgs.identityPoolId } : {}),
191
+ };
192
+
186
193
  const printLog = printTransformerLog ?? defaultPrintTransformerLog;
187
194
  const transform = constructTransform(config);
188
195
 
@@ -192,7 +199,7 @@ export const executeTransform = (config: ExecuteTransformConfig): void => {
192
199
  nestedStackProvider,
193
200
  parameterProvider,
194
201
  assetProvider,
195
- synthParameters,
202
+ synthParameters: mergedSynthParameters,
196
203
  schema,
197
204
  datasourceConfig: {
198
205
  modelToDatasourceMap,