Skip to content

Commit 6071ea9

Browse files
bbridgesbganapa
authored andcommitted
Add 2020-09-01-hybrid profile overrides for Java tags (Azure#16780)
* Add network overrides for java hybrid-2020-09-01 * Add authorization overrides for java hybrid-2020-09-01 * Add compute overrides for java hybrid-2020-09-01 * Add eventhubs overrides for java hybrid-2020-09-01 * Add storage overrides for java hybrid-2020-09-01 * 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. * appservice - Adding a tag for 2020-09-01-hybrid profile Co-authored-by: bganapa <[email protected]>
1 parent c3ab05d commit 6071ea9

File tree

8 files changed

+201
-3
lines changed

8 files changed

+201
-3
lines changed

specification/authorization/resource-manager/readme.java.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,26 @@ java:
142142
regenerate-manager: true
143143
generate-interface: true
144144
```
145+
146+
### Tag: profile-hybrid-2020-09-01 and java
147+
148+
These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line.
149+
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
150+
151+
``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java)
152+
input-file:
153+
- Microsoft.Authorization/stable/2015-07-01/authorization-RoleDefinitionsCalls.json
154+
- Microsoft.Authorization/stable/2015-07-01/authorization-ProviderOperationsCalls.json
155+
- Microsoft.Authorization/stable/2015-07-01/authorization-ElevateAccessCalls.json
156+
- Microsoft.Authorization/stable/2015-07-01/authorization-RoleAssignmentsCalls.json
157+
- Microsoft.Authorization/stable/2015-07-01/authorization-ClassicAdminCalls.json
158+
directive:
159+
- from: authorization-RoleAssignmentsCalls.json
160+
where: $.definitions.RoleAssignment.properties.properties
161+
transform: >
162+
$['x-ms-client-flatten'] = true;
163+
- from: authorization-RoleAssignmentsCalls.json
164+
where: $.definitions.RoleAssignmentCreateParameters.properties.properties
165+
transform: >
166+
$['x-ms-client-flatten'] = true;
167+
```

specification/compute/resource-manager/readme.java.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,18 @@ Creating this tag to pick proper resources from the hybrid profile.
125125
input-file:
126126
- Microsoft.Compute/stable/2017-12-01/compute.json
127127
- Microsoft.Compute/stable/2017-03-30/disk.json
128-
```
128+
```
129+
130+
### Tag: profile-hybrid-2020-09-01 and java
131+
132+
These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line.
133+
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
134+
135+
``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java)
136+
input-file:
137+
- Microsoft.Compute/stable/2020-06-01/compute.json
138+
- Microsoft.Compute/stable/2020-06-01/runCommands.json
139+
- Microsoft.Compute/stable/2019-04-01/skus.json
140+
- Microsoft.Compute/stable/2019-07-01/disk.json
141+
- Microsoft.Compute/stable/2019-12-01/gallery.json
142+
```

specification/containerservice/resource-manager/readme.java.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
These settings apply only when `--java` is specified on the command line.
1+
## Java
2+
3+
These settings apply only when `--java` is specified on the command line and `--tag=profile-hybrid-2020-09-01` is not specified.
24
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.
35

46
``` yaml $(java)
@@ -10,7 +12,11 @@ payload-flattening-threshold: 1
1012
output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-containerservice
1113
title: ContainerServiceManagementClient
1214
description: "Container Service Client"
15+
```
16+
17+
These settings also apply when `--tag=profile-hybrid-2020-09-01` is not specified.
1318

19+
``` yaml $(java) && $(tag) != 'profile-hybrid-2020-09-01'
1420
input-file:
1521
- Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json
1622
- Microsoft.ContainerService/stable/2019-08-01/location.json
@@ -339,3 +345,13 @@ java:
339345
regenerate-manager: true
340346
generate-interface: true
341347
```
348+
349+
### Tag: profile-hybrid-2020-09-01 and java
350+
351+
These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line.
352+
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
353+
354+
``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java)
355+
input-file:
356+
- Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json
357+
```

specification/containerservice/resource-manager/readme.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,18 @@ input-file:
722722
- Microsoft.ContainerService/stable/2016-03-30/containerService.json
723723
```
724724

725+
### Tag: profile-hybrid-2020-09-01
726+
727+
These settings apply only when `--tag=profile-hybrid-2020-09-01` is specified on the command line.
728+
Creating this tag to pick proper resources from the hybrid profile.
729+
730+
``` yaml $(tag) == 'profile-hybrid-2020-09-01'
731+
input-file:
732+
- Microsoft.ContainerService/stable/2020-11-01/managedClusters.json
733+
- Microsoft.ContainerService/stable/2019-04-01/location.json
734+
- Microsoft.ContainerService/stable/2017-07-01/containerService.json
735+
```
736+
725737
---
726738

727739
# Code Generation

specification/eventhub/resource-manager/readme.java.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,23 @@ java:
102102
regenerate-manager: true
103103
generate-interface: true
104104
```
105+
106+
### Tag: profile-hybrid-2020-09-01 and java
107+
108+
These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line.
109+
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
110+
111+
``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java)
112+
input-file:
113+
- Microsoft.EventHub/preview/2018-01-01-preview/AvailableClusterRegions-preview.json
114+
- Microsoft.EventHub/preview/2018-01-01-preview/Clusters-preview.json
115+
- Microsoft.EventHub/preview/2018-01-01-preview/namespaces-preview.json
116+
- Microsoft.EventHub/stable/2017-04-01/AuthorizationRules.json
117+
- Microsoft.EventHub/stable/2017-04-01/CheckNameAvailability.json
118+
- Microsoft.EventHub/stable/2017-04-01/consumergroups.json
119+
- Microsoft.EventHub/stable/2017-04-01/operations.json
120+
- Microsoft.EventHub/stable/2017-04-01/eventhubs.json
121+
- Microsoft.EventHub/stable/2017-04-01/sku.json
122+
- Microsoft.EventHub/stable/2017-04-01/disasterRecoveryConfigs.json
123+
- Microsoft.EventHub/stable/2017-04-01/networkRuleSets.json
124+
```

specification/network/resource-manager/readme.java.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,3 +280,54 @@ input-file:
280280
- Microsoft.Network/stable/2017-10-01/routeTable.json
281281
- Microsoft.Network/stable/2017-10-01/virtualNetwork.json
282282
```
283+
284+
### Tag: profile-hybrid-2020-09-01 and java
285+
286+
These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line.
287+
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
288+
289+
``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java)
290+
input-file:
291+
- Microsoft.Network/stable/2018-11-01/applicationGateway.json
292+
- Microsoft.Network/stable/2018-11-01/applicationSecurityGroup.json
293+
- Microsoft.Network/stable/2018-11-01/availableDelegations.json
294+
- Microsoft.Network/stable/2018-11-01/azureFirewall.json
295+
- Microsoft.Network/stable/2018-11-01/azureFirewallFqdnTag.json
296+
- Microsoft.Network/stable/2018-11-01/checkDnsAvailability.json
297+
- Microsoft.Network/stable/2018-11-01/ddosCustomPolicy.json
298+
- Microsoft.Network/stable/2018-11-01/ddosProtectionPlan.json
299+
- Microsoft.Network/stable/2018-11-01/endpointService.json
300+
- Microsoft.Network/stable/2018-11-01/expressRouteCircuit.json
301+
- Microsoft.Network/stable/2018-11-01/expressRouteCrossConnection.json
302+
- Microsoft.Network/stable/2018-11-01/expressRouteGateway.json
303+
- Microsoft.Network/stable/2018-11-01/expressRoutePort.json
304+
- Microsoft.Network/stable/2018-11-01/interfaceEndpoint.json
305+
- Microsoft.Network/stable/2018-11-01/loadBalancer.json
306+
- Microsoft.Network/stable/2018-11-01/network.json
307+
- Microsoft.Network/stable/2018-11-01/networkInterface.json
308+
- Microsoft.Network/stable/2018-11-01/networkProfile.json
309+
- Microsoft.Network/stable/2018-11-01/networkSecurityGroup.json
310+
- Microsoft.Network/stable/2018-11-01/networkWatcher.json
311+
- Microsoft.Network/stable/2018-11-01/operation.json
312+
- Microsoft.Network/stable/2018-11-01/publicIpAddress.json
313+
- Microsoft.Network/stable/2018-11-01/publicIpPrefix.json
314+
- Microsoft.Network/stable/2018-11-01/routeFilter.json
315+
- Microsoft.Network/stable/2018-11-01/routeTable.json
316+
- Microsoft.Network/stable/2018-11-01/serviceCommunity.json
317+
- Microsoft.Network/stable/2018-11-01/serviceEndpointPolicy.json
318+
- Microsoft.Network/stable/2018-11-01/usage.json
319+
- Microsoft.Network/stable/2018-11-01/virtualNetwork.json
320+
- Microsoft.Network/stable/2018-11-01/virtualNetworkGateway.json
321+
- Microsoft.Network/stable/2018-11-01/virtualNetworkTap.json
322+
- Microsoft.Network/stable/2018-11-01/virtualWan.json
323+
- Microsoft.Network/stable/2018-11-01/vmssNetworkInterface.json
324+
- Microsoft.Network/stable/2018-11-01/vmssPublicIpAddress.json
325+
directive:
326+
- from: loadBalancer.json
327+
where: $.definitions.OutboundRulePropertiesFormat.properties.protocol
328+
transform: >
329+
$['x-ms-enum'] = {
330+
name: 'LoadBalancerOutboundRuleProtocol',
331+
modelAsString: true,
332+
};
333+
```

specification/storage/resource-manager/readme.java.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,4 +180,36 @@ Creating this tag to pick proper resources from the hybrid profile.
180180
``` yaml $(tag) == 'profile-hybrid-2019-03-01'
181181
input-file:
182182
- Microsoft.Storage/stable/2017-10-01/storage.json
183-
```
183+
```
184+
185+
### Tag: profile-hybrid-2020-09-01 and java
186+
187+
These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line.
188+
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
189+
190+
``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java)
191+
input-file:
192+
- Microsoft.Storage/stable/2019-06-01/storage.json
193+
- Microsoft.Storage/stable/2019-06-01/blob.json
194+
- Microsoft.Storage/stable/2019-06-01/file.json
195+
- Microsoft.Storage/stable/2019-06-01/queue.json
196+
- Microsoft.Storage/stable/2019-06-01/table.json
197+
198+
directive:
199+
- from: storage.json
200+
where: $.definitions.Identity.properties.type
201+
transform: >
202+
$['x-ms-enum'].modelAsString = true;
203+
204+
- suppress: R3018
205+
reason: Existing boolean properties
206+
approved-by: "@fearthecowboy"
207+
208+
- where:
209+
- $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/setLegalHold"].post.operationId
210+
- $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/blobServices/default/containers/{containerName}/clearLegalHold"].post.operationId
211+
- $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/regenerateKey"].post.operationId
212+
suppress: R1003
213+
reason: APIs return array of values, is not actually a 'list' operation
214+
approved-by: "@fearthecowboy"
215+
```

specification/web/resource-manager/readme.java.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,33 @@ java:
109109
regenerate-manager: true
110110
generate-interface: true
111111
```
112+
113+
### Tag: profile-hybrid-2020-09-01 and java
114+
115+
These settings apply only when `--tag=profile-hybrid-2020-09-01 --java` is specified on the command line.
116+
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-sdk-for-java clone>`.
117+
118+
``` yaml $(tag) == 'profile-hybrid-2020-09-01' && $(java)
119+
input-file:
120+
- Microsoft.CertificateRegistration/stable/2018-02-01/AppServiceCertificateOrders.json
121+
- Microsoft.CertificateRegistration/stable/2018-02-01/CertificateRegistrationProvider.json
122+
- Microsoft.DomainRegistration/stable/2018-02-01/Domains.json
123+
- Microsoft.DomainRegistration/stable/2018-02-01/TopLevelDomains.json
124+
- Microsoft.DomainRegistration/stable/2018-02-01/DomainRegistrationProvider.json
125+
- Microsoft.Web/stable/2018-02-01/Certificates.json
126+
- Microsoft.Web/stable/2018-02-01/CommonDefinitions.json
127+
- Microsoft.Web/stable/2018-02-01/DeletedWebApps.json
128+
- Microsoft.Web/stable/2018-02-01/Diagnostics.json
129+
- Microsoft.Web/stable/2018-02-01/Provider.json
130+
- Microsoft.Web/stable/2018-02-01/Recommendations.json
131+
- Microsoft.Web/stable/2018-02-01/ResourceProvider.json
132+
- Microsoft.Web/stable/2018-02-01/WebApps.json
133+
- Microsoft.Web/stable/2018-02-01/AppServiceEnvironments.json
134+
- Microsoft.Web/stable/2018-02-01/AppServicePlans.json
135+
- Microsoft.Web/stable/2018-02-01/ResourceHealthMetadata.json
136+
directive:
137+
- from: CommonDefinitions.json
138+
where: $.definitions.Identifier.properties.properties.properties.id
139+
transform: >
140+
$['x-ms-client-name'] = "value";
141+
```

0 commit comments

Comments
 (0)