@azure/arm-templatespecs 2.0.2-alpha.20221026.1 → 2.1.0-alpha.20221128.2

package/src/templateSpecsClient.ts

@@ -8,6 +8,11 @@
 
 import * as coreClient from "@azure/core-client";
 import * as coreRestPipeline from "@azure/core-rest-pipeline";
+import {
+  PipelineRequest,
+  PipelineResponse,
+  SendRequest
+} from "@azure/core-rest-pipeline";
 import * as coreAuth from "@azure/core-auth";
 import { TemplateSpecsImpl, TemplateSpecVersionsImpl } from "./operations";
 import { TemplateSpecs, TemplateSpecVersions } from "./operationsInterfaces";
@@ -45,47 +50,53 @@ export class TemplateSpecsClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-templatespecs/2.0.2`;
+    const packageDetails = `azsdk-js-arm-templatespecs/2.1.0`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
         : `${packageDetails}`;
 
-    if (!options.credentialScopes) {
-      options.credentialScopes = ["https://management.azure.com/.default"];
-    }
     const optionsWithDefaults = {
       ...defaults,
       ...options,
       userAgentOptions: {
         userAgentPrefix
       },
-      baseUri:
+      endpoint:
         options.endpoint ?? options.baseUri ?? "https://management.azure.com"
     };
     super(optionsWithDefaults);
 
+    let bearerTokenAuthenticationPolicyFound: boolean = false;
     if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
       const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
-      const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
+      bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
         (pipelinePolicy) =>
           pipelinePolicy.name ===
           coreRestPipeline.bearerTokenAuthenticationPolicyName
       );
-      if (!bearerTokenAuthenticationPolicyFound) {
-        this.pipeline.removePolicy({
-          name: coreRestPipeline.bearerTokenAuthenticationPolicyName
-        });
-        this.pipeline.addPolicy(
-          coreRestPipeline.bearerTokenAuthenticationPolicy({
-            scopes: `${optionsWithDefaults.baseUri}/.default`,
-            challengeCallbacks: {
-              authorizeRequestOnChallenge:
-                coreClient.authorizeRequestOnClaimChallenge
-            }
-          })
-        );
-      }
+    }
+    if (
+      !options ||
+      !options.pipeline ||
+      options.pipeline.getOrderedPolicies().length == 0 ||
+      !bearerTokenAuthenticationPolicyFound
+    ) {
+      this.pipeline.removePolicy({
+        name: coreRestPipeline.bearerTokenAuthenticationPolicyName
+      });
+      this.pipeline.addPolicy(
+        coreRestPipeline.bearerTokenAuthenticationPolicy({
+          credential: credentials,
+          scopes:
+            optionsWithDefaults.credentialScopes ??
+            `${optionsWithDefaults.endpoint}/.default`,
+          challengeCallbacks: {
+            authorizeRequestOnChallenge:
+              coreClient.authorizeRequestOnClaimChallenge
+          }
+        })
+      );
     }
     // Parameter assignments
     this.subscriptionId = subscriptionId;
@@ -95,6 +106,35 @@ export class TemplateSpecsClient extends coreClient.ServiceClient {
     this.apiVersion = options.apiVersion || "2021-05-01";
     this.templateSpecs = new TemplateSpecsImpl(this);
     this.templateSpecVersions = new TemplateSpecVersionsImpl(this);
+    this.addCustomApiVersionPolicy(options.apiVersion);
+  }
+
+  /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+  private addCustomApiVersionPolicy(apiVersion?: string) {
+    if (!apiVersion) {
+      return;
+    }
+    const apiVersionPolicy = {
+      name: "CustomApiVersionPolicy",
+      async sendRequest(
+        request: PipelineRequest,
+        next: SendRequest
+      ): Promise<PipelineResponse> {
+        const param = request.url.split("?");
+        if (param.length > 1) {
+          const newParams = param[1].split("&").map((item) => {
+            if (item.indexOf("api-version") > -1) {
+              return "api-version=" + apiVersion;
+            } else {
+              return item;
+            }
+          });
+          request.url = param[0] + "?" + newParams.join("&");
+        }
+        return next(request);
+      }
+    };
+    this.pipeline.addPolicy(apiVersionPolicy);
   }
 
   templateSpecs: TemplateSpecs;

package/tsconfig.json

@@ -26,20 +26,8 @@
     "./src/**/*.ts",
     "./test/**/*.ts",
     "samples-dev/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts"
   ],
   "exclude": [
     "node_modules"
   ]
-}
+}

package/types/arm-templatespecs.d.ts

@@ -81,11 +81,24 @@ export declare interface ErrorResponse {
     readonly additionalInfo?: ErrorAdditionalInfo[];
 }
 
+/**
+ * Given a result page from a pageable operation, returns a
+ * continuation token that can be used to begin paging from
+ * that point later.
+ * @param page A result object from calling .byPage() on a paged operation.
+ * @returns The continuation token that can be passed into byPage().
+ */
+export declare function getContinuationToken(page: unknown): string | undefined;
+
 /** Known values of {@link CreatedByType} that the service accepts. */
 export declare enum KnownCreatedByType {
+    /** User */
     User = "User",
+    /** Application */
     Application = "Application",
+    /** ManagedIdentity */
     ManagedIdentity = "ManagedIdentity",
+    /** Key */
     Key = "Key"
 }
 
@@ -120,7 +133,7 @@ export declare interface SystemData {
 }
 
 /** Template Spec object. */
-export declare type TemplateSpec = AzureResourceBase & {
+export declare interface TemplateSpec extends AzureResourceBase {
     /** The location of the Template Spec. It cannot be changed after Template Spec creation. It must be one of the supported Azure locations. */
     location: string;
     /** Resource tags. */
@@ -140,7 +153,7 @@ export declare type TemplateSpec = AzureResourceBase & {
     readonly versions?: {
         [propertyName: string]: TemplateSpecVersionInfo;
     };
-};
+}
 
 /**
  * Defines values for TemplateSpecExpandKind. \
@@ -206,6 +219,8 @@ export declare class TemplateSpecsClient extends coreClient.ServiceClient {
      * @param options The parameter options
      */
     constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: TemplateSpecsClientOptionalParams);
+    /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+    private addCustomApiVersionPolicy;
     templateSpecs: TemplateSpecs;
     templateSpecVersions: TemplateSpecVersions;
 }
@@ -303,15 +318,15 @@ export declare interface TemplateSpecsUpdateOptionalParams extends coreClient.Op
 export declare type TemplateSpecsUpdateResponse = TemplateSpec;
 
 /** Template Spec properties to be updated (only tags are currently supported). */
-export declare type TemplateSpecUpdateModel = AzureResourceBase & {
+export declare interface TemplateSpecUpdateModel extends AzureResourceBase {
     /** Resource tags. */
     tags?: {
         [propertyName: string]: string;
     };
-};
+}
 
 /** Template Spec Version object. */
-export declare type TemplateSpecVersion = AzureResourceBase & {
+export declare interface TemplateSpecVersion extends AzureResourceBase {
     /** The location of the Template Spec Version. It must match the location of the parent Template Spec. */
     location: string;
     /** Resource tags. */
@@ -328,7 +343,7 @@ export declare type TemplateSpecVersion = AzureResourceBase & {
     mainTemplate?: Record<string, unknown>;
     /** The Azure Resource Manager template UI definition content. */
     uiFormDefinition?: Record<string, unknown>;
-};
+}
 
 /** High-level information about a Template Spec version. */
 export declare interface TemplateSpecVersionInfo {
@@ -447,11 +462,11 @@ export declare interface TemplateSpecVersionsUpdateOptionalParams extends coreCl
 export declare type TemplateSpecVersionsUpdateResponse = TemplateSpecVersion;
 
 /** Template Spec Version properties to be updated (only tags are currently supported). */
-export declare type TemplateSpecVersionUpdateModel = AzureResourceBase & {
+export declare interface TemplateSpecVersionUpdateModel extends AzureResourceBase {
     /** Resource tags. */
     tags?: {
         [propertyName: string]: string;
     };
-};
+}
 
 export { }

package/types/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.31.2"
+      "packageVersion": "7.33.5"
     }
   ]
 }