Skip to content

Commit

Permalink
fix: java package names are incorrect for a number of packages (#28121)
Browse files Browse the repository at this point in the history
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*
  • Loading branch information
rix0rrr authored Nov 24, 2023
1 parent 49839b2 commit b865320
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.backupgateway"
"package": "software.amazon.awscdk.services.backupgateway"
},
"dotnet": {
"package": "Amazon.CDK.AWS.BackupGateway"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.cleanrooms"
"package": "software.amazon.awscdk.services.cleanrooms"
},
"dotnet": {
"package": "Amazon.CDK.AWS.CleanRooms"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.entityresolution"
"package": "software.amazon.awscdk.services.entityresolution"
},
"dotnet": {
"package": "Amazon.CDK.AWS.EntityResolution"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.healthimaging"
"package": "software.amazon.awscdk.services.healthimaging"
},
"dotnet": {
"package": "Amazon.CDK.AWS.HealthImaging"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.mediapackagev2"
"package": "software.amazon.awscdk.services.mediapackagev2"
},
"dotnet": {
"package": "Amazon.CDK.AWS.MediaPackageV2"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-osis/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.osis"
"package": "software.amazon.awscdk.services.osis"
},
"dotnet": {
"package": "Amazon.CDK.AWS.OSIS"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.pcaconnectorad"
"package": "software.amazon.awscdk.services.pcaconnectorad"
},
"dotnet": {
"package": "Amazon.CDK.AWS.PCAConnectorAD"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-proton/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.proton"
"package": "software.amazon.awscdk.services.proton"
},
"dotnet": {
"package": "Amazon.CDK.AWS.Proton"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-shield/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.shield"
"package": "software.amazon.awscdk.services.shield"
},
"dotnet": {
"package": "Amazon.CDK.AWS.Shield"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.verifiedpermissions"
"package": "software.amazon.awscdk.services.verifiedpermissions"
},
"dotnet": {
"package": "Amazon.CDK.AWS.VerifiedPermissions"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"targets": {
"java": {
"package": "services.workspacesweb"
"package": "software.amazon.awscdk.services.workspacesweb"
},
"dotnet": {
"package": "Amazon.CDK.AWS.WorkSpacesWeb"
Expand Down
2 changes: 1 addition & 1 deletion tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`;
Expand Down

0 comments on commit b865320

Please sign in to comment.