deprecate-baseurl-in-favor-of-endpoint (#2246)

* deprecate-baseurl-in-favor-of-endpoint * codegen change * fix integration test and unit test * update smoke-test && merge main * revert smoke-test-list * update * revert change * update * update * update * update * Revert "update" This reverts commit 02967a1. * update * fix ci * rename endpoint parameter * update (#15) * update test --------- Co-authored-by: kazrael2119 <98569699+kazrael2119@users.noreply.github.com>
Azure · Mar 21, 2024 · 9759655 · 9759655
1 parent cbe71a7
commit 9759655
Show file tree

Hide file tree

Showing 239 changed files with 767 additions and 598 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/...est.typescript/test/rlcIntegration/generated/bodyComplexRest/src/bodyComplexRestClient.ts b/...est.typescript/test/rlcIntegration/generated/bodyComplexRest/src/bodyComplexRestClient.ts
@@ -12,7 +12,8 @@ import { BodyComplexRestClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): BodyComplexRestClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-body-complex-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as BodyComplexRestClient;
+  const client = getClient(endpointUrl, options) as BodyComplexRestClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return client;

diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/bodyFileRest/src/bodyFile.ts b/packages/autorest.typescript/test/rlcIntegration/generated/bodyFileRest/src/bodyFile.ts
@@ -12,7 +12,8 @@ import { BodyFileClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): BodyFileClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-body-file-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as BodyFileClient;
+  const client = getClient(endpointUrl, options) as BodyFileClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return client;

diff --git a/...es/autorest.typescript/test/rlcIntegration/generated/bodyFormDataRest/src/bodyFormData.ts b/...es/autorest.typescript/test/rlcIntegration/generated/bodyFormDataRest/src/bodyFormData.ts
@@ -12,7 +12,8 @@ import { BodyFormDataClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): BodyFormDataClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-body-formdata-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as BodyFormDataClient;
+  const client = getClient(endpointUrl, options) as BodyFormDataClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return client;

diff --git a/...es/autorest.typescript/test/rlcIntegration/generated/bodyStringRest/src/bodyStringRest.ts b/...es/autorest.typescript/test/rlcIntegration/generated/bodyStringRest/src/bodyStringRest.ts
@@ -12,7 +12,8 @@ import { BodyStringRestClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): BodyStringRestClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-body-string-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as BodyStringRestClient;
+  const client = getClient(endpointUrl, options) as BodyStringRestClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return client;

diff --git a/...utorest.typescript/test/rlcIntegration/generated/customUrlRest/src/customUrlRestClient.ts b/...utorest.typescript/test/rlcIntegration/generated/customUrlRest/src/customUrlRestClient.ts
@@ -14,7 +14,8 @@ export default function createClient(
   host: string,
   options: ClientOptions = {},
 ): CustomUrlRestClient {
-  const baseUrl = options.baseUrl ?? `http://{accountName}${host}`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://{accountName}${host}`;
   const userAgentInfo = `azsdk-js-custom-url-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -30,7 +31,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as CustomUrlRestClient;
+  const client = getClient(endpointUrl, options) as CustomUrlRestClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return {

diff --git a/...t.typescript/test/rlcIntegration/generated/dpgCustomization/src/dPGCustomizationClient.ts b/...t.typescript/test/rlcIntegration/generated/dpgCustomization/src/dPGCustomizationClient.ts
@@ -12,7 +12,8 @@ import { DPGCustomizationClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): DPGCustomizationClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-dpg-customization-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as DPGCustomizationClient;
+  const client = getClient(endpointUrl, options) as DPGCustomizationClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return {

diff --git a/...ages/autorest.typescript/test/rlcIntegration/generated/headerRest/src/headerRestClient.ts b/...ages/autorest.typescript/test/rlcIntegration/generated/headerRest/src/headerRestClient.ts
@@ -12,7 +12,8 @@ import { HeaderRestClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): HeaderRestClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-header-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as HeaderRestClient;
+  const client = getClient(endpointUrl, options) as HeaderRestClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return client;

diff --git a/.../test/rlcIntegration/generated/httpInfrastructureRest/src/httpInfrastructureRestClient.ts b/.../test/rlcIntegration/generated/httpInfrastructureRest/src/httpInfrastructureRestClient.ts
@@ -12,7 +12,8 @@ import { HttpInfrastructureRestClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): HttpInfrastructureRestClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-http-infrastructure-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,10 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as HttpInfrastructureRestClient;
+  const client = getClient(
+    endpointUrl,
+    options,
+  ) as HttpInfrastructureRestClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return {

diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/lroRest/src/lRORestClient.ts b/packages/autorest.typescript/test/rlcIntegration/generated/lroRest/src/lRORestClient.ts
@@ -12,7 +12,8 @@ import { LRORestClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): LRORestClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-lro-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as LRORestClient;
+  const client = getClient(endpointUrl, options) as LRORestClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return client;

diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/mediaTypesRest/src/mediaTypes.ts b/packages/autorest.typescript/test/rlcIntegration/generated/mediaTypesRest/src/mediaTypes.ts
@@ -12,7 +12,8 @@ import { MediaTypesClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): MediaTypesClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-media-types-service-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as MediaTypesClient;
+  const client = getClient(endpointUrl, options) as MediaTypesClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return client;

diff --git a/...est/rlcIntegration/generated/multipleInheritanceRest/src/multipleInheritanceRestClient.ts b/...est/rlcIntegration/generated/multipleInheritanceRest/src/multipleInheritanceRestClient.ts
@@ -12,7 +12,8 @@ import { MultipleInheritanceRestClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): MultipleInheritanceRestClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-multiple-inheritance-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,10 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as MultipleInheritanceRestClient;
+  const client = getClient(
+    endpointUrl,
+    options,
+  ) as MultipleInheritanceRestClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return {

diff --git a/...test/rlcIntegration/generated/multipleUrlParameters/src/multipleUrlParameterRestClient.ts b/...test/rlcIntegration/generated/multipleUrlParameters/src/multipleUrlParameterRestClient.ts
@@ -19,7 +19,8 @@ export default function createClient(
   credentials: TokenCredential,
   options: ClientOptions = {},
 ): MultipleUrlParameterRestClient {
-  const baseUrl =
+  const endpointUrl =
+    options.endpoint ??
     options.baseUrl ??
     `${endpoint}/catalog/api/atlas/${serviceVersion}/{accountName}`;
 
@@ -42,7 +43,7 @@ export default function createClient(
   };
 
   const client = getClient(
-    baseUrl,
+    endpointUrl,
     credentials,
     options,
   ) as MultipleUrlParameterRestClient;

diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/pagingRest/src/paging.ts b/packages/autorest.typescript/test/rlcIntegration/generated/pagingRest/src/paging.ts
@@ -12,7 +12,8 @@ import { PagingClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): PagingClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-paging-service-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as PagingClient;
+  const client = getClient(endpointUrl, options) as PagingClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return client;

diff --git a/...est.typescript/test/rlcIntegration/generated/securityAADRest/src/securityAADRestClient.ts b/...est.typescript/test/rlcIntegration/generated/securityAADRest/src/securityAADRestClient.ts
@@ -15,7 +15,8 @@ export default function createClient(
   credentials: TokenCredential,
   options: ClientOptions = {},
 ): SecurityAADRestClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-security-aad-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -37,7 +38,7 @@ export default function createClient(
   };
 
   const client = getClient(
-    baseUrl,
+    endpointUrl,
     credentials,
     options,
   ) as SecurityAADRestClient;

diff --git a/...est.typescript/test/rlcIntegration/generated/securityKeyRest/src/securityKeyRestClient.ts b/...est.typescript/test/rlcIntegration/generated/securityKeyRest/src/securityKeyRestClient.ts
@@ -15,7 +15,8 @@ export default function createClient(
   credentials: KeyCredential,
   options: ClientOptions = {},
 ): SecurityKeyRestClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-security-key-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -35,7 +36,7 @@ export default function createClient(
   };
 
   const client = getClient(
-    baseUrl,
+    endpointUrl,
     credentials,
     options,
   ) as SecurityKeyRestClient;

diff --git a/packages/autorest.typescript/test/rlcIntegration/generated/urlRest/src/urlRestClient.ts b/packages/autorest.typescript/test/rlcIntegration/generated/urlRest/src/urlRestClient.ts
@@ -12,7 +12,8 @@ import { UrlRestClient } from "./clientDefinitions";
 export default function createClient(
   options: ClientOptions = {},
 ): UrlRestClient {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
+  const endpointUrl =
+    options.endpoint ?? options.baseUrl ?? `http://localhost:3000`;
   const userAgentInfo = `azsdk-js-url-rest/1.0.0-preview1`;
   const userAgentPrefix =
     options.userAgentOptions && options.userAgentOptions.userAgentPrefix
@@ -28,7 +29,7 @@ export default function createClient(
     },
   };
 
-  const client = getClient(baseUrl, options) as UrlRestClient;
+  const client = getClient(endpointUrl, options) as UrlRestClient;
 
   client.pipeline.removePolicy({ name: "ApiVersionPolicy" });
   return {

diff --git a/...ipt/test/smoke/generated/agrifood-data-plane/src/azureAgriFoodPlatformDataPlaneService.ts b/...ipt/test/smoke/generated/agrifood-data-plane/src/azureAgriFoodPlatformDataPlaneService.ts
@@ -17,7 +17,7 @@ export default function createClient(
   credentials: KeyCredential,
   options: ClientOptions = {},
 ): AzureAgriFoodPlatformDataPlaneServiceClient {
-  const baseUrl = options.baseUrl ?? `${endpoint}`;
+  const endpointUrl = options.endpoint ?? options.baseUrl ?? `${endpoint}`;
 
   const userAgentInfo = `azsdk-js-agrifood-data-plane-rest/1.0.0-beta.1`;
   const userAgentPrefix =
@@ -39,7 +39,7 @@ export default function createClient(
   };
 
   const client = getClient(
-    baseUrl,
+    endpointUrl,
     credentials,
     options,
   ) as AzureAgriFoodPlatformDataPlaneServiceClient;

diff --git a/...utorest.typescript/test/smoke/generated/anomaly-detector-mv-rest/src/anomalyDetectorMV.ts b/...utorest.typescript/test/smoke/generated/anomaly-detector-mv-rest/src/anomalyDetectorMV.ts
@@ -22,8 +22,10 @@ export default function createClient(
   options: AnomalyDetectorMVClientOptions = {},
 ): AnomalyDetectorMVClient {
   const apiVersion = options.apiVersion ?? "v1.1";
-  const baseUrl =
-    options.baseUrl ?? `${endpoint}/anomalydetector/${apiVersion}`;
+  const endpointUrl =
+    options.endpoint ??
+    options.baseUrl ??
+    `${endpoint}/anomalydetector/${apiVersion}`;
 
   const userAgentInfo = `azsdk-js-anomaly-detector-mv-rest/1.0.0-beta.1`;
   const userAgentPrefix =
@@ -45,7 +47,7 @@ export default function createClient(
   };
 
   const client = getClient(
-    baseUrl,
+    endpointUrl,
     credentials,
     options,
   ) as AnomalyDetectorMVClient;