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

fix: correct .NET namespace naming #29211

Closed
wants to merge 5 commits into from
Closed

fix: correct .NET namespace naming #29211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55b137a
fix(apigatewayv2) - correct nuget package naming
Feb 22, 2024
dfbf762
Merge branch 'main' into vlesierse/fix-apigwv2-naming
vlesierse Feb 25, 2024
9fd83e4
Merge branch 'main' into vlesierse/fix-apigwv2-naming
vlesierse Feb 28, 2024
a0e00e6
fix: change dotnet package to namespace
Feb 28, 2024
0cce184
Change to .NET package to namespace
Mar 4, 2024
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
13 changes: 13 additions & 0 deletions packages/aws-cdk-lib/aws-apigatewayv2-authorizers/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"targets": {
"dotnet": {
"namespace": "Amazon.CDK.AWS.APIGatewayV2.Authorizers"
},
"java": {
"package": "software.amazon.awscdk.services.apigatewayv2.authorizers"
},
"python": {
"module": "aws_cdk.aws_apigatewayv2_authorizors"
}
}
}
13 changes: 13 additions & 0 deletions packages/aws-cdk-lib/aws-apigatewayv2-integrations/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"targets": {
"dotnet": {
"namespace": "Amazon.CDK.AWS.APIGatewayV2.Integrations"
},
"java": {
"package": "software.amazon.awscdk.services.apigatewayv2.integrations"
},
"python": {
"module": "aws_cdk.aws_apigatewayv2_integrations"
}
}
}
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-apigatewayv2/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"dotnet": {
"namespace": "Amazon.CDK.AWS.Apigatewayv2"
"namespace": "Amazon.CDK.AWS.APIGatewayV2"
},
"java": {
"package": "software.amazon.awscdk.services.apigatewayv2"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-arczonalshift/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.arczonalshift"
},
"dotnet": {
"package": "Amazon.CDK.AWS.ARCZonalShift"
"namespace": "Amazon.CDK.AWS.ARCZonalShift"
},
"python": {
"module": "aws_cdk.aws_arczonalshift"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-b2bi/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.b2bi"
},
"dotnet": {
"package": "Amazon.CDK.AWS.B2BI"
"namespace": "Amazon.CDK.AWS.B2BI"
},
"python": {
"module": "aws_cdk.aws_b2bi"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.backupgateway"
},
"dotnet": {
"package": "Amazon.CDK.AWS.BackupGateway"
"namespace": "Amazon.CDK.AWS.BackupGateway"
},
"python": {
"module": "aws_cdk.aws_backupgateway"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.cleanrooms"
},
"dotnet": {
"package": "Amazon.CDK.AWS.CleanRooms"
"namespace": "Amazon.CDK.AWS.CleanRooms"
},
"python": {
"module": "aws_cdk.aws_cleanrooms"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.entityresolution"
},
"dotnet": {
"package": "Amazon.CDK.AWS.EntityResolution"
"namespace": "Amazon.CDK.AWS.EntityResolution"
},
"python": {
"module": "aws_cdk.aws_entityresolution"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.healthimaging"
},
"dotnet": {
"package": "Amazon.CDK.AWS.HealthImaging"
"namespace": "Amazon.CDK.AWS.HealthImaging"
},
"python": {
"module": "aws_cdk.aws_healthimaging"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.mediapackagev2"
},
"dotnet": {
"package": "Amazon.CDK.AWS.MediaPackageV2"
"namespace": "Amazon.CDK.AWS.MediaPackageV2"
},
"python": {
"module": "aws_cdk.aws_mediapackagev2"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-neptunegraph/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.neptunegraph"
},
"dotnet": {
"package": "Amazon.CDK.AWS.NeptuneGraph"
"namespace": "Amazon.CDK.AWS.NeptuneGraph"
},
"python": {
"module": "aws_cdk.aws_neptunegraph"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-osis/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.osis"
},
"dotnet": {
"package": "Amazon.CDK.AWS.OSIS"
"namespace": "Amazon.CDK.AWS.OSIS"
},
"python": {
"module": "aws_cdk.aws_osis"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.pcaconnectorad"
},
"dotnet": {
"package": "Amazon.CDK.AWS.PCAConnectorAD"
"namespace": "Amazon.CDK.AWS.PCAConnectorAD"
},
"python": {
"module": "aws_cdk.aws_pcaconnectorad"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-proton/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.proton"
},
"dotnet": {
"package": "Amazon.CDK.AWS.Proton"
"namespace": "Amazon.CDK.AWS.Proton"
},
"python": {
"module": "aws_cdk.aws_proton"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-s3express/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.s3express"
},
"dotnet": {
"package": "Amazon.CDK.AWS.S3Express"
"namespace": "Amazon.CDK.AWS.S3Express"
},
"python": {
"module": "aws_cdk.aws_s3express"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-shield/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.shield"
},
"dotnet": {
"package": "Amazon.CDK.AWS.Shield"
"namespace": "Amazon.CDK.AWS.Shield"
},
"python": {
"module": "aws_cdk.aws_shield"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.verifiedpermissions"
},
"dotnet": {
"package": "Amazon.CDK.AWS.VerifiedPermissions"
"namespace": "Amazon.CDK.AWS.VerifiedPermissions"
},
"python": {
"module": "aws_cdk.aws_verifiedpermissions"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-workspacesthinclient/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.workspacesthinclient"
},
"dotnet": {
"package": "Amazon.CDK.AWS.WorkSpacesThinClient"
"namespace": "Amazon.CDK.AWS.WorkSpacesThinClient"
vlesierse marked this conversation as resolved.
Show resolved Hide resolved
},
"python": {
"module": "aws_cdk.aws_workspacesthinclient"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"package": "software.amazon.awscdk.services.workspacesweb"
},
"dotnet": {
"package": "Amazon.CDK.AWS.WorkSpacesWeb"
"namespace": "Amazon.CDK.AWS.WorkSpacesWeb"
},
"python": {
"module": "aws_cdk.aws_workspacesweb"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/scripts/submodules/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ async function ensureSubmodule(submodule: ModuleMapEntry, modulePath: string) {
package: submodule.definition.javaPackage,
},
dotnet: {
package: submodule.definition.dotnetPackage,
namespace: submodule.definition.dotnetNamespace,
},
python: {
module: submodule.definition.pythonModuleName,
Expand Down
6 changes: 3 additions & 3 deletions tools/@aws-cdk/pkglint/lib/library-creation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export interface ModuleDefinition {
readonly moduleBaseName: string;
readonly packageName: string;

readonly dotnetPackage: string;
readonly dotnetNamespace: string;
readonly javaGroupId: string;
readonly javaPackage: string;
readonly javaArtifactId: string;
Expand All @@ -27,7 +27,7 @@ export function createModuleDefinitionFromCfnNamespace(namespace: string): Modul
const packageName = `aws-cdk-lib/${moduleName}`;

// dotnet names
const dotnetPackage = `Amazon.CDK.${moduleFamily}.${moduleBaseName}`;
const dotnetNamespace = `Amazon.CDK.${moduleFamily}.${moduleBaseName}`;

// java names
const javaGroupId = 'software.amazon.awscdk';
Expand All @@ -49,7 +49,7 @@ export function createModuleDefinitionFromCfnNamespace(namespace: string): Modul
moduleFamily,
moduleBaseName,
packageName,
dotnetPackage,
dotnetNamespace,
javaGroupId,
javaPackage,
javaArtifactId,
Expand Down
Loading