[AutoPR] web/resource-manager

lib/services/webSiteManagement2/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Microsoft
+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
@@ -18,4 +18,4 @@ 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.
+SOFTWARE.

lib/services/webSiteManagement2/README.md

@@ -1,36 +1,40 @@
-# Microsoft Azure SDK for Node.js - Web Site Management
+---
+uid: azure-arm-website
+summary: *content
 
-This project provides a Node.js package that makes it easy to manage Microsoft Azure Web Site. Right now it supports:
-- **Node.js version: 6.x.x or higher**
+---
+# Microsoft Azure SDK for Node.js - WebSiteManagementClient
+This project provides a Node.js package for accessing Azure. Right now it supports:
+- **Node.js version 6.x.x or higher**
 
 ## Features
 
- - TODO
 
 ## How to Install
 
 ```bash
 npm install azure-arm-website
 ```
 
-## How to Use
-
-### Authentication, client creation and listing serverFarms in a resource group as an example
-
- ```javascript
- const msRestAzure = require('ms-rest-azure');
- const webSiteManagementClient = require('azure-arm-website');
-
- // Interactive Login
- msRestAzure.interactiveLogin(function(err, credentials) {
-  let client = new webSiteManagementClient(credentials, 'your-subscription-id');
-  client.webApps.list(function(err, result) {
-    if (err) return console.log(err);
-    return console.log(result);
-  });
- });
- ```
+## How to use
+
+### Authentication, client creation and list appServiceCertificateOrders as an example.
+
+```javascript
+const msRestAzure = require("ms-rest-azure");
+const WebSiteManagementClient = require("azure-arm-website");
+msRestAzure.interactiveLogin().then((creds) => {
+    const subscriptionId = "<Subscription_Id>";
+    const client = new WebSiteManagementClient(creds, subscriptionId);
+    return client.appServiceCertificateOrders.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 - All-up](https://github.com/WindowsAzure/azure-sdk-for-node)
+- [Microsoft Azure SDK for Node.js](https://github.com/Azure/azure-sdk-for-node)

lib/services/webSiteManagement2/lib/models/appServiceEnvironment.js

@@ -97,6 +97,12 @@ class AppServiceEnvironment {
    * behavior of the App Service Environment.
    * @member {array} [userWhitelistedIpRanges] User added ip ranges to
    * whitelist on ASE db
+   * @member {boolean} [hasLinuxWorkers] Flag that displays whether an ASE has
+   * linux workers or not
+   * @member {string} [sslCertKeyVaultId] Key Vault ID for ILB App Service
+   * Environment default SSL certificate
+   * @member {string} [sslCertKeyVaultSecretName] Key Vault Secret Name for ILB
+   * App Service Environment default SSL certificate
    */
   constructor() {
   }
@@ -434,6 +440,27 @@ class AppServiceEnvironment {
                   }
               }
             }
+          },
+          hasLinuxWorkers: {
+            required: false,
+            serializedName: 'hasLinuxWorkers',
+            type: {
+              name: 'Boolean'
+            }
+          },
+          sslCertKeyVaultId: {
+            required: false,
+            serializedName: 'sslCertKeyVaultId',
+            type: {
+              name: 'String'
+            }
+          },
+          sslCertKeyVaultSecretName: {
+            required: false,
+            serializedName: 'sslCertKeyVaultSecretName',
+            type: {
+              name: 'String'
+            }
           }
         }
       }

lib/services/webSiteManagement2/lib/models/appServiceEnvironmentPatchResource.js

@@ -99,6 +99,12 @@ class AppServiceEnvironmentPatchResource extends models['ProxyOnlyResource'] {
    * behavior of the App Service Environment.
    * @member {array} [userWhitelistedIpRanges] User added ip ranges to
    * whitelist on ASE db
+   * @member {boolean} [hasLinuxWorkers] Flag that displays whether an ASE has
+   * linux workers or not
+   * @member {string} [sslCertKeyVaultId] Key Vault ID for ILB App Service
+   * Environment default SSL certificate
+   * @member {string} [sslCertKeyVaultSecretName] Key Vault Secret Name for ILB
+   * App Service Environment default SSL certificate
    */
   constructor() {
     super();
@@ -468,6 +474,27 @@ class AppServiceEnvironmentPatchResource extends models['ProxyOnlyResource'] {
                   }
               }
             }
+          },
+          hasLinuxWorkers: {
+            required: false,
+            serializedName: 'properties.hasLinuxWorkers',
+            type: {
+              name: 'Boolean'
+            }
+          },
+          sslCertKeyVaultId: {
+            required: false,
+            serializedName: 'properties.sslCertKeyVaultId',
+            type: {
+              name: 'String'
+            }
+          },
+          sslCertKeyVaultSecretName: {
+            required: false,
+            serializedName: 'properties.sslCertKeyVaultSecretName',
+            type: {
+              name: 'String'
+            }
           }
         }
       }

lib/services/webSiteManagement2/lib/models/appServiceEnvironmentResource.js

@@ -99,6 +99,12 @@ class AppServiceEnvironmentResource extends models['Resource'] {
    * behavior of the App Service Environment.
    * @member {array} [userWhitelistedIpRanges] User added ip ranges to
    * whitelist on ASE db
+   * @member {boolean} [hasLinuxWorkers] Flag that displays whether an ASE has
+   * linux workers or not
+   * @member {string} [sslCertKeyVaultId] Key Vault ID for ILB App Service
+   * Environment default SSL certificate
+   * @member {string} [sslCertKeyVaultSecretName] Key Vault Secret Name for ILB
+   * App Service Environment default SSL certificate
    */
   constructor() {
     super();
@@ -489,6 +495,27 @@ class AppServiceEnvironmentResource extends models['Resource'] {
                   }
               }
             }
+          },
+          hasLinuxWorkers: {
+            required: false,
+            serializedName: 'properties.hasLinuxWorkers',
+            type: {
+              name: 'Boolean'
+            }
+          },
+          sslCertKeyVaultId: {
+            required: false,
+            serializedName: 'properties.sslCertKeyVaultId',
+            type: {
+              name: 'String'
+            }
+          },
+          sslCertKeyVaultSecretName: {
+            required: false,
+            serializedName: 'properties.sslCertKeyVaultSecretName',
+            type: {
+              name: 'String'
+            }
           }
         }
       }

lib/services/webSiteManagement2/lib/models/appServicePlan.js

@@ -20,7 +20,6 @@ const models = require('./index');
 class AppServicePlan extends models['Resource'] {
   /**
    * Create a AppServicePlan.
-   * @member {string} appServicePlanName Name for the App Service plan.
    * @member {string} [workerTierName] Target worker tier assigned to the App
    * Service plan.
    * @member {string} [status] App Service plan status. Possible values
@@ -49,9 +48,13 @@ class AppServicePlan extends models['Resource'] {
    * owns spot instances.
    * @member {date} [spotExpirationTime] The time when the server farm expires.
    * Valid only if it is a spot server farm.
+   * @member {date} [freeOfferExpirationTime] The time when the server farm
+   * free offer expires.
    * @member {string} [resourceGroup] Resource group of the App Service plan.
    * @member {boolean} [reserved] If Linux app service plan <code>true</code>,
    * <code>false</code> otherwise. Default value: false .
+   * @member {boolean} [isXenon] If Hyper-V container app service plan
+   * <code>true</code>, <code>false</code> otherwise. Default value: false .
    * @member {number} [targetWorkerCount] Scaling worker count.
    * @member {number} [targetWorkerSizeId] Scaling worker size ID.
    * @member {string} [provisioningState] Provisioning state of the App Service
@@ -148,13 +151,6 @@ class AppServicePlan extends models['Resource'] {
               }
             }
           },
-          appServicePlanName: {
-            required: true,
-            serializedName: 'properties.name',
-            type: {
-              name: 'String'
-            }
-          },
           workerTierName: {
             required: false,
             serializedName: 'properties.workerTierName',
@@ -240,6 +236,13 @@ class AppServicePlan extends models['Resource'] {
               name: 'DateTime'
             }
           },
+          freeOfferExpirationTime: {
+            required: false,
+            serializedName: 'properties.freeOfferExpirationTime',
+            type: {
+              name: 'DateTime'
+            }
+          },
           resourceGroup: {
             required: false,
             readOnly: true,
@@ -256,6 +259,14 @@ class AppServicePlan extends models['Resource'] {
               name: 'Boolean'
             }
           },
+          isXenon: {
+            required: false,
+            serializedName: 'properties.isXenon',
+            defaultValue: false,
+            type: {
+              name: 'Boolean'
+            }
+          },
           targetWorkerCount: {
             required: false,
             serializedName: 'properties.targetWorkerCount',

lib/services/webSiteManagement2/lib/models/appServicePlanCollection.js

@@ -53,6 +53,7 @@ class AppServicePlanCollection extends Array {
           },
           nextLink: {
             required: false,
+            readOnly: true,
             serializedName: 'nextLink',
             type: {
               name: 'String'

lib/services/webSiteManagement2/lib/models/appServicePlanPatchResource.js

@@ -20,8 +20,6 @@ const models = require('./index');
 class AppServicePlanPatchResource extends models['ProxyOnlyResource'] {
   /**
    * Create a AppServicePlanPatchResource.
-   * @member {string} appServicePlanPatchResourceName Name for the App Service
-   * plan.
    * @member {string} [workerTierName] Target worker tier assigned to the App
    * Service plan.
    * @member {string} [status] App Service plan status. Possible values
@@ -50,9 +48,13 @@ class AppServicePlanPatchResource extends models['ProxyOnlyResource'] {
    * owns spot instances.
    * @member {date} [spotExpirationTime] The time when the server farm expires.
    * Valid only if it is a spot server farm.
+   * @member {date} [freeOfferExpirationTime] The time when the server farm
+   * free offer expires.
    * @member {string} [resourceGroup] Resource group of the App Service plan.
    * @member {boolean} [reserved] If Linux app service plan <code>true</code>,
    * <code>false</code> otherwise. Default value: false .
+   * @member {boolean} [isXenon] If Hyper-V container app service plan
+   * <code>true</code>, <code>false</code> otherwise. Default value: false .
    * @member {number} [targetWorkerCount] Scaling worker count.
    * @member {number} [targetWorkerSizeId] Scaling worker size ID.
    * @member {string} [provisioningState] Provisioning state of the App Service
@@ -108,13 +110,6 @@ class AppServicePlanPatchResource extends models['ProxyOnlyResource'] {
               name: 'String'
             }
           },
-          appServicePlanPatchResourceName: {
-            required: true,
-            serializedName: 'properties.name',
-            type: {
-              name: 'String'
-            }
-          },
           workerTierName: {
             required: false,
             serializedName: 'properties.workerTierName',
@@ -200,6 +195,13 @@ class AppServicePlanPatchResource extends models['ProxyOnlyResource'] {
               name: 'DateTime'
             }
           },
+          freeOfferExpirationTime: {
+            required: false,
+            serializedName: 'properties.freeOfferExpirationTime',
+            type: {
+              name: 'DateTime'
+            }
+          },
           resourceGroup: {
             required: false,
             readOnly: true,
@@ -216,6 +218,14 @@ class AppServicePlanPatchResource extends models['ProxyOnlyResource'] {
               name: 'Boolean'
             }
           },
+          isXenon: {
+            required: false,
+            serializedName: 'properties.isXenon',
+            defaultValue: false,
+            type: {
+              name: 'Boolean'
+            }
+          },
           targetWorkerCount: {
             required: false,
             serializedName: 'properties.targetWorkerCount',