From d309cca43db26ca83df82344e7c2d18ff945986a Mon Sep 17 00:00:00 2001 From: "Fan Yang (AZURE)" Date: Fri, 23 Aug 2019 15:53:23 -0700 Subject: [PATCH 1/4] UpdateManagedNetworkSwagger --- .../ManagedNetwork/ManagedNetworksGet.json | 2 +- .../ManagedNetworksListByResourceGroup.json | 2 +- .../ManagedNetworksListBySubscription.json | 2 +- .../ManagedNetwork/ManagedNetworksPatch.json | 6 ++-- .../ManagedNetwork/ManagedNetworksPut.json | 6 ++-- .../ManagedNetworkPeeringPoliciesGet.json | 2 +- ...rkPeeringPoliciesListByManagedNetwork.json | 2 +- .../ManagedNetworkPeeringPoliciesPut.json | 6 ++-- .../2019-06-01-preview/managedNetwork.json | 34 +++++++++---------- .../managednetwork/resource-manager/readme.md | 34 ++++++------------- 10 files changed, 40 insertions(+), 56 deletions(-) diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksGet.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksGet.json index 46f750fc191d..df8767b44f41 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksGet.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksGet.json @@ -12,7 +12,7 @@ "name": "myManagedNetwork", "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork", "type": "Microsoft.ManagedNetwork/managedNetworks", - "tags": {}, + "tags": [], "location": "eastus", "properties": { "provisioningState": "Succeeded", diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListByResourceGroup.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListByResourceGroup.json index eac86d4ff8bb..f9493033130a 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListByResourceGroup.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListByResourceGroup.json @@ -13,7 +13,7 @@ "name": "myManagedNetwork", "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork", "type": "Microsoft.ManagedNetwork/managedNetworks", - "tags": {}, + "tags": [], "location": "eastus", "properties": { "provisioningState": "Succeeded", diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListBySubscription.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListBySubscription.json index be6cdeb0bad1..608bc26f8ec0 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListBySubscription.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksListBySubscription.json @@ -12,7 +12,7 @@ "name": "myManagedNetwork", "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork", "type": "Microsoft.ManagedNetwork/managedNetworks", - "tags": {}, + "tags": [], "location": "eastus", "properties": { "provisioningState": "Succeeded", diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPatch.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPatch.json index e1c562701091..c2d76c7cb580 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPatch.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPatch.json @@ -6,7 +6,7 @@ "resourceGroupName": "myResourceGroup", "managedNetworkName": "myManagedNetwork", "parameters": { - "tags": {} + "tags": [] } }, "responses": { @@ -15,7 +15,7 @@ "name": "myManagedNetwork", "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork", "type": "Microsoft.ManagedNetwork/managedNetworks", - "tags": {}, + "tags": [], "location": "eastus", "properties": { "provisioningState": "Succeeded", @@ -66,7 +66,7 @@ "name": "myManagedNetwork", "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork", "type": "Microsoft.ManagedNetwork/managedNetworks", - "tags": {}, + "tags": [], "location": "eastus", "properties": { "provisioningState": "Succeeded", diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPut.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPut.json index 084e5ebb2405..d97e7acebf4d 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPut.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetwork/ManagedNetworksPut.json @@ -6,7 +6,7 @@ "resourceGroupName": "myResourceGroup", "managedNetworkName": "myManagedNetwork", "managedNetwork": { - "tags": {}, + "tags": [], "location": "eastus", "properties": { "scope": { @@ -52,7 +52,7 @@ "name": "myManagedNetwork", "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork", "type": "Microsoft.ManagedNetwork/managedNetworks", - "tags": {}, + "tags": [], "location": "eastus", "properties": { "provisioningState": "Succeeded", @@ -103,7 +103,7 @@ "name": "myManagedNetwork", "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.ManagedNetwork/managedNetworks/myManagedNetwork", "type": "Microsoft.ManagedNetwork/managedNetworks", - "tags": {}, + "tags": [], "location": "eastus", "properties": { "provisioningState": "Succeeded", diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesGet.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesGet.json index f7dabe223031..acf6ce84b7b3 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesGet.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesGet.json @@ -16,7 +16,7 @@ "properties": { "provisioningState": "Succeeded", "etag": "asdf-asdf-asdf2", - "peeringPolicyType": "HubAndSpokeTopology", + "type": "HubAndSpokeTopology", "hub": { "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet" }, diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesListByManagedNetwork.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesListByManagedNetwork.json index 6934ff5c83e6..6fc8caa8cf9e 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesListByManagedNetwork.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesListByManagedNetwork.json @@ -17,7 +17,7 @@ "properties": { "provisioningState": "Succeeded", "etag": "asdf-asdf-asdf2", - "peeringPolicyType": "HubAndSpokeTopology", + "type": "HubAndSpokeTopology", "hub": { "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet" }, diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesPut.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesPut.json index a09f56bd3de4..14142d4d37da 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesPut.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/examples/ManagedNetworkPeeringPolicy/ManagedNetworkPeeringPoliciesPut.json @@ -8,7 +8,7 @@ "managedNetworkPeeringPolicyName": "myHubAndSpoke", "managedNetworkPolicy": { "properties": { - "peeringPolicyType": "HubAndSpokeTopology", + "type": "HubAndSpokeTopology", "hub": { "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet" }, @@ -29,7 +29,7 @@ "properties": { "provisioningState": "Succeeded", "etag": "asdf-asdf-asdf2", - "peeringPolicyType": "HubAndSpokeTopology", + "type": "HubAndSpokeTopology", "hub": { "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet" }, @@ -49,7 +49,7 @@ "properties": { "provisioningState": "Succeeded", "etag": "asdf-asdf-asdf2", - "peeringPolicyType": "HubAndSpokeTopology", + "type": "HubAndSpokeTopology", "hub": { "id": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet" }, diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json index 661b8e6bddcb..5658dd3e2030 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json @@ -991,7 +991,6 @@ "type": "object", "properties": { "scope": { - "readOnly": true, "$ref": "#/definitions/Scope", "description": "The collection of management groups, subscriptions, virtual networks, and subnets by the Managed Network. This is a read-only property that is reflective of all ScopeAssignments for this Managed Network" }, @@ -1012,8 +1011,11 @@ "type": "object", "properties": { "tags": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/TagsObject", + "type": "array", + "items": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/TagsObject" + }, "description": "Updates the tags property of the Managed Network" } }, @@ -1230,9 +1232,8 @@ "description": "The Managed Network Peering Policy resource" }, "ManagedNetworkPeeringPolicyProperties": { - "discriminator": "peeringPolicyType", "properties": { - "peeringPolicyType": { + "type": { "type": "string", "enum": [ "HubAndSpokeTopology", @@ -1413,15 +1414,15 @@ "description": "The resource model definition for a ARM tracked top level resource", "properties": { "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], + "type": "array", + "items": { + "type": "string", + "x-ms-mutability": [ + "read", + "create", + "update" + ] + }, "description": "Resource tags." }, "location": { @@ -1460,10 +1461,7 @@ "description": "Generic pointer to a resource" }, "TagsObject": { - "type": "object", - "additionalProperties": { - "type": "string" - }, + "type": "string", "description": "Resource tags." }, "ResourceProperties": { diff --git a/specification/managednetwork/resource-manager/readme.md b/specification/managednetwork/resource-manager/readme.md index 37cf92ae60cc..97d0fee2f8b9 100644 --- a/specification/managednetwork/resource-manager/readme.md +++ b/specification/managednetwork/resource-manager/readme.md @@ -29,7 +29,7 @@ openapi-type: arm tag: package-2019-06-01-preview ``` -### Tag: package-2019-03-01-preview +### Tag: package-2019-06-01-preview These settings apply only when `--tag=package-2019-06-01-preview` is specified on the command line. @@ -54,32 +54,18 @@ swagger-to-sdk: - repo: azure-sdk-for-js - repo: azure-sdk-for-node - repo: azure-sdk-for-ruby - after_scripts: - - bundle install && rake arm:regen_all_profiles['azure_mgmt_managed_network'] ``` +## C# -## Multi-API/Profile support for AutoRest v3 generators +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. -AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. - -This block is updated by an automatic script. Edits may be lost! - -``` yaml $(tag) == 'all-api-versions' /* autogenerated */ -# include the azure profile definitions from the standard location -require: $(this-folder)/../../../profiles/readme.md - -# all the input files across all versions -input-file: - - $(this-folder)/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json - -``` - -If there are files that should not be in the `all-api-versions` set, -uncomment the `exclude-file` section below and add the file paths. - -``` yaml $(tag) == 'all-api-versions' -#exclude-file: -# - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json +``` yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + namespace: Microsoft.Azure.Management.ManagedNetwork + clear-output-folder: true ``` From d00ef2031f9fa0351b62dc03414e6feac704a662 Mon Sep 17 00:00:00 2001 From: "Fan Yang (AZURE)" Date: Fri, 23 Aug 2019 16:11:28 -0700 Subject: [PATCH 2/4] rename required type --- .../preview/2019-06-01-preview/managedNetwork.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json index 5658dd3e2030..a2e6b15144c8 100644 --- a/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json +++ b/specification/managednetwork/resource-manager/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json @@ -1270,7 +1270,7 @@ } ], "required": [ - "peeringPolicyType" + "type" ], "description": "Properties of a Managed Network Peering Policy" }, From 79eb876870944ebd0ea4bf95475febd8d398f1b9 Mon Sep 17 00:00:00 2001 From: Garrett Serack Date: Tue, 27 Aug 2019 07:20:07 -0700 Subject: [PATCH 3/4] Update readme.md --- .../managednetwork/resource-manager/readme.md | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/specification/managednetwork/resource-manager/readme.md b/specification/managednetwork/resource-manager/readme.md index 97d0fee2f8b9..27c4f0353295 100644 --- a/specification/managednetwork/resource-manager/readme.md +++ b/specification/managednetwork/resource-manager/readme.md @@ -69,3 +69,23 @@ csharp: clear-output-folder: true ``` +## Multi-API/Profile support for AutoRest v3 generators +AutoRest V3 generators require the use of `--tag=all-api-versions` to select api files. + +This block is updated by an automatic script. Edits may be lost! + +``` yaml $(tag) == 'all-api-versions' /* autogenerated */ +# include the azure profile definitions from the standard location +require: $(this-folder)/../../../profiles/readme.md +# all the input files across all versions +input-file: + - $(this-folder)/Microsoft.ManagedNetwork/preview/2019-06-01-preview/managedNetwork.json +``` + +If there are files that should not be in the `all-api-versions` set, +uncomment the `exclude-file` section below and add the file paths. + +``` yaml $(tag) == 'all-api-versions' +#exclude-file: +# - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json +``` From 1f5592332ad9bad1cc56a32e55ff146906f9365b Mon Sep 17 00:00:00 2001 From: Garrett Serack Date: Tue, 27 Aug 2019 07:20:48 -0700 Subject: [PATCH 4/4] Update readme.md --- specification/managednetwork/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/managednetwork/resource-manager/readme.md b/specification/managednetwork/resource-manager/readme.md index 27c4f0353295..c4ae8f23370f 100644 --- a/specification/managednetwork/resource-manager/readme.md +++ b/specification/managednetwork/resource-manager/readme.md @@ -57,7 +57,6 @@ swagger-to-sdk: ``` ## C# - These settings apply only when `--csharp` is specified on the command line. Please also specify `--csharp-sdks-folder=`.