Fix agent-string in packages migrated to use core v2 (Azure#16628)

deyaaeldeen · web-flow · commit b36849060d2e · 2021-07-30T12:59:00.000-04:00
* [Text Analytics] Update user-agent

* Fix all other packages

* revert change in kv-admin

* add SDK_VERSION back in package.json for kv-admin
diff --git a/sdk/eventgrid/eventgrid/package.json b/sdk/eventgrid/eventgrid/package.json
@@ -50,8 +50,8 @@
         "prefix": "package-version"
       },
       {
-        "path": "src/constants.ts",
-        "prefix": "SDK_VERSION"
+        "path": "src/generated/generatedClientContext.ts",
+        "prefix": "packageDetails"
       }
     ]
   },
diff --git a/sdk/eventgrid/eventgrid/src/constants.ts b/sdk/eventgrid/eventgrid/src/constants.ts
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export const SDK_VERSION: string = "4.4.1";
 export const DEFAULT_API_VERSION = "2018-01-01";
 export const DEFAULT_EVENTGRID_SCOPE = "https://eventgrid.azure.net/.default";
diff --git a/sdk/eventgrid/eventgrid/src/eventGridClient.ts b/sdk/eventgrid/eventgrid/src/eventGridClient.ts
@@ -5,7 +5,7 @@ import { isTokenCredential, KeyCredential, SASCredential } from "@azure/core-aut
 import { OperationOptions, CommonClientOptions } from "@azure/core-client";
 
 import { eventGridCredentialPolicy } from "./eventGridAuthenticationPolicy";
-import { SDK_VERSION, DEFAULT_EVENTGRID_SCOPE } from "./constants";
+import { DEFAULT_EVENTGRID_SCOPE } from "./constants";
 import {
   SendCloudEventInput,
   SendEventGridEventInput,
@@ -109,20 +109,7 @@ export class EventGridPublisherClient<T extends InputSchema> {
     this.endpointUrl = endpointUrl;
     this.inputSchema = inputSchema;
 
-    const libInfo = `azsdk-js-eventgrid/${SDK_VERSION}`;
-    const pipelineOptions = { ...options };
-
-    if (!pipelineOptions.userAgentOptions) {
-      pipelineOptions.userAgentOptions = {};
-    }
-
-    if (pipelineOptions.userAgentOptions.userAgentPrefix) {
-      pipelineOptions.userAgentOptions.userAgentPrefix = `${pipelineOptions.userAgentOptions.userAgentPrefix} ${libInfo}`;
-    } else {
-      pipelineOptions.userAgentOptions.userAgentPrefix = libInfo;
-    }
-
-    this.client = new GeneratedClient(pipelineOptions);
+    this.client = new GeneratedClient(options);
 
     const authPolicy = isTokenCredential(credential)
       ? bearerTokenAuthenticationPolicy({ credential, scopes: DEFAULT_EVENTGRID_SCOPE })
diff --git a/sdk/keyvault/keyvault-admin/package.json b/sdk/keyvault/keyvault-admin/package.json
@@ -75,7 +75,7 @@
     "constantPaths": [
       {
         "path": "src/generated/keyVaultClientContext.ts",
-        "prefix": "packageVersion"
+        "prefix": "packageDetails"
       },
       {
         "path": "src/constants.ts",
diff --git a/sdk/keyvault/keyvault-admin/src/accessControlClient.ts b/sdk/keyvault/keyvault-admin/src/accessControlClient.ts
@@ -26,7 +26,7 @@ import {
   DeleteRoleDefinitionOptions
 } from "./accessControlModels";
 
-import { SDK_VERSION, LATEST_API_VERSION, authenticationScopes } from "./constants";
+import { LATEST_API_VERSION, authenticationScopes } from "./constants";
 import { mappings } from "./mappings";
 import { logger } from "./log";
 import { v4 as v4uuid } from "uuid";
@@ -76,17 +76,6 @@ export class KeyVaultAccessControlClient {
   ) {
     this.vaultUrl = vaultUrl;
 
-    const libInfo = `azsdk-js-keyvault-admin/${SDK_VERSION}`;
-
-    const userAgentOptions = options.userAgentOptions;
-
-    options.userAgentOptions = {
-      userAgentPrefix:
-        userAgentOptions && userAgentOptions.userAgentPrefix
-          ? `${userAgentOptions.userAgentPrefix} ${libInfo}`
-          : libInfo
-    };
-
     const serviceVersion = options.serviceVersion || LATEST_API_VERSION;
 
     const clientOptions = {
diff --git a/sdk/keyvault/keyvault-admin/src/backupClient.ts b/sdk/keyvault/keyvault-admin/src/backupClient.ts
@@ -13,7 +13,7 @@ import {
   KeyVaultRestoreResult,
   KeyVaultSelectiveKeyRestoreResult
 } from "./backupClientModels";
-import { LATEST_API_VERSION, SDK_VERSION, authenticationScopes } from "./constants";
+import { LATEST_API_VERSION, authenticationScopes } from "./constants";
 import { logger } from "./log";
 import { KeyVaultBackupPoller } from "./lro/backup/poller";
 import { KeyVaultRestorePoller } from "./lro/restore/poller";
@@ -76,17 +76,6 @@ export class KeyVaultBackupClient {
   ) {
     this.vaultUrl = vaultUrl;
 
-    const libInfo = `azsdk-js-keyvault-admin/${SDK_VERSION}`;
-
-    const userAgentOptions = options.userAgentOptions;
-
-    options.userAgentOptions = {
-      userAgentPrefix:
-        userAgentOptions && userAgentOptions.userAgentPrefix
-          ? `${userAgentOptions.userAgentPrefix} ${libInfo}`
-          : libInfo
-    };
-
     const apiVersion = options.serviceVersion || LATEST_API_VERSION;
 
     const clientOptions = {
diff --git a/sdk/remoterendering/mixed-reality-remote-rendering/package.json b/sdk/remoterendering/mixed-reality-remote-rendering/package.json
@@ -12,12 +12,12 @@
   "//metadata": {
     "constantPaths": [
       {
-        "path": "src/generated/generatedClientContext.ts",
-        "prefix": "packageVersion"
+        "path": "swagger/README.md",
+        "prefix": "package-version"
       },
       {
-        "path": "src/constants.ts",
-        "prefix": "SDK_VERSION"
+        "path": "src/generated/generatedClientContext.ts",
+        "prefix": "packageDetails"
       }
     ]
   },
diff --git a/sdk/schemaregistry/schema-registry/package.json b/sdk/schemaregistry/schema-registry/package.json
@@ -43,7 +43,7 @@
     "constantPaths": [
       {
         "path": "src/generated/generatedSchemaRegistryClientContext.ts",
-        "prefix": "packageVersion"
+        "prefix": "packageDetails"
       },
       {
         "path": "swagger/README.md",
diff --git a/sdk/textanalytics/ai-text-analytics/package.json b/sdk/textanalytics/ai-text-analytics/package.json
@@ -32,11 +32,11 @@
     "constantPaths": [
       {
         "path": "src/generated/generatedClientContext.ts",
-        "prefix": "packageVersion"
+        "prefix": "packageDetails"
       },
       {
-        "path": "src/constants.ts",
-        "prefix": "SDK_VERSION"
+        "path": "swagger/README.md",
+        "prefix": "package-version"
       }
     ]
   },
diff --git a/sdk/textanalytics/ai-text-analytics/src/constants.ts b/sdk/textanalytics/ai-text-analytics/src/constants.ts
diff --git a/sdk/textanalytics/ai-text-analytics/src/textAnalyticsClient.ts b/sdk/textanalytics/ai-text-analytics/src/textAnalyticsClient.ts
@@ -7,7 +7,6 @@ import {
   bearerTokenAuthenticationPolicy
 } from "@azure/core-rest-pipeline";
 import { TokenCredential, KeyCredential, isTokenCredential } from "@azure/core-auth";
-import { SDK_VERSION } from "./constants";
 import { GeneratedClient } from "./generated/generatedClient";
 import { logger } from "./logger";
 import {
@@ -373,16 +372,6 @@ export class TextAnalyticsClient {
     this.defaultCountryHint = defaultCountryHint;
     this.defaultLanguage = defaultLanguage;
 
-    const libInfo = `azsdk-js-ai-textanalytics/${SDK_VERSION}`;
-    if (!pipelineOptions.userAgentOptions) {
-      pipelineOptions.userAgentOptions = {};
-    }
-    if (pipelineOptions.userAgentOptions.userAgentPrefix) {
-      pipelineOptions.userAgentOptions.userAgentPrefix = `${pipelineOptions.userAgentOptions.userAgentPrefix} ${libInfo}`;
-    } else {
-      pipelineOptions.userAgentOptions.userAgentPrefix = libInfo;
-    }
-
     const internalPipelineOptions: InternalPipelineOptions = {
       ...pipelineOptions,
       ...{
diff --git a/sdk/web-pubsub/web-pubsub/package.json b/sdk/web-pubsub/web-pubsub/package.json
@@ -41,6 +41,18 @@
     "README.md",
     "LICENSE"
   ],
+  "//metadata": {
+    "constantPaths": [
+      {
+        "path": "src/generated/generatedClientContext.ts",
+        "prefix": "packageDetails"
+      },
+      {
+        "path": "swagger/README.md",
+        "prefix": "package-version"
+      }
+    ]
+  },
   "browser": {
     "./dist-esm/src/util/url.js": "./dist-esm/src/util/url.browser.js"
   },

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@`
`50`	`50`	`"prefix": "package-version"`
`51`	`51`	`},`
`52`	`52`	`{`
`53`		`- "path": "src/constants.ts",`
`54`		`- "prefix": "SDK_VERSION"`
	`53`	`+ "path": "src/generated/generatedClientContext.ts",`
	`54`	`+ "prefix": "packageDetails"`
`55`	`55`	`}`
`56`	`56`	`]`
`57`	`57`	`},`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`	`"constantPaths": [`
`76`	`76`	`{`
`77`	`77`	`"path": "src/generated/keyVaultClientContext.ts",`
`78`		`- "prefix": "packageVersion"`
	`78`	`+ "prefix": "packageDetails"`
`79`	`79`	`},`
`80`	`80`	`{`
`81`	`81`	`"path": "src/constants.ts",`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,12 @@`
`12`	`12`	`"//metadata": {`
`13`	`13`	`"constantPaths": [`
`14`	`14`	`{`
`15`		`- "path": "src/generated/generatedClientContext.ts",`
`16`		`- "prefix": "packageVersion"`
	`15`	`+ "path": "swagger/README.md",`
	`16`	`+ "prefix": "package-version"`
`17`	`17`	`},`
`18`	`18`	`{`
`19`		`- "path": "src/constants.ts",`
`20`		`- "prefix": "SDK_VERSION"`
	`19`	`+ "path": "src/generated/generatedClientContext.ts",`
	`20`	`+ "prefix": "packageDetails"`
`21`	`21`	`}`
`22`	`22`	`]`
`23`	`23`	`},`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`"constantPaths": [`
`44`	`44`	`{`
`45`	`45`	`"path": "src/generated/generatedSchemaRegistryClientContext.ts",`
`46`		`- "prefix": "packageVersion"`
	`46`	`+ "prefix": "packageDetails"`
`47`	`47`	`},`
`48`	`48`	`{`
`49`	`49`	`"path": "swagger/README.md",`
Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@`
`32`	`32`	`"constantPaths": [`
`33`	`33`	`{`
`34`	`34`	`"path": "src/generated/generatedClientContext.ts",`
`35`		`- "prefix": "packageVersion"`
	`35`	`+ "prefix": "packageDetails"`
`36`	`36`	`},`
`37`	`37`	`{`
`38`		`- "path": "src/constants.ts",`
`39`		`- "prefix": "SDK_VERSION"`
	`38`	`+ "path": "swagger/README.md",`
	`39`	`+ "prefix": "package-version"`
`40`	`40`	`}`
`41`	`41`	`]`
`42`	`42`	`},`