Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Changes to fix S360 issues #17064

Merged
merged 7 commits into from
Jan 11, 2022
Merged

Added Changes to fix S360 issues #17064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5b83cc
fix changes
Dec 8, 2021
0a3d9aa
added 202 example
Dec 13, 2021
be2e062
Fix update
Dec 13, 2021
6806bb7
fixed issue
Dec 13, 2021
72c8474
fixed
Dec 13, 2021
54e6b82
added type
Dec 14, 2021
dbcc848
Add example for update application
Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions ...ce-manager/Microsoft.Solutions/preview/2020-08-21-preview/examples/updateApplication.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"applicationName": "myManagedApplication",
"api-version": "2021-07-01",
"parameters": {
"properties": {
"applicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef",
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG"
},
"kind": "ServiceCatalog"
}
},
"responses": {
"200": {
"headers": {},
"body": {
"name": "myManagedApplication",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applications/myManagedApplication",
"type": "Microsoft.Solutions/applications",
"managedBy": null,
"plan": null,
"identity": null,
"kind": "ServiceCatalog",
"sku": null,
"properties": {
"applicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef",
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
"outputs": null,
"parameters": null,
"provisioningState": "Created"
}
}
},
"202": {
"headers": {
"location": "https://url.to.query"
}
}
}
}
15 changes: 15 additions & 0 deletions .../resource-manager/Microsoft.Solutions/preview/2020-08-21-preview/managedapplications.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,11 @@
],
"operationId": "Applications_Update",
"description": "Updates an existing managed application. The only value that can be updated via PATCH currently is the tags.",
"x-ms-examples": {
"Create or update managed application": {
"$ref": "./examples/updateApplication.json"
}
},
"parameters": [
{
"name": "resourceGroupName",
Expand Down Expand Up @@ -290,6 +295,9 @@
"$ref": "#/definitions/Application"
}
},
"202": {
"description": "Accepted - Returns this status until the asynchronous operation has completed."
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -1931,6 +1939,13 @@
"type": "string"
},
"description": "The deny assignment excluded actions."
},
"allowedDataActions": {
"type": "array",
"items": {
"type": "string"
},
"description": "The deny assignment excluded data actions."
}
},
"description": "Managed application locking policy."
Expand Down
42 changes: 42 additions & 0 deletions ...es/resource-manager/Microsoft.Solutions/stable/2019-07-01/examples/updateApplication.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "rg",
"applicationName": "myManagedApplication",
"api-version": "2021-07-01",
"parameters": {
"properties": {
"applicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef",
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG"
},
"kind": "ServiceCatalog"
}
},
"responses": {
"200": {
"headers": {},
"body": {
"name": "myManagedApplication",
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applications/myManagedApplication",
"type": "Microsoft.Solutions/applications",
"managedBy": null,
"plan": null,
"identity": null,
"kind": "ServiceCatalog",
"sku": null,
"properties": {
"applicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef",
"managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
"outputs": null,
"parameters": null,
"provisioningState": "Created"
}
}
},
"202": {
"headers": {
"location": "https://url.to.query"
}
}
}
}
15 changes: 15 additions & 0 deletions ...resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,11 @@
],
"operationId": "Applications_Update",
"description": "Updates an existing managed application. The only value that can be updated via PATCH currently is the tags.",
"x-ms-examples": {
"Create or update managed application": {
"$ref": "./examples/updateApplication.json"
}
},
"parameters": [
{
"name": "resourceGroupName",
Expand Down Expand Up @@ -284,6 +289,9 @@
"$ref": "#/definitions/Application"
}
},
"202": {
"description": "Accepted - Returns this status until the asynchronous operation has completed."
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -1918,6 +1926,13 @@
"type": "string"
},
"description": "The deny assignment excluded actions."
},
"allowedDataActions": {
"type": "array",
"items": {
"type": "string"
},
"description": "The deny assignment excluded data actions."
}
},
"description": "Managed application locking policy."
Expand Down
5 changes: 5 additions & 0 deletions ...ns/resource-manager/Microsoft.Solutions/stable/2021-07-01/examples/updateApplication.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
"provisioningState": "Created"
}
}
},
"202": {
"headers": {
"location": "https://url.to.query"
}
}
}
}
67 changes: 65 additions & 2 deletions ...solutions/resource-manager/Microsoft.Solutions/stable/2021-07-01/managedapplications.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@
"$ref": "#/definitions/Application"
}
},
"202": {
"description": "Accepted - Returns this status until the asynchronous operation has completed."
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
Expand Down Expand Up @@ -986,7 +989,7 @@
"pattern": "^[-\\w\\._,\\(\\)]+$"
},
"identity": {
"$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity",
"$ref": "#/definitions/Identity",
"description": "The identity of the resource."
}
},
Expand Down Expand Up @@ -1019,7 +1022,7 @@
"pattern": "^[-\\w\\._,\\(\\)]+$"
},
"identity": {
"$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity",
"$ref": "#/definitions/Identity",
"description": "The identity of the resource."
}
},
Expand Down Expand Up @@ -1367,6 +1370,59 @@
],
"description": "SKU for the resource."
},
"Identity": {
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal ID of resource identity."
},
"tenantId": {
"readOnly": true,
"type": "string",
"description": "The tenant ID of resource."
},
"type": {
"type": "string",
"description": "The identity type.",
"enum": [
"SystemAssigned",
"UserAssigned",
"SystemAssigned, UserAssigned",
"None"
],
"x-ms-enum": {
"name": "ResourceIdentityType",
"modelAsString": false
}
},
"userAssignedIdentities": {
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/userAssignedResourceIdentity"
},
"description": "The list of user identities associated with the resource. The user identity dictionary key references will be resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
}
},
"description": "Identity for the resource."
},
"userAssignedResourceIdentity": {
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal id of user assigned identity."
},
"tenantId": {
"readOnly": true,
"type": "string",
"description": "The tenant id of user assigned identity."
}
},
"description": "Represents the user assigned identity that is contained within the UserAssignedIdentities dictionary on ResourceIdentity"
},
"Resource": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -1596,6 +1652,13 @@
"type": "string"
},
"description": "The deny assignment excluded actions."
},
"allowedDataActions": {
"type": "array",
"items": {
"type": "string"
},
"description": "The deny assignment excluded data actions."
}
},
"description": "Managed application locking policy."
Expand Down