Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgmt, test update appservice 2021-01 #21704

Closed
wants to merge 2 commits into from
+5,010 −1,044
Closed

mgmt, test update appservice 2021-01 #21704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6db7be6
update appservice
weidongxu-microsoft May 21, 2021
247bbf1
code
weidongxu-microsoft May 21, 2021
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
2 changes: 1 addition & 1 deletion sdk/resourcemanager/api-specs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dir": "azure-resourcemanager-appservice",
"source": "specification/web/resource-manager/readme.md",
"package": "com.azure.resourcemanager.appservice",
"args": "--payload-flattening-threshold=1 --tag=package-2020-12 --add-inner=AppServiceCertificate --name-for-ungrouped-operations=ResourceProvider",
"args": "--payload-flattening-threshold=1 --tag=package-2021-01 --add-inner=AppServiceCertificate --name-for-ungrouped-operations=ResourceProvider",
"note": "Add status code '200' to 'syncFunctionTriggers'"
},
"authorization": {
Expand Down
439 changes: 439 additions & 0 deletions ...ice/src/main/java/com/azure/resourcemanager/appservice/fluent/KubeEnvironmentsClient.java
View file
Open in desktop

Large diffs are not rendered by default.

105 changes: 89 additions & 16 deletions ...r-appservice/src/main/java/com/azure/resourcemanager/appservice/fluent/WebAppsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,7 +1697,7 @@ Response<SiteAuthSettingsInner> updateAuthSettingsWithResponse(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<Response<SiteAuthSettingsV2Inner>> updateAuthSettingsV2WithResponseAsync(
Expand All @@ -1713,7 +1713,7 @@ Mono<Response<SiteAuthSettingsV2Inner>> updateAuthSettingsV2WithResponseAsync(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<SiteAuthSettingsV2Inner> updateAuthSettingsV2Async(
Expand All @@ -1729,7 +1729,7 @@ Mono<SiteAuthSettingsV2Inner> updateAuthSettingsV2Async(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
SiteAuthSettingsV2Inner updateAuthSettingsV2(
Expand All @@ -1746,7 +1746,7 @@ SiteAuthSettingsV2Inner updateAuthSettingsV2(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Response<SiteAuthSettingsV2Inner> updateAuthSettingsV2WithResponse(
Expand All @@ -1761,7 +1761,7 @@ Response<SiteAuthSettingsV2Inner> updateAuthSettingsV2WithResponse(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<Response<SiteAuthSettingsV2Inner>> getAuthSettingsV2WithResponseAsync(String resourceGroupName, String name);
Expand All @@ -1775,7 +1775,7 @@ Response<SiteAuthSettingsV2Inner> updateAuthSettingsV2WithResponse(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<SiteAuthSettingsV2Inner> getAuthSettingsV2Async(String resourceGroupName, String name);
Expand All @@ -1789,7 +1789,7 @@ Response<SiteAuthSettingsV2Inner> updateAuthSettingsV2WithResponse(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
SiteAuthSettingsV2Inner getAuthSettingsV2(String resourceGroupName, String name);
Expand All @@ -1804,7 +1804,7 @@ Response<SiteAuthSettingsV2Inner> updateAuthSettingsV2WithResponse(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Response<SiteAuthSettingsV2Inner> getAuthSettingsV2WithResponse(
Expand Down Expand Up @@ -7961,6 +7961,79 @@ Mono<Response<SwiftVirtualNetworkInner>> getSwiftVirtualNetworkConnectionWithRes
Response<SwiftVirtualNetworkInner> getSwiftVirtualNetworkConnectionWithResponse(
String resourceGroupName, String name, Context context);

/**
* Description for Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true
* when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not in
* use by another App Service Plan other than the one this App is in.
*
* @param resourceGroupName Name of the resource group to which the resource belongs.
* @param name Name of the app.
* @param connectionEnvelope Properties of the Virtual Network connection. See example.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return swift Virtual Network Contract.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<Response<SwiftVirtualNetworkInner>> createOrUpdateSwiftVirtualNetworkConnectionWithCheckWithResponseAsync(
String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope);

/**
* Description for Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true
* when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not in
* use by another App Service Plan other than the one this App is in.
*
* @param resourceGroupName Name of the resource group to which the resource belongs.
* @param name Name of the app.
* @param connectionEnvelope Properties of the Virtual Network connection. See example.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return swift Virtual Network Contract.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<SwiftVirtualNetworkInner> createOrUpdateSwiftVirtualNetworkConnectionWithCheckAsync(
String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope);

/**
* Description for Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true
* when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not in
* use by another App Service Plan other than the one this App is in.
*
* @param resourceGroupName Name of the resource group to which the resource belongs.
* @param name Name of the app.
* @param connectionEnvelope Properties of the Virtual Network connection. See example.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return swift Virtual Network Contract.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
SwiftVirtualNetworkInner createOrUpdateSwiftVirtualNetworkConnectionWithCheck(
String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope);

/**
* Description for Integrates this Web App with a Virtual Network. This requires that 1) "swiftSupported" is true
* when doing a GET against this resource, and 2) that the target Subnet has already been delegated, and is not in
* use by another App Service Plan other than the one this App is in.
*
* @param resourceGroupName Name of the resource group to which the resource belongs.
* @param name Name of the app.
* @param connectionEnvelope Properties of the Virtual Network connection. See example.
* @param context The context to associate with this operation.
* @throws IllegalArgumentException thrown if parameters fail the validation.
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return swift Virtual Network Contract.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Response<SwiftVirtualNetworkInner> createOrUpdateSwiftVirtualNetworkConnectionWithCheckWithResponse(
String resourceGroupName, String name, SwiftVirtualNetworkInner connectionEnvelope, Context context);

/**
* Description for Deletes a Swift Virtual Network connection from an app (or deployment slot).
*
Expand Down Expand Up @@ -12928,7 +13001,7 @@ Response<SiteAuthSettingsInner> getAuthSettingsSlotWithResponse(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<Response<SiteAuthSettingsV2Inner>> updateAuthSettingsV2SlotWithResponseAsync(
Expand All @@ -12945,7 +13018,7 @@ Mono<Response<SiteAuthSettingsV2Inner>> updateAuthSettingsV2SlotWithResponseAsyn
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<SiteAuthSettingsV2Inner> updateAuthSettingsV2SlotAsync(
Expand All @@ -12962,7 +13035,7 @@ Mono<SiteAuthSettingsV2Inner> updateAuthSettingsV2SlotAsync(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
SiteAuthSettingsV2Inner updateAuthSettingsV2Slot(
Expand All @@ -12980,7 +13053,7 @@ SiteAuthSettingsV2Inner updateAuthSettingsV2Slot(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Response<SiteAuthSettingsV2Inner> updateAuthSettingsV2SlotWithResponse(
Expand All @@ -13001,7 +13074,7 @@ Response<SiteAuthSettingsV2Inner> updateAuthSettingsV2SlotWithResponse(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<Response<SiteAuthSettingsV2Inner>> getAuthSettingsV2SlotWithResponseAsync(
Expand All @@ -13018,7 +13091,7 @@ Mono<Response<SiteAuthSettingsV2Inner>> getAuthSettingsV2SlotWithResponseAsync(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Mono<SiteAuthSettingsV2Inner> getAuthSettingsV2SlotAsync(String resourceGroupName, String name, String slot);
Expand All @@ -13034,7 +13107,7 @@ Mono<Response<SiteAuthSettingsV2Inner>> getAuthSettingsV2SlotWithResponseAsync(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
SiteAuthSettingsV2Inner getAuthSettingsV2Slot(String resourceGroupName, String name, String slot);
Expand All @@ -13051,7 +13124,7 @@ Mono<Response<SiteAuthSettingsV2Inner>> getAuthSettingsV2SlotWithResponseAsync(
* @throws com.azure.resourcemanager.appservice.models.DefaultErrorResponseErrorException thrown if the request is
* rejected by server.
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
* @return the response.
* @return configuration settings for the Azure App Service Authentication / Authorization V2 feature.
*/
@ServiceMethod(returns = ReturnType.SINGLE)
Response<SiteAuthSettingsV2Inner> getAuthSettingsV2SlotWithResponse(
Expand Down
45 changes: 26 additions & 19 deletions ...ce/src/main/java/com/azure/resourcemanager/appservice/fluent/WebSiteManagementClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,20 @@ public interface WebSiteManagementClient {
*/
DomainRegistrationProvidersClient getDomainRegistrationProviders();

/**
* Gets the AppServiceEnvironmentsClient object to access its operations.
*
* @return the AppServiceEnvironmentsClient object.
*/
AppServiceEnvironmentsClient getAppServiceEnvironments();

/**
* Gets the AppServicePlansClient object to access its operations.
*
* @return the AppServicePlansClient object.
*/
AppServicePlansClient getAppServicePlans();

/**
* Gets the CertificatesClient object to access its operations.
*
Expand Down Expand Up @@ -129,18 +143,18 @@ public interface WebSiteManagementClient {
RecommendationsClient getRecommendations();

/**
* Gets the ResourceProvidersClient object to access its operations.
* Gets the ResourceHealthMetadatasClient object to access its operations.
*
* @return the ResourceProvidersClient object.
* @return the ResourceHealthMetadatasClient object.
*/
ResourceProvidersClient getResourceProviders();
ResourceHealthMetadatasClient getResourceHealthMetadatas();

/**
* Gets the WebAppsClient object to access its operations.
* Gets the ResourceProvidersClient object to access its operations.
*
* @return the WebAppsClient object.
* @return the ResourceProvidersClient object.
*/
WebAppsClient getWebApps();
ResourceProvidersClient getResourceProviders();

/**
* Gets the StaticSitesClient object to access its operations.
Expand All @@ -150,23 +164,16 @@ public interface WebSiteManagementClient {
StaticSitesClient getStaticSites();

/**
* Gets the AppServiceEnvironmentsClient object to access its operations.
*
* @return the AppServiceEnvironmentsClient object.
*/
AppServiceEnvironmentsClient getAppServiceEnvironments();

/**
* Gets the AppServicePlansClient object to access its operations.
* Gets the WebAppsClient object to access its operations.
*
* @return the AppServicePlansClient object.
* @return the WebAppsClient object.
*/
AppServicePlansClient getAppServicePlans();
WebAppsClient getWebApps();

/**
* Gets the ResourceHealthMetadatasClient object to access its operations.
* Gets the KubeEnvironmentsClient object to access its operations.
*
* @return the ResourceHealthMetadatasClient object.
* @return the KubeEnvironmentsClient object.
*/
ResourceHealthMetadatasClient getResourceHealthMetadatas();
KubeEnvironmentsClient getKubeEnvironments();
}
30 changes: 30 additions & 0 deletions ...src/main/java/com/azure/resourcemanager/appservice/fluent/models/AppServicePlanInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.azure.core.annotation.JsonFlatten;
import com.azure.core.management.Resource;
import com.azure.core.util.logging.ClientLogger;
import com.azure.resourcemanager.appservice.models.ExtendedLocation;
import com.azure.resourcemanager.appservice.models.HostingEnvironmentProfile;
import com.azure.resourcemanager.appservice.models.KubeEnvironmentProfile;
import com.azure.resourcemanager.appservice.models.ProvisioningState;
Expand All @@ -30,6 +31,12 @@ public class AppServicePlanInner extends Resource {
@JsonProperty(value = "sku")
private SkuDescription sku;

/*
* Extended Location.
*/
@JsonProperty(value = "extendedLocation")
private ExtendedLocation extendedLocation;

/*
* Target worker tier assigned to the App Service plan.
*/
Expand Down Expand Up @@ -187,6 +194,26 @@ public AppServicePlanInner withSku(SkuDescription sku) {
return this;
}

/**
* Get the extendedLocation property: Extended Location.
*
* @return the extendedLocation value.
*/
public ExtendedLocation extendedLocation() {
return this.extendedLocation;
}

/**
* Set the extendedLocation property: Extended Location.
*
* @param extendedLocation the extendedLocation value to set.
* @return the AppServicePlanInner object itself.
*/
public AppServicePlanInner withExtendedLocation(ExtendedLocation extendedLocation) {
this.extendedLocation = extendedLocation;
return this;
}

/**
* Get the workerTierName property: Target worker tier assigned to the App Service plan.
*
Expand Down Expand Up @@ -572,6 +599,9 @@ public void validate() {
if (sku() != null) {
sku().validate();
}
if (extendedLocation() != null) {
extendedLocation().validate();
}
if (hostingEnvironmentProfile() != null) {
hostingEnvironmentProfile().validate();
}
Expand Down
Loading