Pick up previous Swagger Fix in 2019-09-01 version (Azure#14092)

* Add missing swagger fix * Fix bad copy-paste * update the some capitalized words in the description
mkarmark · Jul 20, 2021 · 3674659 · 3674659
1 parent f774bdd
commit 3674659
Show file tree

Hide file tree

Showing 10 changed files with 206 additions and 1 deletion.
diff --git a/.../resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/createVault.json b/.../resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/createVault.json
@@ -92,6 +92,21 @@
             "name": "standard"
           },
           "tenantId": "00000000-0000-0000-0000-000000000000",
+          "networkAcls": {
+            "bypass": "AzureServices",
+            "defaultAction": "Deny",
+            "ipRules": [
+              {
+                "value": ""
+              }
+            ],
+            "virtualNetworkRules": [
+              {
+                "id": "",
+                "ignoreMissingVnetServiceEndpoint": false
+              }
+            ]
+          },
           "accessPolicies": [
             {
               "tenantId": "00000000-0000-0000-0000-000000000000",
@@ -144,9 +159,26 @@
               }
             }
           ],
+          "privateEndpointConnections": [
+            {
+              "id": "",
+              "etag": "",
+              "properties": {
+                "provisioningState": "Succeeded",
+                "privateEndpoint": {
+                  "id": ""
+                },
+                "privateLinkServiceConnectionState": {
+                  "status": "Approved",
+                  "actionsRequired": "None"
+                }
+              }
+            }
+          ],
           "enabledForDeployment": true,
           "enabledForDiskEncryption": true,
           "enabledForTemplateDeployment": true,
+          "hsmPoolResourceId": "00000000-0000-0000-0000-000000000000",
           "vaultUri": "https://sample-vault.vault.azure.net",
           "provisioningState": "Succeeded"
         }
@@ -228,6 +260,7 @@
           "enabledForDeployment": true,
           "enabledForDiskEncryption": true,
           "enabledForTemplateDeployment": true,
+          "hsmPoolResourceId": "00000000-0000-0000-0000-000000000000",
           "vaultUri": "https://sample-vault.vault.azure.net",
           "provisioningState": "Succeeded"
         }

diff --git a/...er/Microsoft.KeyVault/preview/2021-04-01-preview/examples/createVaultWithNetworkAcls.json b/...er/Microsoft.KeyVault/preview/2021-04-01-preview/examples/createVaultWithNetworkAcls.json
@@ -77,6 +77,7 @@
           "enabledForDeployment": true,
           "enabledForDiskEncryption": true,
           "enabledForTemplateDeployment": true,
+          "hsmPoolResourceId": "00000000-0000-0000-0000-000000000000",
           "vaultUri": "https://sample-vault.vault.azure.net"
         }
       }
@@ -122,6 +123,7 @@
           "enabledForDeployment": true,
           "enabledForDiskEncryption": true,
           "enabledForTemplateDeployment": true,
+          "hsmPoolResourceId": "00000000-0000-0000-0000-000000000000",
           "vaultUri": "https://sample-vault.vault.azure.net"
         }
       }

diff --git a/...ult/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/getVault.json b/...ult/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/getVault.json
@@ -82,6 +82,7 @@
           "enabledForDeployment": true,
           "enabledForDiskEncryption": true,
           "enabledForTemplateDeployment": true,
+          "hsmPoolResourceId": "00000000-0000-0000-0000-000000000000",
           "vaultUri": "https://sample-vault.vault.azure.net",
           "provisioningState": "Succeeded"
         }

diff --git a/...source-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/listOperations.json b/...source-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/listOperations.json
@@ -94,6 +94,36 @@
                     "displayName": "Audit Logs",
                     "blobDuration": "PT1H"
                   }
+                ],
+                "metricSpecifications": [
+                  {
+                    "name": "ServiceApiHit",
+                    "displayName": "",
+                    "displayDescription": "",
+                    "unit": "",
+                    "aggregationType": "",
+                    "supportedAggregationTypes": [
+                      ""
+                    ],
+                    "supportedTimeGrainTypes": [
+                      ""
+                    ],
+                    "lockAggregationType": "",
+                    "dimensions": [
+                      {
+                        "name": "ActivityType",
+                        "displayName": "",
+                        "toBeExportedForShoebox": true
+                      },
+                      {
+                        "name": "ActivityName",
+                        "displayName": "",
+                        "toBeExportedForShoebox": true
+                      }
+                    ],
+                    "fillGapWithZero": false,
+                    "internalMetricName": "AuditEvent"
+                  }
                 ]
               }
             }

diff --git a/...ager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/listVaultByResourceGroup.json b/...ager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/listVaultByResourceGroup.json
@@ -85,6 +85,7 @@
               "enabledForDiskEncryption": true,
               "enabledForTemplateDeployment": true,
               "enableSoftDelete": true,
+              "hsmPoolResourceId": "00000000-0000-0000-0000-000000000000",
               "vaultUri": "https://sample-vault.vault.azure.net/",
               "provisioningState": "Succeeded"
             }

diff --git a/...nager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/listVaultBySubscription.json b/...nager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/listVaultBySubscription.json
@@ -84,6 +84,7 @@
               "enabledForDiskEncryption": true,
               "enabledForTemplateDeployment": true,
               "enableSoftDelete": true,
+              "hsmPoolResourceId": "00000000-0000-0000-0000-000000000000",
               "vaultUri": "https://sample-vault.vault.azure.net/",
               "provisioningState": "Succeeded"
             }

diff --git a/.../Microsoft.KeyVault/preview/2021-04-01-preview/examples/putPrivateEndpointConnection.json b/.../Microsoft.KeyVault/preview/2021-04-01-preview/examples/putPrivateEndpointConnection.json
@@ -6,6 +6,7 @@
     "privateEndpointConnectionName": "sample-pec",
     "api-version": "2018-02-14",
     "properties": {
+      "etag": "",
       "properties": {
         "privateLinkServiceConnectionState": {
           "status": "Approved",
@@ -20,6 +21,7 @@
         "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/sample-group/providers/Microsoft.KeyVault/vaults/sample-vault/privateEndpointConnections/sample-pec",
         "name": "sample-pec",
         "type": "Microsoft.KeyVault/vaults/privateEndpointConnections",
+        "etag": "",
         "properties": {
           "provisioningState": "Succeeded",
           "privateEndpoint": {

diff --git a/.../resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/updateVault.json b/.../resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/updateVault.json
@@ -91,6 +91,21 @@
             "name": "standard"
           },
           "tenantId": "00000000-0000-0000-0000-000000000000",
+          "networkAcls": {
+            "bypass": "AzureServices",
+            "defaultAction": "Deny",
+            "ipRules": [
+              {
+                "value": ""
+              }
+            ],
+            "virtualNetworkRules": [
+              {
+                "id": "",
+                "ignoreMissingVnetServiceEndpoint": false
+              }
+            ]
+          },
           "accessPolicies": [
             {
               "tenantId": "00000000-0000-0000-0000-000000000000",
@@ -143,9 +158,25 @@
               }
             }
           ],
+          "privateEndpointConnections": [
+            {
+              "id": "",
+              "properties": {
+                "provisioningState": "Succeeded",
+                "privateEndpoint": {
+                  "id": ""
+                },
+                "privateLinkServiceConnectionState": {
+                  "status": "Approved",
+                  "actionsRequired": "None"
+                }
+              }
+            }
+          ],
           "enabledForDeployment": true,
           "enabledForDiskEncryption": true,
           "enabledForTemplateDeployment": true,
+          "hsmPoolResourceId": "00000000-0000-0000-0000-000000000000",
           "vaultUri": "https://sample-vault.vault.azure.net",
           "provisioningState": "Succeeded"
         }
@@ -227,6 +258,7 @@
           "enabledForDeployment": true,
           "enabledForDiskEncryption": true,
           "enabledForTemplateDeployment": true,
+          "hsmPoolResourceId": "00000000-0000-0000-0000-000000000000",
           "vaultUri": "https://sample-vault.vault.azure.net",
           "provisioningState": "Succeeded"
         }

diff --git a/...ion/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/keyvault.json b/...ion/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/keyvault.json
@@ -1282,6 +1282,11 @@
           "type": "string",
           "description": "The URI of the vault for performing operations on keys and secrets."
         },
+        "hsmPoolResourceId": {
+          "type": "string",
+          "description": "The resource id of HSM Pool.",
+          "readOnly": true
+        },
         "enabledForDeployment": {
           "type": "boolean",
           "description": "Property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault."
@@ -1320,7 +1325,11 @@
           "x-ms-enum": {
             "name": "CreateMode",
             "modelAsString": false
-          }
+          },
+          "x-ms-mutability": [
+            "create",
+            "update"
+          ]
         },
         "enablePurgeProtection": {
           "type": "boolean",
@@ -1814,6 +1823,10 @@
         "id": {
           "type": "string",
           "description": "Full resource id of a vnet subnet, such as '/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1'."
+        },
+        "ignoreMissingVnetServiceEndpoint": {
+          "type": "boolean",
+          "description": "Property to specify whether NRP will ignore the check if parent subnet has serviceEndpoints configured."
         }
       },
       "required": [
@@ -1823,6 +1836,14 @@
     },
     "PrivateEndpointConnectionItem": {
       "properties": {
+        "id": {
+          "type": "string",
+          "description": "Id of private endpoint connection."
+        },
+        "etag": {
+          "type": "string",
+          "description": "Modified whenever there is a change in the state of private endpoint connection."
+        },
         "properties": {
           "$ref": "#/definitions/PrivateEndpointConnectionProperties",
           "x-ms-client-flatten": true,

diff --git a/...on/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/providers.json b/...on/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/providers.json
@@ -139,6 +139,13 @@
           "items": {
             "$ref": "#/definitions/LogSpecification"
           }
+        },
+        "metricSpecifications": {
+          "description": "Metric specifications of operation.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/MetricSpecification"
+          }
         }
       }
     },
@@ -158,6 +165,81 @@
           "description": "Blob duration of specification."
         }
       }
+    },
+    "MetricSpecification": {
+      "description": "Metric specification of operation.",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of metric specification."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Display name of metric specification."
+        },
+        "displayDescription": {
+          "type": "string",
+          "description": "Display description of metric specification."
+        },
+        "unit": {
+          "type": "string",
+          "description": "The metric unit. Possible values include: 'Bytes', 'Count', 'Milliseconds'."
+        },
+        "aggregationType": {
+          "type": "string",
+          "description": "The metric aggregation type. Possible values include: 'Average', 'Count', 'Total'."
+        },
+        "supportedAggregationTypes": {
+          "type": "array",
+          "description": "The supported aggregation types for the metrics.",
+          "items": {
+            "type": "string"
+          }
+        },
+        "supportedTimeGrainTypes": {
+          "type": "array",
+          "description": "The supported time grain types for the metrics.",
+          "items": {
+            "type": "string"
+          }
+        },
+        "lockAggregationType": {
+          "type": "string",
+          "description": "The metric lock aggregation type."
+        },
+        "dimensions": {
+          "type": "array",
+          "description": "The dimensions of metric",
+          "items": {
+            "$ref": "#/definitions/DimensionProperties"
+          }
+        },
+        "fillGapWithZero": {
+          "type": "boolean",
+          "description": "Property to specify whether to fill gap with zero."
+        },
+        "internalMetricName": {
+          "type": "string",
+          "description": "The internal metric name."
+        }
+      }
+    },
+    "DimensionProperties": {
+      "description": "Type of operation: get, read, delete, etc.",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of dimension."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "Display name of dimension."
+        },
+        "toBeExportedForShoebox": {
+          "type": "boolean",
+          "description": "Property to specify whether the dimension should be exported for Shoebox."
+        }
+      }
     }
   },
   "parameters": {