@aws-solutions-constructs/core 1.145.0 → 1.148.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.
- package/.jsii +87 -70
- package/lib/alb-helper.js +9 -27
- package/lib/apigateway-helper.js +8 -25
- package/lib/cloudfront-distribution-helper.js +4 -9
- package/lib/cloudwatch-log-group-helper.js +2 -7
- package/lib/cognito-helper.js +4 -16
- package/lib/dynamodb-table-helper.js +6 -17
- package/lib/elasticsearch-helper.js +2 -4
- package/lib/glue-job-defaults.d.ts +2 -1
- package/lib/glue-job-defaults.js +5 -2
- package/lib/glue-job-helper.d.ts +8 -1
- package/lib/glue-job-helper.js +27 -18
- package/lib/kinesis-streams-helper.js +3 -9
- package/lib/kms-helper.js +3 -9
- package/lib/lambda-event-source-mapping-defaults.js +4 -19
- package/lib/mediastore-helper.js +2 -7
- package/lib/sagemaker-helper.js +5 -17
- package/lib/secretsmanager-helper.js +2 -7
- package/lib/sns-helper.js +2 -10
- package/lib/vpc-helper.js +2 -7
- package/lib/waf-helper.js +2 -7
- package/package.json +70 -70
- package/test/glue-job-helper.test.js +4 -2
- package/test/test-helper.d.ts +1 -0
- package/test/test-helper.js +13 -2
|
@@ -62,9 +62,7 @@ function buildElasticSearch(scope, domainName, options, cfnDomainProps) {
|
|
|
62
62
|
});
|
|
63
63
|
cognitoKibanaConfigureRolePolicy.attachToRole(cognitoKibanaConfigureRole);
|
|
64
64
|
let _cfnDomainProps = elasticsearch_defaults_1.DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, options);
|
|
65
|
-
|
|
66
|
-
_cfnDomainProps = utils_1.overrideProps(_cfnDomainProps, cfnDomainProps);
|
|
67
|
-
}
|
|
65
|
+
_cfnDomainProps = utils_1.consolidateProps(_cfnDomainProps, cfnDomainProps);
|
|
68
66
|
const esDomain = new elasticsearch.CfnDomain(scope, "ElasticsearchDomain", _cfnDomainProps);
|
|
69
67
|
utils_1.addCfnSuppressRules(esDomain, [
|
|
70
68
|
{
|
|
@@ -202,4 +200,4 @@ function buildElasticSearchCWAlarms(scope) {
|
|
|
202
200
|
return alarms;
|
|
203
201
|
}
|
|
204
202
|
exports.buildElasticSearchCWAlarms = buildElasticSearchCWAlarms;
|
|
205
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"elasticsearch-helper.js","sourceRoot":"","sources":["elasticsearch-helper.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAEH,4DAA4D;AAC5D,qEAAmF;AACnF,mCAA6D;AAC7D,wCAAwC;AACxC,qCAAqC;AACrC,sDAAsD;AAItD,SAAgB,kBAAkB,CAAC,KAAgB,EAAE,UAAkB,EACrE,OAAyB,EAAE,cAA6C;IAExE,sFAAsF;IACtF,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,4BAA4B,EAAE;QACnF,SAAS,EAAE,IAAI,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CAAC;KACxD,CAAC,CAAC;IAEH,MAAM,gCAAgC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,kCAAkC,EAAE;QACjG,UAAU,EAAE;YACV,IAAI,GAAG,CAAC,eAAe,CAAC;gBACtB,OAAO,EAAE;oBACP,8BAA8B;oBAC9B,kCAAkC;oBAClC,kCAAkC;oBAClC,oCAAoC;oBACpC,+BAA+B;oBAC/B,oCAAoC;oBACpC,iCAAiC;oBACjC,uCAAuC;oBACvC,qCAAqC;oBACrC,uCAAuC;oBACvC,uCAAuC;oBACvC,oCAAoC;iBACrC;gBACD,SAAS,EAAE;oBACT,OAAO,CAAC,QAAQ,CAAC,WAAW;oBAC5B,4BAA4B,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,iBAAiB,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE;oBAC3G,cAAc,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,WAAW,UAAU,EAAE;iBAC1E;aACF,CAAC;YACF,IAAI,GAAG,CAAC,eAAe,CAAC;gBACtB,OAAO,EAAE;oBACP,cAAc;iBACf;gBACD,UAAU,EAAE;oBACV,UAAU,EAAE,EAAC,qBAAqB,EAAE,gCAAgC,EAAC;iBACtE;gBACD,SAAS,EAAE;oBACT,0BAA0B,CAAC,OAAO;iBACnC;aACF,CAAC;SACH;KACF,CAAC,CAAC;IACH,gCAAgC,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAAC;IAE1E,IAAI,eAAe,GAAG,8CAAqB,CAAC,UAAU,EAAE,0BAA0B,EAAE,OAAO,CAAC,CAAC;IAE7F,IAAI,cAAc,EAAE;QAClB,eAAe,GAAG,qBAAa,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;KAClE;IAED,MAAM,QAAQ,GAAG,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAC;IAC5F,2BAAmB,CAAC,QAAQ,EAAE;QAC5B;YACE,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,8KAA8K;SACvL;QACD;YACE,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,iFAAiF;SAC1F;KACF,CAAC,CAAC;IAEH,OAAO,CAAC,QAAQ,EAAE,0BAA0B,CAAC,CAAC;AAChD,CAAC;AAjED,gDAiEC;AAED,SAAgB,0BAA0B,CAAC,KAAgB;IACzD,yBAAyB;IACzB,MAAM,MAAM,GAAuB,IAAI,KAAK,EAAE,CAAC;IAE/C,qEAAqE;IACrE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,gBAAgB,EAAE;QACxD,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,mBAAmB;YAC/B,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;SACjC,CAAC;QACF,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,2EAA2E;KAC9F,CAAC,CAAC,CAAC;IAEJ,wEAAwE;IACxE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,mBAAmB,EAAE;QAC3D,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,sBAAsB;YAClC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;SACjC,CAAC;QACF,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,wDAAwD;KAC3E,CAAC,CAAC,CAAC;IAEJ,wEAAwE;IACxE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,6BAA6B,EAAE;QACrE,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,kBAAkB;YAC9B,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;SACjC,CAAC;QACF,SAAS,EAAE,KAAK;QAChB,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,+BAA+B;QACjF,gBAAgB,EAAE,iEAAiE;KACpF,CAAC,CAAC,CAAC;IAEJ,sEAAsE;IACtE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,gCAAgC,EAAE;QACxE,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,2BAA2B;YACvC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,0CAA0C;KAC7D,CAAC,CAAC,CAAC;IAEJ,4EAA4E;IAC5E,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,sCAAsC,EAAE;QAC9E,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,0BAA0B;YACtC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;SACjC,CAAC;QACF,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,gGAAgG;KACnH,CAAC,CAAC,CAAC;IAEJ,uEAAuE;IACvE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,4BAA4B,EAAE;QACpE,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,gBAAgB;YAC5B,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,EAAE;QACb,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,0IAA0I;KAC7J,CAAC,CAAC,CAAC;IAEJ,yEAAyE;IACzE,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,+BAA+B,EAAE;QACvE,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,mBAAmB;YAC/B,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,EAAE;QACb,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,yFAAyF;KAC5G,CAAC,CAAC,CAAC;IAEJ,6EAA6E;IAC7E,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,kCAAkC,EAAE;QAC1E,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,sBAAsB;YAClC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,EAAE;QACb,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,8HAA8H;KACjJ,CAAC,CAAC,CAAC;IAEJ,+EAA+E;IAC/E,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,qCAAqC,EAAE;QAC7E,MAAM,EAAE,IAAI,UAAU,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,QAAQ;YACnB,UAAU,EAAE,yBAAyB;YACrC,SAAS,EAAE,SAAS;YACpB,MAAM,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;SAClC,CAAC;QACF,SAAS,EAAE,EAAE;QACb,iBAAiB,EAAE,CAAC;QACpB,kBAAkB,EAAE,UAAU,CAAC,kBAAkB,CAAC,kCAAkC;QACpF,gBAAgB,EAAE,yFAAyF;KAC5G,CAAC,CAAC,CAAC;IAEJ,OAAO,MAAM,CAAC;AAChB,CAAC;AAnID,gEAmIC","sourcesContent":["/**\n *  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport * as elasticsearch from '@aws-cdk/aws-elasticsearch';\nimport { CfnDomainOptions, DefaultCfnDomainProps } from './elasticsearch-defaults';\nimport { overrideProps, addCfnSuppressRules } from './utils';\nimport * as iam from '@aws-cdk/aws-iam';\nimport * as cdk from '@aws-cdk/core';\nimport * as cloudwatch from '@aws-cdk/aws-cloudwatch';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from '@aws-cdk/core';\n\nexport function buildElasticSearch(scope: Construct, domainName: string,\n  options: CfnDomainOptions, cfnDomainProps?: elasticsearch.CfnDomainProps): [elasticsearch.CfnDomain, iam.Role] {\n\n  // Setup the IAM Role & policy for ES to configure Cognito User pool and Identity pool\n  const cognitoKibanaConfigureRole = new iam.Role(scope, 'CognitoKibanaConfigureRole', {\n    assumedBy: new iam.ServicePrincipal('es.amazonaws.com')\n  });\n\n  const cognitoKibanaConfigureRolePolicy = new iam.Policy(scope, 'CognitoKibanaConfigureRolePolicy', {\n    statements: [\n      new iam.PolicyStatement({\n        actions: [\n          \"cognito-idp:DescribeUserPool\",\n          \"cognito-idp:CreateUserPoolClient\",\n          \"cognito-idp:DeleteUserPoolClient\",\n          \"cognito-idp:DescribeUserPoolClient\",\n          \"cognito-idp:AdminInitiateAuth\",\n          \"cognito-idp:AdminUserGlobalSignOut\",\n          \"cognito-idp:ListUserPoolClients\",\n          \"cognito-identity:DescribeIdentityPool\",\n          \"cognito-identity:UpdateIdentityPool\",\n          \"cognito-identity:SetIdentityPoolRoles\",\n          \"cognito-identity:GetIdentityPoolRoles\",\n          \"es:UpdateElasticsearchDomainConfig\"\n        ],\n        resources: [\n          options.userpool.userPoolArn,\n          `arn:aws:cognito-identity:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:identitypool/${options.identitypool.ref}`,\n          `arn:aws:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/${domainName}`\n        ]\n      }),\n      new iam.PolicyStatement({\n        actions: [\n          \"iam:PassRole\"\n        ],\n        conditions: {\n          StringLike: {'iam:PassedToService': 'cognito-identity.amazonaws.com'}\n        },\n        resources: [\n          cognitoKibanaConfigureRole.roleArn\n        ]\n      })\n    ]\n  });\n  cognitoKibanaConfigureRolePolicy.attachToRole(cognitoKibanaConfigureRole);\n\n  let _cfnDomainProps = DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, options);\n\n  if (cfnDomainProps) {\n    _cfnDomainProps = overrideProps(_cfnDomainProps, cfnDomainProps);\n  }\n\n  const esDomain = new elasticsearch.CfnDomain(scope, \"ElasticsearchDomain\", _cfnDomainProps);\n  addCfnSuppressRules(esDomain, [\n    {\n      id: \"W28\",\n      reason: `The ES Domain is passed dynamically as as parameter and explicitly specified to ensure that IAM policies are configured to lockdown access to this specific ES instance only`,\n    },\n    {\n      id: \"W90\",\n      reason: `This is not a rule for the general case, just for specific use cases/industries`,\n    },\n  ]);\n\n  return [esDomain, cognitoKibanaConfigureRole];\n}\n\nexport function buildElasticSearchCWAlarms(scope: Construct): cloudwatch.Alarm[] {\n  // Setup CW Alarms for ES\n  const alarms: cloudwatch.Alarm[] = new Array();\n\n  // ClusterStatus.red maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'StatusRedAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterStatus.red',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'At least one primary shard and its replicas are not allocated to a node. '\n  }));\n\n  // ClusterStatus.yellow maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'StatusYellowAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterStatus.yellow',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'At least one replica shard is not allocated to a node.'\n  }));\n\n  // FreeStorageSpace minimum is <= 20480 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'FreeStorageSpaceTooLowAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'FreeStorageSpace',\n      statistic: 'Minimum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 20000,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'A node in your cluster is down to 20 GiB of free storage space.'\n  }));\n\n  // ClusterIndexWritesBlocked is >= 1 for 5 minutes, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'IndexWritesBlockedTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterIndexWritesBlocked',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(300),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Your cluster is blocking write requests.'\n  }));\n\n  // AutomatedSnapshotFailure maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'AutomatedSnapshotFailureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'AutomatedSnapshotFailure',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'An automated snapshot failed. This failure is often the result of a red cluster health status.'\n  }));\n\n  // CPUUtilization maximum is >= 80% for 15 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'CPUUtilizationTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'CPUUtilization',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 80,\n    evaluationPeriods: 3,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: '100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.'\n  }));\n\n  // JVMMemoryPressure maximum is >= 80% for 5 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'JVMMemoryPressureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'JVMMemoryPressure',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 80,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.'\n  }));\n\n  // MasterCPUUtilization maximum is >= 50% for 15 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'MasterCPUUtilizationTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'MasterCPUUtilization',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 50,\n    evaluationPeriods: 3,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.'\n  }));\n\n  // MasterJVMMemoryPressure maximum is >= 80% for 15 minutes, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'MasterJVMMemoryPressureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'MasterJVMMemoryPressure',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 50,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.'\n  }));\n\n  return alarms;\n}\n"]}
|
|
203
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"elasticsearch-helper.js","sourceRoot":"","sources":["elasticsearch-helper.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport * as elasticsearch from '@aws-cdk/aws-elasticsearch';\nimport { CfnDomainOptions, DefaultCfnDomainProps } from './elasticsearch-defaults';\nimport { consolidateProps, addCfnSuppressRules } from './utils';\nimport * as iam from '@aws-cdk/aws-iam';\nimport * as cdk from '@aws-cdk/core';\nimport * as cloudwatch from '@aws-cdk/aws-cloudwatch';\n// Note: To ensure CDKv2 compatibility, keep the import statement for Construct separate\nimport { Construct } from '@aws-cdk/core';\n\nexport function buildElasticSearch(scope: Construct, domainName: string,\n  options: CfnDomainOptions, cfnDomainProps?: elasticsearch.CfnDomainProps): [elasticsearch.CfnDomain, iam.Role] {\n\n  // Setup the IAM Role & policy for ES to configure Cognito User pool and Identity pool\n  const cognitoKibanaConfigureRole = new iam.Role(scope, 'CognitoKibanaConfigureRole', {\n    assumedBy: new iam.ServicePrincipal('es.amazonaws.com')\n  });\n\n  const cognitoKibanaConfigureRolePolicy = new iam.Policy(scope, 'CognitoKibanaConfigureRolePolicy', {\n    statements: [\n      new iam.PolicyStatement({\n        actions: [\n          \"cognito-idp:DescribeUserPool\",\n          \"cognito-idp:CreateUserPoolClient\",\n          \"cognito-idp:DeleteUserPoolClient\",\n          \"cognito-idp:DescribeUserPoolClient\",\n          \"cognito-idp:AdminInitiateAuth\",\n          \"cognito-idp:AdminUserGlobalSignOut\",\n          \"cognito-idp:ListUserPoolClients\",\n          \"cognito-identity:DescribeIdentityPool\",\n          \"cognito-identity:UpdateIdentityPool\",\n          \"cognito-identity:SetIdentityPoolRoles\",\n          \"cognito-identity:GetIdentityPoolRoles\",\n          \"es:UpdateElasticsearchDomainConfig\"\n        ],\n        resources: [\n          options.userpool.userPoolArn,\n          `arn:aws:cognito-identity:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:identitypool/${options.identitypool.ref}`,\n          `arn:aws:es:${cdk.Aws.REGION}:${cdk.Aws.ACCOUNT_ID}:domain/${domainName}`\n        ]\n      }),\n      new iam.PolicyStatement({\n        actions: [\n          \"iam:PassRole\"\n        ],\n        conditions: {\n          StringLike: { 'iam:PassedToService': 'cognito-identity.amazonaws.com' }\n        },\n        resources: [\n          cognitoKibanaConfigureRole.roleArn\n        ]\n      })\n    ]\n  });\n  cognitoKibanaConfigureRolePolicy.attachToRole(cognitoKibanaConfigureRole);\n\n  let _cfnDomainProps = DefaultCfnDomainProps(domainName, cognitoKibanaConfigureRole, options);\n\n  _cfnDomainProps = consolidateProps(_cfnDomainProps, cfnDomainProps);\n\n  const esDomain = new elasticsearch.CfnDomain(scope, \"ElasticsearchDomain\", _cfnDomainProps);\n  addCfnSuppressRules(esDomain, [\n    {\n      id: \"W28\",\n      reason: `The ES Domain is passed dynamically as as parameter and explicitly specified to ensure that IAM policies are configured to lockdown access to this specific ES instance only`,\n    },\n    {\n      id: \"W90\",\n      reason: `This is not a rule for the general case, just for specific use cases/industries`,\n    },\n  ]);\n\n  return [esDomain, cognitoKibanaConfigureRole];\n}\n\nexport function buildElasticSearchCWAlarms(scope: Construct): cloudwatch.Alarm[] {\n  // Setup CW Alarms for ES\n  const alarms: cloudwatch.Alarm[] = new Array();\n\n  // ClusterStatus.red maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'StatusRedAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterStatus.red',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'At least one primary shard and its replicas are not allocated to a node. '\n  }));\n\n  // ClusterStatus.yellow maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'StatusYellowAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterStatus.yellow',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'At least one replica shard is not allocated to a node.'\n  }));\n\n  // FreeStorageSpace minimum is <= 20480 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'FreeStorageSpaceTooLowAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'FreeStorageSpace',\n      statistic: 'Minimum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 20000,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.LESS_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'A node in your cluster is down to 20 GiB of free storage space.'\n  }));\n\n  // ClusterIndexWritesBlocked is >= 1 for 5 minutes, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'IndexWritesBlockedTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'ClusterIndexWritesBlocked',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(300),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Your cluster is blocking write requests.'\n  }));\n\n  // AutomatedSnapshotFailure maximum is >= 1 for 1 minute, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'AutomatedSnapshotFailureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'AutomatedSnapshotFailure',\n      statistic: 'Maximum',\n      period: cdk.Duration.seconds(60),\n    }),\n    threshold: 1,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'An automated snapshot failed. This failure is often the result of a red cluster health status.'\n  }));\n\n  // CPUUtilization maximum is >= 80% for 15 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'CPUUtilizationTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'CPUUtilization',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 80,\n    evaluationPeriods: 3,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: '100% CPU utilization is not uncommon, but sustained high usage is problematic. Consider using larger instance types or adding instances.'\n  }));\n\n  // JVMMemoryPressure maximum is >= 80% for 5 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'JVMMemoryPressureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'JVMMemoryPressure',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 80,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.'\n  }));\n\n  // MasterCPUUtilization maximum is >= 50% for 15 minutes, 3 consecutive times\n  alarms.push(new cloudwatch.Alarm(scope, 'MasterCPUUtilizationTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'MasterCPUUtilization',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 50,\n    evaluationPeriods: 3,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average CPU utilization over last 45 minutes too high. Consider using larger instance types for your dedicated master nodes.'\n  }));\n\n  // MasterJVMMemoryPressure maximum is >= 80% for 15 minutes, 1 consecutive time\n  alarms.push(new cloudwatch.Alarm(scope, 'MasterJVMMemoryPressureTooHighAlarm', {\n    metric: new cloudwatch.Metric({\n      namespace: 'AWS/ES',\n      metricName: 'MasterJVMMemoryPressure',\n      statistic: 'Average',\n      period: cdk.Duration.seconds(900),\n    }),\n    threshold: 50,\n    evaluationPeriods: 1,\n    comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n    alarmDescription: 'Average JVM memory pressure over last 15 minutes too high. Consider scaling vertically.'\n  }));\n\n  return alarms;\n}\n"]}
|
|
@@ -12,4 +12,5 @@
|
|
|
12
12
|
*/
|
|
13
13
|
import { CfnJobProps } from '@aws-cdk/aws-glue';
|
|
14
14
|
import { IRole } from '@aws-cdk/aws-iam';
|
|
15
|
-
|
|
15
|
+
import * as s3assets from "@aws-cdk/aws-s3-assets";
|
|
16
|
+
export declare function DefaultGlueJobProps(jobRole: IRole, userProvidedGlueJobProps: CfnJobProps | any, glueSecurityConfigName: string, defaultArguments: {}, etlCodeAsset?: s3assets.Asset): CfnJobProps;
|
package/lib/glue-job-defaults.js
CHANGED
|
@@ -13,11 +13,14 @@
|
|
|
13
13
|
*/
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.DefaultGlueJobProps = void 0;
|
|
16
|
-
function DefaultGlueJobProps(jobRole, userProvidedGlueJobProps, glueSecurityConfigName, defaultArguments) {
|
|
16
|
+
function DefaultGlueJobProps(jobRole, userProvidedGlueJobProps, glueSecurityConfigName, defaultArguments, etlCodeAsset) {
|
|
17
17
|
const glueVersion = userProvidedGlueJobProps.glueVersion;
|
|
18
18
|
// setting default to 2 to reduce cost
|
|
19
19
|
const maxCapacity = glueVersion === "1.0" && !(userProvidedGlueJobProps.workerType
|
|
20
20
|
|| userProvidedGlueJobProps.numberOfWorkers) ? 2 : undefined;
|
|
21
|
+
if (etlCodeAsset) {
|
|
22
|
+
userProvidedGlueJobProps.command.scriptLocation = etlCodeAsset.s3ObjectUrl;
|
|
23
|
+
}
|
|
21
24
|
const defaultGlueJobProps = {
|
|
22
25
|
command: userProvidedGlueJobProps.command,
|
|
23
26
|
role: jobRole.roleArn,
|
|
@@ -32,4 +35,4 @@ function DefaultGlueJobProps(jobRole, userProvidedGlueJobProps, glueSecurityConf
|
|
|
32
35
|
return defaultGlueJobProps;
|
|
33
36
|
}
|
|
34
37
|
exports.DefaultGlueJobProps = DefaultGlueJobProps;
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2x1ZS1qb2ItZGVmYXVsdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJnbHVlLWpvYi1kZWZhdWx0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7O0dBV0c7OztBQU1ILFNBQWdCLG1CQUFtQixDQUFDLE9BQWMsRUFBRSx3QkFBMkMsRUFDN0Ysc0JBQThCLEVBQUUsZ0JBQW9CLEVBQUUsWUFBNkI7SUFDbkYsTUFBTSxXQUFXLEdBQXVCLHdCQUF3QixDQUFDLFdBQVcsQ0FBQztJQUU3RSxzQ0FBc0M7SUFDdEMsTUFBTSxXQUFXLEdBQUcsV0FBVyxLQUFLLEtBQUssSUFBSSxDQUFDLENBQUMsd0JBQXdCLENBQUMsVUFBVTtXQUM3RSx3QkFBd0IsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFL0QsSUFBSSxZQUFZLEVBQUU7UUFDaEIsd0JBQXdCLENBQUMsT0FBTyxDQUFDLGNBQWMsR0FBRyxZQUFZLENBQUMsV0FBVyxDQUFDO0tBQzVFO0lBRUQsTUFBTSxtQkFBbUIsR0FBZ0I7UUFDdkMsT0FBTyxFQUFFLHdCQUF3QixDQUFDLE9BQVE7UUFDMUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxPQUFPO1FBQ3JCLHFCQUFxQixFQUFFLHNCQUFzQjtRQUM3QyxnQkFBZ0I7UUFDaEIsV0FBVztRQUNYLGVBQWUsRUFBRSxDQUFDLENBQUMsV0FBVyxJQUFJLFdBQVcsS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTO1FBQ3hFLFVBQVUsRUFBRSxDQUFDLENBQUMsV0FBVyxJQUFJLFdBQVcsS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxTQUFTO1FBQ3hFLHdIQUF3SDtRQUN4SCxXQUFXLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEtBQUs7S0FDL0MsQ0FBQztJQUVGLE9BQU8sbUJBQW1CLENBQUM7QUFDN0IsQ0FBQztBQXpCRCxrREF5QkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMiBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbmltcG9ydCB7IENmbkpvYlByb3BzIH0gZnJvbSAnQGF3cy1jZGsvYXdzLWdsdWUnO1xuaW1wb3J0IHsgSVJvbGUgfSBmcm9tICdAYXdzLWNkay9hd3MtaWFtJztcbmltcG9ydCAqIGFzIHMzYXNzZXRzIGZyb20gXCJAYXdzLWNkay9hd3MtczMtYXNzZXRzXCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBEZWZhdWx0R2x1ZUpvYlByb3BzKGpvYlJvbGU6IElSb2xlLCB1c2VyUHJvdmlkZWRHbHVlSm9iUHJvcHM6IENmbkpvYlByb3BzIHwgYW55LFxuICBnbHVlU2VjdXJpdHlDb25maWdOYW1lOiBzdHJpbmcsIGRlZmF1bHRBcmd1bWVudHM6IHt9LCBldGxDb2RlQXNzZXQ/OiBzM2Fzc2V0cy5Bc3NldCk6IENmbkpvYlByb3BzIHtcbiAgY29uc3QgZ2x1ZVZlcnNpb246IHN0cmluZyB8IHVuZGVmaW5lZCA9IHVzZXJQcm92aWRlZEdsdWVKb2JQcm9wcy5nbHVlVmVyc2lvbjtcblxuICAvLyBzZXR0aW5nIGRlZmF1bHQgdG8gMiB0byByZWR1Y2UgY29zdFxuICBjb25zdCBtYXhDYXBhY2l0eSA9IGdsdWVWZXJzaW9uID09PSBcIjEuMFwiICYmICEodXNlclByb3ZpZGVkR2x1ZUpvYlByb3BzLndvcmtlclR5cGVcbiAgICB8fCB1c2VyUHJvdmlkZWRHbHVlSm9iUHJvcHMubnVtYmVyT2ZXb3JrZXJzKSA/IDIgOiB1bmRlZmluZWQ7XG5cbiAgaWYgKGV0bENvZGVBc3NldCkge1xuICAgIHVzZXJQcm92aWRlZEdsdWVKb2JQcm9wcy5jb21tYW5kLnNjcmlwdExvY2F0aW9uID0gZXRsQ29kZUFzc2V0LnMzT2JqZWN0VXJsO1xuICB9XG5cbiAgY29uc3QgZGVmYXVsdEdsdWVKb2JQcm9wczogQ2ZuSm9iUHJvcHMgPSB7XG4gICAgY29tbWFuZDogdXNlclByb3ZpZGVkR2x1ZUpvYlByb3BzLmNvbW1hbmQhLFxuICAgIHJvbGU6IGpvYlJvbGUucm9sZUFybixcbiAgICBzZWN1cml0eUNvbmZpZ3VyYXRpb246IGdsdWVTZWN1cml0eUNvbmZpZ05hbWUsXG4gICAgZGVmYXVsdEFyZ3VtZW50cyxcbiAgICBtYXhDYXBhY2l0eSxcbiAgICBudW1iZXJPZldvcmtlcnM6ICghZ2x1ZVZlcnNpb24gfHwgZ2x1ZVZlcnNpb24gPT09IFwiMi4wXCIpID8gMiA6IHVuZGVmaW5lZCwgLy8gZGVmYXVsdGluZyB0byAyIHdvcmtlcnMsXG4gICAgd29ya2VyVHlwZTogKCFnbHVlVmVyc2lvbiB8fCBnbHVlVmVyc2lvbiA9PT0gXCIyLjBcIikgPyAnRy4xWCcgOiB1bmRlZmluZWQsIC8vIGRlZmF1bHRpbmcgdG8gRy4xWCBhcyBpdCBpcyBwcmVmZXJyZWQgd2l0aCBnbHVlIHZlcnNpb24gMi4wXG4gICAgLy8gZ2x1ZSB2ZXJzaW9uIHRob3VnaCBvcHRpb25hbCBpcyByZXF1aXJlZCBmb3Igc3RyZWFtaW5nIGV0bCBqb2JzIG90aGVyd2lzZSBpdCB0aHJvd3MgYW4gZXJyb3IgdGhhdCAnY29tbWFuZCBub3QgZm91bmQnXG4gICAgZ2x1ZVZlcnNpb246IGdsdWVWZXJzaW9uID8gZ2x1ZVZlcnNpb24gOiAnMi4wJ1xuICB9O1xuXG4gIHJldHVybiBkZWZhdWx0R2x1ZUpvYlByb3BzO1xufSJdfQ==
|
package/lib/glue-job-helper.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ import * as glue from '@aws-cdk/aws-glue';
|
|
|
14
14
|
import { IRole, Role } from '@aws-cdk/aws-iam';
|
|
15
15
|
import { Bucket, BucketProps } from '@aws-cdk/aws-s3';
|
|
16
16
|
import { Construct } from '@aws-cdk/core';
|
|
17
|
+
import * as s3assets from "@aws-cdk/aws-s3-assets";
|
|
17
18
|
/**
|
|
18
19
|
* Enumeration of data store types that could include S3, DynamoDB, DocumentDB, RDS or Redshift. Current
|
|
19
20
|
* construct implementation only supports S3, but potential to add other output types in the future
|
|
@@ -70,9 +71,15 @@ export interface BuildGlueJobProps {
|
|
|
70
71
|
* Output storage options
|
|
71
72
|
*/
|
|
72
73
|
readonly outputDataStore?: SinkDataStoreProps;
|
|
74
|
+
/**
|
|
75
|
+
* Asset instance for the ETL code that performs Glue Job transformation
|
|
76
|
+
*
|
|
77
|
+
* @default - None
|
|
78
|
+
*/
|
|
79
|
+
readonly etlCodeAsset?: s3assets.Asset;
|
|
73
80
|
}
|
|
74
81
|
export declare function buildGlueJob(scope: Construct, props: BuildGlueJobProps): [glue.CfnJob, IRole, [Bucket, (Bucket | undefined)?]?];
|
|
75
|
-
export declare function deployGlueJob(scope: Construct, glueJobProps: glue.CfnJobProps, database: glue.CfnDatabase, table: glue.CfnTable, outputDataStore: SinkDataStoreProps): [glue.CfnJob, IRole, [Bucket, (Bucket | undefined)?]];
|
|
82
|
+
export declare function deployGlueJob(scope: Construct, glueJobProps: glue.CfnJobProps, database: glue.CfnDatabase, table: glue.CfnTable, outputDataStore: SinkDataStoreProps, etlCodeAsset?: s3assets.Asset): [glue.CfnJob, IRole, [Bucket, (Bucket | undefined)?]];
|
|
76
83
|
/**
|
|
77
84
|
* This is a helper method to create the Role required for the Glue Job. If a role is already created then this
|
|
78
85
|
* method is not required to be called.
|
package/lib/glue-job-helper.js
CHANGED
|
@@ -38,7 +38,7 @@ function buildGlueJob(scope, props) {
|
|
|
38
38
|
throw Error('Cannot set MaxCapacity and "WorkerType" or "NumberOfWorkers". If using glueVersion 2.0 or beyond, ' +
|
|
39
39
|
'it is recommended to use "WorkerType" or "NumberOfWorkers"');
|
|
40
40
|
}
|
|
41
|
-
return deployGlueJob(scope, props.glueJobProps, props.database, props.table, props.outputDataStore);
|
|
41
|
+
return deployGlueJob(scope, props.glueJobProps, props.database, props.table, props.outputDataStore, props.etlCodeAsset);
|
|
42
42
|
}
|
|
43
43
|
else {
|
|
44
44
|
throw Error('Either glueJobProps or existingCfnJob is required');
|
|
@@ -49,7 +49,7 @@ function buildGlueJob(scope, props) {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
exports.buildGlueJob = buildGlueJob;
|
|
52
|
-
function deployGlueJob(scope, glueJobProps, database, table, outputDataStore) {
|
|
52
|
+
function deployGlueJob(scope, glueJobProps, database, table, outputDataStore, etlCodeAsset) {
|
|
53
53
|
let _glueSecurityConfigName;
|
|
54
54
|
if (glueJobProps.securityConfiguration === undefined) {
|
|
55
55
|
_glueSecurityConfigName = 'ETLJobSecurityConfig';
|
|
@@ -109,18 +109,21 @@ function deployGlueJob(scope, glueJobProps, database, table, outputDataStore) {
|
|
|
109
109
|
{ '--output_path': `s3a://${_outputLocation[0].bucketName}/output/` }),
|
|
110
110
|
...glueJobProps.defaultArguments
|
|
111
111
|
};
|
|
112
|
-
const _newGlueJobProps = utils_1.overrideProps(defaults.DefaultGlueJobProps(_jobRole, glueJobProps, _glueSecurityConfigName, _jobArgumentsList), glueJobProps);
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
112
|
+
const _newGlueJobProps = utils_1.overrideProps(defaults.DefaultGlueJobProps(_jobRole, glueJobProps, _glueSecurityConfigName, _jobArgumentsList, etlCodeAsset), glueJobProps);
|
|
113
|
+
if (etlCodeAsset) {
|
|
114
|
+
etlCodeAsset.grantRead(_jobRole);
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
// create CDK Bucket instance from S3 url and grant read access to Glue Job's service principal
|
|
118
|
+
if (isJobCommandProperty(_newGlueJobProps.command)) {
|
|
119
|
+
if (!_newGlueJobProps.command.scriptLocation) {
|
|
120
|
+
throw Error('Script location has to be provided as an s3 Url location. Script location cannot be empty');
|
|
121
|
+
}
|
|
122
|
+
const _scriptLocation = _newGlueJobProps.command.scriptLocation;
|
|
123
|
+
const _scriptBucketLocation = aws_s3_1.Bucket.fromBucketArn(scope, 'ScriptLocaiton', getS3ArnfromS3Url(_scriptLocation));
|
|
124
|
+
_scriptBucketLocation.grantRead(_jobRole);
|
|
120
125
|
}
|
|
121
126
|
}
|
|
122
|
-
const _scriptBucketLocation = aws_s3_1.Bucket.fromBucketArn(scope, 'ScriptLocaiton', getS3ArnfromS3Url(_scriptLocation));
|
|
123
|
-
_scriptBucketLocation.grantRead(_jobRole);
|
|
124
127
|
const _glueJob = new glue.CfnJob(scope, 'KinesisETLJob', _newGlueJobProps);
|
|
125
128
|
return [_glueJob, _jobRole, _outputLocation];
|
|
126
129
|
}
|
|
@@ -165,17 +168,23 @@ exports.createGlueDatabase = createGlueDatabase;
|
|
|
165
168
|
* @param s3Url
|
|
166
169
|
*/
|
|
167
170
|
function getS3ArnfromS3Url(s3Url) {
|
|
168
|
-
|
|
169
|
-
|
|
171
|
+
if (s3Url && s3Url.startsWith('s3://')) {
|
|
172
|
+
const splitString = s3Url.slice('s3://'.length);
|
|
173
|
+
return `arn:${core_1.Aws.PARTITION}:s3:::${splitString}`;
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
throw Error(`Received S3URL as ${s3Url}. The S3 url string does not begin with s3://. This is not a standard S3 url`);
|
|
177
|
+
}
|
|
170
178
|
}
|
|
171
179
|
/**
|
|
172
|
-
* A utility method to type check CfnJob.JobCommandProperty type.
|
|
180
|
+
* A utility method to type check CfnJob.JobCommandProperty type. For the construct to work for streaming ETL from Kinesis Data
|
|
181
|
+
* Streams, all three attributes of the JobCommandProperty are required, even though they may be optional for other use cases.
|
|
173
182
|
*
|
|
174
183
|
* @param command
|
|
175
184
|
*/
|
|
176
185
|
function isJobCommandProperty(command) {
|
|
177
|
-
if (command.name
|
|
178
|
-
command.pythonVersion
|
|
186
|
+
if (command.name &&
|
|
187
|
+
command.pythonVersion &&
|
|
179
188
|
command.scriptLocation) {
|
|
180
189
|
return true;
|
|
181
190
|
}
|
|
@@ -184,4 +193,4 @@ function isJobCommandProperty(command) {
|
|
|
184
193
|
return false;
|
|
185
194
|
}
|
|
186
195
|
}
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"glue-job-helper.js","sourceRoot":"","sources":["glue-job-helper.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport * as glue from '@aws-cdk/aws-glue';\nimport { Effect, IRole, Policy, PolicyStatement, Role, ServicePrincipal } from '@aws-cdk/aws-iam';\nimport { Bucket, BucketProps, IBucket } from '@aws-cdk/aws-s3';\nimport { Aws, Construct, IResolvable } from '@aws-cdk/core';\nimport * as defaults from '../';\nimport { overrideProps } from './utils';\n\n/**\n * Enumeration of data store types that could include S3, DynamoDB, DocumentDB, RDS or Redshift. Current\n * construct implementation only supports S3, but potential to add other output types in the future\n */\nexport enum SinkStoreType {\n  S3 = 'S3'\n}\n\n/**\n * Interface to define potential outputs to allow the construct define additional output destinations for ETL\n * transformation\n */\nexport interface SinkDataStoreProps {\n  /**\n   * Sink data store type\n   */\n  readonly datastoreType: SinkStoreType;\n  /**\n   * The output S3 location where the data should be written. The provided S3 bucket will be used to pass\n   * the output location to the etl script as an argument to the AWS Glue job.\n   *\n   * If no location is provided, it will check if @outputBucketProps are provided. If not it will create a new\n   * bucket if the @datastoreType is S3.\n   *\n   * The argument key is `output_path`. The value of the argument can be retrieve in the python script\n   * as follows:\n   *  getResolvedOptions(sys.argv, [\"JOB_NAME\", \"output_path\", <other arguments that are passed> ])\n   *  output_path = args[\"output_path\"]\n   */\n  readonly existingS3OutputBucket?: Bucket\n  /**\n   * If @existingS3OutputBUcket is provided, this parameter is ignored. If this parameter is not provided,\n   * the construct will create a new bucket if the @datastoreType is S3.\n   */\n  readonly outputBucketProps?: BucketProps;\n}\n\nexport interface BuildGlueJobProps {\n  /**\n   * Glue ETL job properties.\n   */\n  readonly glueJobProps?: glue.CfnJobProps | any\n  /**\n   * Existing instance of the S3 bucket object, if this is set then the script location is ignored.\n   */\n  readonly existingCfnJob?: glue.CfnJob;\n  /**\n   * AWS Glue table\n   */\n  readonly table: glue.CfnTable;\n  /**\n   * AWS Glue database\n   */\n  readonly database: glue.CfnDatabase;\n  /**\n   * Output storage options\n   */\n  readonly outputDataStore?: SinkDataStoreProps\n}\n\nexport function buildGlueJob(scope: Construct, props: BuildGlueJobProps): [glue.CfnJob, IRole, [Bucket, (Bucket | undefined)?]?] {\n  if (!props.existingCfnJob) {\n    if (props.glueJobProps) {\n      if (props.glueJobProps.glueVersion === '2.0' && props.glueJobProps.maxCapacity) {\n        throw Error('Cannot set \"MaxCapacity\" with GlueVersion 2.0 or higher. Use \"NumberOfWorkers\" and \"WorkerType\". ' +\n        'Refer the API documentation https://docs.aws.amazon.com/glue/latest/webapi/API_Job.html for more details');\n      }\n\n      if (props.glueJobProps.maxCapacity && (props.glueJobProps.numberOfWorkers || props.glueJobProps.workerType)) {\n        throw Error('Cannot set MaxCapacity and \"WorkerType\" or  \"NumberOfWorkers\". If using glueVersion 2.0 or beyond, ' +\n        'it is recommended to use \"WorkerType\" or  \"NumberOfWorkers\"');\n      }\n\n      return deployGlueJob(scope, props.glueJobProps, props.database!, props.table!, props.outputDataStore!);\n    } else {\n      throw Error('Either glueJobProps or existingCfnJob is required');\n    }\n  } else {\n    return [props.existingCfnJob, Role.fromRoleArn(scope, 'ExistingRole', props.existingCfnJob.role)];\n  }\n}\n\nexport function deployGlueJob(scope: Construct, glueJobProps: glue.CfnJobProps, database: glue.CfnDatabase, table: glue.CfnTable,\n  outputDataStore: SinkDataStoreProps): [glue.CfnJob, IRole, [Bucket, (Bucket | undefined)?]] {\n\n  let _glueSecurityConfigName: string;\n\n  if (glueJobProps.securityConfiguration === undefined) {\n    _glueSecurityConfigName = 'ETLJobSecurityConfig';\n    const _glueKMSKey = `arn:${Aws.PARTITION}:kms:${Aws.REGION}:${Aws.ACCOUNT_ID}:alias/aws/glue`;\n\n    new glue.CfnSecurityConfiguration(scope, 'GlueSecurityConfig', {\n      name: _glueSecurityConfigName,\n      encryptionConfiguration: {\n        jobBookmarksEncryption: {\n          jobBookmarksEncryptionMode: 'CSE-KMS',\n          kmsKeyArn: _glueKMSKey\n        },\n        s3Encryptions: [{\n          s3EncryptionMode: 'SSE-S3'\n        }]\n      }\n    });\n  } else {\n    _glueSecurityConfigName = glueJobProps.securityConfiguration;\n  }\n\n  const _glueJobPolicy = new Policy(scope, 'LogPolicy', {\n    statements: [\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [ 'logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents' ],\n        resources: [ `arn:${Aws.PARTITION}:logs:${Aws.REGION}:${Aws.ACCOUNT_ID}:log-group:/aws-glue/*` ]\n      })\n    ]\n  });\n\n  let _jobRole: IRole;\n  if (glueJobProps.role) {\n    _jobRole = Role.fromRoleArn(scope, 'JobRole', glueJobProps.role);\n  } else {\n    _jobRole = defaults.createGlueJobRole(scope);\n  }\n\n  _glueJobPolicy.attachToRole(_jobRole);\n\n  let _outputLocation: [ Bucket, Bucket? ];\n  if (outputDataStore !== undefined && outputDataStore.datastoreType === SinkStoreType.S3) {\n    if (outputDataStore.existingS3OutputBucket !== undefined) {\n      _outputLocation = [ outputDataStore.existingS3OutputBucket, undefined ];\n    } else {\n      _outputLocation = defaults.buildS3Bucket(scope, { bucketProps: outputDataStore.outputBucketProps } );\n    }\n  } else {\n    _outputLocation = defaults.buildS3Bucket(scope, {});\n  }\n\n  _outputLocation[0].grantReadWrite(_jobRole);\n\n  const _jobArgumentsList = {\n    \"--enable-metrics\" : true,\n    \"--enable-continuous-cloudwatch-log\" : true,\n    \"--database_name\": database.ref,\n    \"--table_name\": table.ref,\n    ...((outputDataStore === undefined || (outputDataStore && outputDataStore.datastoreType === SinkStoreType.S3)) &&\n      { '--output_path' : `s3a://${_outputLocation[0].bucketName}/output/` }),\n    ...glueJobProps.defaultArguments\n  };\n\n  const _newGlueJobProps: glue.CfnJobProps = overrideProps(defaults.DefaultGlueJobProps(_jobRole!, glueJobProps,\n    _glueSecurityConfigName, _jobArgumentsList), glueJobProps);\n\n  let _scriptLocation: string;\n  if (isJobCommandProperty(_newGlueJobProps.command)) {\n    if (_newGlueJobProps.command.scriptLocation) {\n      _scriptLocation = _newGlueJobProps.command.scriptLocation;\n    } else {\n      throw Error('Script location has to be provided as an s3 Url location. Script location cannot be empty');\n    }\n  }\n\n  const _scriptBucketLocation: IBucket = Bucket.fromBucketArn(scope, 'ScriptLocaiton', getS3ArnfromS3Url(_scriptLocation!));\n  _scriptBucketLocation.grantRead(_jobRole);\n\n  const _glueJob: glue.CfnJob = new glue.CfnJob(scope, 'KinesisETLJob', _newGlueJobProps);\n  return [_glueJob, _jobRole, _outputLocation];\n}\n\n/**\n * This is a helper method to create the Role required for the Glue Job. If a role is already created then this\n * method is not required to be called.\n *\n * @param scope - The AWS Construct under which the role is to be created\n */\nexport function createGlueJobRole(scope: Construct): Role {\n  return new Role(scope, 'JobRole', {\n    assumedBy: new ServicePrincipal('glue.amazonaws.com'),\n    description: 'Service role that Glue custom ETL jobs will assume for exeuction',\n  });\n}\n\n/**\n * This method creates an AWS Glue table. The method is called when an existing Glue table is not provided\n */\nexport function createGlueTable(scope: Construct, database: glue.CfnDatabase, tableProps?: glue.CfnTableProps,\n  fieldSchema?: glue.CfnTable.ColumnProperty [], sourceType?: string, parameters?: any): glue.CfnTable {\n  return defaults.DefaultGlueTable(scope, tableProps !== undefined ? tableProps :\n    defaults.DefaultGlueTableProps(database, fieldSchema!, sourceType, parameters));\n}\n\n/**\n * This method creates an AWS Glue database. The method is only called with an existing Glue database type is not provided.\n * The method uses the user provided props to override the defaul props for the Glue database\n *\n * @param scope\n * @param databaseProps\n */\nexport function createGlueDatabase(scope: Construct,  databaseProps?: glue.CfnDatabaseProps): glue.CfnDatabase {\n  const _mergedDBProps: glue.CfnDatabaseProps = (databaseProps !== undefined) ? overrideProps(defaults.DefaultGlueDatabaseProps(), databaseProps) :\n    defaults.DefaultGlueDatabaseProps();\n  return defaults.DefaultGlueDatabase(scope, _mergedDBProps);\n}\n\n/**\n * A utility method to generate the S3 Arn from an S3 Url.\n *\n * @param s3Url\n */\nfunction getS3ArnfromS3Url(s3Url: string): string {\n  const splitString: string = s3Url.slice('s3://'.length);\n  return `arn:${Aws.PARTITION}:s3:::${splitString}`;\n}\n\n/**\n * A utility method to type check CfnJob.JobCommandProperty type.\n *\n * @param command\n */\nfunction isJobCommandProperty(command: glue.CfnJob.JobCommandProperty | IResolvable): command is glue.CfnJob.JobCommandProperty {\n  if ((command as glue.CfnJob.JobCommandProperty).name ||\n    (command as glue.CfnJob.JobCommandProperty).pythonVersion ||\n    (command as glue.CfnJob.JobCommandProperty).scriptLocation) {\n    return true;\n  } else {\n    defaults.printWarning('command not of type JobCommandProperty type');\n    return false;\n  }\n}"]}
|
|
196
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"glue-job-helper.js","sourceRoot":"","sources":["glue-job-helper.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n *  Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n *\n *  Licensed under the Apache License, Version 2.0 (the \"License\"). You may not use this file except in compliance\n *  with the License. A copy of the License is located at\n *\n *      http://www.apache.org/licenses/LICENSE-2.0\n *\n *  or in the 'license' file accompanying this file. This file is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES\n *  OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions\n *  and limitations under the License.\n */\n\nimport * as glue from '@aws-cdk/aws-glue';\nimport { Effect, IRole, Policy, PolicyStatement, Role, ServicePrincipal } from '@aws-cdk/aws-iam';\nimport { Bucket, BucketProps, IBucket } from '@aws-cdk/aws-s3';\nimport { Aws, Construct, IResolvable } from '@aws-cdk/core';\nimport * as s3assets from \"@aws-cdk/aws-s3-assets\";\nimport * as defaults from '../';\nimport { overrideProps } from './utils';\n\n/**\n * Enumeration of data store types that could include S3, DynamoDB, DocumentDB, RDS or Redshift. Current\n * construct implementation only supports S3, but potential to add other output types in the future\n */\nexport enum SinkStoreType {\n  S3 = 'S3'\n}\n\n/**\n * Interface to define potential outputs to allow the construct define additional output destinations for ETL\n * transformation\n */\nexport interface SinkDataStoreProps {\n  /**\n   * Sink data store type\n   */\n  readonly datastoreType: SinkStoreType;\n  /**\n   * The output S3 location where the data should be written. The provided S3 bucket will be used to pass\n   * the output location to the etl script as an argument to the AWS Glue job.\n   *\n   * If no location is provided, it will check if @outputBucketProps are provided. If not it will create a new\n   * bucket if the @datastoreType is S3.\n   *\n   * The argument key is `output_path`. The value of the argument can be retrieve in the python script\n   * as follows:\n   *  getResolvedOptions(sys.argv, [\"JOB_NAME\", \"output_path\", <other arguments that are passed> ])\n   *  output_path = args[\"output_path\"]\n   */\n  readonly existingS3OutputBucket?: Bucket\n  /**\n   * If @existingS3OutputBUcket is provided, this parameter is ignored. If this parameter is not provided,\n   * the construct will create a new bucket if the @datastoreType is S3.\n   */\n  readonly outputBucketProps?: BucketProps;\n}\n\nexport interface BuildGlueJobProps {\n  /**\n   * Glue ETL job properties.\n   */\n  readonly glueJobProps?: glue.CfnJobProps | any\n  /**\n   * Existing instance of the S3 bucket object, if this is set then the script location is ignored.\n   */\n  readonly existingCfnJob?: glue.CfnJob;\n  /**\n   * AWS Glue table\n   */\n  readonly table: glue.CfnTable;\n  /**\n   * AWS Glue database\n   */\n  readonly database: glue.CfnDatabase;\n  /**\n   * Output storage options\n   */\n  readonly outputDataStore?: SinkDataStoreProps\n  /**\n   * Asset instance for the ETL code that performs Glue Job transformation\n   *\n   * @default - None\n   */\n   readonly etlCodeAsset?: s3assets.Asset;\n}\n\nexport function buildGlueJob(scope: Construct, props: BuildGlueJobProps): [glue.CfnJob, IRole, [Bucket, (Bucket | undefined)?]?] {\n  if (!props.existingCfnJob) {\n    if (props.glueJobProps) {\n      if (props.glueJobProps.glueVersion === '2.0' && props.glueJobProps.maxCapacity) {\n        throw Error('Cannot set \"MaxCapacity\" with GlueVersion 2.0 or higher. Use \"NumberOfWorkers\" and \"WorkerType\". ' +\n        'Refer the API documentation https://docs.aws.amazon.com/glue/latest/webapi/API_Job.html for more details');\n      }\n\n      if (props.glueJobProps.maxCapacity && (props.glueJobProps.numberOfWorkers || props.glueJobProps.workerType)) {\n        throw Error('Cannot set MaxCapacity and \"WorkerType\" or  \"NumberOfWorkers\". If using glueVersion 2.0 or beyond, ' +\n        'it is recommended to use \"WorkerType\" or  \"NumberOfWorkers\"');\n      }\n\n      return deployGlueJob(scope, props.glueJobProps, props.database!, props.table!, props.outputDataStore!, props.etlCodeAsset);\n    } else {\n      throw Error('Either glueJobProps or existingCfnJob is required');\n    }\n  } else {\n    return [props.existingCfnJob, Role.fromRoleArn(scope, 'ExistingRole', props.existingCfnJob.role)];\n  }\n}\n\nexport function deployGlueJob(scope: Construct, glueJobProps: glue.CfnJobProps, database: glue.CfnDatabase, table: glue.CfnTable,\n  outputDataStore: SinkDataStoreProps, etlCodeAsset?: s3assets.Asset): [glue.CfnJob, IRole, [Bucket, (Bucket | undefined)?]] {\n\n  let _glueSecurityConfigName: string;\n\n  if (glueJobProps.securityConfiguration === undefined) {\n    _glueSecurityConfigName = 'ETLJobSecurityConfig';\n    const _glueKMSKey = `arn:${Aws.PARTITION}:kms:${Aws.REGION}:${Aws.ACCOUNT_ID}:alias/aws/glue`;\n\n    new glue.CfnSecurityConfiguration(scope, 'GlueSecurityConfig', {\n      name: _glueSecurityConfigName,\n      encryptionConfiguration: {\n        jobBookmarksEncryption: {\n          jobBookmarksEncryptionMode: 'CSE-KMS',\n          kmsKeyArn: _glueKMSKey\n        },\n        s3Encryptions: [{\n          s3EncryptionMode: 'SSE-S3'\n        }]\n      }\n    });\n  } else {\n    _glueSecurityConfigName = glueJobProps.securityConfiguration;\n  }\n\n  const _glueJobPolicy = new Policy(scope, 'LogPolicy', {\n    statements: [\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: [ 'logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents' ],\n        resources: [ `arn:${Aws.PARTITION}:logs:${Aws.REGION}:${Aws.ACCOUNT_ID}:log-group:/aws-glue/*` ]\n      })\n    ]\n  });\n\n  let _jobRole: IRole;\n  if (glueJobProps.role) {\n    _jobRole = Role.fromRoleArn(scope, 'JobRole', glueJobProps.role);\n  } else {\n    _jobRole = defaults.createGlueJobRole(scope);\n  }\n\n  _glueJobPolicy.attachToRole(_jobRole);\n\n  let _outputLocation: [ Bucket, Bucket? ];\n  if (outputDataStore !== undefined && outputDataStore.datastoreType === SinkStoreType.S3) {\n    if (outputDataStore.existingS3OutputBucket !== undefined) {\n      _outputLocation = [ outputDataStore.existingS3OutputBucket, undefined ];\n    } else {\n      _outputLocation = defaults.buildS3Bucket(scope, { bucketProps: outputDataStore.outputBucketProps } );\n    }\n  } else {\n    _outputLocation = defaults.buildS3Bucket(scope, {});\n  }\n\n  _outputLocation[0].grantReadWrite(_jobRole);\n\n  const _jobArgumentsList = {\n    \"--enable-metrics\" : true,\n    \"--enable-continuous-cloudwatch-log\" : true,\n    \"--database_name\": database.ref,\n    \"--table_name\": table.ref,\n    ...((outputDataStore === undefined || (outputDataStore && outputDataStore.datastoreType === SinkStoreType.S3)) &&\n      { '--output_path' : `s3a://${_outputLocation[0].bucketName}/output/` }),\n    ...glueJobProps.defaultArguments\n  };\n\n  const _newGlueJobProps: glue.CfnJobProps = overrideProps(defaults.DefaultGlueJobProps(_jobRole!, glueJobProps,\n    _glueSecurityConfigName, _jobArgumentsList, etlCodeAsset), glueJobProps);\n  if (etlCodeAsset) {\n    etlCodeAsset.grantRead(_jobRole);\n  } else {\n    // create CDK Bucket instance from S3 url and grant read access to Glue Job's service principal\n    if (isJobCommandProperty(_newGlueJobProps.command)) {\n      if (!_newGlueJobProps.command.scriptLocation) {\n        throw Error('Script location has to be provided as an s3 Url location. Script location cannot be empty');\n      }\n      const _scriptLocation = _newGlueJobProps.command.scriptLocation;\n\n      const _scriptBucketLocation: IBucket = Bucket.fromBucketArn(scope, 'ScriptLocaiton', getS3ArnfromS3Url(_scriptLocation!));\n      _scriptBucketLocation.grantRead(_jobRole);\n    }\n  }\n\n  const _glueJob: glue.CfnJob = new glue.CfnJob(scope, 'KinesisETLJob', _newGlueJobProps);\n  return [_glueJob, _jobRole, _outputLocation];\n}\n\n/**\n * This is a helper method to create the Role required for the Glue Job. If a role is already created then this\n * method is not required to be called.\n *\n * @param scope - The AWS Construct under which the role is to be created\n */\nexport function createGlueJobRole(scope: Construct): Role {\n  return new Role(scope, 'JobRole', {\n    assumedBy: new ServicePrincipal('glue.amazonaws.com'),\n    description: 'Service role that Glue custom ETL jobs will assume for exeuction',\n  });\n}\n\n/**\n * This method creates an AWS Glue table. The method is called when an existing Glue table is not provided\n */\nexport function createGlueTable(scope: Construct, database: glue.CfnDatabase, tableProps?: glue.CfnTableProps,\n  fieldSchema?: glue.CfnTable.ColumnProperty [], sourceType?: string, parameters?: any): glue.CfnTable {\n  return defaults.DefaultGlueTable(scope, tableProps !== undefined ? tableProps :\n    defaults.DefaultGlueTableProps(database, fieldSchema!, sourceType, parameters));\n}\n\n/**\n * This method creates an AWS Glue database. The method is only called with an existing Glue database type is not provided.\n * The method uses the user provided props to override the defaul props for the Glue database\n *\n * @param scope\n * @param databaseProps\n */\nexport function createGlueDatabase(scope: Construct,  databaseProps?: glue.CfnDatabaseProps): glue.CfnDatabase {\n  const _mergedDBProps: glue.CfnDatabaseProps = (databaseProps !== undefined) ? overrideProps(defaults.DefaultGlueDatabaseProps(), databaseProps) :\n    defaults.DefaultGlueDatabaseProps();\n  return defaults.DefaultGlueDatabase(scope, _mergedDBProps);\n}\n\n/**\n * A utility method to generate the S3 Arn from an S3 Url.\n *\n * @param s3Url\n */\nfunction getS3ArnfromS3Url(s3Url: string): string {\n  if (s3Url && s3Url.startsWith('s3://')) {\n    const splitString: string = s3Url.slice('s3://'.length);\n    return `arn:${Aws.PARTITION}:s3:::${splitString}`;\n  } else {\n    throw Error(`Received S3URL as ${s3Url}. The S3 url string does not begin with s3://. This is not a standard S3 url`);\n  }\n}\n\n/**\n * A utility method to type check CfnJob.JobCommandProperty type. For the construct to work for streaming ETL from Kinesis Data\n * Streams, all three attributes of the JobCommandProperty are required, even though they may be optional for other use cases.\n *\n * @param command\n */\nfunction isJobCommandProperty(command: glue.CfnJob.JobCommandProperty | IResolvable): command is glue.CfnJob.JobCommandProperty {\n  if ((command as glue.CfnJob.JobCommandProperty).name &&\n    (command as glue.CfnJob.JobCommandProperty).pythonVersion &&\n    (command as glue.CfnJob.JobCommandProperty).scriptLocation) {\n    return true;\n  } else {\n    defaults.printWarning('command not of type JobCommandProperty type');\n    return false;\n  }\n}"]}
|
|
@@ -25,14 +25,8 @@ function buildKinesisStream(scope, props) {
|
|
|
25
25
|
}
|
|
26
26
|
// Setup the stream properties
|
|
27
27
|
let kinesisStreamProps;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
kinesisStreamProps = utils_1.overrideProps(kinesis_streams_defaults_1.DefaultStreamProps, props.kinesisStreamProps);
|
|
31
|
-
}
|
|
32
|
-
else {
|
|
33
|
-
// If no property overrides, deploy using the default configuration
|
|
34
|
-
kinesisStreamProps = kinesis_streams_defaults_1.DefaultStreamProps;
|
|
35
|
-
}
|
|
28
|
+
// If property overrides have been provided, incorporate them and deploy
|
|
29
|
+
kinesisStreamProps = utils_1.consolidateProps(kinesis_streams_defaults_1.DefaultStreamProps, props.kinesisStreamProps);
|
|
36
30
|
// Create the stream and return
|
|
37
31
|
return new kinesis.Stream(scope, 'KinesisStream', kinesisStreamProps);
|
|
38
32
|
}
|
|
@@ -69,4 +63,4 @@ function buildKinesisStreamCWAlarms(scope) {
|
|
|
69
63
|
return alarms;
|
|
70
64
|
}
|
|
71
65
|
exports.buildKinesisStreamCWAlarms = buildKinesisStreamCWAlarms;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia2luZXNpcy1zdHJlYW1zLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImtpbmVzaXMtc3RyZWFtcy1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOzs7QUFFSCxVQUFVO0FBQ1YsZ0RBQWdEO0FBQ2hELHlFQUFnRTtBQUNoRSxxQ0FBcUM7QUFDckMsbUNBQTJDO0FBQzNDLHNEQUFzRDtBQW9CdEQsU0FBZ0Isa0JBQWtCLENBQUMsS0FBZ0IsRUFBRSxLQUE4QjtJQUVqRixJQUFJLEtBQUssQ0FBQyxpQkFBaUIsRUFBRTtRQUMzQixPQUFPLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQztLQUNoQztJQUVELDhCQUE4QjtJQUM5QixJQUFJLGtCQUFrQixDQUFDO0lBQ3ZCLHdFQUF3RTtJQUN4RSxrQkFBa0IsR0FBRyx3QkFBZ0IsQ0FBQyw2Q0FBa0IsRUFBRSxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUVwRiwrQkFBK0I7SUFDL0IsT0FBTyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO0FBQ3hFLENBQUM7QUFiRCxnREFhQztBQUVELFNBQWdCLDBCQUEwQixDQUFDLEtBQWdCO0lBQ3pELG9DQUFvQztJQUNwQyxNQUFNLE1BQU0sR0FBdUIsSUFBSSxLQUFLLEVBQUUsQ0FBQztJQUUvQyw0R0FBNEc7SUFDNUcsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLHlDQUF5QyxFQUFFO1FBQ2pGLE1BQU0sRUFBRSxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUM7WUFDNUIsU0FBUyxFQUFFLGFBQWE7WUFDeEIsVUFBVSxFQUFFLG9DQUFvQztZQUNoRCxTQUFTLEVBQUUsU0FBUztZQUNwQixNQUFNLEVBQUUsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1NBQ2hDLENBQUM7UUFDRixTQUFTLEVBQUUsT0FBTztRQUNsQixpQkFBaUIsRUFBRSxDQUFDO1FBQ3BCLGtCQUFrQixFQUFFLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxrQ0FBa0M7UUFDcEYsZ0JBQWdCLEVBQUUsa0dBQWtHO0tBQ3JILENBQUMsQ0FBQyxDQUFDO0lBRUosd0RBQXdEO0lBQ3hELE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxxREFBcUQsRUFBRTtRQUM3RixNQUFNLEVBQUUsSUFBSSxVQUFVLENBQUMsTUFBTSxDQUFDO1lBQzVCLFNBQVMsRUFBRSxhQUFhO1lBQ3hCLFVBQVUsRUFBRSxtQ0FBbUM7WUFDL0MsU0FBUyxFQUFFLFNBQVM7WUFDcEIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztTQUNoQyxDQUFDO1FBQ0YsU0FBUyxFQUFFLENBQUM7UUFDWixpQkFBaUIsRUFBRSxDQUFDO1FBQ3BCLGtCQUFrQixFQUFFLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQyxzQkFBc0I7UUFDeEUsZ0JBQWdCLEVBQUUsaUVBQWlFO0tBQ3BGLENBQUMsQ0FBQyxDQUFDO0lBRUosT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQWpDRCxnRUFpQ0MiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMiBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbi8vIEltcG9ydHNcbmltcG9ydCAqIGFzIGtpbmVzaXMgZnJvbSAnQGF3cy1jZGsvYXdzLWtpbmVzaXMnO1xuaW1wb3J0IHsgRGVmYXVsdFN0cmVhbVByb3BzIH0gZnJvbSAnLi9raW5lc2lzLXN0cmVhbXMtZGVmYXVsdHMnO1xuaW1wb3J0ICogYXMgY2RrIGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuaW1wb3J0IHsgY29uc29saWRhdGVQcm9wcyB9IGZyb20gJy4vdXRpbHMnO1xuaW1wb3J0ICogYXMgY2xvdWR3YXRjaCBmcm9tICdAYXdzLWNkay9hd3MtY2xvdWR3YXRjaCc7XG4vLyBOb3RlOiBUbyBlbnN1cmUgQ0RLdjIgY29tcGF0aWJpbGl0eSwga2VlcCB0aGUgaW1wb3J0IHN0YXRlbWVudCBmb3IgQ29uc3RydWN0IHNlcGFyYXRlXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tICdAYXdzLWNkay9jb3JlJztcblxuZXhwb3J0IGludGVyZmFjZSBCdWlsZEtpbmVzaXNTdHJlYW1Qcm9wcyB7XG4gIC8qKlxuICAgKiBFeGlzdGluZyBpbnN0YW5jZSBvZiBLaW5lc2lzIFN0cmVhbSwgcHJvdmlkaW5nIGJvdGggdGhpcyBhbmQgYGtpbmVzaXNTdHJlYW1Qcm9wc2Agd2lsbCBjYXVzZSBhbiBlcnJvci5cbiAgICpcbiAgICogQGRlZmF1bHQgLSBOb25lXG4gICAqL1xuICByZWFkb25seSBleGlzdGluZ1N0cmVhbU9iaj86IGtpbmVzaXMuU3RyZWFtO1xuXG4gIC8qKlxuICAgKiBPcHRpb25hbCB1c2VyIHByb3ZpZGVkIHByb3BzIHRvIG92ZXJyaWRlIHRoZSBkZWZhdWx0IHByb3BzIGZvciB0aGUgS2luZXNpcyBzdHJlYW0uXG4gICAqXG4gICAqIEBkZWZhdWx0IC0gRGVmYXVsdCBwcm9wcyBhcmUgdXNlZC5cbiAgICovXG4gIHJlYWRvbmx5IGtpbmVzaXNTdHJlYW1Qcm9wcz86IGtpbmVzaXMuU3RyZWFtUHJvcHNcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkS2luZXNpc1N0cmVhbShzY29wZTogQ29uc3RydWN0LCBwcm9wczogQnVpbGRLaW5lc2lzU3RyZWFtUHJvcHMpOiBraW5lc2lzLlN0cmVhbSB7XG5cbiAgaWYgKHByb3BzLmV4aXN0aW5nU3RyZWFtT2JqKSB7XG4gICAgcmV0dXJuIHByb3BzLmV4aXN0aW5nU3RyZWFtT2JqO1xuICB9XG5cbiAgLy8gU2V0dXAgdGhlIHN0cmVhbSBwcm9wZXJ0aWVzXG4gIGxldCBraW5lc2lzU3RyZWFtUHJvcHM7XG4gIC8vIElmIHByb3BlcnR5IG92ZXJyaWRlcyBoYXZlIGJlZW4gcHJvdmlkZWQsIGluY29ycG9yYXRlIHRoZW0gYW5kIGRlcGxveVxuICBraW5lc2lzU3RyZWFtUHJvcHMgPSBjb25zb2xpZGF0ZVByb3BzKERlZmF1bHRTdHJlYW1Qcm9wcywgcHJvcHMua2luZXNpc1N0cmVhbVByb3BzKTtcblxuICAvLyBDcmVhdGUgdGhlIHN0cmVhbSBhbmQgcmV0dXJuXG4gIHJldHVybiBuZXcga2luZXNpcy5TdHJlYW0oc2NvcGUsICdLaW5lc2lzU3RyZWFtJywga2luZXNpc1N0cmVhbVByb3BzKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGJ1aWxkS2luZXNpc1N0cmVhbUNXQWxhcm1zKHNjb3BlOiBDb25zdHJ1Y3QpOiBjbG91ZHdhdGNoLkFsYXJtW10ge1xuICAvLyBTZXR1cCBDVyBBbGFybXMgZm9yIEtpbmVzaXNTdHJlYW1cbiAgY29uc3QgYWxhcm1zOiBjbG91ZHdhdGNoLkFsYXJtW10gPSBuZXcgQXJyYXkoKTtcblxuICAvLyBBbGFybSBpZiBNYXggKEdldFJlY29yZHMuSXRlcmF0b3JBZ2VNaWxsaXNlY29uZHMpOiA+PSAxMiBob3VycyAoNTAlIG9mIDI0IGhvdXJzIGRlZmF1bHQgcmV0ZW50aW9uIHBlcmlvZClcbiAgYWxhcm1zLnB1c2gobmV3IGNsb3Vkd2F0Y2guQWxhcm0oc2NvcGUsICdLaW5lc2lzU3RyZWFtR2V0UmVjb3Jkc0l0ZXJhdG9yQWdlQWxhcm0nLCB7XG4gICAgbWV0cmljOiBuZXcgY2xvdWR3YXRjaC5NZXRyaWMoe1xuICAgICAgbmFtZXNwYWNlOiAnQVdTL0tpbmVzaXMnLFxuICAgICAgbWV0cmljTmFtZTogJ0dldFJlY29yZHMuSXRlcmF0b3JBZ2VNaWxsaXNlY29uZHMnLFxuICAgICAgc3RhdGlzdGljOiAnTWF4aW11bScsXG4gICAgICBwZXJpb2Q6IGNkay5EdXJhdGlvbi5taW51dGVzKDUpLFxuICAgIH0pLFxuICAgIHRocmVzaG9sZDogMjU5MjAwMCwgLy8gMTIgSG91cnMgKDUwJSBvZiAyNCBob3VycyAtIGRlZmF1bHQgcmVjb3JkIHJldGVudGlvbiBwZXJpb2QpXG4gICAgZXZhbHVhdGlvblBlcmlvZHM6IDEsXG4gICAgY29tcGFyaXNvbk9wZXJhdG9yOiBjbG91ZHdhdGNoLkNvbXBhcmlzb25PcGVyYXRvci5HUkVBVEVSX1RIQU5fT1JfRVFVQUxfVE9fVEhSRVNIT0xELFxuICAgIGFsYXJtRGVzY3JpcHRpb246ICdDb25zdW1lciBSZWNvcmQgUHJvY2Vzc2luZyBGYWxsaW5nIEJlaGluZCwgdGhlcmUgaXMgcmlzayBmb3IgZGF0YSBsb3NzIGR1ZSB0byByZWNvcmQgZXhwaXJhdGlvbi4nXG4gIH0pKTtcblxuICAvLyBBbGFybSBpZiBBdmcgKFJlYWRQcm92aXNpb25lZFRocm91Z2hwdXRFeGNlZWRlZCk6ID4gMFxuICBhbGFybXMucHVzaChuZXcgY2xvdWR3YXRjaC5BbGFybShzY29wZSwgJ0tpbmVzaXNTdHJlYW1SZWFkUHJvdmlzaW9uZWRUaHJvdWdocHV0RXhjZWVkZWRBbGFybScsIHtcbiAgICBtZXRyaWM6IG5ldyBjbG91ZHdhdGNoLk1ldHJpYyh7XG4gICAgICBuYW1lc3BhY2U6ICdBV1MvS2luZXNpcycsXG4gICAgICBtZXRyaWNOYW1lOiAnUmVhZFByb3Zpc2lvbmVkVGhyb3VnaHB1dEV4Y2VlZGVkJyxcbiAgICAgIHN0YXRpc3RpYzogJ0F2ZXJhZ2UnLFxuICAgICAgcGVyaW9kOiBjZGsuRHVyYXRpb24ubWludXRlcyg1KSxcbiAgICB9KSxcbiAgICB0aHJlc2hvbGQ6IDAsXG4gICAgZXZhbHVhdGlvblBlcmlvZHM6IDEsXG4gICAgY29tcGFyaXNvbk9wZXJhdG9yOiBjbG91ZHdhdGNoLkNvbXBhcmlzb25PcGVyYXRvci5HUkVBVEVSX1RIQU5fVEhSRVNIT0xELFxuICAgIGFsYXJtRGVzY3JpcHRpb246ICdDb25zdW1lciBBcHBsaWNhdGlvbiBpcyBSZWFkaW5nIGF0IGEgU2xvd2VyIFJhdGUgVGhhbiBFeHBlY3RlZC4nXG4gIH0pKTtcblxuICByZXR1cm4gYWxhcm1zO1xufSJdfQ==
|
package/lib/kms-helper.js
CHANGED
|
@@ -19,16 +19,10 @@ const utils_1 = require("./utils");
|
|
|
19
19
|
function buildEncryptionKey(scope, keyProps) {
|
|
20
20
|
// Setup the key properties
|
|
21
21
|
let encryptionKeyProps;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
encryptionKeyProps = utils_1.overrideProps(kms_defaults_1.DefaultEncryptionProps, keyProps);
|
|
25
|
-
}
|
|
26
|
-
else {
|
|
27
|
-
// If no property overrides, deploy using the default configuration
|
|
28
|
-
encryptionKeyProps = kms_defaults_1.DefaultEncryptionProps;
|
|
29
|
-
}
|
|
22
|
+
// If property overrides have been provided, incorporate them and deploy
|
|
23
|
+
encryptionKeyProps = utils_1.consolidateProps(kms_defaults_1.DefaultEncryptionProps, keyProps);
|
|
30
24
|
// Create the encryption key and return
|
|
31
25
|
return new kms.Key(scope, 'EncryptionKey', encryptionKeyProps);
|
|
32
26
|
}
|
|
33
27
|
exports.buildEncryptionKey = buildEncryptionKey;
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia21zLWhlbHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImttcy1oZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7OztHQVdHOzs7QUFFSCx3Q0FBd0M7QUFDeEMsaURBQXdEO0FBQ3hELG1DQUEyQztBQUkzQyxTQUFnQixrQkFBa0IsQ0FBQyxLQUFnQixFQUFFLFFBQXVCO0lBQzFFLDJCQUEyQjtJQUMzQixJQUFJLGtCQUFrQixDQUFDO0lBRXZCLHdFQUF3RTtJQUN4RSxrQkFBa0IsR0FBRyx3QkFBZ0IsQ0FBQyxxQ0FBc0IsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUV4RSx1Q0FBdUM7SUFDdkMsT0FBTyxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO0FBQ2pFLENBQUM7QUFURCxnREFTQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0ICogYXMga21zIGZyb20gJ0Bhd3MtY2RrL2F3cy1rbXMnO1xuaW1wb3J0IHsgRGVmYXVsdEVuY3J5cHRpb25Qcm9wcyB9IGZyb20gJy4va21zLWRlZmF1bHRzJztcbmltcG9ydCB7IGNvbnNvbGlkYXRlUHJvcHMgfSBmcm9tICcuL3V0aWxzJztcbi8vIE5vdGU6IFRvIGVuc3VyZSBDREt2MiBjb21wYXRpYmlsaXR5LCBrZWVwIHRoZSBpbXBvcnQgc3RhdGVtZW50IGZvciBDb25zdHJ1Y3Qgc2VwYXJhdGVcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuXG5leHBvcnQgZnVuY3Rpb24gYnVpbGRFbmNyeXB0aW9uS2V5KHNjb3BlOiBDb25zdHJ1Y3QsIGtleVByb3BzPzoga21zLktleVByb3BzKToga21zLktleSB7XG4gIC8vIFNldHVwIHRoZSBrZXkgcHJvcGVydGllc1xuICBsZXQgZW5jcnlwdGlvbktleVByb3BzO1xuXG4gIC8vIElmIHByb3BlcnR5IG92ZXJyaWRlcyBoYXZlIGJlZW4gcHJvdmlkZWQsIGluY29ycG9yYXRlIHRoZW0gYW5kIGRlcGxveVxuICBlbmNyeXB0aW9uS2V5UHJvcHMgPSBjb25zb2xpZGF0ZVByb3BzKERlZmF1bHRFbmNyeXB0aW9uUHJvcHMsIGtleVByb3BzKTtcblxuICAvLyBDcmVhdGUgdGhlIGVuY3J5cHRpb24ga2V5IGFuZCByZXR1cm5cbiAgcmV0dXJuIG5ldyBrbXMuS2V5KHNjb3BlLCAnRW5jcnlwdGlvbktleScsIGVuY3J5cHRpb25LZXlQcm9wcyk7XG59Il19
|
|
@@ -37,24 +37,14 @@ function DynamoEventSourceProps(scope, _dynamoEventSourceProps) {
|
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
const defaultDynamoEventSourceProps = Object.assign(baseProps, extraProps);
|
|
40
|
-
|
|
41
|
-
return utils_1.overrideProps(defaultDynamoEventSourceProps, _dynamoEventSourceProps.eventSourceProps);
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
return defaultDynamoEventSourceProps;
|
|
45
|
-
}
|
|
40
|
+
return utils_1.consolidateProps(defaultDynamoEventSourceProps, _dynamoEventSourceProps === null || _dynamoEventSourceProps === void 0 ? void 0 : _dynamoEventSourceProps.eventSourceProps);
|
|
46
41
|
}
|
|
47
42
|
exports.DynamoEventSourceProps = DynamoEventSourceProps;
|
|
48
43
|
function S3EventSourceProps(_s3EventSourceProps) {
|
|
49
44
|
const defaultS3EventSourceProps = {
|
|
50
45
|
events: [s3.EventType.OBJECT_CREATED]
|
|
51
46
|
};
|
|
52
|
-
|
|
53
|
-
return utils_1.overrideProps(defaultS3EventSourceProps, _s3EventSourceProps, false);
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
return defaultS3EventSourceProps;
|
|
57
|
-
}
|
|
47
|
+
return utils_1.consolidateProps(defaultS3EventSourceProps, _s3EventSourceProps);
|
|
58
48
|
}
|
|
59
49
|
exports.S3EventSourceProps = S3EventSourceProps;
|
|
60
50
|
function KinesisEventSourceProps(scope, _kinesisEventSourceProps) {
|
|
@@ -75,12 +65,7 @@ function KinesisEventSourceProps(scope, _kinesisEventSourceProps) {
|
|
|
75
65
|
};
|
|
76
66
|
}
|
|
77
67
|
const defaultKinesisEventSourceProps = Object.assign(baseProps, extraProps);
|
|
78
|
-
|
|
79
|
-
return utils_1.overrideProps(defaultKinesisEventSourceProps, _kinesisEventSourceProps.eventSourceProps);
|
|
80
|
-
}
|
|
81
|
-
else {
|
|
82
|
-
return defaultKinesisEventSourceProps;
|
|
83
|
-
}
|
|
68
|
+
return utils_1.consolidateProps(defaultKinesisEventSourceProps, _kinesisEventSourceProps === null || _kinesisEventSourceProps === void 0 ? void 0 : _kinesisEventSourceProps.eventSourceProps);
|
|
84
69
|
}
|
|
85
70
|
exports.KinesisEventSourceProps = KinesisEventSourceProps;
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGFtYmRhLWV2ZW50LXNvdXJjZS1tYXBwaW5nLWRlZmF1bHRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibGFtYmRhLWV2ZW50LXNvdXJjZS1tYXBwaW5nLWRlZmF1bHRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7Ozs7Ozs7R0FXRzs7O0FBRUgsOENBQThDO0FBQzlDLG1DQUEyQztBQUMzQyxnRkFBd0o7QUFDeEosc0NBQXNDO0FBQ3RDLHdDQUFvRDtBQUVwRCw2Q0FBMEM7QUFRMUMsU0FBZ0Isc0JBQXNCLENBQUMsS0FBZ0IsRUFBRSx1QkFBMEM7SUFFakcsTUFBTSxTQUFTLEdBQTJCO1FBQ3hDLGdCQUFnQixFQUFFLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxZQUFZO1FBQ3RELGtCQUFrQixFQUFFLElBQUk7UUFDeEIsWUFBWSxFQUFFLGVBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ2hDLGFBQWEsRUFBRSxHQUFHO0tBQ25CLENBQUM7SUFFRixJQUFJLFVBQVUsR0FBRyxFQUFFLENBQUM7SUFFcEIsSUFBSSx1QkFBdUIsS0FBSyxTQUFTLElBQUksQ0FBQSx1QkFBdUIsYUFBdkIsdUJBQXVCLHVCQUF2Qix1QkFBdUIsQ0FBRSxpQkFBaUIsTUFBSyxTQUFTO1dBQ2hHLHVCQUF1QixDQUFDLGlCQUFpQixFQUFFO1FBQzlDLE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBRyx1QkFBVSxDQUFDLEtBQUssRUFBRSxhQUFhLEVBQUU7WUFDbEQsVUFBVSxFQUFFLHVCQUF1QixhQUF2Qix1QkFBdUIsdUJBQXZCLHVCQUF1QixDQUFFLGdCQUFnQjtTQUN0RCxDQUFDLENBQUM7UUFFSCxVQUFVLEdBQUc7WUFDWCxTQUFTLEVBQUUsSUFBSSxpQ0FBTSxDQUFDLFFBQVEsQ0FBQztTQUNoQyxDQUFDO0tBQ0g7SUFFRCxNQUFNLDZCQUE2QixHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO0lBRTNFLE9BQU8sd0JBQWdCLENBQUMsNkJBQTZCLEVBQUUsdUJBQXVCLGFBQXZCLHVCQUF1Qix1QkFBdkIsdUJBQXVCLENBQUUsZ0JBQWdCLENBQUMsQ0FBQztBQUNwRyxDQUFDO0FBekJELHdEQXlCQztBQUVELFNBQWdCLGtCQUFrQixDQUFDLG1CQUF3QztJQUV6RSxNQUFNLHlCQUF5QixHQUF1QjtRQUNwRCxNQUFNLEVBQUUsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQztLQUN0QyxDQUFDO0lBRUYsT0FBTyx3QkFBZ0IsQ0FBQyx5QkFBeUIsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0FBQzFFLENBQUM7QUFQRCxnREFPQztBQUVELFNBQWdCLHVCQUF1QixDQUFDLEtBQWdCLEVBQUUsd0JBQTJDO0lBQ25HLE1BQU0sU0FBUyxHQUE0QjtRQUN6QyxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsZ0JBQWdCLENBQUMsWUFBWTtRQUN0RCxrQkFBa0IsRUFBRSxJQUFJO1FBQ3hCLFlBQVksRUFBRSxlQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUNoQyxhQUFhLEVBQUUsR0FBRztLQUNuQixDQUFDO0lBRUYsSUFBSSxVQUFVLEdBQUcsRUFBRSxDQUFDO0lBRXBCLElBQUksd0JBQXdCLEtBQUssU0FBUyxJQUFJLENBQUEsd0JBQXdCLGFBQXhCLHdCQUF3Qix1QkFBeEIsd0JBQXdCLENBQUUsaUJBQWlCLE1BQUssU0FBUztXQUNsRyx3QkFBd0IsQ0FBQyxpQkFBaUIsRUFBRTtRQUMvQyxNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsdUJBQVUsQ0FBQyxLQUFLLEVBQUUsYUFBYSxFQUFFO1lBQ2xELFVBQVUsRUFBRSx3QkFBd0IsYUFBeEIsd0JBQXdCLHVCQUF4Qix3QkFBd0IsQ0FBRSxnQkFBZ0I7U0FDdkQsQ0FBQyxDQUFDO1FBRUgsVUFBVSxHQUFHO1lBQ1gsU0FBUyxFQUFFLElBQUksaUNBQU0sQ0FBQyxRQUFRLENBQUM7U0FDaEMsQ0FBQztLQUNIO0lBRUQsTUFBTSw4QkFBOEIsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUU1RSxPQUFPLHdCQUFnQixDQUFDLDhCQUE4QixFQUFFLHdCQUF3QixhQUF4Qix3QkFBd0IsdUJBQXhCLHdCQUF3QixDQUFFLGdCQUFnQixDQUFDLENBQUM7QUFDdEcsQ0FBQztBQXhCRCwwREF3QkMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqICBDb3B5cmlnaHQgMjAyMiBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqICBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpLiBZb3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlXG4gKiAgd2l0aCB0aGUgTGljZW5zZS4gQSBjb3B5IG9mIHRoZSBMaWNlbnNlIGlzIGxvY2F0ZWQgYXRcbiAqXG4gKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICBvciBpbiB0aGUgJ2xpY2Vuc2UnIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICdBUyBJUycgQkFTSVMsIFdJVEhPVVQgV0FSUkFOVElFU1xuICogIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGV4cHJlc3Mgb3IgaW1wbGllZC4gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zXG4gKiAgYW5kIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5cbmltcG9ydCAqIGFzIGxhbWJkYSBmcm9tICdAYXdzLWNkay9hd3MtbGFtYmRhJztcbmltcG9ydCB7IGNvbnNvbGlkYXRlUHJvcHMgfSBmcm9tICcuL3V0aWxzJztcbmltcG9ydCB7IER5bmFtb0V2ZW50U291cmNlUHJvcHMsIFMzRXZlbnRTb3VyY2VQcm9wcywgS2luZXNpc0V2ZW50U291cmNlUHJvcHMsIFN0cmVhbUV2ZW50U291cmNlUHJvcHMsIFNxc0RscSB9IGZyb20gJ0Bhd3MtY2RrL2F3cy1sYW1iZGEtZXZlbnQtc291cmNlcyc7XG5pbXBvcnQgKiBhcyBzMyBmcm9tICdAYXdzLWNkay9hd3MtczMnO1xuaW1wb3J0IHsgQ29uc3RydWN0LCBEdXJhdGlvbiB9IGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuaW1wb3J0ICogYXMgc3FzIGZyb20gJ0Bhd3MtY2RrL2F3cy1zcXMnO1xuaW1wb3J0IHsgYnVpbGRRdWV1ZSB9IGZyb20gJy4vc3FzLWhlbHBlcic7XG5cbmV4cG9ydCBpbnRlcmZhY2UgRXZlbnRTb3VyY2VQcm9wcyB7XG4gIHJlYWRvbmx5IGV2ZW50U291cmNlUHJvcHM/OiBTdHJlYW1FdmVudFNvdXJjZVByb3BzLFxuICByZWFkb25seSBkZXBsb3lTcXNEbHFRdWV1ZT86IGJvb2xlYW4sXG4gIHJlYWRvbmx5IHNxc0RscVF1ZXVlUHJvcHM/OiBzcXMuUXVldWVQcm9wc1xufVxuXG5leHBvcnQgZnVuY3Rpb24gRHluYW1vRXZlbnRTb3VyY2VQcm9wcyhzY29wZTogQ29uc3RydWN0LCBfZHluYW1vRXZlbnRTb3VyY2VQcm9wcz86IEV2ZW50U291cmNlUHJvcHMpOiBEeW5hbW9FdmVudFNvdXJjZVByb3BzIHtcblxuICBjb25zdCBiYXNlUHJvcHM6IER5bmFtb0V2ZW50U291cmNlUHJvcHMgPSB7XG4gICAgc3RhcnRpbmdQb3NpdGlvbjogbGFtYmRhLlN0YXJ0aW5nUG9zaXRpb24uVFJJTV9IT1JJWk9OLFxuICAgIGJpc2VjdEJhdGNoT25FcnJvcjogdHJ1ZSxcbiAgICBtYXhSZWNvcmRBZ2U6IER1cmF0aW9uLmhvdXJzKDI0KSxcbiAgICByZXRyeUF0dGVtcHRzOiA1MDBcbiAgfTtcblxuICBsZXQgZXh0cmFQcm9wcyA9IHt9O1xuXG4gIGlmIChfZHluYW1vRXZlbnRTb3VyY2VQcm9wcyA9PT0gdW5kZWZpbmVkIHx8IF9keW5hbW9FdmVudFNvdXJjZVByb3BzPy5kZXBsb3lTcXNEbHFRdWV1ZSA9PT0gdW5kZWZpbmVkXG4gICAgfHwgX2R5bmFtb0V2ZW50U291cmNlUHJvcHMuZGVwbG95U3FzRGxxUXVldWUpIHtcbiAgICBjb25zdCBbc3FzUXVldWVdID0gYnVpbGRRdWV1ZShzY29wZSwgJ1Nxc0RscVF1ZXVlJywge1xuICAgICAgcXVldWVQcm9wczogX2R5bmFtb0V2ZW50U291cmNlUHJvcHM/LnNxc0RscVF1ZXVlUHJvcHNcbiAgICB9KTtcblxuICAgIGV4dHJhUHJvcHMgPSB7XG4gICAgICBvbkZhaWx1cmU6IG5ldyBTcXNEbHEoc3FzUXVldWUpLFxuICAgIH07XG4gIH1cblxuICBjb25zdCBkZWZhdWx0RHluYW1vRXZlbnRTb3VyY2VQcm9wcyA9IE9iamVjdC5hc3NpZ24oYmFzZVByb3BzLCBleHRyYVByb3BzKTtcblxuICByZXR1cm4gY29uc29saWRhdGVQcm9wcyhkZWZhdWx0RHluYW1vRXZlbnRTb3VyY2VQcm9wcywgX2R5bmFtb0V2ZW50U291cmNlUHJvcHM/LmV2ZW50U291cmNlUHJvcHMpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gUzNFdmVudFNvdXJjZVByb3BzKF9zM0V2ZW50U291cmNlUHJvcHM/OiBTM0V2ZW50U291cmNlUHJvcHMpIHtcblxuICBjb25zdCBkZWZhdWx0UzNFdmVudFNvdXJjZVByb3BzOiBTM0V2ZW50U291cmNlUHJvcHMgPSB7XG4gICAgZXZlbnRzOiBbczMuRXZlbnRUeXBlLk9CSkVDVF9DUkVBVEVEXVxuICB9O1xuXG4gIHJldHVybiBjb25zb2xpZGF0ZVByb3BzKGRlZmF1bHRTM0V2ZW50U291cmNlUHJvcHMsIF9zM0V2ZW50U291cmNlUHJvcHMpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gS2luZXNpc0V2ZW50U291cmNlUHJvcHMoc2NvcGU6IENvbnN0cnVjdCwgX2tpbmVzaXNFdmVudFNvdXJjZVByb3BzPzogRXZlbnRTb3VyY2VQcm9wcyk6IEtpbmVzaXNFdmVudFNvdXJjZVByb3BzIHtcbiAgY29uc3QgYmFzZVByb3BzOiBLaW5lc2lzRXZlbnRTb3VyY2VQcm9wcyA9IHtcbiAgICBzdGFydGluZ1Bvc2l0aW9uOiBsYW1iZGEuU3RhcnRpbmdQb3NpdGlvbi5UUklNX0hPUklaT04sXG4gICAgYmlzZWN0QmF0Y2hPbkVycm9yOiB0cnVlLFxuICAgIG1heFJlY29yZEFnZTogRHVyYXRpb24uaG91cnMoMjQpLFxuICAgIHJldHJ5QXR0ZW1wdHM6IDUwMFxuICB9O1xuXG4gIGxldCBleHRyYVByb3BzID0ge307XG5cbiAgaWYgKF9raW5lc2lzRXZlbnRTb3VyY2VQcm9wcyA9PT0gdW5kZWZpbmVkIHx8IF9raW5lc2lzRXZlbnRTb3VyY2VQcm9wcz8uZGVwbG95U3FzRGxxUXVldWUgPT09IHVuZGVmaW5lZFxuICAgIHx8IF9raW5lc2lzRXZlbnRTb3VyY2VQcm9wcy5kZXBsb3lTcXNEbHFRdWV1ZSkge1xuICAgIGNvbnN0IFtzcXNRdWV1ZV0gPSBidWlsZFF1ZXVlKHNjb3BlLCAnU3FzRGxxUXVldWUnLCB7XG4gICAgICBxdWV1ZVByb3BzOiBfa2luZXNpc0V2ZW50U291cmNlUHJvcHM/LnNxc0RscVF1ZXVlUHJvcHNcbiAgICB9KTtcblxuICAgIGV4dHJhUHJvcHMgPSB7XG4gICAgICBvbkZhaWx1cmU6IG5ldyBTcXNEbHEoc3FzUXVldWUpLFxuICAgIH07XG4gIH1cblxuICBjb25zdCBkZWZhdWx0S2luZXNpc0V2ZW50U291cmNlUHJvcHMgPSBPYmplY3QuYXNzaWduKGJhc2VQcm9wcywgZXh0cmFQcm9wcyk7XG5cbiAgcmV0dXJuIGNvbnNvbGlkYXRlUHJvcHMoZGVmYXVsdEtpbmVzaXNFdmVudFNvdXJjZVByb3BzLCBfa2luZXNpc0V2ZW50U291cmNlUHJvcHM/LmV2ZW50U291cmNlUHJvcHMpO1xufVxuIl19
|
package/lib/mediastore-helper.js
CHANGED
|
@@ -20,12 +20,7 @@ const utils_1 = require("./utils");
|
|
|
20
20
|
function MediaStoreContainer(scope, mediaStoreContainerProps) {
|
|
21
21
|
const defaultprops = mediastore_defaults_1.MediaStoreContainerProps();
|
|
22
22
|
let mediaStoreProps;
|
|
23
|
-
|
|
24
|
-
mediaStoreProps = utils_1.overrideProps(defaultprops, mediaStoreContainerProps);
|
|
25
|
-
}
|
|
26
|
-
else {
|
|
27
|
-
mediaStoreProps = defaultprops;
|
|
28
|
-
}
|
|
23
|
+
mediaStoreProps = utils_1.consolidateProps(defaultprops, mediaStoreContainerProps);
|
|
29
24
|
// Create the MediaStore Container
|
|
30
25
|
const mediaStoreContainer = new mediastore.CfnContainer(scope, 'MediaStoreContainer', mediaStoreProps);
|
|
31
26
|
// Add deletion policy to retain because it will fail to delete if the container is not empty.
|
|
@@ -33,4 +28,4 @@ function MediaStoreContainer(scope, mediaStoreContainerProps) {
|
|
|
33
28
|
return mediaStoreContainer;
|
|
34
29
|
}
|
|
35
30
|
exports.MediaStoreContainer = MediaStoreContainer;
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVkaWFzdG9yZS1oZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJtZWRpYXN0b3JlLWhlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7O0dBV0c7OztBQUVILHFDQUFxQztBQUNyQyxzREFBc0Q7QUFDdEQsK0RBQWlFO0FBQ2pFLG1DQUEyQztBQUkzQyxTQUFnQixtQkFBbUIsQ0FBQyxLQUFnQixFQUFFLHdCQUF1RDtJQUMzRyxNQUFNLFlBQVksR0FBaUMsOENBQXdCLEVBQUUsQ0FBQztJQUM5RSxJQUFJLGVBQTZDLENBQUM7SUFFbEQsZUFBZSxHQUFHLHdCQUFnQixDQUFDLFlBQVksRUFBRSx3QkFBd0IsQ0FBQyxDQUFDO0lBRTNFLGtDQUFrQztJQUNsQyxNQUFNLG1CQUFtQixHQUFHLElBQUksVUFBVSxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFFdkcsOEZBQThGO0lBQzlGLG1CQUFtQixDQUFDLFVBQVUsQ0FBQyxjQUFjLEdBQUcsR0FBRyxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQztJQUU3RSxPQUFPLG1CQUFtQixDQUFDO0FBQzdCLENBQUM7QUFiRCxrREFhQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogIENvcHlyaWdodCAyMDIyIEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSBcIkxpY2Vuc2VcIikuIFlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2VcbiAqICB3aXRoIHRoZSBMaWNlbnNlLiBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wXG4gKlxuICogIG9yIGluIHRoZSAnbGljZW5zZScgZmlsZSBhY2NvbXBhbnlpbmcgdGhpcyBmaWxlLiBUaGlzIGZpbGUgaXMgZGlzdHJpYnV0ZWQgb24gYW4gJ0FTIElTJyBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTXG4gKiAgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZXhwcmVzcyBvciBpbXBsaWVkLiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnNcbiAqICBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0ICogYXMgY2RrIGZyb20gJ0Bhd3MtY2RrL2NvcmUnO1xuaW1wb3J0ICogYXMgbWVkaWFzdG9yZSBmcm9tICdAYXdzLWNkay9hd3MtbWVkaWFzdG9yZSc7XG5pbXBvcnQgeyBNZWRpYVN0b3JlQ29udGFpbmVyUHJvcHMgfSBmcm9tICcuL21lZGlhc3RvcmUtZGVmYXVsdHMnO1xuaW1wb3J0IHsgY29uc29saWRhdGVQcm9wcyB9IGZyb20gJy4vdXRpbHMnO1xuLy8gTm90ZTogVG8gZW5zdXJlIENES3YyIGNvbXBhdGliaWxpdHksIGtlZXAgdGhlIGltcG9ydCBzdGF0ZW1lbnQgZm9yIENvbnN0cnVjdCBzZXBhcmF0ZVxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSAnQGF3cy1jZGsvY29yZSc7XG5cbmV4cG9ydCBmdW5jdGlvbiBNZWRpYVN0b3JlQ29udGFpbmVyKHNjb3BlOiBDb25zdHJ1Y3QsIG1lZGlhU3RvcmVDb250YWluZXJQcm9wcz86IG1lZGlhc3RvcmUuQ2ZuQ29udGFpbmVyUHJvcHMpOiBtZWRpYXN0b3JlLkNmbkNvbnRhaW5lciB7XG4gIGNvbnN0IGRlZmF1bHRwcm9wczogbWVkaWFzdG9yZS5DZm5Db250YWluZXJQcm9wcyA9IE1lZGlhU3RvcmVDb250YWluZXJQcm9wcygpO1xuICBsZXQgbWVkaWFTdG9yZVByb3BzOiBtZWRpYXN0b3JlLkNmbkNvbnRhaW5lclByb3BzO1xuXG4gIG1lZGlhU3RvcmVQcm9wcyA9IGNvbnNvbGlkYXRlUHJvcHMoZGVmYXVsdHByb3BzLCBtZWRpYVN0b3JlQ29udGFpbmVyUHJvcHMpO1xuXG4gIC8vIENyZWF0ZSB0aGUgTWVkaWFTdG9yZSBDb250YWluZXJcbiAgY29uc3QgbWVkaWFTdG9yZUNvbnRhaW5lciA9IG5ldyBtZWRpYXN0b3JlLkNmbkNvbnRhaW5lcihzY29wZSwgJ01lZGlhU3RvcmVDb250YWluZXInLCBtZWRpYVN0b3JlUHJvcHMpO1xuXG4gIC8vIEFkZCBkZWxldGlvbiBwb2xpY3kgdG8gcmV0YWluIGJlY2F1c2UgaXQgd2lsbCBmYWlsIHRvIGRlbGV0ZSBpZiB0aGUgY29udGFpbmVyIGlzIG5vdCBlbXB0eS5cbiAgbWVkaWFTdG9yZUNvbnRhaW5lci5jZm5PcHRpb25zLmRlbGV0aW9uUG9saWN5ID0gY2RrLkNmbkRlbGV0aW9uUG9saWN5LlJFVEFJTjtcblxuICByZXR1cm4gbWVkaWFTdG9yZUNvbnRhaW5lcjtcbn0iXX0=
|