@aws-amplify/graphql-model-transformer 1.5.0-rds.0 → 2.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (156) hide show
  1. package/API.md +15 -15
  2. package/CHANGELOG.md +4 -5
  3. package/lib/graphql-types/mutation.d.ts.map +1 -1
  4. package/lib/graphql-types/mutation.js +2 -9
  5. package/lib/graphql-types/mutation.js.map +1 -1
  6. package/lib/rds-lambda.zip +0 -0
  7. package/lib/rds-notification-lambda.zip +0 -0
  8. package/lib/rds-patching-lambda.zip +0 -0
  9. package/lib/resolvers/generators/dynamodb-vtl-generator.d.ts +5 -6
  10. package/lib/resolvers/generators/dynamodb-vtl-generator.d.ts.map +1 -1
  11. package/lib/resolvers/generators/dynamodb-vtl-generator.js +5 -5
  12. package/lib/resolvers/generators/dynamodb-vtl-generator.js.map +1 -1
  13. package/lib/resolvers/generators/rds-vtl-generator.d.ts +5 -6
  14. package/lib/resolvers/generators/rds-vtl-generator.d.ts.map +1 -1
  15. package/lib/resolvers/generators/rds-vtl-generator.js +10 -10
  16. package/lib/resolvers/generators/rds-vtl-generator.js.map +1 -1
  17. package/lib/resolvers/generators/vtl-generator.d.ts +5 -6
  18. package/lib/resolvers/generators/vtl-generator.d.ts.map +1 -1
  19. package/lib/resolvers/rds/mutation.d.ts +3 -4
  20. package/lib/resolvers/rds/mutation.d.ts.map +1 -1
  21. package/lib/resolvers/rds/mutation.js +3 -7
  22. package/lib/resolvers/rds/mutation.js.map +1 -1
  23. package/lib/resolvers/rds/query.d.ts +1 -2
  24. package/lib/resolvers/rds/query.d.ts.map +1 -1
  25. package/lib/resolvers/rds/query.js +1 -3
  26. package/lib/resolvers/rds/query.js.map +1 -1
  27. package/lib/resolvers/rds/resolver.d.ts +7 -11
  28. package/lib/resolvers/rds/resolver.d.ts.map +1 -1
  29. package/lib/resolvers/rds/resolver.js +39 -50
  30. package/lib/resolvers/rds/resolver.js.map +1 -1
  31. package/lib/resources/dynamo-model-resource-generator.d.ts +2 -2
  32. package/lib/resources/dynamo-model-resource-generator.d.ts.map +1 -1
  33. package/lib/resources/dynamo-model-resource-generator.js +48 -43
  34. package/lib/resources/dynamo-model-resource-generator.js.map +1 -1
  35. package/lib/resources/model-resource-generator.js +8 -8
  36. package/lib/resources/model-resource-generator.js.map +1 -1
  37. package/lib/resources/rds-model-resource-generator.js +13 -13
  38. package/package.json +6 -5
  39. package/publish-notification-lambda/node_modules/.package-lock.json +11 -11
  40. package/publish-notification-lambda/node_modules/@types/node/README.md +1 -1
  41. package/publish-notification-lambda/node_modules/@types/node/package.json +2 -2
  42. package/publish-notification-lambda/node_modules/archiver/CHANGELOG.md +18 -0
  43. package/publish-notification-lambda/node_modules/archiver/package.json +7 -7
  44. package/publish-notification-lambda/node_modules/tslib/package.json +2 -2
  45. package/publish-notification-lambda/package-lock.json +11 -11
  46. package/rds-lambda/handler.ts +1 -2
  47. package/rds-lambda/node_modules/.package-lock.json +407 -362
  48. package/rds-lambda/node_modules/@babel/code-frame/package.json +3 -2
  49. package/rds-lambda/node_modules/@babel/core/package.json +9 -9
  50. package/rds-lambda/node_modules/@babel/helpers/package.json +5 -5
  51. package/rds-lambda/node_modules/@babel/highlight/package.json +1 -1
  52. package/rds-lambda/node_modules/@babel/parser/package.json +3 -3
  53. package/rds-lambda/node_modules/@babel/traverse/package.json +4 -4
  54. package/rds-lambda/node_modules/@babel/types/lib/index.js.flow +10 -10
  55. package/rds-lambda/node_modules/@babel/types/package.json +2 -2
  56. package/rds-lambda/node_modules/@jest/console/package.json +7 -7
  57. package/rds-lambda/node_modules/@jest/core/package.json +25 -25
  58. package/rds-lambda/node_modules/@jest/environment/package.json +6 -6
  59. package/rds-lambda/node_modules/@jest/expect/package.json +5 -5
  60. package/rds-lambda/node_modules/@jest/expect-utils/package.json +5 -5
  61. package/rds-lambda/node_modules/@jest/fake-timers/package.json +8 -8
  62. package/rds-lambda/node_modules/@jest/globals/package.json +7 -7
  63. package/rds-lambda/node_modules/@jest/reporters/node_modules/istanbul-lib-instrument/CHANGELOG.md +642 -0
  64. package/rds-lambda/node_modules/@jest/reporters/node_modules/istanbul-lib-instrument/LICENSE +24 -0
  65. package/rds-lambda/node_modules/@jest/reporters/node_modules/istanbul-lib-instrument/README.md +22 -0
  66. package/rds-lambda/node_modules/@jest/reporters/node_modules/istanbul-lib-instrument/package.json +50 -0
  67. package/rds-lambda/node_modules/@jest/reporters/node_modules/lru-cache/LICENSE +15 -0
  68. package/rds-lambda/node_modules/@jest/reporters/node_modules/lru-cache/README.md +166 -0
  69. package/rds-lambda/node_modules/@jest/reporters/node_modules/lru-cache/package.json +34 -0
  70. package/rds-lambda/node_modules/@jest/reporters/node_modules/semver/LICENSE +15 -0
  71. package/rds-lambda/node_modules/@jest/reporters/node_modules/semver/README.md +637 -0
  72. package/rds-lambda/node_modules/@jest/reporters/node_modules/semver/package.json +87 -0
  73. package/rds-lambda/node_modules/@jest/reporters/node_modules/semver/range.bnf +16 -0
  74. package/rds-lambda/node_modules/@jest/reporters/node_modules/yallist/LICENSE +15 -0
  75. package/rds-lambda/node_modules/@jest/reporters/node_modules/yallist/README.md +204 -0
  76. package/rds-lambda/node_modules/@jest/reporters/node_modules/yallist/package.json +29 -0
  77. package/rds-lambda/node_modules/@jest/reporters/package.json +14 -14
  78. package/rds-lambda/node_modules/@jest/schemas/package.json +3 -3
  79. package/rds-lambda/node_modules/@jest/source-map/package.json +3 -3
  80. package/rds-lambda/node_modules/@jest/test-result/package.json +7 -7
  81. package/rds-lambda/node_modules/@jest/test-sequencer/package.json +6 -6
  82. package/rds-lambda/node_modules/@jest/transform/package.json +8 -8
  83. package/rds-lambda/node_modules/@jest/types/package.json +4 -4
  84. package/rds-lambda/node_modules/@types/jest/README.md +1 -1
  85. package/rds-lambda/node_modules/@types/jest/package.json +2 -2
  86. package/rds-lambda/node_modules/@types/node/README.md +1 -1
  87. package/rds-lambda/node_modules/@types/node/package.json +2 -2
  88. package/rds-lambda/node_modules/archiver/CHANGELOG.md +18 -0
  89. package/rds-lambda/node_modules/archiver/package.json +7 -7
  90. package/rds-lambda/node_modules/babel-jest/README.md +1 -1
  91. package/rds-lambda/node_modules/babel-jest/package.json +6 -6
  92. package/rds-lambda/node_modules/babel-plugin-jest-hoist/README.md +1 -1
  93. package/rds-lambda/node_modules/babel-plugin-jest-hoist/package.json +3 -3
  94. package/rds-lambda/node_modules/babel-preset-jest/README.md +1 -1
  95. package/rds-lambda/node_modules/babel-preset-jest/package.json +4 -4
  96. package/rds-lambda/node_modules/caniuse-lite/package.json +1 -1
  97. package/rds-lambda/node_modules/diff-sequences/package.json +3 -3
  98. package/rds-lambda/node_modules/electron-to-chromium/chromium-versions.json +1 -1
  99. package/rds-lambda/node_modules/electron-to-chromium/full-chromium-versions.json +1 -1
  100. package/rds-lambda/node_modules/electron-to-chromium/full-versions.json +1 -1
  101. package/rds-lambda/node_modules/electron-to-chromium/package.json +1 -1
  102. package/rds-lambda/node_modules/electron-to-chromium/versions.json +1 -1
  103. package/rds-lambda/node_modules/expect/package.json +9 -10
  104. package/rds-lambda/node_modules/jest/package.json +6 -6
  105. package/rds-lambda/node_modules/jest-changed-files/package.json +4 -3
  106. package/rds-lambda/node_modules/jest-circus/README.md +1 -1
  107. package/rds-lambda/node_modules/jest-circus/package.json +14 -14
  108. package/rds-lambda/node_modules/jest-cli/package.json +10 -10
  109. package/rds-lambda/node_modules/jest-config/package.json +15 -15
  110. package/rds-lambda/node_modules/jest-diff/package.json +7 -7
  111. package/rds-lambda/node_modules/jest-docblock/package.json +3 -3
  112. package/rds-lambda/node_modules/jest-each/README.md +1 -1
  113. package/rds-lambda/node_modules/jest-each/package.json +7 -7
  114. package/rds-lambda/node_modules/jest-environment-node/package.json +9 -9
  115. package/rds-lambda/node_modules/jest-get-type/package.json +3 -3
  116. package/rds-lambda/node_modules/jest-haste-map/package.json +7 -7
  117. package/rds-lambda/node_modules/jest-leak-detector/package.json +5 -5
  118. package/rds-lambda/node_modules/jest-matcher-utils/README.md +1 -1
  119. package/rds-lambda/node_modules/jest-matcher-utils/package.json +7 -7
  120. package/rds-lambda/node_modules/jest-message-util/package.json +5 -5
  121. package/rds-lambda/node_modules/jest-mock/package.json +5 -5
  122. package/rds-lambda/node_modules/jest-regex-util/package.json +3 -3
  123. package/rds-lambda/node_modules/jest-resolve/package.json +6 -6
  124. package/rds-lambda/node_modules/jest-resolve-dependencies/package.json +10 -10
  125. package/rds-lambda/node_modules/jest-runner/package.json +20 -20
  126. package/rds-lambda/node_modules/jest-runtime/package.json +19 -19
  127. package/rds-lambda/node_modules/jest-snapshot/package.json +14 -14
  128. package/rds-lambda/node_modules/jest-util/package.json +4 -4
  129. package/rds-lambda/node_modules/jest-validate/package.json +6 -6
  130. package/rds-lambda/node_modules/jest-watcher/package.json +7 -7
  131. package/rds-lambda/node_modules/jest-worker/README.md +1 -1
  132. package/rds-lambda/node_modules/jest-worker/package.json +5 -5
  133. package/rds-lambda/node_modules/pretty-format/package.json +5 -5
  134. package/rds-lambda/node_modules/tslib/package.json +2 -2
  135. package/rds-lambda/package-lock.json +410 -365
  136. package/rds-patching-lambda/node_modules/.package-lock.json +11 -11
  137. package/rds-patching-lambda/node_modules/@types/node/README.md +1 -1
  138. package/rds-patching-lambda/node_modules/@types/node/package.json +2 -2
  139. package/rds-patching-lambda/node_modules/archiver/CHANGELOG.md +18 -0
  140. package/rds-patching-lambda/node_modules/archiver/package.json +7 -7
  141. package/rds-patching-lambda/node_modules/tslib/package.json +2 -2
  142. package/rds-patching-lambda/package-lock.json +11 -11
  143. package/src/__tests__/__snapshots__/model-transformer.test.ts.snap +0 -688
  144. package/src/__tests__/model-directive-arguments.test.ts +23 -28
  145. package/src/__tests__/model-transformer.test.ts +137 -216
  146. package/src/graphql-types/mutation.ts +3 -11
  147. package/src/resolvers/generators/dynamodb-vtl-generator.ts +5 -7
  148. package/src/resolvers/generators/rds-vtl-generator.ts +10 -12
  149. package/src/resolvers/generators/vtl-generator.ts +5 -6
  150. package/src/resolvers/rds/mutation.ts +3 -18
  151. package/src/resolvers/rds/query.ts +1 -9
  152. package/src/resolvers/rds/resolver.ts +45 -62
  153. package/src/resources/dynamo-model-resource-generator.ts +50 -47
  154. package/src/resources/model-resource-generator.ts +8 -8
  155. package/src/resources/rds-model-resource-generator.ts +13 -13
  156. package/tsconfig.tsbuildinfo +1 -1
@@ -36,7 +36,7 @@ class ModelResourceGenerator {
36
36
  modelIndexFields,
37
37
  };
38
38
  if (!this.resolverMap[resolverKey]) {
39
- this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateGetRequestTemplate(requestConfig, ctx), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateGetResponseTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
39
+ this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateGetRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateGetResponseTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
40
40
  }
41
41
  return this.resolverMap[resolverKey];
42
42
  };
@@ -56,7 +56,7 @@ class ModelResourceGenerator {
56
56
  mutation: false,
57
57
  };
58
58
  if (!this.resolverMap[resolverKey]) {
59
- this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateListRequestTemplate(requestConfig, ctx), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
59
+ this.resolverMap[resolverKey] = ctx.resolvers.generateQueryResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateListRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
60
60
  }
61
61
  return this.resolverMap[resolverKey];
62
62
  };
@@ -82,7 +82,7 @@ class ModelResourceGenerator {
82
82
  modelName: type.name.value,
83
83
  };
84
84
  if (!this.resolverMap[resolverKey]) {
85
- const resolver = ctx.resolvers.generateMutationResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateCreateRequestTemplate(requestConfig, ctx), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
85
+ const resolver = ctx.resolvers.generateMutationResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateCreateRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
86
86
  this.resolverMap[resolverKey] = resolver;
87
87
  const initSlotConfig = {
88
88
  operation: 'CREATE',
@@ -117,7 +117,7 @@ class ModelResourceGenerator {
117
117
  modelName: type.name.value,
118
118
  };
119
119
  if (!this.resolverMap[resolverKey]) {
120
- const resolver = ctx.resolvers.generateMutationResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateUpdateRequestTemplate(requestConfig, ctx), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
120
+ const resolver = ctx.resolvers.generateMutationResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateUpdateRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
121
121
  const updateInitConfig = {
122
122
  modelConfig,
123
123
  operation: 'UPDATE',
@@ -151,7 +151,7 @@ class ModelResourceGenerator {
151
151
  modelName: type.name.value,
152
152
  };
153
153
  if (!this.resolverMap[resolverKey]) {
154
- this.resolverMap[resolverKey] = ctx.resolvers.generateMutationResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDeleteRequestTemplate(requestConfig, ctx), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
154
+ this.resolverMap[resolverKey] = ctx.resolvers.generateMutationResolver(typeName, fieldName, resolverLogicalId, dataSource, graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDeleteRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`), graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`));
155
155
  }
156
156
  return this.resolverMap[resolverKey];
157
157
  };
@@ -356,7 +356,7 @@ class ModelResourceGenerator {
356
356
  throw new Error('Unknown query field type');
357
357
  }
358
358
  resolver.addToSlot('postAuth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString((0, resolvers_1.generateAuthExpressionForSandboxMode)(context.transformParameters.sandboxModeEnabled), `${query.typeName}.${query.fieldName}.{slotName}.{slotIndex}.req.vtl`));
359
- resolver.mapToStack(context.stackManager.getStackFor(query.resolverLogicalId, def.name.value));
359
+ resolver.setScope(context.stackManager.getScopeFor(query.resolverLogicalId, def.name.value));
360
360
  context.resolvers.addResolver(query.typeName, query.fieldName, resolver);
361
361
  });
362
362
  const mutationFields = this.getMutationFieldNames(def);
@@ -376,7 +376,7 @@ class ModelResourceGenerator {
376
376
  throw new Error('Unknown mutation field type');
377
377
  }
378
378
  resolver.addToSlot('postAuth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString((0, resolvers_1.generateAuthExpressionForSandboxMode)(context.transformParameters.sandboxModeEnabled), `${mutation.typeName}.${mutation.fieldName}.{slotName}.{slotIndex}.req.vtl`));
379
- resolver.mapToStack(context.stackManager.getStackFor(mutation.resolverLogicalId, def.name.value));
379
+ resolver.setScope(context.stackManager.getScopeFor(mutation.resolverLogicalId, def.name.value));
380
380
  context.resolvers.addResolver(mutation.typeName, mutation.fieldName, resolver);
381
381
  });
382
382
  const subscriptionLevel = (_c = (_b = (_a = this.modelDirectiveMap.get(def.name.value)) === null || _a === void 0 ? void 0 : _a.subscriptions) === null || _b === void 0 ? void 0 : _b.level) !== null && _c !== void 0 ? _c : directive_1.SubscriptionLevel.on;
@@ -400,7 +400,7 @@ class ModelResourceGenerator {
400
400
  if (subscriptionLevel === directive_1.SubscriptionLevel.on) {
401
401
  resolver.addToSlot('postAuth', graphql_transformer_core_1.MappingTemplate.s3MappingTemplateFromString((0, resolvers_1.generateAuthExpressionForSandboxMode)(context.transformParameters.sandboxModeEnabled), `${subscription.typeName}.${subscription.fieldName}.{slotName}.{slotIndex}.req.vtl`));
402
402
  }
403
- resolver.mapToStack(context.stackManager.getStackFor(subscription.resolverLogicalId, def.name.value));
403
+ resolver.setScope(context.stackManager.getScopeFor(subscription.resolverLogicalId, def.name.value));
404
404
  context.resolvers.addResolver(subscription.typeName, subscription.fieldName, resolver);
405
405
  });
406
406
  }
@@ -1 +1 @@
1
- {"version":3,"file":"model-resource-generator.js","sourceRoot":"","sources":["../../src/resources/model-resource-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model-resource-generator.js","sourceRoot":"","sources":["../../src/resources/model-resource-generator.ts"],"names":[],"mappings":"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"}
@@ -22,25 +22,25 @@ class RdsModelResourceGenerator extends model_resource_generator_1.ModelResource
22
22
  if (this.isEnabled()) {
23
23
  const secretEntry = context.datasourceSecretParameterLocations.get(graphql_transformer_core_1.MYSQL_DB_TYPE);
24
24
  const { RDSLambdaIAMRoleLogicalID, RDSPatchingLambdaIAMRoleLogicalID, RDSLambdaLogicalID, RDSPatchingLambdaLogicalID, RDSLambdaDataSourceLogicalID, RDSPatchingSubscriptionLogicalID, } = graphql_transformer_common_1.ResourceConstants.RESOURCES;
25
- const lambdaRoleStack = context.stackManager.getStackFor(RDSLambdaIAMRoleLogicalID, exports.RDS_STACK_NAME);
26
- const lambdaStack = context.stackManager.getStackFor(RDSLambdaLogicalID, exports.RDS_STACK_NAME);
27
- (0, rds_1.setRDSLayerMappings)(lambdaStack, context.rdsLayerMapping);
28
- const role = (0, rds_1.createRdsLambdaRole)(context.resourceHelper.generateIAMRoleName(RDSLambdaIAMRoleLogicalID), lambdaRoleStack, secretEntry);
29
- const lambda = (0, rds_1.createRdsLambda)(lambdaStack, context.api, role, {
25
+ const lambdaRoleScope = context.stackManager.getScopeFor(RDSLambdaIAMRoleLogicalID, exports.RDS_STACK_NAME);
26
+ const lambdaScope = context.stackManager.getScopeFor(RDSLambdaLogicalID, exports.RDS_STACK_NAME);
27
+ (0, rds_1.setRDSLayerMappings)(lambdaScope, context.rdsLayerMapping);
28
+ const role = (0, rds_1.createRdsLambdaRole)(context.resourceHelper.generateIAMRoleName(RDSLambdaIAMRoleLogicalID), lambdaRoleScope, secretEntry);
29
+ const lambda = (0, rds_1.createRdsLambda)(lambdaScope, context.api, role, {
30
30
  username: (_a = secretEntry === null || secretEntry === void 0 ? void 0 : secretEntry.username) !== null && _a !== void 0 ? _a : '',
31
31
  password: (_b = secretEntry === null || secretEntry === void 0 ? void 0 : secretEntry.password) !== null && _b !== void 0 ? _b : '',
32
32
  host: (_c = secretEntry === null || secretEntry === void 0 ? void 0 : secretEntry.host) !== null && _c !== void 0 ? _c : '',
33
33
  port: (_d = secretEntry === null || secretEntry === void 0 ? void 0 : secretEntry.port) !== null && _d !== void 0 ? _d : '',
34
34
  database: (_e = secretEntry === null || secretEntry === void 0 ? void 0 : secretEntry.database) !== null && _e !== void 0 ? _e : '',
35
35
  }, context.sqlLambdaVpcConfig);
36
- const patchingLambdaRoleStack = context.stackManager.getStackFor(RDSPatchingLambdaIAMRoleLogicalID, exports.RDS_STACK_NAME);
37
- const patchingLambdaStack = context.stackManager.getStackFor(RDSPatchingLambdaLogicalID, exports.RDS_STACK_NAME);
38
- const patchingLambdaRole = (0, rds_1.createRdsPatchingLambdaRole)(context.resourceHelper.generateIAMRoleName(RDSPatchingLambdaIAMRoleLogicalID), patchingLambdaRoleStack, lambda.functionArn);
39
- const patchingLambda = (0, rds_1.createRdsPatchingLambda)(patchingLambdaStack, context.api, patchingLambdaRole, {
36
+ const patchingLambdaRoleScope = context.stackManager.getScopeFor(RDSPatchingLambdaIAMRoleLogicalID, exports.RDS_STACK_NAME);
37
+ const patchingLambdaScope = context.stackManager.getScopeFor(RDSPatchingLambdaLogicalID, exports.RDS_STACK_NAME);
38
+ const patchingLambdaRole = (0, rds_1.createRdsPatchingLambdaRole)(context.resourceHelper.generateIAMRoleName(RDSPatchingLambdaIAMRoleLogicalID), patchingLambdaRoleScope, lambda.functionArn);
39
+ const patchingLambda = (0, rds_1.createRdsPatchingLambda)(patchingLambdaScope, context.api, patchingLambdaRole, {
40
40
  LAMBDA_FUNCTION_ARN: lambda.functionArn,
41
41
  });
42
- const patchingSubscriptionStack = context.stackManager.getStackFor(RDSPatchingSubscriptionLogicalID, exports.RDS_STACK_NAME);
43
- const snsTopic = aws_sns_1.Topic.fromTopicArn(patchingSubscriptionStack, 'RDSPatchingTopic', RDS_PATCHING_SNS_TOPIC_ARN);
42
+ const patchingSubscriptionScope = context.stackManager.getScopeFor(RDSPatchingSubscriptionLogicalID, exports.RDS_STACK_NAME);
43
+ const snsTopic = aws_sns_1.Topic.fromTopicArn(patchingSubscriptionScope, 'RDSPatchingTopic', RDS_PATCHING_SNS_TOPIC_ARN);
44
44
  const subscription = new aws_sns_subscriptions_1.LambdaSubscription(patchingLambda, {
45
45
  filterPolicy: {
46
46
  Region: aws_sns_2.SubscriptionFilter.stringFilter({
@@ -49,8 +49,8 @@ class RdsModelResourceGenerator extends model_resource_generator_1.ModelResource
49
49
  },
50
50
  });
51
51
  snsTopic.addSubscription(subscription);
52
- const lambdaDataSourceStack = context.stackManager.getStackFor(RDSLambdaDataSourceLogicalID, exports.RDS_STACK_NAME);
53
- const rdsDatasource = context.api.host.addLambdaDataSource(`${RDSLambdaDataSourceLogicalID}`, lambda, {}, lambdaDataSourceStack);
52
+ const lambdaDataSourceScope = context.stackManager.getScopeFor(RDSLambdaDataSourceLogicalID, exports.RDS_STACK_NAME);
53
+ const rdsDatasource = context.api.host.addLambdaDataSource(`${RDSLambdaDataSourceLogicalID}`, lambda, {}, lambdaDataSourceScope);
54
54
  this.models.forEach((model) => {
55
55
  context.dataSources.add(model, rdsDatasource);
56
56
  this.datasourceMap[model.name.value] = rdsDatasource;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-amplify/graphql-model-transformer",
3
- "version": "1.5.0-rds.0",
3
+ "version": "2.1.1",
4
4
  "description": "Amplify graphql @model transformer",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,17 +32,18 @@
32
32
  "extract-api": "ts-node ../../scripts/extract-api.ts"
33
33
  },
34
34
  "dependencies": {
35
- "@aws-amplify/graphql-transformer-core": "1.5.0-rds.0",
36
- "@aws-amplify/graphql-transformer-interfaces": "2.3.0",
35
+ "@aws-amplify/graphql-transformer-core": "2.1.1",
36
+ "@aws-amplify/graphql-transformer-interfaces": "3.1.1",
37
37
  "graphql": "^15.5.0",
38
38
  "graphql-mapping-template": "4.20.11",
39
- "graphql-transformer-common": "4.26.0-rds.0"
39
+ "graphql-transformer-common": "4.25.0"
40
40
  },
41
41
  "peerDependencies": {
42
42
  "aws-cdk-lib": "^2.80.0",
43
43
  "constructs": "^10.0.5"
44
44
  },
45
45
  "devDependencies": {
46
+ "@aws-amplify/graphql-transformer-test-utils": "0.2.1",
46
47
  "@types/node": "^12.12.6"
47
48
  },
48
49
  "jest": {
@@ -70,5 +71,5 @@
70
71
  "overrides"
71
72
  ]
72
73
  },
73
- "gitHead": "ce50129f66540242a333df9b4ca76fb90cfc00ef"
74
+ "gitHead": "a53a49c3c7784dddf44bdbd81dfee2359207476a"
74
75
  }
@@ -1123,9 +1123,9 @@
1123
1123
  }
1124
1124
  },
1125
1125
  "node_modules/@types/node": {
1126
- "version": "20.4.8",
1127
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.8.tgz",
1128
- "integrity": "sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg==",
1126
+ "version": "20.5.7",
1127
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.7.tgz",
1128
+ "integrity": "sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==",
1129
1129
  "dev": true
1130
1130
  },
1131
1131
  "node_modules/ansi-regex": {
@@ -1153,16 +1153,16 @@
1153
1153
  }
1154
1154
  },
1155
1155
  "node_modules/archiver": {
1156
- "version": "5.3.1",
1157
- "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
1158
- "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
1156
+ "version": "5.3.2",
1157
+ "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",
1158
+ "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==",
1159
1159
  "dev": true,
1160
1160
  "dependencies": {
1161
1161
  "archiver-utils": "^2.1.0",
1162
- "async": "^3.2.3",
1162
+ "async": "^3.2.4",
1163
1163
  "buffer-crc32": "^0.2.1",
1164
1164
  "readable-stream": "^3.6.0",
1165
- "readdir-glob": "^1.0.0",
1165
+ "readdir-glob": "^1.1.2",
1166
1166
  "tar-stream": "^2.2.0",
1167
1167
  "zip-stream": "^4.1.0"
1168
1168
  },
@@ -1808,9 +1808,9 @@
1808
1808
  }
1809
1809
  },
1810
1810
  "node_modules/tslib": {
1811
- "version": "2.6.1",
1812
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
1813
- "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
1811
+ "version": "2.6.2",
1812
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
1813
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
1814
1814
  },
1815
1815
  "node_modules/typescript": {
1816
1816
  "version": "5.1.3",
@@ -8,7 +8,7 @@ This package contains type definitions for Node.js (https://nodejs.org/).
8
8
  Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node.
9
9
 
10
10
  ### Additional Details
11
- * Last updated: Sat, 05 Aug 2023 10:32:49 GMT
11
+ * Last updated: Mon, 28 Aug 2023 00:33:00 GMT
12
12
  * Dependencies: none
13
13
  * Global values: `AbortController`, `AbortSignal`, `__dirname`, `__filename`, `console`, `exports`, `gc`, `global`, `module`, `process`, `require`, `structuredClone`
14
14
 
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@types/node",
3
- "version": "20.4.8",
3
+ "version": "20.5.7",
4
4
  "description": "TypeScript definitions for Node.js",
5
5
  "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node",
6
6
  "license": "MIT",
@@ -227,6 +227,6 @@
227
227
  },
228
228
  "scripts": {},
229
229
  "dependencies": {},
230
- "typesPublisherContentHash": "9acef897909a6e2f2e35b1241c4aee3acd41d6d87a7676afe8d21d5c84e063ad",
230
+ "typesPublisherContentHash": "3c31754d724881876a0bd7b216ddce3840ec052e1944538329b9271e525d425c",
231
231
  "typeScriptVersion": "4.3"
232
232
  }
@@ -1,5 +1,23 @@
1
1
  ## Changelog
2
2
 
3
+ **5.3.2** - <small>_August 16, 2023_</small> — [Diff](https://github.com/archiverjs/node-archiver/compare/5.3.1...5.3.2)
4
+
5
+ Maintenance
6
+
7
+ - test: run tests against node 18 @yharaskrik (#637)
8
+
9
+ Dependency updates
10
+
11
+ - Bump release-drafter/release-drafter from 5.19.0 to 5.23.0 @dependabot (#652)
12
+ - Bump actions/setup-node from 3.1.1 to 3.6.0 @dependabot (#638)
13
+ - Bump chai from 4.3.6 to 4.3.7 @dependabot (#627)
14
+ - Bump mkdirp from 1.0.4 to 2.1.5 @dependabot (#657)
15
+ - Bump rimraf from 3.0.2 to 4.3.1 @dependabot (#660)
16
+ - Bump tar from 6.1.11 to 6.1.13 @dependabot (#631)
17
+ - Bump readdir-glob from 1.1.1 to 1.1.2 @dependabot (#604)
18
+ - Bump minimatch from 3.0.4 to 3.1.2 @dependabot (#669)
19
+ - Bump async from 3.2.3 to 3.2.4 @dependabot (#596)
20
+
3
21
  **5.3.1** - <small>_April 15, 2022_</small> — [Diff](https://github.com/archiverjs/node-archiver/compare/5.3.0...5.3.1)
4
22
 
5
23
  Maintenance
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "archiver",
3
- "version": "5.3.1",
3
+ "version": "5.3.2",
4
4
  "description": "a streaming interface for archive generation",
5
5
  "homepage": "https://github.com/archiverjs/node-archiver",
6
6
  "author": {
@@ -29,22 +29,22 @@
29
29
  },
30
30
  "dependencies": {
31
31
  "archiver-utils": "^2.1.0",
32
- "async": "^3.2.3",
32
+ "async": "^3.2.4",
33
33
  "buffer-crc32": "^0.2.1",
34
34
  "readable-stream": "^3.6.0",
35
- "readdir-glob": "^1.0.0",
35
+ "readdir-glob": "^1.1.2",
36
36
  "tar-stream": "^2.2.0",
37
37
  "zip-stream": "^4.1.0"
38
38
  },
39
39
  "devDependencies": {
40
40
  "archiver-jsdoc-theme": "^1.1.3",
41
- "chai": "^4.2.0",
41
+ "chai": "^4.3.7",
42
42
  "jsdoc": "^3.6.4",
43
- "mkdirp": "^1.0.4",
43
+ "mkdirp": "^2.1.5",
44
44
  "mocha": "^9.0.2",
45
- "rimraf": "^3.0.2",
45
+ "rimraf": "^4.3.1",
46
46
  "stream-bench": "^0.1.2",
47
- "tar": "^6.1.11",
47
+ "tar": "^6.1.13",
48
48
  "yauzl": "^2.9.0"
49
49
  },
50
50
  "keywords": [
@@ -2,7 +2,7 @@
2
2
  "name": "tslib",
3
3
  "author": "Microsoft Corp.",
4
4
  "homepage": "https://www.typescriptlang.org/",
5
- "version": "2.6.1",
5
+ "version": "2.6.2",
6
6
  "license": "0BSD",
7
7
  "description": "Runtime library for TypeScript helper functions",
8
8
  "keywords": [
@@ -29,7 +29,7 @@
29
29
  "exports": {
30
30
  ".": {
31
31
  "module": {
32
- "types": "./tslib/modules/index.d.ts",
32
+ "types": "./modules/index.d.ts",
33
33
  "default": "./tslib.es6.mjs"
34
34
  },
35
35
  "import": {
@@ -1137,9 +1137,9 @@
1137
1137
  }
1138
1138
  },
1139
1139
  "node_modules/@types/node": {
1140
- "version": "20.4.8",
1141
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.8.tgz",
1142
- "integrity": "sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg==",
1140
+ "version": "20.5.7",
1141
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.7.tgz",
1142
+ "integrity": "sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==",
1143
1143
  "dev": true
1144
1144
  },
1145
1145
  "node_modules/ansi-regex": {
@@ -1167,16 +1167,16 @@
1167
1167
  }
1168
1168
  },
1169
1169
  "node_modules/archiver": {
1170
- "version": "5.3.1",
1171
- "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.1.tgz",
1172
- "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
1170
+ "version": "5.3.2",
1171
+ "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz",
1172
+ "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==",
1173
1173
  "dev": true,
1174
1174
  "dependencies": {
1175
1175
  "archiver-utils": "^2.1.0",
1176
- "async": "^3.2.3",
1176
+ "async": "^3.2.4",
1177
1177
  "buffer-crc32": "^0.2.1",
1178
1178
  "readable-stream": "^3.6.0",
1179
- "readdir-glob": "^1.0.0",
1179
+ "readdir-glob": "^1.1.2",
1180
1180
  "tar-stream": "^2.2.0",
1181
1181
  "zip-stream": "^4.1.0"
1182
1182
  },
@@ -1822,9 +1822,9 @@
1822
1822
  }
1823
1823
  },
1824
1824
  "node_modules/tslib": {
1825
- "version": "2.6.1",
1826
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
1827
- "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
1825
+ "version": "2.6.2",
1826
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
1827
+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
1828
1828
  },
1829
1829
  "node_modules/typescript": {
1830
1830
  "version": "5.1.3",
@@ -12,8 +12,7 @@ export const run = async (event): Promise<any> => {
12
12
  const config = await getDBConfig();
13
13
  adapter = await getDBAdapter(config);
14
14
  }
15
- const debugMode = process.env.DEBUG_MODE === 'true';
16
- const result = await adapter.executeRequest(event, debugMode);
15
+ const result = await adapter.executeRequest(event);
17
16
  return result;
18
17
  };
19
18