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.

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

Pprp #13661

Merged
merged 43 commits into from
Apr 6, 2021
Merged

Pprp #13661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f6997e8
Update to use common type
rapatank Nov 17, 2020
1e1ea6e
Change to use common types.
rapatank Dec 14, 2020
849d943
Change to use common types.
rapatank Dec 15, 2020
802c914
Change to use common types.
rapatank Dec 15, 2020
c78c44c
Change to use common types.
rapatank Dec 15, 2020
8381ca6
Change to use common types.
rapatank Dec 15, 2020
ad02e06
Update to use common type.
rapatank Mar 5, 2021
ff230a6
Update .gitignore
rapatank Mar 5, 2021
3d90d70
Update .gitignore
rapatank Mar 5, 2021
ca679c7
Revert "Update to use common type."
rapatank Mar 5, 2021
98b5969
Merge branch 'pprp' of https://github.com/Azure/azure-rest-api-specs …
rapatank Mar 5, 2021
a03ab7a
Delete .gitignore
rapatank Mar 5, 2021
de7f797
Merge branch 'pprp' of https://github.com/Azure/azure-rest-api-specs …
rapatank Mar 5, 2021
ac14fed
Updating the models.
rapatank Mar 5, 2021
3f92b7c
Use common types
rapatank Mar 6, 2021
7a201a5
Use common types
rapatank Mar 6, 2021
3146ae7
Use common types
rapatank Mar 8, 2021
b65a035
Use common types
rapatank Mar 8, 2021
828dff7
Use common types
rapatank Mar 8, 2021
c60c73a
Use common types
rapatank Mar 8, 2021
15d15f1
Use common types
rapatank Mar 8, 2021
1363da4
Use common types
rapatank Mar 8, 2021
d66ea6f
Use common types
rapatank Mar 9, 2021
65659fb
Merge branch 'master' into pprp
rapatank Mar 9, 2021
f3e548a
Use common types
rapatank Mar 10, 2021
f37f633
Use common types
rapatank Mar 10, 2021
475ab6e
Use common types
rapatank Mar 10, 2021
3097e1f
Use common types
rapatank Mar 10, 2021
422e24d
Use common types
rapatank Mar 11, 2021
d063763
Use common types
rapatank Mar 11, 2021
9e2cc27
Use common types
rapatank Mar 11, 2021
7b553ec
Use common types
rapatank Mar 11, 2021
d5894f9
Use common types
rapatank Mar 12, 2021
0622845
Use common types
rapatank Mar 12, 2021
f7665e5
Updates for network injection.
rapatank Mar 26, 2021
925aa5b
Merge branch 'master' into pprp
rapatank Mar 26, 2021
b34d293
Updates for network injection.
rapatank Mar 26, 2021
651cf8a
Merge branch 'pprp' of https://github.com/Azure/azure-rest-api-specs …
rapatank Mar 26, 2021
7dbf257
Updates for network injection.
rapatank Mar 26, 2021
dd5f09d
Updates for network injection.
rapatank Mar 26, 2021
6631b83
Updates for network injection.
rapatank Mar 26, 2021
c23c48c
Updates for network injection.
rapatank Mar 26, 2021
9eba06a
Enterprise Policies update
rapatank Apr 3, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@
"type": "object",
"description": "Settings concerning lockbox.",
"properties": {
"status": {
"$ref": "#/definitions/status",
"state": {
"$ref": "#/definitions/state",
"description": "lockbox configuration"
}
}
Expand All @@ -461,9 +461,23 @@
"type": "object",
"description": "The encryption settings for a configuration store.",
"properties": {
"keyVaultProperties": {
"keyVault": {
"$ref": "#/definitions/KeyVaultProperties",
"description": "Key vault properties."
},
"state": {
"description": "The state of onboarding, which only appears in the response.",
"$ref": "#/definitions/state"
}
}
},
"networkInjection": {
"type": "object",
"description": "Settings concerning network injection.",
"properties": {
"virtualNetworks": {
"$ref": "#/definitions/VirtualNetworkPropertiesList",
"description": "Network injection configuration"
}
}
}
Expand Down Expand Up @@ -497,12 +511,11 @@
}
}
},
"status": {
"state": {
"type": "string",
"readOnly": true,
"description": "The state of onboarding, which only appears in the response.",
"x-ms-enum": {
"name": "status",
"name": "state",
"modelAsString": true
},
"enum": [
Expand All @@ -522,10 +535,6 @@
"key": {
"$ref": "#/definitions/keyProperties",
"description": "Identity of the secret that includes name and version."
},
"status": {
"description": "The state of onboarding, which only appears in the response.",
"$ref": "#/definitions/status"
}
}
},
Expand All @@ -542,6 +551,42 @@
},
"description": "Url and version of the KeyVault Secret"
},
"VirtualNetworkPropertiesList": {
"properties": {
"value": {
"type": "array",
"description": "Array of virtual networks.",
"items": {
"$ref": "#/definitions/VirtualNetworkProperties"
}
}
},
"description": "A list of private link resources"
},
"VirtualNetworkProperties": {
"type": "object",
"description": "Settings concerning the virtual network.",
"properties": {
"id": {
"type": "string",
"description": "Uri of the virtual network."
},
"subnet": {
"$ref": "#/definitions/SubnetProperties",
"description": "Properties of a subnet."
}
}
},
"SubnetProperties": {
"type": "object",
"description": "Properties of a subnet.",
"properties": {
"name": {
"type": "string",
"description": "Subnet name."
}
}
},
"EnterprisePolicyList": {
"properties": {
"value": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,21 @@
"tenantId": "tenantId",
"type": "SystemAssigned"
},
"properties": {
"lockbox": {
"state": "succeeded"
},
"networkInjection": {
"virtualNetworks": [
{
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/virtualNetwork",
"subnet": {
"name": "testSubnet"
}
}
]
}
},
"systemData": {
"createdBy": "user1",
"createdByType": "User",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -130,41 +130,6 @@
}
}
},
"definitions": {
"PrivateLinkResourceListResult": {
"description": "A list of private link resources",
"type": "object",
"properties": {
"value": {
"type": "array",
"description": "Array of private link resources",
"items": {
"$ref": "#/definitions/PrivateLinkResource"
}
}
}
},
"PrivateLinkResource": {
"description": "A private link resource",
"type": "object",
"properties": {
"properties": {
"$ref": "../../../../../common-types/resource-management/v1/privatelinks.json#/definitions/PrivateLinkResourceProperties",
"description": "Resource properties.",
"x-ms-client-flatten": true
},
"systemData": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"description": "Metadata pertaining to creation and last modification of the resource."
}
},
"allOf": [
{
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource"
}
]
}
},
"parameters": {
"GroupNameParameter": {
"name": "groupName",
Expand Down
Loading