[AutoPR] containerinstance/resource-manager

lib/services/containerinstanceManagement/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2018 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

lib/services/containerinstanceManagement/README.md

@@ -1,40 +1,40 @@
----
-uid: azure-arm-containerinstance
-summary: *content
-
----
-# Microsoft Azure SDK for Node.js - ContainerInstanceManagementClient
-This project provides a Node.js package for accessing Azure. Right now it supports:
-- **Node.js version 6.x.x or higher**
-
-## Features
-
-
-## How to Install
-
-```bash
-npm install azure-arm-containerinstance
-```
-
-## How to use
-
-### Authentication, client creation and list containerGroups as an example.
-
-```javascript
-const msRestAzure = require("ms-rest-azure");
-const ContainerInstanceManagementClient = require("azure-arm-containerinstance");
-msRestAzure.interactiveLogin().then((creds) => {
-    const subscriptionId = "<Subscription_Id>";
-    const client = new ContainerInstanceManagementClient(creds, subscriptionId);
-    return client.containerGroups.list().then((result) => {
-      console.log("The result is:");
-      console.log(result);
-    });
-}).catch((err) => {
-  console.log('An error ocurred:');
-  console.dir(err, {depth: null, colors: true});
-});
-
-## Related projects
-
-- [Microsoft Azure SDK for Node.js](https://github.com/Azure/azure-sdk-for-node)
+---
+uid: azure-arm-containerinstance
+summary: *content
+
+---
+# Microsoft Azure SDK for Node.js - ContainerInstanceManagementClient
+This project provides a Node.js package for accessing Azure. Right now it supports:
+- **Node.js version 6.x.x or higher**
+
+## Features
+
+
+## How to Install
+
+```bash
+npm install azure-arm-containerinstance
+```
+
+## How to use
+
+### Authentication, client creation and list containerGroups as an example.
+
+```javascript
+const msRestAzure = require("ms-rest-azure");
+const ContainerInstanceManagementClient = require("azure-arm-containerinstance");
+msRestAzure.interactiveLogin().then((creds) => {
+    const subscriptionId = "<Subscription_Id>";
+    const client = new ContainerInstanceManagementClient(creds, subscriptionId);
+    return client.containerGroups.list().then((result) => {
+      console.log("The result is:");
+      console.log(result);
+    });
+}).catch((err) => {
+  console.log('An error occurred:');
+  console.dir(err, {depth: null, colors: true});
+});
+
+## Related projects
+
+- [Microsoft Azure SDK for Node.js](https://github.com/Azure/azure-sdk-for-node)

lib/services/containerinstanceManagement/lib/containerInstanceManagementClient.d.ts

@@ -34,11 +34,11 @@ export default class ContainerInstanceManagementClient extends AzureServiceClien
    *
    * @param {boolean} [options.noRetryPolicy] - If set to true, turn off default retry policy
    *
-   * @param {string} [options.acceptLanguage] - Gets or sets the preferred language for the response.
+   * @param {string} [options.acceptLanguage] - The preferred language for the response.
    *
-   * @param {number} [options.longRunningOperationRetryTimeout] - Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
+   * @param {number} [options.longRunningOperationRetryTimeout] - The retry timeout in seconds for Long Running Operations. Default value is 30.
    *
-   * @param {boolean} [options.generateClientRequestId] - When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+   * @param {boolean} [options.generateClientRequestId] - Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
    *
    */
   constructor(credentials: ServiceClientCredentials, subscriptionId: string, baseUri?: string, options?: AzureServiceClientOptions);
@@ -59,8 +59,7 @@ export default class ContainerInstanceManagementClient extends AzureServiceClien
   containerGroups: operations.ContainerGroups;
   operations: operations.Operations;
   containerGroupUsage: operations.ContainerGroupUsage;
-  containerLogs: operations.ContainerLogs;
-  startContainer: operations.StartContainer;
+  containerOperations: operations.ContainerOperations;
 }
 
 export { ContainerInstanceManagementClient, models as ContainerInstanceManagementModels };

lib/services/containerinstanceManagement/lib/containerInstanceManagementClient.js

@@ -34,9 +34,9 @@ class ContainerInstanceManagementClient extends ServiceClient {
    * @param {object} [options.requestOptions] - Options for the underlying request object
    * {@link https://github.com/request/request#requestoptions-callback Options doc}
    * @param {boolean} [options.noRetryPolicy] - If set to true, turn off default retry policy
-   * @param {string} [options.acceptLanguage] - Gets or sets the preferred language for the response.
-   * @param {number} [options.longRunningOperationRetryTimeout] - Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
-   * @param {boolean} [options.generateClientRequestId] - When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+   * @param {string} [options.acceptLanguage] - The preferred language for the response.
+   * @param {number} [options.longRunningOperationRetryTimeout] - The retry timeout in seconds for Long Running Operations. Default value is 30.
+   * @param {boolean} [options.generateClientRequestId] - Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
    */
   constructor(credentials, subscriptionId, baseUri, options) {
     if (credentials === null || credentials === undefined) {
@@ -50,7 +50,7 @@ class ContainerInstanceManagementClient extends ServiceClient {
 
     super(credentials, options);
 
-    this.apiVersion = '2018-04-01';
+    this.apiVersion = '2018-06-01';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.generateClientRequestId = true;
@@ -75,8 +75,7 @@ class ContainerInstanceManagementClient extends ServiceClient {
     this.containerGroups = new operations.ContainerGroups(this);
     this.operations = new operations.Operations(this);
     this.containerGroupUsage = new operations.ContainerGroupUsage(this);
-    this.containerLogs = new operations.ContainerLogs(this);
-    this.startContainer = new operations.StartContainer(this);
+    this.containerOperations = new operations.ContainerOperations(this);
     this.models = models;
     msRest.addSerializationMixin(this);
   }

lib/services/containerinstanceManagement/lib/models/container.js

@@ -73,6 +73,36 @@ class Container {
    * instance.
    * @member {array} [volumeMounts] The volume mounts available to the
    * container instance.
+   * @member {object} [livenessProbe] The liveness probe.
+   * @member {object} [livenessProbe.exec] The execution command to probe
+   * @member {array} [livenessProbe.exec.command] The commands to execute
+   * within the container.
+   * @member {object} [livenessProbe.httpGet] The Http Get settings to probe
+   * @member {string} [livenessProbe.httpGet.path] The path to probe.
+   * @member {number} [livenessProbe.httpGet.port] The port number to probe.
+   * @member {string} [livenessProbe.httpGet.scheme] The scheme. Possible
+   * values include: 'http', 'https'
+   * @member {number} [livenessProbe.initialDelaySeconds] The initial delay
+   * seconds.
+   * @member {number} [livenessProbe.periodSeconds] The period seconds.
+   * @member {number} [livenessProbe.failureThreshold] The failure threshold.
+   * @member {number} [livenessProbe.successThreshold] The success threshold.
+   * @member {number} [livenessProbe.timeoutSeconds] The timeout seconds.
+   * @member {object} [readinessProbe] The readiness probe.
+   * @member {object} [readinessProbe.exec] The execution command to probe
+   * @member {array} [readinessProbe.exec.command] The commands to execute
+   * within the container.
+   * @member {object} [readinessProbe.httpGet] The Http Get settings to probe
+   * @member {string} [readinessProbe.httpGet.path] The path to probe.
+   * @member {number} [readinessProbe.httpGet.port] The port number to probe.
+   * @member {string} [readinessProbe.httpGet.scheme] The scheme. Possible
+   * values include: 'http', 'https'
+   * @member {number} [readinessProbe.initialDelaySeconds] The initial delay
+   * seconds.
+   * @member {number} [readinessProbe.periodSeconds] The period seconds.
+   * @member {number} [readinessProbe.failureThreshold] The failure threshold.
+   * @member {number} [readinessProbe.successThreshold] The success threshold.
+   * @member {number} [readinessProbe.timeoutSeconds] The timeout seconds.
    */
   constructor() {
   }
@@ -180,6 +210,22 @@ class Container {
                   }
               }
             }
+          },
+          livenessProbe: {
+            required: false,
+            serializedName: 'properties.livenessProbe',
+            type: {
+              name: 'Composite',
+              className: 'ContainerProbe'
+            }
+          },
+          readinessProbe: {
+            required: false,
+            serializedName: 'properties.readinessProbe',
+            type: {
+              name: 'Composite',
+              className: 'ContainerProbe'
+            }
           }
         }
       }

lib/services/containerinstanceManagement/lib/models/containerExec.js

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * The container execution command, for liveness or readiness probe
+ *
+ */
+class ContainerExec {
+  /**
+   * Create a ContainerExec.
+   * @member {array} [command] The commands to execute within the container.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of ContainerExec
+   *
+   * @returns {object} metadata of ContainerExec
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'ContainerExec',
+      type: {
+        name: 'Composite',
+        className: 'ContainerExec',
+        modelProperties: {
+          command: {
+            required: false,
+            serializedName: 'command',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = ContainerExec;

lib/services/containerinstanceManagement/lib/models/containerExecRequest.js

@@ -13,16 +13,16 @@
 const models = require('./index');
 
 /**
- * The start container exec request.
+ * The container exec request.
  *
  */
 class ContainerExecRequest {
   /**
    * Create a ContainerExecRequest.
    * @member {string} [command] The command to be executed.
    * @member {object} [terminalSize] The size of the terminal.
-   * @member {number} [terminalSize.row] The row size of the terminal
-   * @member {number} [terminalSize.column] The column size of the terminal
+   * @member {number} [terminalSize.rows] The row size of the terminal
+   * @member {number} [terminalSize.cols] The column size of the terminal
    */
   constructor() {
   }

lib/services/containerinstanceManagement/lib/models/containerExecRequestTerminalSize.js

@@ -17,8 +17,8 @@
 class ContainerExecRequestTerminalSize {
   /**
    * Create a ContainerExecRequestTerminalSize.
-   * @member {number} [row] The row size of the terminal
-   * @member {number} [column] The column size of the terminal
+   * @member {number} [rows] The row size of the terminal
+   * @member {number} [cols] The column size of the terminal
    */
   constructor() {
   }
@@ -37,16 +37,16 @@ class ContainerExecRequestTerminalSize {
         name: 'Composite',
         className: 'ContainerExecRequestTerminalSize',
         modelProperties: {
-          row: {
+          rows: {
             required: false,
-            serializedName: 'row',
+            serializedName: 'rows',
             type: {
               name: 'Number'
             }
           },
-          column: {
+          cols: {
             required: false,
-            serializedName: 'column',
+            serializedName: 'cols',
             type: {
               name: 'Number'
             }

lib/services/containerinstanceManagement/lib/models/containerExecResponse.js

@@ -39,15 +39,13 @@ class ContainerExecResponse {
         modelProperties: {
           webSocketUri: {
             required: false,
-            readOnly: true,
             serializedName: 'webSocketUri',
             type: {
               name: 'String'
             }
           },
           password: {
             required: false,
-            readOnly: true,
             serializedName: 'password',
             type: {
               name: 'String'

lib/services/containerinstanceManagement/lib/models/containerGroup.js

@@ -47,6 +47,14 @@ class ContainerGroup extends models['Resource'] {
    * @member {array} [instanceView.events] The events of this container group.
    * @member {string} [instanceView.state] The state of the container group.
    * Only valid in response.
+   * @member {object} [diagnostics] The diagnostic information for a container
+   * group.
+   * @member {object} [diagnostics.logAnalytics] Container group log analytics
+   * information.
+   * @member {string} [diagnostics.logAnalytics.workspaceId] The workspace id
+   * for log analytics
+   * @member {string} [diagnostics.logAnalytics.workspaceKey] The workspace key
+   * for log analytics
    */
   constructor() {
     super();
@@ -194,6 +202,14 @@ class ContainerGroup extends models['Resource'] {
               name: 'Composite',
               className: 'ContainerGroupPropertiesInstanceView'
             }
+          },
+          diagnostics: {
+            required: false,
+            serializedName: 'properties.diagnostics',
+            type: {
+              name: 'Composite',
+              className: 'ContainerGroupDiagnostics'
+            }
           }
         }
       }