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

Fix description and samples #11606

Merged
merged 3 commits into from
Nov 11, 2020
Merged

Fix description and samples #11606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ec9826
update samples
solankisamir Nov 10, 2020
08579a6
doc link
solankisamir Nov 10, 2020
a282f49
apimsi
solankisamir Nov 10, 2020
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
1 change: 1 addition & 0 deletions custom-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ apimgroups
apimidentityprovider
apimissues
apimloggers
apimmsi
apimnetworkstatus
apimnotifications
apimopenidconnectproviders
Expand Down
2 changes: 1 addition & 1 deletion ...t/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimdeployment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@
},
"keyVaultId": {
"type": "string",
"description": "Url to the KeyVault Secret containing the Ssl Certificate. If absolute Url containing version is provided, auto-update of ssl certificate will not work. This requires Api Management service to be configured with MSI. The secret should be of type *application/x-pkcs12*"
"description": "Url to the KeyVault Secret containing the Ssl Certificate. If absolute Url containing version is provided, auto-update of ssl certificate will not work. This requires Api Management service to be configured with aka.ms/apimmsi. The secret should be of type *application/x-pkcs12*"
},
"identityClientId": {
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion ...ment/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2747,7 +2747,7 @@
"properties": {
"secretIdentifier": {
"type": "string",
"description": "Key vault secret identifier for fetching secret."
"description": "Key vault secret identifier for fetching secret. Providing a versioned secret will prevent auto-refresh. This requires Api Management service to be configured with aka.ms/apimmsi"
},
"identityClientId": {
"type": "string",
Expand Down
6 changes: 3 additions & 3 deletions ...gement/preview/2020-06-01-preview/examples/ApiManagementCreateNamedValueWithKeyVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"displayName": "prop6namekv",
"keyVault": {
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert"
"secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret"
},
"tags": [
"foo",
Expand All @@ -34,7 +34,7 @@
"properties": {
"displayName": "prop6namekv",
"keyVault": {
"secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
"secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"lastStatus": {
"code": "Success",
Expand All @@ -57,7 +57,7 @@
"properties": {
"displayName": "prop6namekv",
"keyVault": {
"secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
"secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"lastStatus": {
"code": "Success",
Expand Down
2 changes: 1 addition & 1 deletion ...osoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListNamedValues.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"properties": {
"displayName": "prop6namekv",
"keyVault": {
"secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
"secretIdentifier": "https://contoso.vault.azure.net/secrets/aadSecret",
"identityClientId": "2d2df842-44d8-4885-8dec-77cc1a984a31",
"lastStatus": {
"code": "Success",
Expand Down