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

Update resource association swagger #18432

Merged
merged 25 commits into from
Apr 19, 2022
Merged

Update resource association swagger #18432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
204a07a
update access mode values
Mar 28, 2022
bbbc594
update examples
Mar 28, 2022
782579a
Add 202 in delete spec
Mar 28, 2022
2569e4a
Add provisioning issues changes
Mar 28, 2022
e3c2462
update schema
Mar 28, 2022
f87f480
review changs
Mar 29, 2022
42d3ac4
update
Mar 29, 2022
69b4b9b
typo in model fix
Mar 29, 2022
2c1d1da
make provisioning issues readonly
Mar 29, 2022
ec28bd6
Add one example in list association, provisioning state enum update
Mar 29, 2022
3a066d9
Add logggin categories in profile
Apr 1, 2022
a956cdf
examples update
Apr 1, 2022
b0d7f87
update
Apr 1, 2022
9b51e98
update examples
Apr 1, 2022
aeb90a3
reformat code
Apr 4, 2022
21a01b1
Merge branch 'main' of github.com:Azure/azure-rest-api-specs into swa…
Apr 4, 2022
ab52ce4
Add x-msidentifier for logger
Apr 4, 2022
726f3b8
update
Apr 4, 2022
13ed110
provisioning state fix
Apr 6, 2022
8cd0af0
Fix provisioning state
Apr 6, 2022
7498882
Merge branch 'main' of github.com:Azure/azure-rest-api-specs into swa…
Apr 7, 2022
8d48fe1
Add location header in delete nsp association
Apr 11, 2022
4a12dab
update location header
Apr 13, 2022
fc6f224
update location header
Apr 13, 2022
134bcd8
location header update
Apr 13, 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
8 changes: 7 additions & 1 deletion ...e-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,16 @@
"subscriptionId": "subId",
"resourceGroupName": "rg1",
"networkSecurityPerimeterName": "nsp1",
"associationName": "association1"
"associationName": "association1",
"operationId": "operationId1"
},
"responses": {
"200": {},
"202": {
"headers": {
"location": "https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/resourceAssociations/{associationName}/operationResults/{operationId}?api-version={api-version}"
}
},
"204": {}
}
}
3 changes: 2 additions & 1 deletion ...urce-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"profile": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
},
"accessMode": "EnforceMode"
"accessMode": "Enforced",
"hasProvisioningIssues": "no"
}
}
}
Expand Down
22 changes: 20 additions & 2 deletions ...rce-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"profile": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
},
"accessMode": "EnforceMode"
"accessMode": "Enforced",
"hasProvisioningIssues": "no"
}
},
{
Expand All @@ -37,7 +38,24 @@
"profile": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
},
"accessMode": "DryRunMode"
"accessMode": "Audit",
"hasProvisioningIssues": "no"
}
},
{
"name": "association3",
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/resourceAssociations/association3",
"type": "Microsoft.Network/networkSecurityPerimeters/resourceAssociations",
"properties": {
"provisioningState": "Failed",
"privateLinkResource": {
"id": "/subscriptions/{paasSubscriptionId}/resourceGroups/{paasResourceGroupName}/providers/{providerName}/{resourceType}/{resourceName}"
},
"profile": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
},
"accessMode": "Learning",
"hasProvisioningIssues": "yes"
}
}
],
Expand Down
8 changes: 5 additions & 3 deletions ...urce-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspAssociationPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"profile": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
},
"accessMode": "EnforceMode"
"accessMode": "Enforced"
}
}
},
Expand All @@ -32,7 +32,8 @@
"profile": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
},
"accessMode": "EnforceMode"
"accessMode": "Enforced",
"hasProvisioningIssues": "no"
}
}
},
Expand All @@ -49,7 +50,8 @@
"profile": {
"id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkSecurityPerimeters/nsp1/profiles/{profileName}"
},
"accessMode": "EnforceMode"
"accessMode": "Enforced",
"hasProvisioningIssues": "no"
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion ...resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
"type": "Microsoft.Network/networkSecurityPerimeters/profiles",
"location": "resource location",
"properties": {
"accessRulesVersion": "0"
"accessRulesVersion": "0",
"enabledLogCategories": [
{
"name": "NSPOutboundAccessAllowed"
}
]
}
}
}
Expand Down
14 changes: 12 additions & 2 deletions ...esource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfileList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@
"type": "Microsoft.Network/networkSecurityPerimeters/profiles",
"location": "resource location",
"properties": {
"accessRulesVersion": "0"
"accessRulesVersion": "0",
"enabledLogCategories": [
{
"name": "NSPOutboundAccessDenied"
}
]
}
},
{
Expand All @@ -25,7 +30,12 @@
"type": "Microsoft.Network/networkSecurityPerimeters/profiles",
"location": "resource location",
"properties": {
"accessRulesVersion": "0"
"accessRulesVersion": "0",
"enabledLogCategories": [
{
"name": "NSPOutboundAttempt"
}
]
}
}
],
Expand Down
14 changes: 12 additions & 2 deletions ...resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NspProfilePut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
"type": "Microsoft.Network/networkSecurityPerimeters/profiles",
"location": "East US 2 EUAP",
"properties": {
"accessRulesVersion": "0"
"accessRulesVersion": "0",
"enabledLogCategories": [
{
"name": "NSPInboundAccessAllowed"
}
]
}
}
},
Expand All @@ -29,7 +34,12 @@
"type": "Microsoft.Network/networkSecurityPerimeters/profiles",
"location": "East US 2 EUAP",
"properties": {
"accessRulesVersion": "0"
"accessRulesVersion": "0",
"enabledLogCategories": [
{
"name": "NSPInboundAccessDenied"
}
]
}
}
}
Expand Down
65 changes: 58 additions & 7 deletions ...source-manager/Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,15 @@
"200": {
"description": "Delete Succeed."
},
"202": {
"description": "Delete in progress.",
"headers": {
"location": {
"description": "location header",
"type": "string"
}
}
},
"204": {
"description": "Request successful. The resource does not exist."
},
Expand All @@ -678,6 +687,7 @@
}
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"NspAssociationDelete": {
"$ref": "./examples/NspAssociationDelete.json"
Expand Down Expand Up @@ -846,7 +856,7 @@
},
"provisioningState": {
"readOnly": true,
"$ref": "./network.json#/definitions/ProvisioningState",
"$ref": "#/definitions/NSPProvisioningState",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the difference between these two provisioningState?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NSPProvisioningState has two extra field: Accepting, Created.

"description": "The provisioning state of the scope assignment resource."
}
},
Expand Down Expand Up @@ -906,6 +916,16 @@
"readOnly": true,
"type": "string",
"description": "Version number that increases with every update to access rules within the profile."
},
"enabledLogCategories": {
"type": "array",
"items": {
"$ref": "#/definitions/LoggingCategory"
},
"x-ms-identifiers": [
"name"
],
"description": "Gets the enabled log categories."
}
},
"description": "Properties of NSP profile."
Expand Down Expand Up @@ -962,7 +982,7 @@
"properties": {
"provisioningState": {
"readOnly": true,
"$ref": "./network.json#/definitions/ProvisioningState",
"$ref": "#/definitions/NSPProvisioningState",
"description": "The provisioning state of the scope assignment resource."
},
"direction": {
Expand Down Expand Up @@ -1080,7 +1100,7 @@
"properties": {
"provisioningState": {
"readOnly": true,
"$ref": "./network.json#/definitions/ProvisioningState",
"$ref": "#/definitions/NSPProvisioningState",
"description": "The provisioning state of the resource association resource."
},
"privateLinkResource": {
Expand All @@ -1094,16 +1114,20 @@
"accessMode": {
"type": "string",
"enum": [
"Unspecified",
"EnforceMode",
"LearningMode",
"DryRunMode"
"Learning",
"Enforced",
"Audit"
],
"x-ms-enum": {
"name": "AssociationAccessMode",
"modelAsString": true
},
"description": "Access mode on the association."
},
"hasProvisioningIssues": {
"readOnly": true,
"type": "string",
"description": "Specifies if there are provisioning issues"
}
}
},
Expand Down Expand Up @@ -1177,6 +1201,33 @@
}
},
"description": "Properties of the perimeter associable resources."
},
"LoggingCategory": {
"type": "object",
"properties": {
"name": {
"type": "string",
"description": "The name of the logging category."
}
},
"description": "Logging Category"
},
"NSPProvisioningState": {
"type": "string",
"readOnly": true,
"description": "The current provisioning state.",
"enum": [
"Succeeded",
"Creating",
"Updating",
"Deleting",
"Accepted",
"Failed"
],
"x-ms-enum": {
"name": "nspProvisioningState",
"modelAsString": true
}
}
},
"parameters": {
Expand Down