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

SystemData implemenation on API Management Control Plane #14899

Merged
merged 3 commits into from
Jul 5, 2021
Merged

SystemData implemenation on API Management Control Plane #14899

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
2d4b43e
system-data
solankisamir Jun 20, 2021
40a5de3
fix spec
solankisamir Jun 21, 2021
f6c7e15
remove unreferenced file
solankisamir Jun 24, 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
2 changes: 1 addition & 1 deletion ...crosoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"publicIPAddresses": [
Expand Down
2 changes: 1 addition & 1 deletion ...piManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceHavingMsi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"virtualNetworkType": "None",
Expand Down
2 changes: 1 addition & 1 deletion ...ent/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"publicIpAddressId": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.Network/publicIPAddresses/apimazvnet",
Expand Down
2 changes: 1 addition & 1 deletion ....ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInZones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"virtualNetworkType": "None",
Expand Down
4 changes: 2 additions & 2 deletions ...iew/2021-01-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": false,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
},
{
"type": "Proxy",
Expand Down Expand Up @@ -175,7 +175,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": false,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
},
{
"type": "Proxy",
Expand Down
2 changes: 1 addition & 1 deletion ...preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"publicIPAddresses": [
Expand Down
4 changes: 2 additions & 2 deletions ...eview/2021-01-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"virtualNetworkType": "None"
Expand Down Expand Up @@ -99,7 +99,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"customProperties": {
Expand Down
2 changes: 1 addition & 1 deletion ...t/preview/2021-01-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": false,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
},
{
"type": "Proxy",
Expand Down
2 changes: 1 addition & 1 deletion ...oft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": false,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
},
{
"type": "Proxy",
Expand Down
2 changes: 1 addition & 1 deletion ...nagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": false,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
},
{
"type": "Proxy",
Expand Down
20 changes: 17 additions & 3 deletions ...t/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeployment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,6 @@
"ApiManagementServiceGetService": {
"$ref": "./examples/ApiManagementServiceGetService.json"
},
"ApiManagementServiceGetServiceHavingMsi": {
"$ref": "./examples/ApiManagementServiceGetServiceHavingMsi.json"
},
"ApiManagementServiceGetMultiRegionInternalVnet": {
"$ref": "./examples/ApiManagementServiceGetMultiRegionInternalVnet.json"
}
Expand Down Expand Up @@ -1239,6 +1236,18 @@
"type": "string",
"description": "Public Standard SKU IP V4 based IP address to be associated with Virtual Network deployed service in the region. Supported only for Developer and Premium SKU being deployed in Virtual Network."
},
"publicNetworkAccess": {
"description": "Whether or not public endpoint access is allowed for this API Management service. Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private endpoints are the exclusive access method. Default value is 'Enabled'",
"enum": [
"Enabled",
"Disabled"
],
"type": "string",
"x-ms-enum": {
"name": "PublicNetworkAccess",
"modelAsString": true
}
},
"virtualNetworkConfiguration": {
"$ref": "#/definitions/VirtualNetworkConfiguration",
"description": "Virtual network configuration of the API Management service."
Expand Down Expand Up @@ -1398,6 +1407,11 @@
"$ref": "#/definitions/ApiManagementServiceIdentity",
"description": "Managed service identity of the Api Management service."
},
"systemData": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"description": "Metadata pertaining to creation and last modification of the resource.",
"readOnly": true
},
"location": {
"type": "string",
"description": "Resource location.",
Expand Down
18 changes: 17 additions & 1 deletion ...crosoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@
"sku": {
"name": "Developer",
"capacity": 1
},
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
Expand Down Expand Up @@ -90,7 +98,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"publicIPAddresses": [
Expand All @@ -113,6 +121,14 @@
"sku": {
"name": "Developer",
"capacity": 1
},
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
Expand Down
18 changes: 17 additions & 1 deletion ...piManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceHavingMsi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@
"type": "SystemAssigned",
"principalId": "dfb9a757-df69-4966-a8d0-711a9cd8ffb4",
"tenantId": "XXXXXX-86f1-41af-91ab-2d7cd011db47"
},
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
Expand Down Expand Up @@ -94,7 +102,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"virtualNetworkType": "None",
Expand All @@ -108,6 +116,14 @@
"type": "SystemAssigned",
"principalId": "dfb9a757-df69-4966-a8d0-711a9cd8ffb4",
"tenantId": "XXXXXX-86f1-41af-91ab-2d7cd011db47"
},
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
Expand Down
22 changes: 19 additions & 3 deletions ...ent/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"publicIpAddressId": "/subscriptions/subid/resourceGroups/rgName/providers/Microsoft.Network/publicIPAddresses/apimazvnet",
Expand All @@ -76,7 +76,15 @@
"zones": [
"1",
"2"
]
],
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
"200": {
Expand Down Expand Up @@ -139,7 +147,15 @@
"zones": [
"1",
"2"
]
],
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
"202": {
Expand Down
22 changes: 19 additions & 3 deletions ....ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInZones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"virtualNetworkType": "None",
Expand All @@ -67,7 +67,15 @@
"zones": [
"1",
"2"
]
],
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
"200": {
Expand Down Expand Up @@ -126,7 +134,15 @@
"zones": [
"1",
"2"
]
],
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
"202": {
Expand Down
20 changes: 18 additions & 2 deletions ...iew/2021-04-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": false,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
},
{
"type": "Proxy",
Expand Down Expand Up @@ -141,6 +141,14 @@
"userAssignedIdentities": {
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {}
}
},
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
Expand Down Expand Up @@ -175,7 +183,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": false,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
},
{
"type": "Proxy",
Expand Down Expand Up @@ -252,6 +260,14 @@
"clientId": "329419bc-adec-4dce-9568-25a6d486e468"
}
}
},
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
Expand Down
18 changes: 17 additions & 1 deletion ...preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@
"sku": {
"name": "Basic",
"capacity": 1
},
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
Expand Down Expand Up @@ -110,7 +118,7 @@
"hostName": "apimService1.azure-api.net",
"negotiateClientCertificate": false,
"defaultSslBinding": true,
"certificateSource": "Managed"
"certificateSource": "BuiltIn"
}
],
"publicIPAddresses": [
Expand Down Expand Up @@ -143,6 +151,14 @@
"sku": {
"name": "Basic",
"capacity": 1
},
"systemData": {
"createdBy": "string",
"createdByType": "Application",
"createdAt": "2020-02-01T01:01:01.1075056Z",
"lastModifiedBy": "string",
"lastModifiedByType": "Application",
"lastModifiedAt": "2020-02-02T02:03:01.1974346Z"
}
}
},
Expand Down
Loading