Skip to content

Commit

Permalink
[Storage] revert to use REsourceGroup defined in storage swagger sinc…
Browse files Browse the repository at this point in the history 
…e the common one has input it from client, which is breaking
  • Loading branch information
@blueww
blueww committed Apr 25, 2018
1 parent 284ebbb commit 63f725f
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 21 deletions.
24 changes: 12 additions & 12 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2018-02-01/blob.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"description": "Lists all containers and does not support a prefix like data plane. Also SRP today does not return continuation token.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -66,7 +66,7 @@
"description": "Creates a new container under the specified account as described by request body. The container resource includes metadata and properties for that container. It does not include a list of the blobs contained by the container. ",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -112,7 +112,7 @@
"description": "Updates container properties as specified in request body. Properties not mentioned in the request will be unchanged. Update fails if the specified container doesn't already exist. ",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -159,7 +159,7 @@
"description": "Gets properties of a specified container. ",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -196,7 +196,7 @@
"description": "Deletes specified container under its account.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -235,7 +235,7 @@
"description": "Sets legal hold tags. Setting the same tag results in an idempotent operation. SetLegalHold follows an append pattern and does not clear out the existing tags that are not specified in the request.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -283,7 +283,7 @@
"description": "Clears legal hold tags. Clearing the same or non-existent tag results in an idempotent operation. ClearLegalHold clears out only the specified tags in the request.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -331,7 +331,7 @@
"description": "Creates or updates an unlocked immutability policy. ETag in If-Match is honored if given but not required for this operation.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -392,7 +392,7 @@
"description": "Gets the existing immutability policy along with the corresponding ETag in response headers and body.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -445,7 +445,7 @@
"description": "Aborts an unlocked immutability policy. The response of delete has immutabilityPeriodSinceCreationInDays set to 0. ETag in If-Match is required for this operation. Deleting a locked immutability policy is not allowed, only way is to delete the container after deleting all blobs inside the container.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -500,7 +500,7 @@
"description": "Sets the ImmutabilityPolicy to Locked state. The only action allowed on a Locked policy is ExtendImmutabilityPolicy action. ETag in If-Match is required for this operation.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down Expand Up @@ -552,7 +552,7 @@
"description": "Extends the immutabilityPeriodSinceCreationInDays of a locked immutabilityPolicy. The only action allowed on a Locked policy will be this action. ETag in If-Match is required for this operation.",
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "./storage.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/AccountName"
Expand Down
31 changes: 22 additions & 9 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2018-02-01/storage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "#/parameters/ResourceGroupName"
},
{
"name": "accountName",
Expand Down Expand Up @@ -185,7 +185,7 @@
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "#/parameters/ResourceGroupName"
},
{
"name": "accountName",
Expand Down Expand Up @@ -225,7 +225,7 @@
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "#/parameters/ResourceGroupName"
},
{
"name": "accountName",
Expand Down Expand Up @@ -265,7 +265,7 @@
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "#/parameters/ResourceGroupName"
},
{
"name": "accountName",
Expand Down Expand Up @@ -349,7 +349,7 @@
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "#/parameters/ResourceGroupName"
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
Expand Down Expand Up @@ -385,7 +385,7 @@
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "#/parameters/ResourceGroupName"
},
{
"name": "accountName",
Expand Down Expand Up @@ -427,7 +427,7 @@
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "#/parameters/ResourceGroupName"
},
{
"name": "accountName",
Expand Down Expand Up @@ -511,7 +511,7 @@
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "#/parameters/ResourceGroupName"
},
{
"name": "accountName",
Expand Down Expand Up @@ -562,7 +562,7 @@
},
"parameters": [
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
"$ref": "#/parameters/ResourceGroupName"
},
{
"name": "accountName",
Expand Down Expand Up @@ -1877,6 +1877,19 @@
"description": "The List service SAS credentials operation response."
}
},
"parameters": {
"ResourceGroupName": {
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group within the user's subscription. The name is case insensitive.",
"pattern": "^[-\\w\\._\\(\\)]+$",
"minLength": 1,
"maxLength": 90,
"x-ms-parameter-location": "method"
}
},
"securityDefinitions": {
"azure_auth": {
"type": "oauth2",
Expand Down

0 comments on commit 63f725f

Please sign in to comment.