From 0ead5e7804253148a572ada288880f45adca488c Mon Sep 17 00:00:00 2001 From: Bradley Bridges Date: Mon, 27 Sep 2021 12:44:19 -0700 Subject: [PATCH 1/7] Add network overrides for java hybrid-2020-09-01 --- .../network/resource-manager/readme.java.md | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/specification/network/resource-manager/readme.java.md b/specification/network/resource-manager/readme.java.md index e05a5f82adf3..5edd4a4ef519 100644 --- a/specification/network/resource-manager/readme.java.md +++ b/specification/network/resource-manager/readme.java.md @@ -280,3 +280,54 @@ input-file: - Microsoft.Network/stable/2017-10-01/routeTable.json - Microsoft.Network/stable/2017-10-01/virtualNetwork.json ``` + +### Tag: profile-hybrid-2020-09-01 and java + +These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java) +input-file: + - Microsoft.Network/stable/2018-11-01/applicationGateway.json + - Microsoft.Network/stable/2018-11-01/applicationSecurityGroup.json + - Microsoft.Network/stable/2018-11-01/availableDelegations.json + - Microsoft.Network/stable/2018-11-01/azureFirewall.json + - Microsoft.Network/stable/2018-11-01/azureFirewallFqdnTag.json + - Microsoft.Network/stable/2018-11-01/checkDnsAvailability.json + - Microsoft.Network/stable/2018-11-01/ddosCustomPolicy.json + - Microsoft.Network/stable/2018-11-01/ddosProtectionPlan.json + - Microsoft.Network/stable/2018-11-01/endpointService.json + - Microsoft.Network/stable/2018-11-01/expressRouteCircuit.json + - Microsoft.Network/stable/2018-11-01/expressRouteCrossConnection.json + - Microsoft.Network/stable/2018-11-01/expressRouteGateway.json + - Microsoft.Network/stable/2018-11-01/expressRoutePort.json + - Microsoft.Network/stable/2018-11-01/interfaceEndpoint.json + - Microsoft.Network/stable/2018-11-01/loadBalancer.json + - Microsoft.Network/stable/2018-11-01/network.json + - Microsoft.Network/stable/2018-11-01/networkInterface.json + - Microsoft.Network/stable/2018-11-01/networkProfile.json + - Microsoft.Network/stable/2018-11-01/networkSecurityGroup.json + - Microsoft.Network/stable/2018-11-01/networkWatcher.json + - Microsoft.Network/stable/2018-11-01/operation.json + - Microsoft.Network/stable/2018-11-01/publicIpAddress.json + - Microsoft.Network/stable/2018-11-01/publicIpPrefix.json + - Microsoft.Network/stable/2018-11-01/routeFilter.json + - Microsoft.Network/stable/2018-11-01/routeTable.json + - Microsoft.Network/stable/2018-11-01/serviceCommunity.json + - Microsoft.Network/stable/2018-11-01/serviceEndpointPolicy.json + - Microsoft.Network/stable/2018-11-01/usage.json + - Microsoft.Network/stable/2018-11-01/virtualNetwork.json + - Microsoft.Network/stable/2018-11-01/virtualNetworkGateway.json + - Microsoft.Network/stable/2018-11-01/virtualNetworkTap.json + - Microsoft.Network/stable/2018-11-01/virtualWan.json + - Microsoft.Network/stable/2018-11-01/vmssNetworkInterface.json + - Microsoft.Network/stable/2018-11-01/vmssPublicIpAddress.json +directive: + - from: loadBalancer.json + where: $.definitions.OutboundRulePropertiesFormat.properties.protocol + transform: > + $['x-ms-enum'] = { + name: 'LoadBalancerOutboundRuleProtocol', + modelAsString: true, + }; +``` From 01546501aceabd85f773601c3042ffa2c2368089 Mon Sep 17 00:00:00 2001 From: Bradley Bridges Date: Mon, 27 Sep 2021 12:44:55 -0700 Subject: [PATCH 2/7] Add authorization overrides for java hybrid-2020-09-01 --- .../resource-manager/readme.java.md | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/specification/authorization/resource-manager/readme.java.md b/specification/authorization/resource-manager/readme.java.md index 50d86a2a1032..ec0052482c0c 100644 --- a/specification/authorization/resource-manager/readme.java.md +++ b/specification/authorization/resource-manager/readme.java.md @@ -142,3 +142,26 @@ java: regenerate-manager: true generate-interface: true ``` + +### Tag: profile-hybrid-2020-09-01 and java + +These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java) +input-file: + - Microsoft.Authorization/stable/2015-07-01/authorization-RoleDefinitionsCalls.json + - Microsoft.Authorization/stable/2015-07-01/authorization-ProviderOperationsCalls.json + - Microsoft.Authorization/stable/2015-07-01/authorization-ElevateAccessCalls.json + - Microsoft.Authorization/stable/2015-07-01/authorization-RoleAssignmentsCalls.json + - Microsoft.Authorization/stable/2015-07-01/authorization-ClassicAdminCalls.json +directive: + - from: authorization-RoleAssignmentsCalls.json + where: $.definitions.RoleAssignment.properties.properties + transform: > + $['x-ms-client-flatten'] = true; + - from: authorization-RoleAssignmentsCalls.json + where: $.definitions.RoleAssignmentCreateParameters.properties.properties + transform: > + $['x-ms-client-flatten'] = true; +``` From b3a7ecc0e813b6f570ec91d899fa650d3b1ed9d5 Mon Sep 17 00:00:00 2001 From: Bradley Bridges Date: Thu, 30 Sep 2021 11:48:18 -0700 Subject: [PATCH 3/7] Add compute overrides for java hybrid-2020-09-01 --- .../compute/resource-manager/readme.java.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/specification/compute/resource-manager/readme.java.md b/specification/compute/resource-manager/readme.java.md index f83c0c13d7fb..399311f42133 100644 --- a/specification/compute/resource-manager/readme.java.md +++ b/specification/compute/resource-manager/readme.java.md @@ -125,4 +125,18 @@ Creating this tag to pick proper resources from the hybrid profile. input-file: - Microsoft.Compute/stable/2017-12-01/compute.json - Microsoft.Compute/stable/2017-03-30/disk.json -``` \ No newline at end of file +``` + +### Tag: profile-hybrid-2020-09-01 and java + +These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java) +input-file: + - Microsoft.Compute/stable/2020-06-01/compute.json + - Microsoft.Compute/stable/2020-06-01/runCommands.json + - Microsoft.Compute/stable/2019-04-01/skus.json + - Microsoft.Compute/stable/2019-07-01/disk.json + - Microsoft.Compute/stable/2019-12-01/gallery.json +``` From 87fb4f79fa374f68e12f1f5fb690eea997e12bab Mon Sep 17 00:00:00 2001 From: Bradley Bridges Date: Fri, 1 Oct 2021 12:16:02 -0700 Subject: [PATCH 4/7] Add eventhubs overrides for java hybrid-2020-09-01 --- .../eventhub/resource-manager/readme.java.md | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/specification/eventhub/resource-manager/readme.java.md b/specification/eventhub/resource-manager/readme.java.md index 2debab97a829..0335f1a53c96 100644 --- a/specification/eventhub/resource-manager/readme.java.md +++ b/specification/eventhub/resource-manager/readme.java.md @@ -60,3 +60,23 @@ java: regenerate-manager: true generate-interface: true ``` + +### Tag: profile-hybrid-2020-09-01 and java + +These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java) +input-file: + - Microsoft.EventHub/preview/2018-01-01-preview/AvailableClusterRegions-preview.json + - Microsoft.EventHub/preview/2018-01-01-preview/Clusters-preview.json + - Microsoft.EventHub/preview/2018-01-01-preview/namespaces-preview.json + - Microsoft.EventHub/stable/2017-04-01/AuthorizationRules.json + - Microsoft.EventHub/stable/2017-04-01/CheckNameAvailability.json + - Microsoft.EventHub/stable/2017-04-01/consumergroups.json + - Microsoft.EventHub/stable/2017-04-01/operations.json + - Microsoft.EventHub/stable/2017-04-01/eventhubs.json + - Microsoft.EventHub/stable/2017-04-01/sku.json + - Microsoft.EventHub/stable/2017-04-01/disasterRecoveryConfigs.json + - Microsoft.EventHub/stable/2017-04-01/networkRuleSets.json +``` From 6b9effe27a2bf484e298c0d55562bfad4c307183 Mon Sep 17 00:00:00 2001 From: Bradley Bridges Date: Tue, 5 Oct 2021 02:54:28 -0700 Subject: [PATCH 5/7] Add storage overrides for java hybrid-2020-09-01 --- .../storage/resource-manager/readme.java.md | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/specification/storage/resource-manager/readme.java.md b/specification/storage/resource-manager/readme.java.md index 1008074ec04d..74f4e48836d1 100644 --- a/specification/storage/resource-manager/readme.java.md +++ b/specification/storage/resource-manager/readme.java.md @@ -180,4 +180,36 @@ Creating this tag to pick proper resources from the hybrid profile. ``` yaml $(tag) == 'profile-hybrid-2019-03-01' input-file: - Microsoft.Storage/stable/2017-10-01/storage.json -``` \ No newline at end of file +``` + +### Tag: profile-hybrid-2020-09-01 and java + +These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java) +input-file: + - Microsoft.Storage/stable/2019-06-01/storage.json + - Microsoft.Storage/stable/2019-06-01/blob.json + - Microsoft.Storage/stable/2019-06-01/file.json + - Microsoft.Storage/stable/2019-06-01/queue.json + - Microsoft.Storage/stable/2019-06-01/table.json + +directive: + - from: storage.json + where: $.definitions.Identity.properties.type + transform: > + $['x-ms-enum'].modelAsString = true; + + - suppress: R3018 + reason: Existing boolean properties + approved-by: "@fearthecowboy" + + - where: + - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/setLegalHold"].post.operationId + - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/clearLegalHold"].post.operationId + - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/regenerateKey"].post.operationId + suppress: R1003 + reason: APIs return array of values, is not actually a 'list' operation + approved-by: "@fearthecowboy" +``` From 786f4e91cf2bcf3ba05de51fe6277a9e9c6eb0e9 Mon Sep 17 00:00:00 2001 From: Bradley Bridges Date: Wed, 6 Oct 2021 13:04:52 -0700 Subject: [PATCH 6/7] Add containerservice overrides for java hybrid-2020-09-01 Some extra changes were needed because locations.json was being added everywhere and this was conflicting with the version supported for Azure Stack Hub. --- .../resource-manager/readme.java.md | 18 +++++++++++++++++- .../resource-manager/readme.md | 12 ++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/specification/containerservice/resource-manager/readme.java.md b/specification/containerservice/resource-manager/readme.java.md index 7d53a96b35dd..f4b555e86fd5 100644 --- a/specification/containerservice/resource-manager/readme.java.md +++ b/specification/containerservice/resource-manager/readme.java.md @@ -1,4 +1,6 @@ -These settings apply only when `--java` is specified on the command line. +## Java + +These settings apply only when `--java` is specified on the command line and `--tag=profile-hybrid-2020-09-01` is not specified. Please also specify `--azure-libraries-for-java-folder=`. ``` yaml $(java) @@ -10,7 +12,11 @@ payload-flattening-threshold: 1 output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-containerservice title: ContainerServiceManagementClient description: "Container Service Client" +``` + +These settings also apply when `--tag=profile-hybrid-2020-09-01` is not specified. +``` yaml $(java) && $(tag) != 'profile-hybrid-2020-09-01' input-file: - Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json - Microsoft.ContainerService/stable/2019-08-01/location.json @@ -325,3 +331,13 @@ java: regenerate-manager: true generate-interface: true ``` + +### Tag: profile-hybrid-2020-09-01 and java + +These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java) +input-file: + - Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json +``` diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md index 14ce19b80d87..66da0f1213c0 100644 --- a/specification/containerservice/resource-manager/readme.md +++ b/specification/containerservice/resource-manager/readme.md @@ -692,6 +692,18 @@ input-file: - Microsoft.ContainerService/stable/2016-03-30/containerService.json ``` +### Tag: profile-hybrid-2020-09-01 + +These settings apply only when `--tag=profile-hybrid-2020-09-01` is specified on the command line. +Creating this tag to pick proper resources from the hybrid profile. + +``` yaml $(tag) == 'profile-hybrid-2020-09-01' +input-file: +- Microsoft.ContainerService/stable/2020-11-01/managedClusters.json +- Microsoft.ContainerService/stable/2019-04-01/location.json +- Microsoft.ContainerService/stable/2017-07-01/containerService.json +``` + --- # Code Generation From 810133ae96050c04d5e6a1adbf6f0ce32d4de1fb Mon Sep 17 00:00:00 2001 From: bganapa Date: Tue, 12 Oct 2021 11:10:49 -0700 Subject: [PATCH 7/7] appservice - Adding a tag for 2020-09-01-hybrid profile --- .../web/resource-manager/readme.java.md | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/specification/web/resource-manager/readme.java.md b/specification/web/resource-manager/readme.java.md index f5cde8af1741..b3052400c140 100644 --- a/specification/web/resource-manager/readme.java.md +++ b/specification/web/resource-manager/readme.java.md @@ -109,3 +109,33 @@ java: regenerate-manager: true generate-interface: true ``` + +### Tag: profile-hybrid-2020-09-01 and java + +These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line. +Please also specify `--azure-libraries-for-java-folder=`. + +``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java) +input-file: +- Microsoft.CertificateRegistration/stable/2018-02-01/AppServiceCertificateOrders.json +- Microsoft.CertificateRegistration/stable/2018-02-01/CertificateRegistrationProvider.json +- Microsoft.DomainRegistration/stable/2018-02-01/Domains.json +- Microsoft.DomainRegistration/stable/2018-02-01/TopLevelDomains.json +- Microsoft.DomainRegistration/stable/2018-02-01/DomainRegistrationProvider.json +- Microsoft.Web/stable/2018-02-01/Certificates.json +- Microsoft.Web/stable/2018-02-01/CommonDefinitions.json +- Microsoft.Web/stable/2018-02-01/DeletedWebApps.json +- Microsoft.Web/stable/2018-02-01/Diagnostics.json +- Microsoft.Web/stable/2018-02-01/Provider.json +- Microsoft.Web/stable/2018-02-01/Recommendations.json +- Microsoft.Web/stable/2018-02-01/ResourceProvider.json +- Microsoft.Web/stable/2018-02-01/WebApps.json +- Microsoft.Web/stable/2018-02-01/AppServiceEnvironments.json +- Microsoft.Web/stable/2018-02-01/AppServicePlans.json +- Microsoft.Web/stable/2018-02-01/ResourceHealthMetadata.json +directive: + - from: CommonDefinitions.json + where: $.definitions.Identifier.properties.properties.properties.id + transform: > + $['x-ms-client-name'] = "value"; +```