Skip to content

Commit

Permalink
Xynoclafe/2020 06 version (Azure#9888)
Browse files Browse the repository at this point in the history 
* Update Resources 2020-06 to include changes from 2019-10 (From PR - Azure#9441)

* Update Resources 2020-06 to include changes from 2019-10 (From PR - Azure#9580)

* Rollback java support for Resources API version 2020-06-01
  • Loading branch information
@Xynoclafe @00Kai0
Xynoclafe authored and 00Kai0 committed Oct 12, 2020
1 parent 4b7672d commit caec9c2
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 41 deletions.
57 changes: 30 additions & 27 deletions ...ification/resources/resource-manager/Microsoft.Resources/stable/2020-06-01/resources.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2628,7 +2628,7 @@
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SourceSubscriptionIdParameter"
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
Expand Down Expand Up @@ -2758,7 +2758,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
Expand Down Expand Up @@ -2831,7 +2832,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
Expand Down Expand Up @@ -2908,7 +2910,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
},
{
"name": "parameters",
Expand Down Expand Up @@ -3000,7 +3003,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
},
{
"name": "parameters",
Expand Down Expand Up @@ -3086,7 +3090,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
Expand Down Expand Up @@ -3129,7 +3134,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
}
],
"responses": {
Expand Down Expand Up @@ -3167,7 +3173,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
}
],
"responses": {
Expand Down Expand Up @@ -3209,7 +3216,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
},
{
"name": "parameters",
Expand Down Expand Up @@ -3266,7 +3274,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
},
{
"name": "parameters",
Expand Down Expand Up @@ -3317,7 +3326,8 @@
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the operation."
"description": "The API version to use for the operation.",
"x-ms-api-version": false
}
],
"responses": {
Expand All @@ -3341,7 +3351,7 @@
"tags": [
"Tags"
],
"operationId": "TagsOperation_DeleteValue",
"operationId": "Tags_DeleteValue",
"summary": "Deletes a predefined tag value for a predefined tag name.",
"description": "This operation allows deleting a value from the list of predefined values for an existing predefined tag name. The value being deleted must not be in use as a tag value for the given tag name for any resource.",
"parameters": [
Expand Down Expand Up @@ -3385,7 +3395,7 @@
"tags": [
"Tags"
],
"operationId": "TagsOperation_CreateOrUpdateValue",
"operationId": "Tags_CreateOrUpdateValue",
"summary": "Creates a predefined value for a predefined tag name.",
"description": "This operation allows adding a value to the list of predefined values for an existing predefined tag name. A tag value can have a maximum of 256 characters.",
"parameters": [
Expand Down Expand Up @@ -3437,7 +3447,7 @@
"tags": [
"Tags"
],
"operationId": "TagsOperation_CreateOrUpdate",
"operationId": "Tags_CreateOrUpdate",
"summary": "Creates a predefined tag name.",
"description": "This operation allows adding a name to the list of predefined tag names for the given subscription. A tag name can have a maximum of 512 characters and is case-insensitive. Tag names cannot have the following prefixes which are reserved for Azure use: 'microsoft', 'azure', 'windows'.",
"parameters": [
Expand Down Expand Up @@ -3480,7 +3490,7 @@
"tags": [
"Tags"
],
"operationId": "TagsOperation_Delete",
"operationId": "Tags_Delete",
"summary": "Deletes a predefined tag name.",
"description": "This operation allows deleting a name from the list of predefined tag names for the given subscription. The name being deleted must not be in use as a tag name for any resource. All predefined values for the given name must have already been deleted.",
"parameters": [
Expand Down Expand Up @@ -3519,7 +3529,7 @@
"tags": [
"Tags"
],
"operationId": "TagsOperation_List",
"operationId": "Tags_List",
"summary": "Gets a summary of tag usage under the subscription.",
"description": "This operation performs a union of predefined tags, resource tags, resource group tags and subscription tags, and returns a summary of usage for each tag name and value under the given subscription. In case of a large number of tags, this operation may return a previously cached result.",
"parameters": [
Expand Down Expand Up @@ -4040,7 +4050,7 @@
"tags": [
"Tags"
],
"operationId": "TagsOperation_CreateOrUpdateAtScope",
"operationId": "Tags_CreateOrUpdateAtScope",
"summary": "Creates or updates the entire set of tags on a resource or subscription.",
"description": "This operation allows adding or replacing the entire set of tags on the specified resource or subscription. The specified entity can have a maximum of 50 tags.",
"parameters": [
Expand Down Expand Up @@ -4086,7 +4096,7 @@
"tags": [
"Tags"
],
"operationId": "TagsOperation_UpdateAtScope",
"operationId": "Tags_UpdateAtScope",
"summary": "Selectively updates the set of tags on a resource or subscription.",
"description": "This operation allows replacing, merging or selectively deleting tags on the specified resource or subscription. The specified entity can have a maximum of 50 tags at the end of the operation. The 'replace' option replaces the entire set of existing tags with a new set. The 'merge' option allows adding tags with new names and updating the values of tags with existing names. The 'delete' option allows selectively deleting tags based on given names or name/value pairs.",
"parameters": [
Expand Down Expand Up @@ -4124,7 +4134,7 @@
"tags": [
"Tags"
],
"operationId": "TagsOperation_GetAtScope",
"operationId": "Tags_GetAtScope",
"summary": "Gets the entire set of tags on a resource or subscription.",
"parameters": [
{
Expand Down Expand Up @@ -4161,7 +4171,7 @@
"tags": [
"Tags"
],
"operationId": "TagsOperation_DeleteAtScope",
"operationId": "Tags_DeleteAtScope",
"summary": "Deletes the entire set of tags on a resource or subscription.",
"parameters": [
{
Expand Down Expand Up @@ -5884,13 +5894,6 @@
"type": "string",
"description": "The ID of the target subscription."
},
"SourceSubscriptionIdParameter": {
"name": "subscriptionId",
"in": "path",
"required": true,
"type": "string",
"description": "The ID of the source subscription."
},
"DeploymentNameParameter": {
"name": "deploymentName",
"in": "path",
Expand Down
14 changes: 0 additions & 14 deletions specification/resources/resource-manager/readme.java.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ batch:
- tag: package-policy-2018-05
- tag: package-policy-2018-03
- tag: package-policy-2016-12
- tag: package-resources-2020-06
- tag: package-resources-2019-08
- tag: package-resources-2019-07
- tag: package-resources-2019-0510
Expand Down Expand Up @@ -190,19 +189,6 @@ directive:
transform: $['x-ms-client-name'] = 'scopeProperty'
```

### Tag: package-resources-2020-06 and java

These settings apply only when `--tag=package-resources-2020-06 --java` is specified on the command line.
Please also specify `--azure-libraries-for-java-folder=<path to the root directory of your azure-libraries-for-java clone>`.

``` yaml $(tag) == 'package-resources-2020-06' && $(java) && $(multiapi)
java:
namespace: com.microsoft.azure.management.resources.v2020_06_01
output-folder: $(azure-libraries-for-java-folder)/resources/resource-manager/v2020_06_01
regenerate-manager: true
generate-interface: true
```

### Tag: package-resources-2019-08 and java

These settings apply only when `--tag=package-resources-2019-08 --java` is specified on the command line.
Expand Down

0 comments on commit caec9c2

Please sign in to comment.