Skip to content

Commit 13b6480

Browse files
authored
revert: remove invalid Dev::ServiceCatalog resource from L1 update (#36678)
### Reason for this change The L1 update #36660 introduced an invalid `Dev::ServiceCatalog::LaunchRoleConstraint` resource that was accidentally included in the CloudFormation spec. This is not a real AWS resource - it appears to be test/development data that made it into the production spec. This causes CI failures during the `pack.sh` phase when jsii-pacmak tries to generate .NET code, because the interface namespace mapping is incorrect. ### Description of changes Reverts commit eb6a82a which introduced the invalid `dev-servicecatalog` module. ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) --- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent e3f7dba commit 13b6480

13 files changed

Lines changed: 23 additions & 85 deletions

File tree

packages/@aws-cdk/mixins-preview/lib/services/dev-servicecatalog/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/@aws-cdk/mixins-preview/lib/services/dev-servicecatalog/mixins.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/@aws-cdk/mixins-preview/lib/services/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,4 +266,3 @@ export * as aws_workspacesinstances from './aws-workspacesinstances';
266266
export * as aws_workspacesthinclient from './aws-workspacesthinclient';
267267
export * as aws_workspacesweb from './aws-workspacesweb';
268268
export * as aws_xray from './aws-xray';
269-
export * as dev_servicecatalog from './dev-servicecatalog';

packages/@aws-cdk/mixins-preview/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,6 @@
577577
"./aws-xray": "./lib/services/aws-xray/index.js",
578578
"./aws-xray/mixins": "./lib/services/aws-xray/mixins.js",
579579
"./core": "./lib/core/index.js",
580-
"./dev-servicecatalog": "./lib/services/dev-servicecatalog/index.js",
581-
"./dev-servicecatalog/mixins": "./lib/services/dev-servicecatalog/mixins.js",
582580
"./mixins": "./lib/mixins/index.js",
583581
"./with": "./lib/with.js"
584582
},
@@ -663,7 +661,7 @@
663661
"@aws-cdk/integ-runner": "^2.192.2",
664662
"@aws-cdk/integ-tests-alpha": "0.0.0",
665663
"@aws-cdk/pkglint": "0.0.0",
666-
"@aws-cdk/service-spec-types": "^0.0.206",
664+
"@aws-cdk/service-spec-types": "^0.0.202",
667665
"@aws-cdk/spec2cdk": "0.0.0",
668666
"@cdklabs/tskb": "^0.0.4",
669667
"@cdklabs/typewriter": "^0.0.14",

packages/aws-cdk-lib/dev-servicecatalog/.jsiirc.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/aws-cdk-lib/dev-servicecatalog/README.md

Lines changed: 0 additions & 39 deletions
This file was deleted.

packages/aws-cdk-lib/dev-servicecatalog/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/aws-cdk-lib/dev-servicecatalog/lib/index.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

packages/aws-cdk-lib/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ export * as cloud_assembly_schema from './cloud-assembly-schema';
300300
export * as cloudformation_include from './cloudformation-include';
301301
export * as custom_resources from './custom-resources';
302302
export * as cx_api from './cx-api';
303-
export * as dev_servicecatalog from './dev-servicecatalog';
304303
export * as interfaces from './interfaces';
305304
export * as lambda_layer_awscli from './lambda-layer-awscli';
306305
export * as lambda_layer_node_proxy_agent from './lambda-layer-node-proxy-agent';

packages/aws-cdk-lib/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
},
132132
"devDependencies": {
133133
"@aws-cdk/lambda-layer-kubectl-v31": "^2.1.0",
134-
"@aws-cdk/aws-service-spec": "^0.1.140",
134+
"@aws-cdk/aws-service-spec": "^0.1.136",
135135
"@aws-cdk/cdk-build-tools": "0.0.0",
136136
"@aws-cdk/custom-resource-handlers": "0.0.0",
137137
"@aws-cdk/pkglint": "0.0.0",
@@ -519,7 +519,6 @@
519519
"./custom-resources": "./custom-resources/index.js",
520520
"./custom-resources/lib/helpers-internal": "./custom-resources/lib/helpers-internal/index.js",
521521
"./cx-api": "./cx-api/index.js",
522-
"./dev-servicecatalog": "./dev-servicecatalog/index.js",
523522
"./interfaces": "./interfaces/index.js",
524523
"./lambda-layer-awscli": "./lambda-layer-awscli/index.js",
525524
"./lambda-layer-kubectl": "./lambda-layer-kubectl/index.js",

0 commit comments

Comments
 (0)