Fix for the preview.46 (#938)

* fix redundant comma when no client params for client factory and pump version * use moduleName instead of hard code pkg name
Azure · Mar 10, 2023 · d2c9632 · d2c9632
1 parent a547e23
commit d2c9632
Show file tree

Hide file tree

Showing 169 changed files with 170 additions and 170 deletions.
diff --git a/src/generator/clientFactory.ts b/src/generator/clientFactory.ts
@@ -56,8 +56,8 @@ export async function generateClientFactory(session: Session<CodeModel>): Promis
     result += `${formatCommentAsBulletItem('credential - used to authorize requests. Usually a credential from azidentity.')}\n`;
     result += `${formatCommentAsBulletItem('options - pass nil to accept the default values.')}\n`;
 
-    result += `func NewClientFactory(${allClientParams.map(p => {return `${p.language.go!.name} ${formatParameterTypeName(p)}`;}).join(', ')}, credential azcore.TokenCredential, options *arm.ClientOptions) (*ClientFactory, error) {\n`;
-    result += '\t_, err := arm.NewClient("armcompute.ClientFactory", moduleVersion, credential, options)\n';
+    result += `func NewClientFactory(${allClientParams.map(p => {return `${p.language.go!.name} ${formatParameterTypeName(p)}`;}).join(', ')}${allClientParams.length>0 ? ',' : ''} credential azcore.TokenCredential, options *arm.ClientOptions) (*ClientFactory, error) {\n`;
+    result += '\t_, err := arm.NewClient(moduleName+".ClientFactory", moduleVersion, credential, options)\n';
     result += '\tif err != nil {\n';
     result += '\t\treturn nil, err\n';
     result += '\t}\n';

diff --git a/src/generator/operations.ts b/src/generator/operations.ts
@@ -141,7 +141,7 @@ export async function generateOperations(session: Session<CodeModel>): Promise<O
       }
 
       clientText += `func ${group.language.go!.clientCtorName}(${methodParams.join(', ')}) (*${clientName}, error) {\n`;
-      clientText += `\tcl, err := ${clientPkg}.NewClient("${session.model.language.go!.packageName}.${clientName}", moduleVersion, credential, options)\n`;
+      clientText += `\tcl, err := ${clientPkg}.NewClient(moduleName+".${clientName}", moduleVersion, credential, options)\n`;
       clientText += "\tif err != nil {\n"
       clientText += '\t\treturn nil, err\n';
       clientText += '\t}\n';

diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@autorest/go",
-  "version": "4.0.0-preview.46",
+  "version": "4.0.0-preview.47",
   "description": "AutoRest Go Generator",
   "main": "dist/exports.js",
   "typings": "dist/exports.d.ts",

diff --git a/test/compute/2019-12-01/armcompute/zz_availabilitysets_client.go b/test/compute/2019-12-01/armcompute/zz_availabilitysets_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_client_factory.go b/test/compute/2019-12-01/armcompute/zz_client_factory.go
diff --git a/test/compute/2019-12-01/armcompute/zz_containerservices_client.go b/test/compute/2019-12-01/armcompute/zz_containerservices_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_dedicatedhostgroups_client.go b/test/compute/2019-12-01/armcompute/zz_dedicatedhostgroups_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_dedicatedhosts_client.go b/test/compute/2019-12-01/armcompute/zz_dedicatedhosts_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_diskencryptionsets_client.go b/test/compute/2019-12-01/armcompute/zz_diskencryptionsets_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_disks_client.go b/test/compute/2019-12-01/armcompute/zz_disks_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_galleries_client.go b/test/compute/2019-12-01/armcompute/zz_galleries_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_galleryapplications_client.go b/test/compute/2019-12-01/armcompute/zz_galleryapplications_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_galleryapplicationversions_client.go b/test/compute/2019-12-01/armcompute/zz_galleryapplicationversions_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_galleryimages_client.go b/test/compute/2019-12-01/armcompute/zz_galleryimages_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_galleryimageversions_client.go b/test/compute/2019-12-01/armcompute/zz_galleryimageversions_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_images_client.go b/test/compute/2019-12-01/armcompute/zz_images_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_loganalytics_client.go b/test/compute/2019-12-01/armcompute/zz_loganalytics_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_operations_client.go b/test/compute/2019-12-01/armcompute/zz_operations_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_proximityplacementgroups_client.go b/test/compute/2019-12-01/armcompute/zz_proximityplacementgroups_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_resourceskus_client.go b/test/compute/2019-12-01/armcompute/zz_resourceskus_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_snapshots_client.go b/test/compute/2019-12-01/armcompute/zz_snapshots_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_sshpublickeys_client.go b/test/compute/2019-12-01/armcompute/zz_sshpublickeys_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_usage_client.go b/test/compute/2019-12-01/armcompute/zz_usage_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachineextensionimages_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachineextensionimages_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachineextensions_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachineextensions_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachineimages_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachineimages_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachineruncommands_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachineruncommands_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachines_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachines_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesetextensions_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesetextensions_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesetrollingupgrades_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesetrollingupgrades_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesets_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesets_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesetvmextensions_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesetvmextensions_client.go
diff --git a/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesetvms_client.go b/test/compute/2019-12-01/armcompute/zz_virtualmachinescalesetvms_client.go