fix: remove api version number in client identifier (#199)

Author: AllanZhengYP

packages/package-generator/src/clientModuleIdentifier.spec.ts

@@ -34,16 +34,6 @@ describe('clientModuleIdentifier', () => {
             .toBe('client-simple-foo-service');
     });
 
-    it('should apply known version identifiers', () => {
-        expect(
-            clientModuleIdentifier({
-                ...minimalMetadata,
-                serviceId: 'DynamoDB',
-                apiVersion: '2012-08-10',
-            })
-        ).toBe('client-dynamodb-v2');
-    });
-
     it('should append the runtime target', () => {
         expect(clientModuleIdentifier(minimalMetadata, 'node'))
             .toBe('client-simple-foo-service-node');

packages/package-generator/src/clientModuleIdentifier.ts

@@ -7,10 +7,6 @@ export function clientModuleIdentifier(
 ): string {
 
     let name = `client-${getServiceId(metadata)}`;
-    const modelVersion = determineServiceVersion(metadata);
-    if (modelVersion > 1) {
-        name += `-v${modelVersion}`;
-    }
     if (runtime !== 'universal') {
         name += `-${runtime}`;
     }
@@ -34,29 +30,4 @@ function getServiceId(metadata: ServiceMetadata): string {
     return className
         .toLowerCase()
         .replace(/\s/g, '-');
-}
-
-// TODO use metadata.major_version when added to the model
-function determineServiceVersion(metadata: ServiceMetadata): number {
-    const serviceId = getServiceId(metadata);
-    if (
-        serviceMajorVersions[serviceId] &&
-        serviceMajorVersions[serviceId][metadata.apiVersion]
-    ) {
-        return serviceMajorVersions[serviceId][metadata.apiVersion];
-    }
-
-    return 1;
-}
-
-interface MajorVersionMatcher {
-    [serviceIdentifier: string]: {
-        [apiVersion: string]: number;
-    }
-}
-
-const serviceMajorVersions: MajorVersionMatcher = {
-    dynamodb: {
-        '2012-08-10': 2,
-    },
-};
+}

packages/package-generator/src/commands/ImportModelsCommand.ts

@@ -39,7 +39,15 @@ export const ImportModelsCommand: yargs.CommandModule = {
         for (const match of globSync(matching, {ignore})) {
             const model = fromModelJson(readFileSync(match, 'utf8'));
             const smoke = loadSmokeTestModel(dirname(match));
-            services.set(clientModuleIdentifier(model.metadata), {model, smoke});
+            const clientId = clientModuleIdentifier(model.metadata);
+            if (services.has(clientId)) {
+                const currentApiVersion = services.get(clientId)!.model.metadata.apiVersion;
+                if (model.metadata.apiVersion > currentApiVersion) {
+                    services.set(clientId, {model, smoke});
+                }
+            } else {
+                services.set(clientModuleIdentifier(model.metadata), {model, smoke});
+            }
         }
 
         console.log(`Generating ${services.size} SDK packages...`);