From dbbaabc8f355751781167e718b9808003790c249 Mon Sep 17 00:00:00 2001 From: "Janardhan (Janny) Molumuri" Date: Wed, 24 Jul 2024 00:34:47 +0000 Subject: [PATCH] Updated snapshots --- .../aws-glue-job-python-shell.assets.json | 4 +- .../aws-glue-job-python-shell.template.json | 17 +- .../manifest.json | 2 +- .../tree.json | 17 +- .../GlueWorkflowTriggerStack.assets.json | 32 ++ .../GlueWorkflowTriggerStack.template.json | 244 ++++++++++ ...9be7858a12b228a2ae6e5c10faccd9097b1e855.py | 1 + ...efaultTestDeployAssert43E79173.assets.json | 19 + ...aultTestDeployAssert43E79173.template.json | 36 ++ .../test/integ.workflow.js.snapshot/cdk.out | 1 + .../integ.workflow.js.snapshot/integ.json | 12 + .../integ.workflow.js.snapshot/manifest.json | 155 ++++++ .../test/integ.workflow.js.snapshot/tree.json | 448 ++++++++++++++++++ 13 files changed, 981 insertions(+), 7 deletions(-) create mode 100644 packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/GlueWorkflowTriggerStack.assets.json create mode 100644 packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/GlueWorkflowTriggerStack.template.json create mode 100644 packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/asset.432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py create mode 100644 packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.assets.json create mode 100644 packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.template.json create mode 100644 packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/cdk.out create mode 100644 packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/integ.json create mode 100644 packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/manifest.json create mode 100644 packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/tree.json diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.assets.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.assets.json index 0a415cd107153..522babd056beb 100644 --- a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.assets.json +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.assets.json @@ -14,7 +14,7 @@ } } }, - "aeda11f7bb7dfbd52c66176f2e7ae14f20571f1f22ab7988a59bc714daf278a0": { + "c75d6d44cca641f11b82111a563ba198269fa0483d583cbffd578d0301e9edaf": { "source": { "path": "aws-glue-job-python-shell.template.json", "packaging": "file" @@ -22,7 +22,7 @@ "destinations": { "current_account-current_region": { "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", - "objectKey": "aeda11f7bb7dfbd52c66176f2e7ae14f20571f1f22ab7988a59bc714daf278a0.json", + "objectKey": "c75d6d44cca641f11b82111a563ba198269fa0483d583cbffd578d0301e9edaf.json", "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" } } diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.template.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.template.json index 9c752c984fef2..d98d7d4485e3b 100644 --- a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.template.json +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/aws-glue-job-python-shell.template.json @@ -108,7 +108,11 @@ } }, "DefaultArguments": { - "library-set": "analytics" + "--job-language": "python", + "library-set": "analytics", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true" }, "GlueVersion": "3.0", "MaxCapacity": 0.0625, @@ -140,7 +144,12 @@ ] } }, - "DefaultArguments": {}, + "DefaultArguments": { + "--job-language": "python", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true" + }, "GlueVersion": "1.0", "MaxCapacity": 0.0625, "MaxRetries": 0, @@ -172,7 +181,11 @@ } }, "DefaultArguments": { + "--job-language": "python", "library-set": "analytics", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true", "arg1": "value1", "arg2": "value2" }, diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/manifest.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/manifest.json index 24a56a14662e5..026dce44eec16 100644 --- a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/manifest.json +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/manifest.json @@ -18,7 +18,7 @@ "validateOnSynth": false, "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", - "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/aeda11f7bb7dfbd52c66176f2e7ae14f20571f1f22ab7988a59bc714daf278a0.json", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c75d6d44cca641f11b82111a563ba198269fa0483d583cbffd578d0301e9edaf.json", "requiresBootstrapStackVersion": 6, "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", "additionalDependencies": [ diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/tree.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/tree.json index 8f39bfe79fe3c..4c23b18fce55d 100644 --- a/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/tree.json +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.job-python-shell.js.snapshot/tree.json @@ -193,7 +193,11 @@ "pythonVersion": "3.9" }, "defaultArguments": { - "library-set": "analytics" + "--job-language": "python", + "library-set": "analytics", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true" }, "glueVersion": "3.0", "maxCapacity": 0.0625, @@ -243,7 +247,12 @@ }, "pythonVersion": "3" }, - "defaultArguments": {}, + "defaultArguments": { + "--job-language": "python", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true" + }, "glueVersion": "1.0", "maxCapacity": 0.0625, "maxRetries": 0, @@ -293,7 +302,11 @@ "pythonVersion": "3.9" }, "defaultArguments": { + "--job-language": "python", "library-set": "analytics", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true", "arg1": "value1", "arg2": "value2" }, diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/GlueWorkflowTriggerStack.assets.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/GlueWorkflowTriggerStack.assets.json new file mode 100644 index 0000000000000..020d92b9ce3ed --- /dev/null +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/GlueWorkflowTriggerStack.assets.json @@ -0,0 +1,32 @@ +{ + "version": "36.0.0", + "files": { + "432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855": { + "source": { + "path": "asset.432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + }, + "db15b89b0de33d7503c531cae5fa3f18506eb8982953470211e04f53dfe9a2da": { + "source": { + "path": "GlueWorkflowTriggerStack.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "db15b89b0de33d7503c531cae5fa3f18506eb8982953470211e04f53dfe9a2da.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/GlueWorkflowTriggerStack.template.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/GlueWorkflowTriggerStack.template.json new file mode 100644 index 0000000000000..371975c8eeeb2 --- /dev/null +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/GlueWorkflowTriggerStack.template.json @@ -0,0 +1,244 @@ +{ + "Resources": { + "Workflow193EF7C1": { + "Type": "AWS::Glue::Workflow", + "Properties": { + "Description": "MyWorkflow" + } + }, + "WorkflowOnDemandTriggerEE8E75A1": { + "Type": "AWS::Glue::Trigger", + "Properties": { + "Actions": [ + { + "JobName": { + "Ref": "InboundJobEDA3CBF4" + } + } + ], + "Type": "ON_DEMAND", + "WorkflowName": { + "Ref": "Workflow193EF7C1" + } + } + }, + "WorkflowConditionalTrigger133C0CA8": { + "Type": "AWS::Glue::Trigger", + "Properties": { + "Actions": [ + { + "JobName": { + "Ref": "OutboundJobB5826414" + } + } + ], + "EventBatchingCondition": { + "BatchSize": 1, + "BatchWindow": 900 + }, + "Predicate": { + "Conditions": [ + { + "JobName": { + "Ref": "InboundJobEDA3CBF4" + }, + "LogicalOperator": "EQUALS", + "State": "SUCCEEDED" + } + ] + }, + "Type": "CONDITIONAL", + "WorkflowName": { + "Ref": "Workflow193EF7C1" + } + } + }, + "JobRole014917C6": { + "Type": "AWS::IAM::Role", + "Properties": { + "AssumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "glue.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + } + } + }, + "JobRoleDefaultPolicy5DE0D8F9": { + "Type": "AWS::IAM::Policy", + "Properties": { + "PolicyDocument": { + "Statement": [ + { + "Action": [ + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/*" + ] + ] + }, + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + } + ] + ] + } + ] + } + ], + "Version": "2012-10-17" + }, + "PolicyName": "JobRoleDefaultPolicy5DE0D8F9", + "Roles": [ + { + "Ref": "JobRole014917C6" + } + ] + } + }, + "OutboundJobB5826414": { + "Type": "AWS::Glue::Job", + "Properties": { + "Command": { + "Name": "glueetl", + "PythonVersion": "3", + "ScriptLocation": { + "Fn::Join": [ + "", + [ + "s3://", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py" + ] + ] + } + }, + "DefaultArguments": { + "--job-language": "python", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true" + }, + "GlueVersion": "4.0", + "NumberOfWorkers": 2, + "Role": { + "Fn::GetAtt": [ + "JobRole014917C6", + "Arn" + ] + }, + "WorkerType": "G.2X" + } + }, + "InboundJobEDA3CBF4": { + "Type": "AWS::Glue::Job", + "Properties": { + "Command": { + "Name": "glueetl", + "PythonVersion": "3", + "ScriptLocation": { + "Fn::Join": [ + "", + [ + "s3://", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py" + ] + ] + } + }, + "DefaultArguments": { + "--job-language": "python", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true" + }, + "GlueVersion": "4.0", + "NumberOfWorkers": 2, + "Role": { + "Fn::GetAtt": [ + "JobRole014917C6", + "Arn" + ] + }, + "WorkerType": "G.2X" + } + } + }, + "Outputs": { + "WorkflowName": { + "Value": { + "Ref": "Workflow193EF7C1" + } + } + }, + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/asset.432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/asset.432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py new file mode 100644 index 0000000000000..e75154b7c390f --- /dev/null +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/asset.432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py @@ -0,0 +1 @@ +print("hello world") \ No newline at end of file diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.assets.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.assets.json new file mode 100644 index 0000000000000..d2484f5013f09 --- /dev/null +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.assets.json @@ -0,0 +1,19 @@ +{ + "version": "36.0.0", + "files": { + "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { + "source": { + "path": "awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.template.json", + "packaging": "file" + }, + "destinations": { + "current_account-current_region": { + "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", + "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" + } + } + } + }, + "dockerImages": {} +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.template.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.template.json new file mode 100644 index 0000000000000..ad9d0fb73d1dd --- /dev/null +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.template.json @@ -0,0 +1,36 @@ +{ + "Parameters": { + "BootstrapVersion": { + "Type": "AWS::SSM::Parameter::Value", + "Default": "/cdk-bootstrap/hnb659fds/version", + "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" + } + }, + "Rules": { + "CheckBootstrapVersion": { + "Assertions": [ + { + "Assert": { + "Fn::Not": [ + { + "Fn::Contains": [ + [ + "1", + "2", + "3", + "4", + "5" + ], + { + "Ref": "BootstrapVersion" + } + ] + } + ] + }, + "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." + } + ] + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/cdk.out b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/cdk.out new file mode 100644 index 0000000000000..1f0068d32659a --- /dev/null +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/cdk.out @@ -0,0 +1 @@ +{"version":"36.0.0"} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/integ.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/integ.json new file mode 100644 index 0000000000000..dc0019765cecf --- /dev/null +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/integ.json @@ -0,0 +1,12 @@ +{ + "version": "36.0.0", + "testCases": { + "aws-cdk-glue-workflow-trigger-integ/DefaultTest": { + "stacks": [ + "GlueWorkflowTriggerStack" + ], + "assertionStack": "aws-cdk-glue-workflow-trigger-integ/DefaultTest/DeployAssert", + "assertionStackName": "awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173" + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/manifest.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/manifest.json new file mode 100644 index 0000000000000..9b01d7d71edae --- /dev/null +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/manifest.json @@ -0,0 +1,155 @@ +{ + "version": "36.0.0", + "artifacts": { + "GlueWorkflowTriggerStack.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "GlueWorkflowTriggerStack.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "GlueWorkflowTriggerStack": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "GlueWorkflowTriggerStack.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/db15b89b0de33d7503c531cae5fa3f18506eb8982953470211e04f53dfe9a2da.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "GlueWorkflowTriggerStack.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "GlueWorkflowTriggerStack.assets" + ], + "metadata": { + "/GlueWorkflowTriggerStack/Workflow/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "Workflow193EF7C1" + } + ], + "/GlueWorkflowTriggerStack/Workflow/OnDemandTrigger": [ + { + "type": "aws:cdk:logicalId", + "data": "WorkflowOnDemandTriggerEE8E75A1" + } + ], + "/GlueWorkflowTriggerStack/Workflow/ConditionalTrigger": [ + { + "type": "aws:cdk:logicalId", + "data": "WorkflowConditionalTrigger133C0CA8" + } + ], + "/GlueWorkflowTriggerStack/JobRole/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "JobRole014917C6" + } + ], + "/GlueWorkflowTriggerStack/JobRole/DefaultPolicy/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "JobRoleDefaultPolicy5DE0D8F9" + } + ], + "/GlueWorkflowTriggerStack/OutboundJob/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "OutboundJobB5826414" + } + ], + "/GlueWorkflowTriggerStack/InboundJob/Resource": [ + { + "type": "aws:cdk:logicalId", + "data": "InboundJobEDA3CBF4" + } + ], + "/GlueWorkflowTriggerStack/WorkflowName": [ + { + "type": "aws:cdk:logicalId", + "data": "WorkflowName" + } + ], + "/GlueWorkflowTriggerStack/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/GlueWorkflowTriggerStack/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "GlueWorkflowTriggerStack" + }, + "awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.assets": { + "type": "cdk:asset-manifest", + "properties": { + "file": "awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.assets.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173": { + "type": "aws:cloudformation:stack", + "environment": "aws://unknown-account/unknown-region", + "properties": { + "templateFile": "awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.template.json", + "terminationProtection": false, + "validateOnSynth": false, + "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", + "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", + "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", + "requiresBootstrapStackVersion": 6, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", + "additionalDependencies": [ + "awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.assets" + ], + "lookupRole": { + "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", + "requiresBootstrapStackVersion": 8, + "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" + } + }, + "dependencies": [ + "awscdkglueworkflowtriggerintegDefaultTestDeployAssert43E79173.assets" + ], + "metadata": { + "/aws-cdk-glue-workflow-trigger-integ/DefaultTest/DeployAssert/BootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "BootstrapVersion" + } + ], + "/aws-cdk-glue-workflow-trigger-integ/DefaultTest/DeployAssert/CheckBootstrapVersion": [ + { + "type": "aws:cdk:logicalId", + "data": "CheckBootstrapVersion" + } + ] + }, + "displayName": "aws-cdk-glue-workflow-trigger-integ/DefaultTest/DeployAssert" + }, + "Tree": { + "type": "cdk:tree", + "properties": { + "file": "tree.json" + } + } + } +} \ No newline at end of file diff --git a/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/tree.json b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/tree.json new file mode 100644 index 0000000000000..988a73eab37e0 --- /dev/null +++ b/packages/@aws-cdk/aws-glue-alpha/test/integ.workflow.js.snapshot/tree.json @@ -0,0 +1,448 @@ +{ + "version": "tree-0.1", + "tree": { + "id": "App", + "path": "", + "children": { + "GlueWorkflowTriggerStack": { + "id": "GlueWorkflowTriggerStack", + "path": "GlueWorkflowTriggerStack", + "children": { + "Workflow": { + "id": "Workflow", + "path": "GlueWorkflowTriggerStack/Workflow", + "children": { + "Resource": { + "id": "Resource", + "path": "GlueWorkflowTriggerStack/Workflow/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Glue::Workflow", + "aws:cdk:cloudformation:props": { + "description": "MyWorkflow" + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_glue.CfnWorkflow", + "version": "0.0.0" + } + }, + "OnDemandTrigger": { + "id": "OnDemandTrigger", + "path": "GlueWorkflowTriggerStack/Workflow/OnDemandTrigger", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Glue::Trigger", + "aws:cdk:cloudformation:props": { + "actions": [ + { + "jobName": { + "Ref": "InboundJobEDA3CBF4" + } + } + ], + "type": "ON_DEMAND", + "workflowName": { + "Ref": "Workflow193EF7C1" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_glue.CfnTrigger", + "version": "0.0.0" + } + }, + "ConditionalTrigger": { + "id": "ConditionalTrigger", + "path": "GlueWorkflowTriggerStack/Workflow/ConditionalTrigger", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Glue::Trigger", + "aws:cdk:cloudformation:props": { + "actions": [ + { + "jobName": { + "Ref": "OutboundJobB5826414" + } + } + ], + "eventBatchingCondition": { + "batchSize": 1, + "batchWindow": 900 + }, + "predicate": { + "conditions": [ + { + "logicalOperator": "EQUALS", + "jobName": { + "Ref": "InboundJobEDA3CBF4" + }, + "state": "SUCCEEDED" + } + ] + }, + "type": "CONDITIONAL", + "workflowName": { + "Ref": "Workflow193EF7C1" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_glue.CfnTrigger", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-glue-alpha.Workflow", + "version": "0.0.0" + } + }, + "JobRole": { + "id": "JobRole", + "path": "GlueWorkflowTriggerStack/JobRole", + "children": { + "ImportJobRole": { + "id": "ImportJobRole", + "path": "GlueWorkflowTriggerStack/JobRole/ImportJobRole", + "constructInfo": { + "fqn": "aws-cdk-lib.Resource", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "GlueWorkflowTriggerStack/JobRole/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Role", + "aws:cdk:cloudformation:props": { + "assumeRolePolicyDocument": { + "Statement": [ + { + "Action": "sts:AssumeRole", + "Effect": "Allow", + "Principal": { + "Service": "glue.amazonaws.com" + } + } + ], + "Version": "2012-10-17" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.CfnRole", + "version": "0.0.0" + } + }, + "DefaultPolicy": { + "id": "DefaultPolicy", + "path": "GlueWorkflowTriggerStack/JobRole/DefaultPolicy", + "children": { + "Resource": { + "id": "Resource", + "path": "GlueWorkflowTriggerStack/JobRole/DefaultPolicy/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::IAM::Policy", + "aws:cdk:cloudformation:props": { + "policyDocument": { + "Statement": [ + { + "Action": [ + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*" + ], + "Effect": "Allow", + "Resource": [ + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/*" + ] + ] + }, + { + "Fn::Join": [ + "", + [ + "arn:", + { + "Ref": "AWS::Partition" + }, + ":s3:::", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + } + ] + ] + } + ] + } + ], + "Version": "2012-10-17" + }, + "policyName": "JobRoleDefaultPolicy5DE0D8F9", + "roles": [ + { + "Ref": "JobRole014917C6" + } + ] + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.CfnPolicy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.Policy", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_iam.Role", + "version": "0.0.0" + } + }, + "OutboundJob": { + "id": "OutboundJob", + "path": "GlueWorkflowTriggerStack/OutboundJob", + "children": { + "Code2907ea7be4a583708cfffc21b3df1dfa": { + "id": "Code2907ea7be4a583708cfffc21b3df1dfa", + "path": "GlueWorkflowTriggerStack/OutboundJob/Code2907ea7be4a583708cfffc21b3df1dfa", + "children": { + "Stage": { + "id": "Stage", + "path": "GlueWorkflowTriggerStack/OutboundJob/Code2907ea7be4a583708cfffc21b3df1dfa/Stage", + "constructInfo": { + "fqn": "aws-cdk-lib.AssetStaging", + "version": "0.0.0" + } + }, + "AssetBucket": { + "id": "AssetBucket", + "path": "GlueWorkflowTriggerStack/OutboundJob/Code2907ea7be4a583708cfffc21b3df1dfa/AssetBucket", + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3.BucketBase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_s3_assets.Asset", + "version": "0.0.0" + } + }, + "Resource": { + "id": "Resource", + "path": "GlueWorkflowTriggerStack/OutboundJob/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Glue::Job", + "aws:cdk:cloudformation:props": { + "command": { + "name": "glueetl", + "scriptLocation": { + "Fn::Join": [ + "", + [ + "s3://", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py" + ] + ] + }, + "pythonVersion": "3" + }, + "defaultArguments": { + "--job-language": "python", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true" + }, + "glueVersion": "4.0", + "numberOfWorkers": 2, + "role": { + "Fn::GetAtt": [ + "JobRole014917C6", + "Arn" + ] + }, + "workerType": "G.2X" + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_glue.CfnJob", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-glue-alpha.PySparkEtlJob", + "version": "0.0.0" + } + }, + "InboundJob": { + "id": "InboundJob", + "path": "GlueWorkflowTriggerStack/InboundJob", + "children": { + "Resource": { + "id": "Resource", + "path": "GlueWorkflowTriggerStack/InboundJob/Resource", + "attributes": { + "aws:cdk:cloudformation:type": "AWS::Glue::Job", + "aws:cdk:cloudformation:props": { + "command": { + "name": "glueetl", + "scriptLocation": { + "Fn::Join": [ + "", + [ + "s3://", + { + "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}" + }, + "/432033e3218068a915d2532fa9be7858a12b228a2ae6e5c10faccd9097b1e855.py" + ] + ] + }, + "pythonVersion": "3" + }, + "defaultArguments": { + "--job-language": "python", + "--enable-continuous-cloudwatch-log": "true", + "--enable-metrics": "", + "--enable-observability-metrics": "true" + }, + "glueVersion": "4.0", + "numberOfWorkers": 2, + "role": { + "Fn::GetAtt": [ + "JobRole014917C6", + "Arn" + ] + }, + "workerType": "G.2X" + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.aws_glue.CfnJob", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/aws-glue-alpha.PySparkEtlJob", + "version": "0.0.0" + } + }, + "WorkflowName": { + "id": "WorkflowName", + "path": "GlueWorkflowTriggerStack/WorkflowName", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnOutput", + "version": "0.0.0" + } + }, + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "GlueWorkflowTriggerStack/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "GlueWorkflowTriggerStack/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + }, + "aws-cdk-glue-workflow-trigger-integ": { + "id": "aws-cdk-glue-workflow-trigger-integ", + "path": "aws-cdk-glue-workflow-trigger-integ", + "children": { + "DefaultTest": { + "id": "DefaultTest", + "path": "aws-cdk-glue-workflow-trigger-integ/DefaultTest", + "children": { + "Default": { + "id": "Default", + "path": "aws-cdk-glue-workflow-trigger-integ/DefaultTest/Default", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + }, + "DeployAssert": { + "id": "DeployAssert", + "path": "aws-cdk-glue-workflow-trigger-integ/DefaultTest/DeployAssert", + "children": { + "BootstrapVersion": { + "id": "BootstrapVersion", + "path": "aws-cdk-glue-workflow-trigger-integ/DefaultTest/DeployAssert/BootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnParameter", + "version": "0.0.0" + } + }, + "CheckBootstrapVersion": { + "id": "CheckBootstrapVersion", + "path": "aws-cdk-glue-workflow-trigger-integ/DefaultTest/DeployAssert/CheckBootstrapVersion", + "constructInfo": { + "fqn": "aws-cdk-lib.CfnRule", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.Stack", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTestCase", + "version": "0.0.0" + } + } + }, + "constructInfo": { + "fqn": "@aws-cdk/integ-tests-alpha.IntegTest", + "version": "0.0.0" + } + }, + "Tree": { + "id": "Tree", + "path": "Tree", + "constructInfo": { + "fqn": "constructs.Construct", + "version": "10.3.0" + } + } + }, + "constructInfo": { + "fqn": "aws-cdk-lib.App", + "version": "0.0.0" + } + } +} \ No newline at end of file