SystemData implemenation on API Management Control Plane (#14899)

* system-data * fix spec * remove unreferenced file
Azure · Jul 5, 2021 · 1018cb0 · 1018cb0
1 parent bbabd9c
commit 1018cb0
Show file tree

Hide file tree

Showing 23 changed files with 791 additions and 304 deletions.
diff --git a/...crosoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateService.json b/...crosoft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateService.json
@@ -90,7 +90,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "publicIPAddresses": [

diff --git a/...piManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceHavingMsi.json b/...piManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceHavingMsi.json
@@ -94,7 +94,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "virtualNetworkType": "None",

diff --git a/...ent/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json b/...ent/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json
@@ -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",

diff --git a/....ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInZones.json b/....ApiManagement/preview/2021-01-01-preview/examples/ApiManagementCreateServiceInZones.json
@@ -54,7 +54,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "virtualNetworkType": "None",

diff --git a/...iew/2021-01-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json b/...iew/2021-01-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json
@@ -81,7 +81,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",
@@ -175,7 +175,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",

diff --git a/...preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json b/...preview/2021-01-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json
@@ -110,7 +110,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "publicIPAddresses": [

diff --git a/...eview/2021-01-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json b/...eview/2021-01-01-preview/examples/ApiManagementCreateServiceWithUserAssignedIdentity.json
@@ -56,7 +56,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "virtualNetworkType": "None"
@@ -99,7 +99,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "customProperties": {

diff --git a/...t/preview/2021-01-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json b/...t/preview/2021-01-01-preview/examples/ApiManagementServiceGetMultiRegionInternalVnet.json
@@ -33,7 +33,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",

diff --git a/...oft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetService.json b/...oft.ApiManagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetService.json
@@ -37,7 +37,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",

diff --git a/...nagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json b/...nagement/preview/2021-01-01-preview/examples/ApiManagementServiceGetServiceHavingMsi.json
@@ -33,7 +33,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",

diff --git a/...t/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeployment.json b/...t/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/apimdeployment.json
@@ -385,9 +385,6 @@
           "ApiManagementServiceGetService": {
             "$ref": "./examples/ApiManagementServiceGetService.json"
           },
-          "ApiManagementServiceGetServiceHavingMsi": {
-            "$ref": "./examples/ApiManagementServiceGetServiceHavingMsi.json"
-          },
           "ApiManagementServiceGetMultiRegionInternalVnet": {
             "$ref": "./examples/ApiManagementServiceGetMultiRegionInternalVnet.json"
           }
@@ -1270,6 +1267,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."
@@ -1429,6 +1438,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.",

diff --git a/...crosoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateService.json b/...crosoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateService.json
@@ -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"
         }
       }
     },
@@ -90,7 +98,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "publicIPAddresses": [
@@ -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"
         }
       }
     },

diff --git a/...piManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceHavingMsi.json b/...piManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceHavingMsi.json
@@ -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"
         }
       }
     },
@@ -94,7 +102,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "virtualNetworkType": "None",
@@ -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"
         }
       }
     },

diff --git a/...ent/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json b/...ent/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInVnetWithPublicIP.json
@@ -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",
@@ -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": {
@@ -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": {

diff --git a/....ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInZones.json b/....ApiManagement/preview/2021-04-01-preview/examples/ApiManagementCreateServiceInZones.json
@@ -54,7 +54,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "virtualNetworkType": "None",
@@ -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": {
@@ -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": {

diff --git a/...iew/2021-04-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json b/...iew/2021-04-01-preview/examples/ApiManagementCreateServiceWithCustomHostnameKeyVault.json
@@ -81,7 +81,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",
@@ -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"
         }
       }
     },
@@ -175,7 +183,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": false,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             },
             {
               "type": "Proxy",
@@ -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"
         }
       }
     },

diff --git a/...preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json b/...preview/2021-04-01-preview/examples/ApiManagementCreateServiceWithSystemCertificates.json
@@ -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"
         }
       }
     },
@@ -110,7 +118,7 @@
               "hostName": "apimService1.azure-api.net",
               "negotiateClientCertificate": false,
               "defaultSslBinding": true,
-              "certificateSource": "Managed"
+              "certificateSource": "BuiltIn"
             }
           ],
           "publicIPAddresses": [
@@ -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"
         }
       }
     },