From b865320674f97bd7dd7cfcc69235d3521e6aa0d4 Mon Sep 17 00:00:00 2001 From: Rico Hermans Date: Fri, 24 Nov 2023 10:04:25 +0100 Subject: [PATCH] fix: java package names are incorrect for a number of packages (#28121) In Java, the following services were all generated with an incorrect package name: ``` services.backupgateway services.cleanrooms services.entityresolution services.healthimaging services.mediapackagev2 services.osis services.pcaconnectorad services.proton services.shield services.verifiedpermissions services.workspacesweb ``` Which all should have been: ``` software.amazon.awscdk.services.backupgateway (etc) ``` ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license* --- packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-osis/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-proton/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-shield/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json | 2 +- packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json | 2 +- tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json b/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json index da087046f85d3..f41c93513dd95 100644 --- a/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.backupgateway" + "package": "software.amazon.awscdk.services.backupgateway" }, "dotnet": { "package": "Amazon.CDK.AWS.BackupGateway" diff --git a/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json b/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json index d64d0518accfd..33f9a03331071 100644 --- a/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.cleanrooms" + "package": "software.amazon.awscdk.services.cleanrooms" }, "dotnet": { "package": "Amazon.CDK.AWS.CleanRooms" diff --git a/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json b/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json index 429b91f572e17..48d7cdbe02806 100644 --- a/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.entityresolution" + "package": "software.amazon.awscdk.services.entityresolution" }, "dotnet": { "package": "Amazon.CDK.AWS.EntityResolution" diff --git a/packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json b/packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json index f2084e360d104..0a770de6cb85e 100644 --- a/packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.healthimaging" + "package": "software.amazon.awscdk.services.healthimaging" }, "dotnet": { "package": "Amazon.CDK.AWS.HealthImaging" diff --git a/packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json b/packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json index 81603d258f333..2c11c8ceb76f0 100644 --- a/packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.mediapackagev2" + "package": "software.amazon.awscdk.services.mediapackagev2" }, "dotnet": { "package": "Amazon.CDK.AWS.MediaPackageV2" diff --git a/packages/aws-cdk-lib/aws-osis/.jsiirc.json b/packages/aws-cdk-lib/aws-osis/.jsiirc.json index dffd9d64ead1e..826b95a0bcef8 100644 --- a/packages/aws-cdk-lib/aws-osis/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-osis/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.osis" + "package": "software.amazon.awscdk.services.osis" }, "dotnet": { "package": "Amazon.CDK.AWS.OSIS" diff --git a/packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json b/packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json index 65613c9537b59..e8a3f5e7d2f3b 100644 --- a/packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.pcaconnectorad" + "package": "software.amazon.awscdk.services.pcaconnectorad" }, "dotnet": { "package": "Amazon.CDK.AWS.PCAConnectorAD" diff --git a/packages/aws-cdk-lib/aws-proton/.jsiirc.json b/packages/aws-cdk-lib/aws-proton/.jsiirc.json index c85aea0ed7b07..3ebb107529714 100644 --- a/packages/aws-cdk-lib/aws-proton/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-proton/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.proton" + "package": "software.amazon.awscdk.services.proton" }, "dotnet": { "package": "Amazon.CDK.AWS.Proton" diff --git a/packages/aws-cdk-lib/aws-shield/.jsiirc.json b/packages/aws-cdk-lib/aws-shield/.jsiirc.json index 7dc78ce52f428..146a5b1899b2e 100644 --- a/packages/aws-cdk-lib/aws-shield/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-shield/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.shield" + "package": "software.amazon.awscdk.services.shield" }, "dotnet": { "package": "Amazon.CDK.AWS.Shield" diff --git a/packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json b/packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json index 829d266f44192..c4ca82cc34b7f 100644 --- a/packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.verifiedpermissions" + "package": "software.amazon.awscdk.services.verifiedpermissions" }, "dotnet": { "package": "Amazon.CDK.AWS.VerifiedPermissions" diff --git a/packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json b/packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json index daa2d4ee94aaa..52d74bf642b6c 100644 --- a/packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json +++ b/packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json @@ -1,7 +1,7 @@ { "targets": { "java": { - "package": "services.workspacesweb" + "package": "software.amazon.awscdk.services.workspacesweb" }, "dotnet": { "package": "Amazon.CDK.AWS.WorkSpacesWeb" diff --git a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts index e3945d82c92f3..b8f58f5a30010 100644 --- a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts +++ b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts @@ -13,7 +13,7 @@ export function createModuleDefinitionFromCfnNamespace(namespace: string) { const javaGroupId = 'software.amazon.awscdk'; const javaPackage = moduleFamily === 'AWS' - ? `services.${lowcaseModuleName}` + ? `software.amazon.awscdk.services.${lowcaseModuleName}` : `${moduleFamily.toLocaleLowerCase()}.${lowcaseModuleName}`; const javaArtifactId = moduleFamily === 'AWS' ? lowcaseModuleName : `${moduleFamily.toLocaleLowerCase()}-${lowcaseModuleName}`;