Skip to content

Commit e48e584

Browse files
authored
fix(cdk-lib): multiple submodules use an incorrect namespace for .NET (#36002)
### Issue 53 submodules of `aws-cdk-lib` used the wrong .NET package name. Example: ``` # ❌ wrong Amazon.CDK.aws_bedrockagentcore # ✅ correct Amazon.CDK.AWS.BedrockAgentCore ``` ❌ wrong <img width="514" height="150" alt="image" src="https://github.com/user-attachments/assets/97477ced-3bf0-4076-abfb-12e46ec55fa9" /> ✅ correct <img width="453" height="123" alt="image" src="https://github.com/user-attachments/assets/8a76b027-faf4-47bd-aeea-7c1d7b4824db" /> Full list of affected submodules: ``` aws-aiops aws-applicationsignals aws-apptest aws-arcregionswitch aws-arczonalshift aws-b2bi aws-backupgateway aws-bcmdataexports aws-bedrock aws-bedrockagentcore aws-billing aws-cleanrooms aws-cleanroomsml aws-codeconnections aws-connectcampaignsv2 aws-datazone aws-deadline aws-dsql aws-entityresolution aws-evs aws-gameliftstreams aws-healthimaging aws-invoicing aws-launchwizard aws-mediapackagev2 aws-mpa aws-neptunegraph aws-notifications aws-notificationscontacts aws-observabilityadmin aws-odb aws-osis aws-paymentcryptography aws-pcaconnectorad aws-pcaconnectorscep aws-pcs aws-proton aws-qbusiness aws-rbin aws-route53profiles aws-rtbfabric aws-s3express aws-s3tables aws-s3vectors aws-securitylake aws-shield aws-smsvoice aws-ssmguiconnect aws-ssmquicksetup aws-verifiedpermissions aws-workspacesinstances aws-workspacesthinclient aws-workspacesweb ``` ### Reason for this change The name of submodules is determined by a `.jsiirc.json‎` inside the submodule directory. If not present, the export name is appended to the name of the parent module. However for most jsii languages this convention is not great: JavaScript export names don't translate well into other ecosystems. For `aws-cdk-lib` we therefore have added `.jsiirc.json‎` files into each submodule. For new services, this file is generated when the service is first added. Due to a bug, this generated file was incorrectly adding the key `package` to the `dotnet` target configuration. It should have been `namespace` instead. Since this was a mistake, we are fixing this now. It means that the package names for the listed 53 submodules are changing for .NET users. ### Description of changes Update the package names of the listed 53 submodules to use the correct configuration. Adjusted the order of targets in other `.jsiirc.json` files to be the same as generated ones. ### Describe any new or updated permissions being added n/a ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 7445176 commit e48e584

File tree

204 files changed

+501
-514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+501
-514
lines changed

packages/@aws-cdk/aws-eks-v2-alpha/.jsiirc.json

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

packages/aws-cdk-lib/alexa-ask/.jsiirc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"targets": {
3-
"dotnet": {
4-
"namespace": "Amazon.CDK.Alexa.Ask"
5-
},
63
"java": {
74
"package": "software.amazon.awscdk.alexa.ask"
85
},
6+
"dotnet": {
7+
"namespace": "Amazon.CDK.Alexa.Ask"
8+
},
99
"python": {
1010
"module": "aws_cdk.alexa_ask"
1111
}

packages/aws-cdk-lib/aws-accessanalyzer/.jsiirc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"targets": {
3-
"dotnet": {
4-
"namespace": "Amazon.CDK.AWS.AccessAnalyzer"
5-
},
63
"java": {
74
"package": "software.amazon.awscdk.services.accessanalyzer"
85
},
6+
"dotnet": {
7+
"namespace": "Amazon.CDK.AWS.AccessAnalyzer"
8+
},
99
"python": {
1010
"module": "aws_cdk.aws_accessanalyzer"
1111
}

packages/aws-cdk-lib/aws-acmpca/.jsiirc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"targets": {
3-
"dotnet": {
4-
"namespace": "Amazon.CDK.AWS.ACMPCA"
5-
},
63
"java": {
74
"package": "software.amazon.awscdk.services.acmpca"
85
},
6+
"dotnet": {
7+
"namespace": "Amazon.CDK.AWS.ACMPCA"
8+
},
99
"python": {
1010
"module": "aws_cdk.aws_acmpca"
1111
}

packages/aws-cdk-lib/aws-aiops/.jsiirc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"package": "software.amazon.awscdk.services.aiops"
55
},
66
"dotnet": {
7-
"package": "Amazon.CDK.AWS.AIOps"
7+
"namespace": "Amazon.CDK.AWS.AIOps"
88
},
99
"python": {
1010
"module": "aws_cdk.aws_aiops"

packages/aws-cdk-lib/aws-amazonmq/.jsiirc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"targets": {
3-
"dotnet": {
4-
"namespace": "Amazon.CDK.AWS.AmazonMQ"
5-
},
63
"java": {
74
"package": "software.amazon.awscdk.services.amazonmq"
85
},
6+
"dotnet": {
7+
"namespace": "Amazon.CDK.AWS.AmazonMQ"
8+
},
99
"python": {
1010
"module": "aws_cdk.aws_amazonmq"
1111
}

packages/aws-cdk-lib/aws-amplify/.jsiirc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"targets": {
3-
"dotnet": {
4-
"namespace": "Amazon.CDK.AWS.Amplify"
5-
},
63
"java": {
74
"package": "software.amazon.awscdk.services.amplify"
85
},
6+
"dotnet": {
7+
"namespace": "Amazon.CDK.AWS.Amplify"
8+
},
99
"python": {
1010
"module": "aws_cdk.aws_amplify"
1111
}

packages/aws-cdk-lib/aws-amplifyuibuilder/.jsiirc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"targets": {
3-
"dotnet": {
4-
"namespace": "Amazon.CDK.AWS.AmplifyUIBuilder"
5-
},
63
"java": {
74
"package": "software.amazon.awscdk.services.amplifyuibuilder"
85
},
6+
"dotnet": {
7+
"namespace": "Amazon.CDK.AWS.AmplifyUIBuilder"
8+
},
99
"python": {
1010
"module": "aws_cdk.aws_amplifyuibuilder"
1111
}

packages/aws-cdk-lib/aws-apigatewayv2/.jsiirc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"targets": {
3-
"dotnet": {
4-
"namespace": "Amazon.CDK.AWS.Apigatewayv2"
5-
},
63
"java": {
74
"package": "software.amazon.awscdk.services.apigatewayv2"
85
},
6+
"dotnet": {
7+
"namespace": "Amazon.CDK.AWS.Apigatewayv2"
8+
},
99
"python": {
1010
"module": "aws_cdk.aws_apigatewayv2"
1111
}

packages/aws-cdk-lib/aws-appconfig/.jsiirc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"targets": {
3-
"dotnet": {
4-
"namespace": "Amazon.CDK.AWS.AppConfig"
5-
},
63
"java": {
74
"package": "software.amazon.awscdk.services.appconfig"
85
},
6+
"dotnet": {
7+
"namespace": "Amazon.CDK.AWS.AppConfig"
8+
},
99
"python": {
1010
"module": "aws_cdk.aws_appconfig"
1111
}

0 commit comments

Comments
 (0)