chore(interfaces): fix go package name for interfaces is incorrect

Author: mrgrain

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

@@ -8,6 +8,9 @@
     },
     "python": {
       "module": "aws_cdk.interfaces"
+    },
+    "go": {
+      "packageName": "interfaces"
     }
   }
 }

packages/aws-cdk-lib/scripts/submodules/index.ts

@@ -1,5 +1,5 @@
 import * as path from 'node:path';
-import { createLibraryReadme, ModuleDefinition } from '@aws-cdk/pkglint';
+import { createLibraryReadme } from '@aws-cdk/pkglint';
 import { topo } from '@aws-cdk/spec2cdk';
 import * as fs from 'fs-extra';
 
@@ -88,21 +88,23 @@ async function ensureInterfaceSubmoduleJsiiJsonRc(submodule: topo.ModuleMapEntry
 
   const jsiirc = {
     targets: {
-      ...combineLanguageNamespace('java', 'package', 'javaPackage'),
-      ...combineLanguageNamespace('dotnet', 'namespace', 'dotnetPackage'),
-      ...combineLanguageNamespace('python', 'module', 'pythonModuleName'),
-      // No Go...
+      ...combineLanguageNamespace('java', 'package', submodule.definition?.javaPackage),
+      ...combineLanguageNamespace('dotnet', 'namespace', submodule.definition?.dotnetPackage),
+      ...combineLanguageNamespace('python', 'module', submodule.definition?.pythonModuleName),
+      ...combineLanguageNamespace('go', 'packageName', submodule.definition?.moduleName.replace(/[^a-z0-9.]/gi, '')),
     },
   };
   await fs.writeJson(jsiiRcPath, jsiirc, { spaces: 2 });
 
-  function combineLanguageNamespace(language: string, whatName: string, k: keyof ModuleDefinition) {
-    const ns = `${interfacesModuleJsiiRc.targets[language][whatName]}.${lastPart(submodule.definition?.[k] ?? 'undefined')}`;
-    if (ns.includes('undefined')) {
-      throw new Error(`Could not build child namespace for language ${language} from ${JSON.stringify(interfacesModuleJsiiRc.targets[language])} and ${k} from ${JSON.stringify(submodule.definition)}`);
+  function combineLanguageNamespace(language: string, whatName: string, fromDef?: string) {
+    if (fromDef == null) {
+      throw new Error(`Could not build child namespace for language ${language} from ${JSON.stringify(interfacesModuleJsiiRc.targets[language])} and definition ${JSON.stringify(submodule.definition)}`);
     }
 
-    return { [language]: { [whatName]: ns } };
+    const nsParts = [interfacesModuleJsiiRc.targets[language][whatName], lastPart(fromDef)];
+    const nsSep = language === 'go' ? '' : '.';
+
+    return { [language]: { [whatName]: nsParts.join(nsSep) } };
   }
 }
 

tools/@aws-cdk/spec2cdk/lib/util/jsii.ts

@@ -1,3 +1,4 @@
+import type { ModuleDefinition } from '@aws-cdk/pkglint';
 import * as naming from '../naming';
 
 export interface PackageBaseNames {
@@ -21,15 +22,16 @@ export const AWS_CDK_LIB_BASE_NAMES: PackageBaseNames = {
  * @param bases - provide different package base names and overwrite jsii targets
  * @returns the module definition
  */
-export function namespaceToModuleDefinition(namespace: string, bases: PackageBaseNames = AWS_CDK_LIB_BASE_NAMES) {
+export function namespaceToModuleDefinition(namespace: string, bases: PackageBaseNames = AWS_CDK_LIB_BASE_NAMES): ModuleDefinition {
+  // [aws-s3, AWS, S3]
   const { moduleName, moduleFamily, moduleBaseName } = naming.modulePartsFromNamespace(namespace);
-  const submoduleName = moduleName.replace('-', '_');
+  const submoduleName = moduleName.replace('-', '_'); // aws_s3
 
-  const lowcaseModuleName = moduleBaseName.toLocaleLowerCase();
-  const packageName = `${bases.javascript}/${moduleName}`;
+  const lowcaseModuleName = moduleBaseName.toLocaleLowerCase(); // s3
+  const packageName = `${bases.javascript}/${moduleName}`; // aws-cdk-lib/aws-s3
 
   // dotnet names
-  const dotnetPackage = `${bases.dotnet}.${moduleFamily}.${moduleBaseName}`;
+  const dotnetPackage = `${bases.dotnet}.${moduleFamily}.${moduleBaseName}`; // Amazon.CDK.AWS.S3
 
   // java names
   const javaGroupId = bases.java;
@@ -41,8 +43,8 @@ export function namespaceToModuleDefinition(namespace: string, bases: PackageBas
     moduleFamily === 'AWS' ? lowcaseModuleName : `${moduleFamily.toLocaleLowerCase()}-${lowcaseModuleName}`;
 
   // python names
-  const pythonDistName = `${bases.python}.${moduleName}`;
-  const pythonModuleName = pythonDistName.replace(/-/g, '_');
+  const pythonDistName = `${bases.python}.${moduleName}`; // aws-cdk.aws-s3
+  const pythonModuleName = pythonDistName.replace(/-/g, '_'); // aws_cdk.aws_s3
 
   return {
     namespace,