Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

provide vpc connection to glue jobs in glue-job-deployer, add disable-proxy-v2 to default arguments #214

Merged
merged 1 commit into from
Oct 9, 2023
Merged

provide vpc connection to glue jobs in glue-job-deployer, add disable-proxy-v2 to default arguments #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions sdlf-cicd/template-glue-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,21 @@ Resources:
Name: glueetl
PythonVersion: "3"
ScriptLocation: !Sub s3://${pArtifactsBucket}/transforms/${pDomain}/${pEnvironment}/${pTeamName}/${GlueJobName}-${pGitRef}.py
DefaultArguments:
"--job-bookmark-option": job-bookmark-disable
"--enable-glue-datacatalog": "true"
"--enable-continuous-cloudwatch-log": "true"
"--enable-continuous-log-filter": "true"
"--enable-metrics": "true"
DefaultArguments: !If
- RunInVpc
-
"--job-bookmark-option": job-bookmark-disable
"--enable-glue-datacatalog": "true"
"--enable-continuous-cloudwatch-log": "true"
"--enable-continuous-log-filter": "true"
"--enable-metrics": "true"
"--disable-proxy-v2": "true"
-
"--job-bookmark-option": job-bookmark-disable
"--enable-glue-datacatalog": "true"
"--enable-continuous-cloudwatch-log": "true"
"--enable-continuous-log-filter": "true"
"--enable-metrics": "true"
ExecutionProperty:
MaxConcurrentRuns: 10
MaxRetries: 0
Expand All @@ -120,3 +129,8 @@ Resources:
Name: !Sub sdlf-${pTeamName}-${GlueJobName}
SecurityConfiguration: !Sub "{{resolve:ssm:/SDLF/Glue/${pTeamName}/SecurityConfigurationId}}"
Role: !Ref rGlueRole
Connections: !If
- RunInVpc
- Connections:
- !Ref rGlueConnection
- !Ref "AWS::NoValue"
21 changes: 17 additions & 4 deletions sdlf-utils/pipeline-examples/legislators/scripts/legislators-glue-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ Parameters:
Description: The team name
Type: String
Default: engineering
pEnableVpc:
Description: Deploy SDLF resources in a VPC
Type: AWS::SSM::Parameter::Value<String>
Default: /SDLF/VPC/Enabled

Conditions:
RunInVpc: !Equals [!Ref pEnableVpc, true]

Resources:
rGlueRole:
Expand Down Expand Up @@ -50,7 +57,7 @@ Resources:
Resource:
- !Sub "{{resolve:ssm:/SDLF/KMS/${pTeamName}/InfraKeyId:1}}"
- !Sub "{{resolve:ssm:/SDLF/KMS/${pTeamName}/DataKeyId:1}}"
- !Sub "{{resolve:ssm:/SDLF/KMS/KeyArn:1}}"
- "{{resolve:ssm:/SDLF/KMS/KeyArn:1}}"

rGlueJob:
Type: AWS::Glue::Job
Expand All @@ -59,9 +66,15 @@ Resources:
Name: glueetl
PythonVersion: "3"
ScriptLocation: !Sub s3://${pArtifactsBucket}/artifacts/${pDatasetName}-glue-job.py
DefaultArguments:
"--job-bookmark-option": job-bookmark-enable
"--enable-metrics": ""
DefaultArguments: !If
- RunInVpc
-
"--job-bookmark-option": job-bookmark-enable
"--enable-metrics": ""
"--disable-proxy-v2": "true"
-
"--job-bookmark-option": job-bookmark-enable
"--enable-metrics": ""
ExecutionProperty:
MaxConcurrentRuns: 3
MaxRetries: 0
Expand Down
Loading