Skip to content
This repository has been archived by the owner on May 5, 2023. It is now read-only.

[AutoPR web/resource-manager] [App Service] Update swagger spec for ANT80 #4616

Merged
merged 1 commit into from
Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions lib/services/websiteManagement2/lib/models/appServicePlan.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class AppServicePlan extends models['Resource'] {
* @property {string} [status] App Service plan status. Possible values
* include: 'Ready', 'Pending', 'Creating'
* @property {string} [subscription] App Service plan subscription.
* @property {string} [adminSiteName] App Service plan administration site.
* @property {object} [hostingEnvironmentProfile] Specification for the App
* Service Environment to use for the App Service plan.
* @property {string} [hostingEnvironmentProfile.id] Resource ID of the App
Expand Down Expand Up @@ -180,13 +179,6 @@ class AppServicePlan extends models['Resource'] {
name: 'String'
}
},
adminSiteName: {
required: false,
serializedName: 'properties.adminSiteName',
type: {
name: 'String'
}
},
hostingEnvironmentProfile: {
required: false,
serializedName: 'properties.hostingEnvironmentProfile',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class AppServicePlanPatchResource extends models['ProxyOnlyResource'] {
* @property {string} [status] App Service plan status. Possible values
* include: 'Ready', 'Pending', 'Creating'
* @property {string} [subscription] App Service plan subscription.
* @property {string} [adminSiteName] App Service plan administration site.
* @property {object} [hostingEnvironmentProfile] Specification for the App
* Service Environment to use for the App Service plan.
* @property {string} [hostingEnvironmentProfile.id] Resource ID of the App
Expand Down Expand Up @@ -139,13 +138,6 @@ class AppServicePlanPatchResource extends models['ProxyOnlyResource'] {
name: 'String'
}
},
adminSiteName: {
required: false,
serializedName: 'properties.adminSiteName',
type: {
name: 'String'
}
},
hostingEnvironmentProfile: {
required: false,
serializedName: 'properties.hostingEnvironmentProfile',
Expand Down
60 changes: 60 additions & 0 deletions lib/services/websiteManagement2/lib/models/geoDistribution.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* 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';

/**
* A global distribution definition.
*
*/
class GeoDistribution {
/**
* Create a GeoDistribution.
* @property {string} [location] Location.
* @property {number} [numberOfWorkers] NumberOfWorkers.
*/
constructor() {
}

/**
* Defines the metadata of GeoDistribution
*
* @returns {object} metadata of GeoDistribution
*
*/
mapper() {
return {
required: false,
serializedName: 'GeoDistribution',
type: {
name: 'Composite',
className: 'GeoDistribution',
modelProperties: {
location: {
required: false,
serializedName: 'location',
type: {
name: 'String'
}
},
numberOfWorkers: {
required: false,
serializedName: 'numberOfWorkers',
type: {
name: 'Number'
}
}
}
}
};
}
}

module.exports = GeoDistribution;
104 changes: 95 additions & 9 deletions lib/services/websiteManagement2/lib/models/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,20 @@ export interface ManagedServiceIdentity {
identityIds?: string[];
}

/**
* A global distribution definition.
*/
export interface GeoDistribution {
/**
* Location.
*/
location?: string;
/**
* NumberOfWorkers.
*/
numberOfWorkers?: number;
}

/**
* The status of the last successful slot swap operation.
*/
Expand Down Expand Up @@ -854,11 +868,23 @@ export interface IpSecurityRestriction {
* CIDR notation such as ipv4/mask (leading bit match). For CIDR,
* SubnetMask property must not be specified.
*/
ipAddress: string;
ipAddress?: string;
/**
* Subnet mask for the range of IP addresses the restriction is valid for.
*/
subnetMask?: string;
/**
* Virtual network resource id
*/
vnetSubnetResourceId?: string;
/**
* (internal) Vnet traffic tag
*/
vnetTrafficTag?: number;
/**
* (internal) Subnet traffic tag
*/
subnetTrafficTag?: number;
/**
* Allow or Deny access for this IP range.
*/
Expand Down Expand Up @@ -1604,6 +1630,10 @@ export interface Site extends Resource {
* otherwise, <code>false</code>. Default is <code>false</code>.
*/
clientCertEnabled?: boolean;
/**
* client certificate authentication comma-separated exclusion paths
*/
clientCertExclusionPaths?: string;
/**
* <code>true</code> to disable the public hostnames of the app; otherwise, <code>false</code>.
* If <code>true</code>, the app is only accessible via API management process.
Expand Down Expand Up @@ -1661,6 +1691,19 @@ export interface Site extends Resource {
* http requests
*/
httpsOnly?: boolean;
/**
* Site redundancy mode. Possible values include: 'None', 'Manual', 'Failover', 'ActiveActive',
* 'GeoRedundant'
*/
redundancyMode?: string;
/**
* Specifies an operation id if this site has a pending operation.
*/
readonly inProgressOperationId?: string;
/**
* GeoDistributions for this site
*/
geoDistributions?: GeoDistribution[];
identity?: ManagedServiceIdentity;
}

Expand Down Expand Up @@ -1758,10 +1801,6 @@ export interface AppServicePlan extends Resource {
* App Service plan subscription.
*/
readonly subscription?: string;
/**
* App Service plan administration site.
*/
adminSiteName?: string;
/**
* Specification for the App Service Environment to use for the App Service plan.
*/
Expand Down Expand Up @@ -3540,6 +3579,10 @@ export interface StackMinorVersion {
* <code>true</code> if this is the default minor version; otherwise, <code>false</code>.
*/
isDefault?: boolean;
/**
* <code>true</code> if this supports Remote Debugging, otherwise <code>false</code>.
*/
isRemoteDebuggingEnabled?: boolean;
}

/**
Expand Down Expand Up @@ -4007,6 +4050,36 @@ export interface SourceControl extends ProxyOnlyResource {
expirationTime?: Date;
}

/**
* Container settings validation request context
*/
export interface ValidateContainerSettingsRequest {
/**
* Base URL of the container registry
*/
baseUrl?: string;
/**
* Username for to access the container registry
*/
username?: string;
/**
* Password for to access the container registry
*/
password?: string;
/**
* Repository name (image name)
*/
repository?: string;
/**
* Image tag
*/
tag?: string;
/**
* Platform (windows or linux)
*/
platform?: string;
}

/**
* Resource validation request content.
*/
Expand Down Expand Up @@ -6064,6 +6137,10 @@ export interface SitePatchResource extends ProxyOnlyResource {
* otherwise, <code>false</code>. Default is <code>false</code>.
*/
clientCertEnabled?: boolean;
/**
* client certificate authentication comma-separated exclusion paths
*/
clientCertExclusionPaths?: string;
/**
* <code>true</code> to disable the public hostnames of the app; otherwise, <code>false</code>.
* If <code>true</code>, the app is only accessible via API management process.
Expand Down Expand Up @@ -6121,6 +6198,19 @@ export interface SitePatchResource extends ProxyOnlyResource {
* http requests
*/
httpsOnly?: boolean;
/**
* Site redundancy mode. Possible values include: 'None', 'Manual', 'Failover', 'ActiveActive',
* 'GeoRedundant'
*/
redundancyMode?: string;
/**
* Specifies an operation id if this site has a pending operation.
*/
readonly inProgressOperationId?: string;
/**
* GeoDistributions for this site
*/
geoDistributions?: GeoDistribution[];
}

/**
Expand Down Expand Up @@ -6987,10 +7077,6 @@ export interface AppServicePlanPatchResource extends ProxyOnlyResource {
* App Service plan subscription.
*/
readonly subscription?: string;
/**
* App Service plan administration site.
*/
adminSiteName?: string;
/**
* Specification for the App Service Environment to use for the App Service plan.
*/
Expand Down
2 changes: 2 additions & 0 deletions lib/services/websiteManagement2/lib/models/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ exports.HybridConnectionKey = require('./hybridConnectionKey');
exports.HybridConnection = require('./hybridConnection');
exports.DeletedSite = require('./deletedSite');
exports.ManagedServiceIdentity = require('./managedServiceIdentity');
exports.GeoDistribution = require('./geoDistribution');
exports.SlotSwapStatus = require('./slotSwapStatus');
exports.CloningInfo = require('./cloningInfo');
exports.HostingEnvironmentProfile = require('./hostingEnvironmentProfile');
Expand Down Expand Up @@ -151,6 +152,7 @@ exports.ResourceNameAvailability = require('./resourceNameAvailability');
exports.ResourceNameAvailabilityRequest = require('./resourceNameAvailabilityRequest');
exports.SkuInfos = require('./skuInfos');
exports.SourceControl = require('./sourceControl');
exports.ValidateContainerSettingsRequest = require('./validateContainerSettingsRequest');
exports.ValidateRequest = require('./validateRequest');
exports.ValidateResponseError = require('./validateResponseError');
exports.ValidateResponse = require('./validateResponse');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@
class IpSecurityRestriction {
/**
* Create a IpSecurityRestriction.
* @property {string} ipAddress IP address the security restriction is valid
* for.
* @property {string} [ipAddress] IP address the security restriction is
* valid for.
* It can be in form of pure ipv4 address (required SubnetMask property) or
* CIDR notation such as ipv4/mask (leading bit match). For CIDR,
* SubnetMask property must not be specified.
* @property {string} [subnetMask] Subnet mask for the range of IP addresses
* the restriction is valid for.
* @property {string} [vnetSubnetResourceId] Virtual network resource id
* @property {number} [vnetTrafficTag] (internal) Vnet traffic tag
* @property {number} [subnetTrafficTag] (internal) Subnet traffic tag
* @property {string} [action] Allow or Deny access for this IP range.
* @property {string} [tag] Defines what this IP filter will be used for.
* This is to support IP filtering on proxies. Possible values include:
Expand All @@ -50,7 +53,7 @@ class IpSecurityRestriction {
className: 'IpSecurityRestriction',
modelProperties: {
ipAddress: {
required: true,
required: false,
serializedName: 'ipAddress',
type: {
name: 'String'
Expand All @@ -63,6 +66,27 @@ class IpSecurityRestriction {
name: 'String'
}
},
vnetSubnetResourceId: {
required: false,
serializedName: 'vnetSubnetResourceId',
type: {
name: 'String'
}
},
vnetTrafficTag: {
required: false,
serializedName: 'vnetTrafficTag',
type: {
name: 'Number'
}
},
subnetTrafficTag: {
required: false,
serializedName: 'subnetTrafficTag',
type: {
name: 'Number'
}
},
action: {
required: false,
serializedName: 'action',
Expand Down
Loading