Skip to content

Commit

Permalink
CodeGen from PR 19430 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history 
Web ant97 2022 03 01 (Azure#19430)

* Adds base for updating Microsoft.Web from version stable/2021-03-01 to version 2022-03-01

* Updates readme

* Updates API version in new specs and examples

* Carry fwd Microsoft.CertificateRegistration and Microsoft.DomainRegis… (Azure#18460)

* Carry fwd Microsoft.CertificateRegistration and Microsoft.DomainRegistration RPs to Api-version 2022-03-01

* Add x-ms-enum for array of inline enums. Fix reference to older api version for common defs

* Add examples for App Service Certificate orders

* Add suppressions back

* Add examples for Microsoft.DomainRegistration RP

* Fixes from prettier

* Remove unused example

* Add Unhealthy CustomDomainStatus for StaticSites (Azure#18557)

* Adding VnetRouteAllEnabled, VnetImagePullEnabled, VnetContentShareEnabled site properties to CommonDefinitions (Azure#18627)

* Added vnet realted site properties to common definitions

* removed tab

Co-authored-by: Tanay Bhartia <tanaybhartia@microsoft.com>

* Add Ftp/Remote debug properties to Ase network config (Azure#18549)

* Add Ftp/Remote debug properties to Ase network config

* Switched changes to the right file

* Add Networking config to hosting environment creates

* Added some of the missing examples

* Remove disallowed properties from example Ase GET response

* Adjusted responses from other gets

* Added a bunch more examples

* Added other missing examples for Ase.

* Added more missing examples for Ase.

* fixed formatting

* Edit some examples, add back privatelink apis and try to supress the errors for missing examples.

* Fix suppress spelling and fix prettier

* Added missing privatelink examples since suppressing did not work

* Add Bring your own Backend operations (Azure#18517)

* add bring your own backend operations

* add missing files

* fix json formattin

* validation fixes

* fix

* fix more validation

* fix ids

* fix model validation

* fix descriptions

* fix environmentName description

* change to 202

* revert change to 202

* customhostnamesites optional param for 2022 API version (Azure#18670)

* fix DUPLICATE_PARAMETER

* prettier

* fix  OBJECT_ADDITIONAL_PROPERTIES

* fix random sub in examples

* add optional hostname param to customHostnameSites RT and add examples

* move changes from 2021 api version to 2022

* move examples to 2022

* Revert "add optional hostname param to customHostnameSites RT and add examples"

This reverts commit 7fc318e190de2108222dbb869d9a6219a02cae2f.

* remove examples from 2021

* fix lintDiff

* prettier fix

* model validation fix

* suppress model validation in readme

Co-authored-by: Elle Tojaroon <patojaro@microsoft.com>

* [Microsoft.Web] Add CustomDnsSuffixConfiguration to ASE (Azure#18553)

* [Microsoft.Web] Add CustomDnsSuffixConfiguration to AppServiceEnvironments

* Add examples

* Fix style issues

* Add customdnssuffix to custom-words

* Add CustomDnsSuffixConfiguration to AppServiceEnvironment definition

* Address remaining model validation errors

* Adjusted networking configuration definitions

* Addressed Arm review feedback

Co-authored-by: Jarod Aerts <jarodaerts@microsoft.com>

* Fork/web ant97 2022 03 01 (Azure#19259)

* Added DeploymentStatus API specs and examples

* change status to enum, rm extra dot

* suppress missing examples for now

* rm id from List Deployment Slot examples

* rm location, and rename deploymentId in GetSiteDeploymentStatus examples

* change model as string to true, add 202 operations for DeploymentStatus ops to spec

* rename operationId to deploymentStatusId, undo deploymentId rename

* add long running op, as per linter

Co-authored-by: Shubham Dhond <shdhond@microsoft.com>
Co-authored-by: Weidong Xu <weidxu@microsoft.com>

* PublicNetworkAccess Swagger Change (Azure#19352)

* add publicNetworkAccess property in site for swagger

* add suppression to fix Model Validation CI

* Add allowed values in the description

* Add specs for Hosting Environment Maintenance Control (Azure#18691)

* Add documentation for Hosting Environment Maintenance Control

* Update example file name

* Make UpgradePreference non-nullable

* Correct indentation to 2 spaces

* Fix upgradePreference indentation

* Address swagger feedback. Add enums with descriptions.

* Move testNotification to request body. Update description text

* Fix testNotification

* Fix example

* Replace TestNotification parameter with TestUpgradeNotification API

* Rename to TestUpgradeAvailableNotification

* Added logic apps operations (Azure#18604)

* Added Initial Operations and some definitions

* Adding additional objects to support Logic Apps operations

* Updated path and parameters to match testing

* Prettier Fixes

* oav validat-example fixes

* Github validation fixes

* Prettier

* Updated examples and paths

* Prettier

* Revert "Prettier"

This reverts commit da090adf8005e0bd6fdc2ddebbd4390e5c4b6b20.

* Prettier

* Fixed model validation errors

* Filled in nextLinkName values

* Fixing swagger lintdiff errors

* added x-ms-long-running to async calls

* Adds numberOfWorkers to app service plan (Azure#19475)

* Adds numberOfWorkers to app service plan

* Add suppression for missing ASP examples

* Updating to fix workflow errors (Azure#19490)

* Removed conflicting resource definition and added reference to CommonDefinitions.json (Azure#19507)

* Removed conflicting resource definition and added reference to CommonDefinitions.json

* Updated resource to have workflow version

* Updated nextLink object to be correctly tagged (Azure#19560)

* Updated nextLink object to be correctly tagged

* Adding value placeholder

* Updated SKU to remove conflict

* Updated x-ms-enum

* Added missing model

* Adding more missing models

* Add suppressions for missing examples (Azure#19563)

Co-authored-by: Joseph Lin <54335291+joslinmicrosoft@users.noreply.github.com>
Co-authored-by: Tanay Bhartia <tanaybhartia@gmail.com>
Co-authored-by: Tanay Bhartia <tanaybhartia@microsoft.com>
Co-authored-by: JarodAertsMs <90280240+JarodAertsMs@users.noreply.github.com>
Co-authored-by: annikel <92825476+annikel@users.noreply.github.com>
Co-authored-by: Paviya (Elle) Tojaroon <pt335@cornell.edu>
Co-authored-by: Elle Tojaroon <patojaro@microsoft.com>
Co-authored-by: Chris Chen <chrc@microsoft.com>
Co-authored-by: Jarod Aerts <jarodaerts@microsoft.com>
Co-authored-by: edwin-msft <71858592+edwin-msft@users.noreply.github.com>
Co-authored-by: Shubham Dhond <shdhond@microsoft.com>
Co-authored-by: Weidong Xu <weidxu@microsoft.com>
Co-authored-by: jiansong-msft <77516279+jiansong-msft@users.noreply.github.com>
Co-authored-by: Derek Johnson <47129225+dejo-msft@users.noreply.github.com>
Co-authored-by: Alex Karcher <alkarche@microsoft.com>
  • Loading branch information
@joslinmicrosoft @tanaybhartia
@tabhar-msft @JarodAertsMs @annikel @cschen13 @edwin-msft @weidongxu-microsoft @jiansong-msft @dejo-msft @alexkarcher-msft
16 people committed Jun 24, 2022
1 parent 41807f0 commit c6a7ea2
Show file tree
Hide file tree
Showing 561 changed files with 323,302 additions and 170,256 deletions.
6 changes: 3 additions & 3 deletions sdk/appservice/azure-mgmt-web/_meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"autorest": "3.7.2",
"use": [
"@autorest/python@5.12.0",
"@autorest/python@5.16.0",
"@autorest/modelerfour@4.19.3"
],
"commit": "cf47fa91b882618a1043e3aeb5803b3a7397cd08",
"commit": "cf3574813e15bb33b3cb610f44edfcbebd8b1b23",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest_command": "autorest specification/web/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
"autorest_command": "autorest specification/web/resource-manager/readme.md --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.16.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
"readme": "specification/web/resource-manager/readme.md"
}
100 changes: 51 additions & 49 deletions sdk/appservice/azure-mgmt-web/azure/mgmt/web/_operations_mixin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
from msrest import Serializer, Deserializer
from typing import TYPE_CHECKING

from . import models as _models

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from typing import Any, Iterable, Optional, Union
Expand All @@ -27,16 +29,16 @@ def check_name_availability(
is_fqdn=None, # type: Optional[bool]
**kwargs # type: Any
):
# type: (...) -> "_models.ResourceNameAvailability"
# type: (...) -> _models.ResourceNameAvailability
"""Check if a resource name is available.
Description for Check if a resource name is available.
Check if a resource name is available.
:param name: Resource name to verify.
:type name: str
:param type: Resource type used for verification.
:type type: str or ~azure.mgmt.web.v2021_03_01.models.CheckNameResourceTypes
:param is_fqdn: Is fully qualified domain name.
:param is_fqdn: Is fully qualified domain name. Default value is None.
:type is_fqdn: bool
:keyword callable cls: A custom type or function that will be passed the direct response
:return: ResourceNameAvailability, or the result of cls(response)
Expand Down Expand Up @@ -76,10 +78,10 @@ def get_publishing_user(
self,
**kwargs # type: Any
):
# type: (...) -> "_models.User"
# type: (...) -> _models.User
"""Gets publishing user.
Description for Gets publishing user.
Gets publishing user.
:keyword callable cls: A custom type or function that will be passed the direct response
:return: User, or the result of cls(response)
Expand Down Expand Up @@ -120,10 +122,10 @@ def get_source_control(
source_control_type, # type: str
**kwargs # type: Any
):
# type: (...) -> "_models.SourceControl"
# type: (...) -> _models.SourceControl
"""Gets source control token.
Description for Gets source control token.
Gets source control token.
:param source_control_type: Type of source control.
:type source_control_type: str
Expand Down Expand Up @@ -165,10 +167,10 @@ def get_subscription_deployment_locations(
self,
**kwargs # type: Any
):
# type: (...) -> "_models.DeploymentLocations"
# type: (...) -> _models.DeploymentLocations
"""Gets list of available geo regions plus ministamps.
Description for Gets list of available geo regions plus ministamps.
Gets list of available geo regions plus ministamps.
:keyword callable cls: A custom type or function that will be passed the direct response
:return: DeploymentLocations, or the result of cls(response)
Expand Down Expand Up @@ -210,14 +212,14 @@ def list_billing_meters(
os_type=None, # type: Optional[str]
**kwargs # type: Any
):
# type: (...) -> Iterable["_models.BillingMeterCollection"]
# type: (...) -> Iterable[_models.BillingMeterCollection]
"""Gets a list of meters for a given location.
Description for Gets a list of meters for a given location.
Gets a list of meters for a given location.
:param billing_location: Azure Location of billable resource.
:param billing_location: Azure Location of billable resource. Default value is None.
:type billing_location: str
:param os_type: App Service OS type meters used for.
:param os_type: App Service OS type meters used for. Default value is None.
:type os_type: str
:keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either BillingMeterCollection or the result of
Expand Down Expand Up @@ -256,7 +258,7 @@ def list_custom_host_name_sites(
self,
**kwargs # type: Any
):
# type: (...) -> Iterable["_models.CustomHostnameSitesCollection"]
# type: (...) -> Iterable[_models.CustomHostnameSitesCollection]
"""Get custom hostnames under this subscription.
Get custom hostnames under this subscription.
Expand Down Expand Up @@ -289,21 +291,21 @@ def list_geo_regions(
linux_dynamic_workers_enabled=None, # type: Optional[bool]
**kwargs # type: Any
):
# type: (...) -> Iterable["_models.GeoRegionCollection"]
# type: (...) -> Iterable[_models.GeoRegionCollection]
"""Get a list of available geographical regions.
Description for Get a list of available geographical regions.
Get a list of available geographical regions.
:param sku: Name of SKU used to filter the regions.
:param sku: Name of SKU used to filter the regions. Default value is None.
:type sku: str or ~azure.mgmt.web.v2021_03_01.models.SkuName
:param linux_workers_enabled: Specify :code:`<code>true</code>` if you want to filter to only
regions that support Linux workers.
regions that support Linux workers. Default value is None.
:type linux_workers_enabled: bool
:param xenon_workers_enabled: Specify :code:`<code>true</code>` if you want to filter to only
regions that support Xenon workers.
regions that support Xenon workers. Default value is None.
:type xenon_workers_enabled: bool
:param linux_dynamic_workers_enabled: Specify :code:`<code>true</code>` if you want to filter
to only regions that support Linux Consumption Workers.
to only regions that support Linux Consumption Workers. Default value is None.
:type linux_dynamic_workers_enabled: bool
:keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either GeoRegionCollection or the result of cls(response)
Expand Down Expand Up @@ -343,10 +345,10 @@ def list_premier_add_on_offers(
self,
**kwargs # type: Any
):
# type: (...) -> Iterable["_models.PremierAddOnOfferCollection"]
# type: (...) -> Iterable[_models.PremierAddOnOfferCollection]
"""List all premier add-on offers.
Description for List all premier add-on offers.
List all premier add-on offers.
:keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either PremierAddOnOfferCollection or the result of
Expand Down Expand Up @@ -386,13 +388,13 @@ def list_premier_add_on_offers(

def list_site_identifiers_assigned_to_host_name(
self,
name_identifier, # type: "_models.NameIdentifier"
name_identifier, # type: _models.NameIdentifier
**kwargs # type: Any
):
# type: (...) -> Iterable["_models.IdentifierCollection"]
# type: (...) -> Iterable[_models.IdentifierCollection]
"""List all apps that are assigned to a hostname.
Description for List all apps that are assigned to a hostname.
List all apps that are assigned to a hostname.
:param name_identifier: Hostname information.
:type name_identifier: ~azure.mgmt.web.v2021_03_01.models.NameIdentifier
Expand Down Expand Up @@ -435,10 +437,10 @@ def list_skus(
self,
**kwargs # type: Any
):
# type: (...) -> "_models.SkuInfos"
# type: (...) -> _models.SkuInfos
"""List all SKUs.
Description for List all SKUs.
List all SKUs.
:keyword callable cls: A custom type or function that will be passed the direct response
:return: SkuInfos, or the result of cls(response)
Expand Down Expand Up @@ -478,10 +480,10 @@ def list_source_controls(
self,
**kwargs # type: Any
):
# type: (...) -> Iterable["_models.SourceControlCollection"]
# type: (...) -> Iterable[_models.SourceControlCollection]
"""Gets the source controls available for Azure websites.
Description for Gets the source controls available for Azure websites.
Gets the source controls available for Azure websites.
:keyword callable cls: A custom type or function that will be passed the direct response
:return: An iterator like instance of either SourceControlCollection or the result of
Expand Down Expand Up @@ -519,16 +521,16 @@ def list_source_controls(
mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
return mixin_instance.list_source_controls(**kwargs)

def move(
def move( # pylint: disable=inconsistent-return-statements
self,
resource_group_name, # type: str
move_resource_envelope, # type: "_models.CsmMoveResourceEnvelope"
move_resource_envelope, # type: _models.CsmMoveResourceEnvelope
**kwargs # type: Any
):
# type: (...) -> None
"""Move resources between resource groups.
Description for Move resources between resource groups.
Move resources between resource groups.
:param resource_group_name: Name of the resource group to which the resource belongs.
:type resource_group_name: str
Expand Down Expand Up @@ -570,13 +572,13 @@ def move(

def update_publishing_user(
self,
user_details, # type: "_models.User"
user_details, # type: _models.User
**kwargs # type: Any
):
# type: (...) -> "_models.User"
# type: (...) -> _models.User
"""Updates publishing user.
Description for Updates publishing user.
Updates publishing user.
:param user_details: Details of publishing user.
:type user_details: ~azure.mgmt.web.v2021_03_01.models.User
Expand Down Expand Up @@ -617,13 +619,13 @@ def update_publishing_user(
def update_source_control(
self,
source_control_type, # type: str
request_message, # type: "_models.SourceControl"
request_message, # type: _models.SourceControl
**kwargs # type: Any
):
# type: (...) -> "_models.SourceControl"
# type: (...) -> _models.SourceControl
"""Updates source control token.
Description for Updates source control token.
Updates source control token.
:param source_control_type: Type of source control.
:type source_control_type: str
Expand Down Expand Up @@ -666,13 +668,13 @@ def update_source_control(
def validate(
self,
resource_group_name, # type: str
validate_request, # type: "_models.ValidateRequest"
validate_request, # type: _models.ValidateRequest
**kwargs # type: Any
):
# type: (...) -> "_models.ValidateResponse"
# type: (...) -> _models.ValidateResponse
"""Validate if a resource can be created.
Description for Validate if a resource can be created.
Validate if a resource can be created.
:param resource_group_name: Name of the resource group to which the resource belongs.
:type resource_group_name: str
Expand Down Expand Up @@ -715,7 +717,7 @@ def validate(
def validate_container_settings(
self,
resource_group_name, # type: str
validate_container_settings_request, # type: "_models.ValidateContainerSettingsRequest"
validate_container_settings_request, # type: _models.ValidateContainerSettingsRequest
**kwargs # type: Any
):
# type: (...) -> Any
Expand Down Expand Up @@ -746,16 +748,16 @@ def validate_container_settings(
mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
return mixin_instance.validate_container_settings(resource_group_name, validate_container_settings_request, **kwargs)

def validate_move(
def validate_move( # pylint: disable=inconsistent-return-statements
self,
resource_group_name, # type: str
move_resource_envelope, # type: "_models.CsmMoveResourceEnvelope"
move_resource_envelope, # type: _models.CsmMoveResourceEnvelope
**kwargs # type: Any
):
# type: (...) -> None
"""Validate whether a resource can be moved.
Description for Validate whether a resource can be moved.
Validate whether a resource can be moved.
:param resource_group_name: Name of the resource group to which the resource belongs.
:type resource_group_name: str
Expand Down Expand Up @@ -797,15 +799,15 @@ def validate_move(

def verify_hosting_environment_vnet(
self,
parameters, # type: "_models.VnetParameters"
parameters, # type: _models.VnetParameters
**kwargs # type: Any
):
# type: (...) -> "_models.VnetValidationFailureDetails"
# type: (...) -> _models.VnetValidationFailureDetails
"""Verifies if this VNET is compatible with an App Service Environment by analyzing the Network
Security Group rules.
Description for Verifies if this VNET is compatible with an App Service Environment by
analyzing the Network Security Group rules.
Verifies if this VNET is compatible with an App Service Environment by analyzing the Network
Security Group rules.
:param parameters: VNET information.
:type parameters: ~azure.mgmt.web.v2021_03_01.models.VnetParameters
Expand Down
3 changes: 2 additions & 1 deletion sdk/appservice/azure-mgmt-web/azure/mgmt/web/_web_site_management_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@

from typing import TYPE_CHECKING

from msrest import Deserializer, Serializer

from azure.mgmt.core import ARMPipelineClient
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin
from msrest import Deserializer, Serializer

from ._configuration import WebSiteManagementClientConfiguration
from ._operations_mixin import WebSiteManagementClientOperationsMixin
Expand Down
Loading

0 comments on commit c6a7ea2

Please sign in to comment.