Skip to content

fix(dataops-job): apply AmazonDataZoneProject tag so Glue jobs appear in SMUS UI #53

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

Open
marcinc wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(dataops-job): apply AmazonDataZoneProject tag so Glue jobs appear in SMUS UI #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5ec108
fix(dataops-job): apply AmazonDataZoneProject tag so Glue jobs appear…
marcinc May 19, 2026
a6a3bba
fix(dataops-job): update diff baselines to include AmazonDataZoneProj…
marcinc May 22, 2026
3dc0403
fix(dataops-project): update diff baselines to include sagemaker/proj…
marcinc May 22, 2026
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
21 changes: 20 additions & 1 deletion ...apps/dataops/dataops-job-app/test/__snapshots__/sample-config-comprehensive.baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/test-org/test-domain/dataops-project-test/kmsArn/default"
},
"SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/test-org/test-domain/dataops-project-test/sagemaker/project/id/default"
},
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
Expand Down Expand Up @@ -551,6 +555,9 @@
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsecurityConfigurationdefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"Tags": {
"AmazonDataZoneProject": {
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"mdaa_cdk_app": "dataops-job",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
Expand Down Expand Up @@ -1406,6 +1413,9 @@
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsecurityConfigurationdefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"Tags": {
"AmazonDataZoneProject": {
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"mdaa_cdk_app": "dataops-job",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
Expand Down Expand Up @@ -2183,6 +2193,9 @@
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsecurityConfigurationdefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"Tags": {
"AmazonDataZoneProject": {
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"mdaa_cdk_app": "dataops-job",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
Expand Down Expand Up @@ -2609,6 +2622,9 @@
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsecurityConfigurationdefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"Tags": {
"AmazonDataZoneProject": {
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"mdaa_cdk_app": "dataops-job",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
Expand Down Expand Up @@ -3221,6 +3237,9 @@
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsecurityConfigurationdefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"Tags": {
"AmazonDataZoneProject": {
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"mdaa_cdk_app": "dataops-job",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
Expand Down Expand Up @@ -3347,4 +3366,4 @@
]
}
}
}
}
7 changes: 7 additions & 0 deletions packages/apps/dataops/dataops-job-app/test/__snapshots__/sample-config-minimal.baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/test-org/test-domain/dataops-project-test/kmsArn/default"
},
"SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/test-org/test-domain/dataops-project-test/sagemaker/project/id/default"
},
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
Expand Down Expand Up @@ -392,6 +396,9 @@
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsecurityConfigurationdefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"Tags": {
"AmazonDataZoneProject": {
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"mdaa_cdk_app": "dataops-job",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
Expand Down
13 changes: 13 additions & 0 deletions ...es/apps/dataops/dataops-job-app/test/__snapshots__/sample-config-workertype.baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/test-org/test-domain/dataops-project-test/kmsArn/default"
},
"SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/test-org/test-domain/dataops-project-test/sagemaker/project/id/default"
},
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
Expand Down Expand Up @@ -392,6 +396,9 @@
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsecurityConfigurationdefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"Tags": {
"AmazonDataZoneProject": {
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"mdaa_cdk_app": "dataops-job",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
Expand Down Expand Up @@ -820,6 +827,9 @@
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsecurityConfigurationdefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"Tags": {
"AmazonDataZoneProject": {
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"mdaa_cdk_app": "dataops-job",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
Expand Down Expand Up @@ -1248,6 +1258,9 @@
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsecurityConfigurationdefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"Tags": {
"AmazonDataZoneProject": {
"Ref": "SsmParameterValuetestorgtestdomaindataopsprojecttestsagemakerprojectiddefaultC96584B6F00A464EAD1953AFF4B05118Parameter"
},
"mdaa_cdk_app": "dataops-job",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
Expand Down
20 changes: 20 additions & 0 deletions ...prehensive.test-org-test-env-test-domain-test-dataops-project-comprehensive.baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6225,6 +6225,26 @@
}
}
},
"ssmsagemakerprojectidFE5981B8": {
"Type": "AWS::SSM::Parameter",
"Properties": {
"Name": "/test-org/test-domain/test-dataops-project-comprehensive/sagemaker/project/id/default",
"Tags": {
"mdaa_cdk_app": "dataops-project",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
"mdaa_module_name": "test-dataops-project-comprehensive",
"mdaa_org": "test-org"
},
"Type": "String",
"Value": {
"Fn::GetAtt": [
"constructsagemakerprojectdataopsproject7423C7DC",
"Id"
]
}
}
},
"securityconfig6DD90031": {
"Type": "AWS::Glue::SecurityConfiguration",
"Properties": {
Expand Down
20 changes: 20 additions & 0 deletions ...config-datazone.test-org-test-env-test-domain-test-dataops-project-datazone.baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4198,6 +4198,26 @@
}
}
},
"ssmsagemakerprojectidFE5981B8": {
"Type": "AWS::SSM::Parameter",
"Properties": {
"Name": "/test-org/test-domain/test-dataops-project-datazone/sagemaker/project/id/default",
"Tags": {
"mdaa_cdk_app": "dataops-project",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
"mdaa_module_name": "test-dataops-project-datazone",
"mdaa_org": "test-org"
},
"Type": "String",
"Value": {
"Fn::GetAtt": [
"constructdatazoneproject5CD687B2",
"Id"
]
}
}
},
"securityconfig6DD90031": {
"Type": "AWS::Glue::SecurityConfiguration",
"Properties": {
Expand Down
20 changes: 20 additions & 0 deletions ...nfig-sagemaker.test-org-test-env-test-domain-test-dataops-project-sagemaker.baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4227,6 +4227,26 @@
}
}
},
"ssmsagemakerprojectidFE5981B8": {
"Type": "AWS::SSM::Parameter",
"Properties": {
"Name": "/test-org/test-domain/test-dataops-project-sagemaker/sagemaker/project/id/default",
"Tags": {
"mdaa_cdk_app": "dataops-project",
"mdaa_domain": "test-domain",
"mdaa_env": "test-env",
"mdaa_module_name": "test-dataops-project-sagemaker",
"mdaa_org": "test-org"
},
"Type": "String",
"Value": {
"Fn::GetAtt": [
"constructsagemakerprojectdataopsproject7423C7DC",
"Id"
]
}
}
},
"securityconfig6DD90031": {
"Type": "AWS::Glue::SecurityConfiguration",
"Properties": {
Expand Down
14 changes: 12 additions & 2 deletions packages/constructs/L3/dataops/dataops-job-l3-construct/lib/dataops-job-l3-construct.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import { MdaaRole } from '@aws-mdaa/iam-constructs';
import { MdaaBucket } from '@aws-mdaa/s3-constructs';
import { MdaaL3Construct, MdaaL3ConstructProps } from '@aws-mdaa/l3-construct';
import { CfnJob } from 'aws-cdk-lib/aws-glue';
import { Fn, Tags } from 'aws-cdk-lib';
import { MdaaNagSuppressions, MdaaStringParameter } from '@aws-mdaa/construct'; //NOSONAR
import { BucketDeployment, ISource, Source } from 'aws-cdk-lib/aws-s3-deployment';
import { MdaaNagSuppressions } from '@aws-mdaa/construct'; //NOSONAR
import { Construct } from 'constructs';
import * as path from 'path';
import { SnsTopic } from 'aws-cdk-lib/aws-events-targets';
import { MdaaSnsTopic } from '@aws-mdaa/sns-constructs';
import { Rule } from 'aws-cdk-lib/aws-events';
import { Fn } from 'aws-cdk-lib';
import { ConfigurationElement } from '@aws-mdaa/config';
import { RetentionDays } from 'aws-cdk-lib/aws-logs';
import { MdaaLogGroup } from '@aws-mdaa/cloudwatch-constructs';
Expand Down Expand Up @@ -505,6 +505,16 @@ export class GlueJobL3Construct extends MdaaL3Construct {
job.name,
);

// Apply AmazonDataZoneProject tag so the job appears in the SMUS project UI.
// The DataZone project ID is published to SSM by the dataops-project module.
const projectIdSsmPath = this.props.naming.ssmPath(
`${this.props.projectName}/sagemaker/project/id/default`,
false,
false,
);
const datazoneProjectId = MdaaStringParameter.valueForStringParameter(this.scope, projectIdSsmPath);
Tags.of(job).add('AmazonDataZoneProject', datazoneProjectId);

const eventRule = this.createJobMonitoringEventRule(`${jobName}-monitor`, [job.name]);
if (!this.props.notificationTopicArn) {
throw new Error('Notification topic ARN is required for job monitoring event rule');
Expand Down
5 changes: 5 additions & 0 deletions packages/constructs/L3/dataops/dataops-job-l3-construct/test/job.compliance.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,11 @@ describe('MDAA Compliance Stack Tests', () => {
RetentionInDays: Match.absent(),
});
});
test('Job has AmazonDataZoneProject tag when projectName is set', () => {
template.hasResourceProperties('AWS::Glue::Job', {
Tags: Match.objectLike({ AmazonDataZoneProject: Match.anyValue() }),
});
});
});

describe('MDAA with input parameters', () => {
Expand Down
17 changes: 14 additions & 3 deletions ...es/constructs/L3/dataops/dataops-project-l3-construct/lib/dataops-project-l3-construct.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,12 +682,23 @@ export class DataOpsProjectL3Construct extends MdaaL3Construct {
if (this.props.datazone && this.props.sagemaker) {
throw new Error('Only one of datazone or sagemaker properties should be defined');
}
let resources: DatazoneResources | undefined;
if (this.props.datazone) {
return this.createDatazoneResources(this.props.datazone, projectBucket, datazoneUserRole);
resources = this.createDatazoneResources(this.props.datazone, projectBucket, datazoneUserRole);
} else if (this.props.sagemaker) {
return this.createSageMakerResources(this.props.sagemaker);
resources = this.createSageMakerResources(this.props.sagemaker);
}
return undefined;
if (resources?.datazoneProject) {
// Publish the DataZone project ID to SSM so sibling modules (dataops-job, dataops-crawler,
// dataops-workflow) can apply the AmazonDataZoneProject tag, making their resources visible
// in the SageMaker Unified Studio project UI.
this.createProjectSSMParam(
'ssm-sagemaker-project-id',
'sagemaker/project/id/default',
resources.datazoneProject.project.attrId,
);
}
return resources;
}

private createLakeFormationRole() {
Expand Down
7 changes: 7 additions & 0 deletions packages/constructs/L3/dataops/dataops-project-l3-construct/test/project.compliance.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,13 @@ describe('MDAA Compliance Stack Tests', () => {
});
});

test('DataZone project ID SSM parameter published for cross-module use', () => {
template.hasResourceProperties('AWS::SSM::Parameter', {
Name: Match.stringLikeRegexp('sagemaker/project/id/default'),
Type: 'String',
});
});

test('LakeFormationTagAssociation', () => {
template.hasResourceProperties('AWS::LakeFormation::TagAssociation', {
LFTags: [
Expand Down