Update from master

AzureSDKAutomation · May 15, 2020 · 2186fc0 · 2186fc0
1 parent c10c9ff
commit 2186fc0
Show file tree

Hide file tree

Showing 25 changed files with 417 additions and 438 deletions.
diff --git a/sdk/cosmosdb/arm-cosmosdb/src/cosmosDBManagementClient.ts b/sdk/cosmosdb/arm-cosmosdb/src/cosmosDBManagementClient.ts
@@ -42,12 +42,11 @@ class CosmosDBManagementClient extends CosmosDBManagementClientContext {
   /**
    * Initializes a new instance of the CosmosDBManagementClient class.
    * @param credentials Credentials needed for the client to connect to Azure.
-   * @param subscriptionId Azure subscription ID.
-   * @param subscriptionId1 The ID of the target subscription.
+   * @param subscriptionId The ID of the target subscription.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, subscriptionId1: string, options?: Models.CosmosDBManagementClientOptions) {
-    super(credentials, subscriptionId, subscriptionId1, options);
+  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.CosmosDBManagementClientOptions) {
+    super(credentials, subscriptionId, options);
     this.databaseAccounts = new operations.DatabaseAccounts(this);
     this.operations = new operations.Operations(this);
     this.database = new operations.Database(this);

diff --git a/sdk/cosmosdb/arm-cosmosdb/src/cosmosDBManagementClientContext.ts b/sdk/cosmosdb/arm-cosmosdb/src/cosmosDBManagementClientContext.ts
@@ -18,25 +18,20 @@ const packageVersion = "7.0.0";
 export class CosmosDBManagementClientContext extends msRestAzure.AzureServiceClient {
   credentials: msRest.ServiceClientCredentials;
   subscriptionId: string;
-  subscriptionId1: string;
 
   /**
    * Initializes a new instance of the CosmosDBManagementClient class.
    * @param credentials Credentials needed for the client to connect to Azure.
-   * @param subscriptionId Azure subscription ID.
-   * @param subscriptionId1 The ID of the target subscription.
+   * @param subscriptionId The ID of the target subscription.
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, subscriptionId1: string, options?: Models.CosmosDBManagementClientOptions) {
+  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.CosmosDBManagementClientOptions) {
     if (credentials == undefined) {
       throw new Error('\'credentials\' cannot be null.');
     }
     if (subscriptionId == undefined) {
       throw new Error('\'subscriptionId\' cannot be null.');
     }
-    if (subscriptionId1 == undefined) {
-      throw new Error('\'subscriptionId1\' cannot be null.');
-    }
 
     if (!options) {
       options = {};
@@ -54,7 +49,6 @@ export class CosmosDBManagementClientContext extends msRestAzure.AzureServiceCli
     this.requestContentType = "application/json; charset=utf-8";
     this.credentials = credentials;
     this.subscriptionId = subscriptionId;
-    this.subscriptionId1 = subscriptionId1;
 
     if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
       this.acceptLanguage = options.acceptLanguage;

diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/index.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/index.ts
@@ -133,15 +133,15 @@ export interface PrivateLinkServiceConnectionStateProperty {
    * The private link service connection status.
    */
   status?: string;
-  /**
-   * The private link service connection description.
-   */
-  description?: string;
   /**
    * Any action that is required beyond basic workflow (approve/ reject/ disconnect)
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
   readonly actionsRequired?: string;
+  /**
+   * The private link service connection description.
+   */
+  description?: string;
 }
 
 /**
@@ -294,8 +294,9 @@ export interface DatabaseAccountGetResults extends ARMResourceProperties {
   virtualNetworkRules?: VirtualNetworkRule[];
   /**
    * List of Private Endpoint Connections configured for the Cosmos DB account.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  privateEndpointConnections?: PrivateEndpointConnection[];
+  readonly privateEndpointConnections?: PrivateEndpointConnection[];
   /**
    * Enables the account to write in multiple locations
    */

diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/mappers.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/mappers.ts
@@ -205,15 +205,15 @@ export const PrivateLinkServiceConnectionStateProperty: msRest.CompositeMapper =
           name: "String"
         }
       },
-      description: {
-        serializedName: "description",
+      actionsRequired: {
+        readOnly: true,
+        serializedName: "actionsRequired",
         type: {
           name: "String"
         }
       },
-      actionsRequired: {
-        readOnly: true,
-        serializedName: "actionsRequired",
+      description: {
+        serializedName: "description",
         type: {
           name: "String"
         }
@@ -488,6 +488,7 @@ export const DatabaseAccountGetResults: msRest.CompositeMapper = {
         }
       },
       privateEndpointConnections: {
+        readOnly: true,
         serializedName: "properties.privateEndpointConnections",
         type: {
           name: "Sequence",

diff --git a/sdk/cosmosdb/arm-cosmosdb/src/models/parameters.ts b/sdk/cosmosdb/arm-cosmosdb/src/models/parameters.ts
@@ -42,6 +42,9 @@ export const apiVersion0: msRest.OperationQueryParameter = {
     isConstant: true,
     serializedName: "api-version",
     defaultValue: '2020-03-01',
+    constraints: {
+      MinLength: 1
+    },
     type: {
       name: "String"
     }
@@ -54,24 +57,15 @@ export const apiVersion1: msRest.OperationQueryParameter = {
     isConstant: true,
     serializedName: "api-version",
     defaultValue: '2019-08-01',
+    constraints: {
+      MinLength: 1
+    },
     type: {
       name: "String"
     }
   }
 };
 export const apiVersion2: msRest.OperationQueryParameter = {
-  parameterPath: "apiVersion",
-  mapper: {
-    required: true,
-    isConstant: true,
-    serializedName: "api-version",
-    defaultValue: '2019-08-01-preview',
-    type: {
-      name: "String"
-    }
-  }
-};
-export const apiVersion3: msRest.OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
     required: true,
@@ -276,17 +270,7 @@ export const storedProcedureName: msRest.OperationURLParameter = {
     }
   }
 };
-export const subscriptionId0: msRest.OperationURLParameter = {
-  parameterPath: "subscriptionId",
-  mapper: {
-    required: true,
-    serializedName: "subscriptionId",
-    type: {
-      name: "String"
-    }
-  }
-};
-export const subscriptionId1: msRest.OperationURLParameter = {
+export const subscriptionId: msRest.OperationURLParameter = {
   parameterPath: "subscriptionId",
   mapper: {
     required: true,