Skip to content

Commit 63f495e

Browse files
chore: update analytics metadata blueprints
1 parent 6380983 commit 63f495e

File tree

10 files changed

+99
-44
lines changed

10 files changed

+99
-44
lines changed

packages/@aws-cdk/aws-glue-alpha/lib/jobs/pyspark-etl-job.ts

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Construct } from 'constructs';
33
import { JobType, GlueVersion, JobLanguage, PythonVersion, WorkerType } from '../constants';
44
import { Code } from '../code';
55
import { SparkJob, SparkJobProps } from './spark-job';
6+
import { addConstructMetadata } from 'aws-cdk-lib/core/lib/metadata-resource';
67

78
/**
89
* Properties for creating a Python Spark ETL job
@@ -75,6 +76,8 @@ export class PySparkEtlJob extends SparkJob {
7576
*/
7677
constructor(scope: Construct, id: string, props: PySparkEtlJobProps) {
7778
super(scope, id, props);
79+
// Enhanced CDK Analytics Telemetry
80+
addConstructMetadata(this, props);
7881

7982
// Combine command line arguments into a single line item
8083
const defaultArguments = {

packages/@aws-cdk/aws-glue-alpha/lib/jobs/pyspark-flex-etl-job.ts

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { JobType, GlueVersion, JobLanguage, PythonVersion, WorkerType, Execution
44
import * as cdk from 'aws-cdk-lib/core';
55
import { Code } from '../code';
66
import { SparkJob, SparkJobProps } from './spark-job';
7+
import { addConstructMetadata } from 'aws-cdk-lib/core/lib/metadata-resource';
78

89
/**
910
* Properties for PySparkFlexEtlJob
@@ -71,6 +72,8 @@ export class PySparkFlexEtlJob extends SparkJob {
7172
*/
7273
constructor(scope: Construct, id: string, props: PySparkFlexEtlJobProps) {
7374
super(scope, id, props);
75+
// Enhanced CDK Analytics Telemetry
76+
addConstructMetadata(this, props);
7477

7578
// Combine command line arguments into a single line item
7679
const defaultArguments = {

packages/@aws-cdk/aws-glue-alpha/lib/jobs/pyspark-streaming-job.ts

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Construct } from 'constructs';
33
import { JobType, GlueVersion, JobLanguage, PythonVersion, WorkerType } from '../constants';
44
import { Code } from '../code';
55
import { SparkJob, SparkJobProps } from './spark-job';
6+
import { addConstructMetadata } from 'aws-cdk-lib/core/lib/metadata-resource';
67

78
/**
89
* Properties for creating a Python Spark ETL job
@@ -75,6 +76,8 @@ export class PySparkStreamingJob extends SparkJob {
7576
*/
7677
constructor(scope: Construct, id: string, props: PySparkStreamingJobProps) {
7778
super(scope, id, props);
79+
// Enhanced CDK Analytics Telemetry
80+
addConstructMetadata(this, props);
7881

7982
// Combine command line arguments into a single line item
8083
const defaultArguments = {

packages/@aws-cdk/aws-glue-alpha/lib/jobs/scala-spark-etl-job.ts

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Construct } from 'constructs';
33
import { JobType, GlueVersion, JobLanguage, WorkerType } from '../constants';
44
import { Code } from '../code';
55
import { SparkJob, SparkJobProps } from './spark-job';
6+
import { addConstructMetadata } from 'aws-cdk-lib/core/lib/metadata-resource';
67

78
/**
89
* Properties for creating a Scala Spark ETL job
@@ -74,6 +75,8 @@ export class ScalaSparkEtlJob extends SparkJob {
7475
*/
7576
constructor(scope: Construct, id: string, props: ScalaSparkEtlJobProps) {
7677
super(scope, id, props);
78+
// Enhanced CDK Analytics Telemetry
79+
addConstructMetadata(this, props);
7780

7881
// Combine command line arguments into a single line item
7982
const defaultArguments = {

packages/@aws-cdk/aws-glue-alpha/lib/jobs/scala-spark-flex-etl-job.ts

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { JobType, GlueVersion, JobLanguage, WorkerType, ExecutionClass } from '.
44
import * as cdk from 'aws-cdk-lib/core';
55
import { Code } from '../code';
66
import { SparkJob, SparkJobProps } from './spark-job';
7+
import { addConstructMetadata } from 'aws-cdk-lib/core/lib/metadata-resource';
78

89
/**
910
* Flex Jobs class
@@ -80,6 +81,8 @@ export class ScalaSparkFlexEtlJob extends SparkJob {
8081
*/
8182
constructor(scope: Construct, id: string, props: ScalaSparkFlexEtlJobProps) {
8283
super(scope, id, props);
84+
// Enhanced CDK Analytics Telemetry
85+
addConstructMetadata(this, props);
8386

8487
// Combine command line arguments into a single line item
8588
const defaultArguments = {

packages/@aws-cdk/aws-glue-alpha/lib/jobs/scala-spark-streaming-job.ts

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Construct } from 'constructs';
33
import { JobType, GlueVersion, JobLanguage, WorkerType } from '../constants';
44
import { Code } from '../code';
55
import { SparkJob, SparkJobProps } from './spark-job';
6+
import { addConstructMetadata } from 'aws-cdk-lib/core/lib/metadata-resource';
67

78
/**
89
* Properties for creating a Scala Spark ETL job
@@ -74,6 +75,8 @@ export class ScalaSparkStreamingJob extends SparkJob {
7475
*/
7576
constructor(scope: Construct, id: string, props: ScalaSparkStreamingJobProps) {
7677
super(scope, id, props);
78+
// Enhanced CDK Analytics Telemetry
79+
addConstructMetadata(this, props);
7780

7881
// Combine command line arguments into a single line item
7982
const defaultArguments = {

packages/aws-cdk-lib/core/lib/analytics-data-source/classes.ts

+50-39
Original file line numberDiff line numberDiff line change
@@ -4161,10 +4161,8 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
41614161
}
41624162
},
41634163
'@aws-cdk.aws-scheduler-alpha': {
4164-
'Group': {
4165-
'groupName': '*',
4166-
'removalPolicy': 'RemovalPolicy'
4167-
},
4164+
'Group': {},
4165+
'ScheduleGroup': {},
41684166
'Schedule': {
41694167
'schedule': '*',
41704168
'target': '*',
@@ -4180,6 +4178,16 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
41804178
},
41814179
'node': '*'
41824180
},
4181+
'scheduleGroup': {
4182+
'scheduleGroupName': '*',
4183+
'scheduleGroupArn': '*',
4184+
'stack': '*',
4185+
'env': {
4186+
'account': '*',
4187+
'region': '*'
4188+
},
4189+
'node': '*'
4190+
},
41834191
'enabled': 'boolean',
41844192
'key': {
41854193
'keyArn': '*',
@@ -18955,6 +18963,7 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
1895518963
},
1895618964
'logGroupName': '*',
1895718965
'dataProtectionPolicy': '*',
18966+
'fieldIndexPolicies': '*',
1895818967
'retention': 'RetentionDays',
1895918968
'logGroupClass': 'LogGroupClass',
1896018969
'removalPolicy': 'RemovalPolicy'
@@ -19286,6 +19295,7 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
1928619295
'node': '*'
1928719296
},
1928819297
'publiclyAccessible': 'boolean',
19298+
'availabilityZone': '*',
1928919299
'preferredMaintenanceWindow': '*',
1929019300
'parameters': '*',
1929119301
'allowMajorVersionUpgrade': 'boolean',
@@ -24096,6 +24106,11 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2409624106
},
2409724107
'aws-glue-alpha.lib': {
2409824108
'PySparkEtlJob': {
24109+
'extraPythonFiles': '*',
24110+
'extraFiles': '*',
24111+
'extraJars': '*',
24112+
'extraJarsFirst': 'boolean',
24113+
'jobRunQueuingEnabled': 'boolean',
2409924114
'sparkUI': {
2410024115
'bucket': {
2410124116
'bucketArn': '*',
@@ -24119,13 +24134,8 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2411924134
'policy': '*',
2412024135
'replicationRoleArn': '*'
2412124136
},
24122-
'prefix': '*',
24123-
'jobRunQueuingEnabled': 'boolean'
24137+
'prefix': '*'
2412424138
},
24125-
'extraPythonFiles': '*',
24126-
'extraFiles': '*',
24127-
'extraJars': '*',
24128-
'jobRunQueuingEnabled': 'boolean',
2412924139
'script': '*',
2413024140
'role': {
2413124141
'roleArn': '*',
@@ -24192,6 +24202,11 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2419224202
}
2419324203
},
2419424204
'PySparkFlexEtlJob': {
24205+
'notifyDelayAfter': '*',
24206+
'extraPythonFiles': '*',
24207+
'extraFiles': '*',
24208+
'extraJars': '*',
24209+
'extraJarsFirst': 'boolean',
2419524210
'sparkUI': {
2419624211
'bucket': {
2419724212
'bucketArn': '*',
@@ -24215,13 +24230,8 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2421524230
'policy': '*',
2421624231
'replicationRoleArn': '*'
2421724232
},
24218-
'prefix': '*',
24219-
'jobRunQueuingEnabled': 'boolean'
24233+
'prefix': '*'
2422024234
},
24221-
'notifyDelayAfter': '*',
24222-
'extraPythonFiles': '*',
24223-
'extraFiles': '*',
24224-
'extraJars': '*',
2422524235
'script': '*',
2422624236
'role': {
2422724237
'roleArn': '*',
@@ -24288,6 +24298,11 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2428824298
}
2428924299
},
2429024300
'PySparkStreamingJob': {
24301+
'extraPythonFiles': '*',
24302+
'extraFiles': '*',
24303+
'extraJars': '*',
24304+
'extraJarsFirst': 'boolean',
24305+
'jobRunQueuingEnabled': 'boolean',
2429124306
'sparkUI': {
2429224307
'bucket': {
2429324308
'bucketArn': '*',
@@ -24311,13 +24326,8 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2431124326
'policy': '*',
2431224327
'replicationRoleArn': '*'
2431324328
},
24314-
'prefix': '*',
24315-
'jobRunQueuingEnabled': 'boolean'
24329+
'prefix': '*'
2431624330
},
24317-
'extraPythonFiles': '*',
24318-
'extraFiles': '*',
24319-
'extraJars': '*',
24320-
'jobRunQueuingEnabled': 'boolean',
2432124331
'script': '*',
2432224332
'role': {
2432324333
'roleArn': '*',
@@ -24521,6 +24531,11 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2452124531
}
2452224532
},
2452324533
'ScalaSparkEtlJob': {
24534+
'className': '*',
24535+
'extraFiles': '*',
24536+
'extraJars': '*',
24537+
'extraJarsFirst': 'boolean',
24538+
'jobRunQueuingEnabled': 'boolean',
2452424539
'sparkUI': {
2452524540
'bucket': {
2452624541
'bucketArn': '*',
@@ -24544,12 +24559,8 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2454424559
'policy': '*',
2454524560
'replicationRoleArn': '*'
2454624561
},
24547-
'prefix': '*',
24548-
'jobRunQueuingEnabled': 'boolean'
24562+
'prefix': '*'
2454924563
},
24550-
'className': '*',
24551-
'extraJars': '*',
24552-
'jobRunQueuingEnabled': 'boolean',
2455324564
'script': '*',
2455424565
'role': {
2455524566
'roleArn': '*',
@@ -24616,6 +24627,11 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2461624627
}
2461724628
},
2461824629
'ScalaSparkFlexEtlJob': {
24630+
'notifyDelayAfter': '*',
24631+
'className': '*',
24632+
'extraFiles': '*',
24633+
'extraJars': '*',
24634+
'extraJarsFirst': 'boolean',
2461924635
'sparkUI': {
2462024636
'bucket': {
2462124637
'bucketArn': '*',
@@ -24639,14 +24655,8 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2463924655
'policy': '*',
2464024656
'replicationRoleArn': '*'
2464124657
},
24642-
'prefix': '*',
24643-
'jobRunQueuingEnabled': 'boolean'
24658+
'prefix': '*'
2464424659
},
24645-
'notifyDelayAfter': '*',
24646-
'className': '*',
24647-
'extraJars': '*',
24648-
'extraJarsFirst': 'boolean',
24649-
'extraFiles': '*',
2465024660
'script': '*',
2465124661
'role': {
2465224662
'roleArn': '*',
@@ -24713,6 +24723,11 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2471324723
}
2471424724
},
2471524725
'ScalaSparkStreamingJob': {
24726+
'className': '*',
24727+
'extraFiles': '*',
24728+
'extraJars': '*',
24729+
'extraJarsFirst': 'boolean',
24730+
'jobRunQueuingEnabled': 'boolean',
2471624731
'sparkUI': {
2471724732
'bucket': {
2471824733
'bucketArn': '*',
@@ -24736,12 +24751,8 @@ export const AWS_CDK_CONSTRUCTOR_PROPS: { [key: string]: any } = {
2473624751
'policy': '*',
2473724752
'replicationRoleArn': '*'
2473824753
},
24739-
'prefix': '*',
24740-
'jobRunQueuingEnabled': 'boolean'
24754+
'prefix': '*'
2474124755
},
24742-
'className': '*',
24743-
'extraJars': '*',
24744-
'jobRunQueuingEnabled': 'boolean',
2474524756
'script': '*',
2474624757
'role': {
2474724758
'roleArn': '*',

0 commit comments

Comments
 (0)