Skip to content

[2020-06-01-preview] update certificate contract for KeyVault #11097

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

Merged
fengzhou-msft merged 2 commits into from
Oct 14, 2020
Merged

[2020-06-01-preview] update certificate contract for KeyVault #11097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db5652f
update certificate contract for KeyVault
KacieKK Oct 8, 2020
de7d0e7
prettier check
KacieKK Oct 12, 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
6 changes: 6 additions & 0 deletions ...resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/apimcertificates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@
"x-ms-examples": {
"ApiManagementGetCertificate": {
"$ref": "./examples/ApiManagementGetCertificate.json"
},
"ApiManagementGetCertificateWithKeyVault": {
"$ref": "./examples/ApiManagementGetCertificateWithKeyVault.json"
}
},
"parameters": [
Expand Down Expand Up @@ -202,6 +205,9 @@
"x-ms-examples": {
"ApiManagementCreateCertificate": {
"$ref": "./examples/ApiManagementCreateCertificate.json"
},
"ApiManagementCreateCertificateWithKeyVault": {
"$ref": "./examples/ApiManagementCreateCertificateWithKeyVault.json"
}
},
"parameters": [
Expand Down
11 changes: 8 additions & 3 deletions ...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 @@ -1681,6 +1681,10 @@
"type": "string",
"format": "date-time",
"description": "Expiration date of the certificate. The date conforms to the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard.\n"
},
"keyVault": {
"$ref": "#/definitions/KeyVaultContractProperties",
"description": "KeyVault location details of the certificate."
}
},
"required": [
Expand Down Expand Up @@ -1709,11 +1713,12 @@
"password": {
"type": "string",
"description": "Password for the Certificate"
},
"keyVault": {
"$ref": "#/definitions/KeyVaultContractCreateProperties",
"description": "KeyVault location details of the certificate."
}
},
"required": [
"data"
],
"description": "Parameters supplied to the CreateOrUpdate certificate operation."
},
"DeployConfigurationParameters": {
Expand Down
59 changes: 59 additions & 0 deletions ...ement/preview/2020-06-01-preview/examples/ApiManagementCreateCertificateWithKeyVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"parameters": {
"serviceName": "apimService1",
"resourceGroupName": "rg1",
"api-version": "2020-06-01-preview",
"subscriptionId": "subid",
"certificateId": "templateCertkv",
"parameters": {
"properties": {
"keyVault": {
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert"
}
}
}
},
"responses": {
"201": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCertkv",
"type": "Microsoft.ApiManagement/service/certificates",
"name": "templateCertkv",
"properties": {
"subject": "CN=*.msitesting.net",
"thumbprint": "EA**********************9AD690",
"expirationDate": "2037-01-01T07:00:00Z",
"keyVault": {
"secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"lastStatus": {
"code": "Success",
"timeStampUtc": "2020-09-22T00:24:53.3191468Z"
}
}
}
}
},
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCertkv",
"type": "Microsoft.ApiManagement/service/certificates",
"name": "templateCertkv",
"properties": {
"subject": "CN=*.msitesting.net",
"thumbprint": "EA**********************9AD690",
"expirationDate": "2037-01-01T07:00:00Z",
"keyVault": {
"secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"lastStatus": {
"code": "Success",
"timeStampUtc": "2020-09-22T00:24:53.3191468Z"
}
}
}
}
}
}
}
31 changes: 31 additions & 0 deletions ...nagement/preview/2020-06-01-preview/examples/ApiManagementGetCertificateWithKeyVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"parameters": {
"serviceName": "apimService1",
"resourceGroupName": "rg1",
"api-version": "2020-06-01-preview",
"subscriptionId": "subid",
"certificateId": "templateCertkv"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCertkv",
"type": "Microsoft.ApiManagement/service/certificates",
"name": "templateCertkv",
"properties": {
"subject": "CN=*.msitesting.net",
"thumbprint": "EA**********************9AD690",
"expirationDate": "2037-01-01T07:00:00Z",
"keyVault": {
"secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"lastStatus": {
"code": "Success",
"timeStampUtc": "2020-09-22T00:24:53.3191468Z"
}
}
}
}
}
}
}
18 changes: 18 additions & 0 deletions ...soft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListCertificates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@
"thumbprint": "EBA************************48594A6",
"expirationDate": "2017-04-23T17:03:41Z"
}
},
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/templateCertkv",
"type": "Microsoft.ApiManagement/service/certificates",
"name": "templateCertkv",
"properties": {
"subject": "CN=*.msitesting.net",
"thumbprint": "EA**********************9AD690",
"expirationDate": "2037-01-01T07:00:00Z",
"keyVault": {
"secretIdentifier": "https://rpbvtkeyvaultintegration.vault-int.azure-int.net/secrets/msitestingCert",
"identityClientId": "ceaa6b06-c00f-43ef-99ac-f53d1fe876a0",
"lastStatus": {
"code": "Success",
"timeStampUtc": "2020-09-22T00:24:53.3191468Z"
}
}
}
}
],
"nextLink": ""
Expand Down