add private only feature to azure bastion service (Azure#30807)

* add private only feature to azure bastion service * fix Swagger PrettierCheck * fix the swagger PrettierCheck * modify the api version * modify file name --------- Co-authored-by: Leo Liu (from Dev Box) <[email protected]>
mikeharder · Nov 27, 2024 · fbe3851 · fbe3851
1 parent f9c90e4
commit fbe3851
Show file tree

Hide file tree

Showing 14 changed files with 266 additions and 21 deletions.
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2024-05-01/bastionHost.json b/specification/network/resource-manager/Microsoft.Network/stable/2024-05-01/bastionHost.json
@@ -128,6 +128,9 @@
           },
           "Get Bastion Host With Zones": {
             "$ref": "./examples/BastionHostGetWithZones.json"
+          },
+          "Get Bastion Host With Private Only": {
+            "$ref": "./examples/BastionHostGetWithPrivateOnly.json"
           }
         }
       },
@@ -187,6 +190,9 @@
           "Create Bastion Host With Zones": {
             "$ref": "./examples/BastionHostPutWithZones.json"
           },
+          "Create Bastion Host With Private Only": {
+            "$ref": "./examples/BastionHostPutWithPrivateOnly.json"
+          },
           "Create Developer Bastion Host": {
             "$ref": "./examples/BastionHostDeveloperPut.json"
           }
@@ -681,7 +687,7 @@
         },
         "publicIPAddress": {
           "$ref": "./network.json#/definitions/SubResource",
-          "description": "Reference of the PublicIP resource."
+          "description": "Reference of the PublicIP resource. Null for private only bastion"
         },
         "provisioningState": {
           "readOnly": true,
@@ -694,8 +700,7 @@
         }
       },
       "required": [
-        "subnet",
-        "publicIPAddress"
+        "subnet"
       ],
       "description": "Properties of IP configuration of an Bastion Host."
     },
@@ -803,6 +808,11 @@
           "type": "boolean",
           "default": false,
           "description": "Enable/Disable Session Recording feature of the Bastion Host resource."
+        },
+        "enablePrivateOnlyBastion": {
+          "type": "boolean",
+          "default": false,
+          "description": "Enable/Disable Private Only feature of the Bastion Host resource."
         }
       },
       "description": "Properties of the Bastion Host."
@@ -1112,4 +1122,3 @@
     }
   }
 }
-
diff --git a/...work/resource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostDelete.json b/...work/resource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostDelete.json
@@ -15,4 +15,3 @@
     "204": {}
   }
 }
-
diff --git a/...urce-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostDeveloperDelete.json b/...urce-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostDeveloperDelete.json
@@ -15,4 +15,3 @@
     "204": {}
   }
 }
-
diff --git a/...esource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostDeveloperGet.json b/...esource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostDeveloperGet.json
@@ -35,4 +35,3 @@
     }
   }
 }
-
diff --git a/...esource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostDeveloperPut.json b/...esource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostDeveloperPut.json
@@ -80,4 +80,3 @@
     }
   }
 }
-
diff --git a/...network/resource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostGet.json b/...network/resource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostGet.json
@@ -30,6 +30,7 @@
           "enableShareableLink": false,
           "enableKerberos": false,
           "enableSessionRecording": false,
+          "enablePrivateOnlyBastion": false,
           "ipConfigurations": [
             {
               "name": "bastionHostIpConfiguration",
@@ -53,4 +54,3 @@
     }
   }
 }
-
diff --git a/...e-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostGetWithPrivateOnly.json b/...e-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostGetWithPrivateOnly.json
@@ -0,0 +1,53 @@
+{
+  "parameters": {
+    "api-version": "2024-05-01",
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg1",
+    "bastionHostName": "bastionhosttenant"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "name": "bastionhosttenant",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhosttenant'",
+        "type": "Microsoft.Network/bastionHosts",
+        "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+        "location": "West US",
+        "tags": {
+          "key1": "value1"
+        },
+        "sku": {
+          "name": "Premium"
+        },
+        "zones": [],
+        "properties": {
+          "provisioningState": "Succeeded",
+          "dnsName": "bst-9d89d361-100e-4c01-b92d-466548c476dc.bastion.azure.com",
+          "scaleUnits": 2,
+          "disableCopyPaste": false,
+          "enableTunneling": false,
+          "enableIpConnect": false,
+          "enableShareableLink": false,
+          "enableKerberos": false,
+          "enableSessionRecording": false,
+          "enablePrivateOnlyBastion": true,
+          "ipConfigurations": [
+            {
+              "name": "bastionHostIpConfiguration",
+              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhosttenant/bastionHostIpConfigurations/bastionHostIpConfiguration",
+              "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+              "type": "Microsoft.Network/bastionHosts/bastionHostIpConfigurations",
+              "properties": {
+                "provisioningState": "Succeeded",
+                "privateIPAllocationMethod": "Dynamic",
+                "subnet": {
+                  "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/BastionHostSubnet"
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/...esource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostGetWithZones.json b/...esource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostGetWithZones.json
@@ -3,13 +3,13 @@
     "api-version": "2024-05-01",
     "subscriptionId": "subid",
     "resourceGroupName": "rg1",
-    "bastionHostName": "bastionhosttenant'"
+    "bastionHostName": "bastionhosttenant"
   },
   "responses": {
     "200": {
       "body": {
-        "name": "bastionhost'",
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhosttenant'",
+        "name": "bastionhosttenant",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhosttenant",
         "type": "Microsoft.Network/bastionHosts",
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
         "location": "West US",
@@ -33,6 +33,7 @@
           "enableShareableLink": false,
           "enableKerberos": false,
           "enableSessionRecording": false,
+          "enablePrivateOnlyBastion": false,
           "ipConfigurations": [
             {
               "name": "bastionHostIpConfiguration",
@@ -56,4 +57,3 @@
     }
   }
 }
-
diff --git a/...-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostListByResourceGroup.json b/...-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostListByResourceGroup.json
@@ -28,6 +28,7 @@
               "enableShareableLink": false,
               "enableKerberos": false,
               "enableSessionRecording": false,
+              "enablePrivateOnlyBastion": false,
               "ipConfigurations": [
                 {
                   "name": "bastionHostIpConfiguration",
@@ -68,6 +69,7 @@
               "enableShareableLink": false,
               "enableKerberos": false,
               "enableSessionRecording": true,
+              "enablePrivateOnlyBastion": false,
               "ipConfigurations": [
                 {
                   "name": "bastionHostIpConfiguration",
@@ -87,10 +89,47 @@
                 }
               ]
             }
+          },
+          {
+            "name": "bastionhost3",
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhost3",
+            "type": "Microsoft.Network/bastionHosts",
+            "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+            "location": "West US",
+            "sku": {
+              "name": "Premium"
+            },
+            "zones": [],
+            "properties": {
+              "provisioningState": "Succeeded",
+              "dnsName": "bst-9d89d361-100e-4c01-b92d-466548c476dc.bastion.azure.com",
+              "scaleUnits": 2,
+              "disableCopyPaste": false,
+              "enableTunneling": false,
+              "enableIpConnect": false,
+              "enableShareableLink": false,
+              "enableKerberos": false,
+              "enableSessionRecording": false,
+              "enablePrivateOnlyBastion": true,
+              "ipConfigurations": [
+                {
+                  "name": "bastionHostIpConfiguration",
+                  "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhost3/bastionHostIpConfigurations/IpConf",
+                  "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                  "type": "Microsoft.Network/bastionHosts/bastionHostIpConfigurations",
+                  "properties": {
+                    "provisioningState": "Succeeded",
+                    "privateIPAllocationMethod": "Dynamic",
+                    "subnet": {
+                      "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet3/subnets/AzureBastionSubnet"
+                    }
+                  }
+                }
+              ]
+            }
           }
         ]
       }
     }
   }
 }
-
diff --git a/...e-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostListBySubscription.json b/...e-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostListBySubscription.json
@@ -27,6 +27,7 @@
               "enableShareableLink": false,
               "enableKerberos": false,
               "enableSessionRecording": false,
+              "enablePrivateOnlyBastion": false,
               "ipConfigurations": [
                 {
                   "name": "bastionHostIpConfiguration",
@@ -92,6 +93,7 @@
               "enableShareableLink": false,
               "enableKerberos": false,
               "enableSessionRecording": true,
+              "enablePrivateOnlyBastion": false,
               "ipConfigurations": [
                 {
                   "name": "bastionHostIpConfiguration",
@@ -111,10 +113,47 @@
                 }
               ]
             }
+          },
+          {
+            "name": "bastionhost4",
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhost4",
+            "type": "Microsoft.Network/bastionHosts",
+            "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+            "location": "West US",
+            "sku": {
+              "name": "Premium"
+            },
+            "zones": [],
+            "properties": {
+              "provisioningState": "Succeeded",
+              "dnsName": "bst-9d89d361-100e-4c01-b92d-466548c476dc.bastion.azure.com",
+              "scaleUnits": 2,
+              "disableCopyPaste": false,
+              "enableTunneling": false,
+              "enableIpConnect": false,
+              "enableShareableLink": false,
+              "enableKerberos": false,
+              "enableSessionRecording": false,
+              "enablePrivateOnlyBastion": true,
+              "ipConfigurations": [
+                {
+                  "name": "bastionHostIpConfiguration",
+                  "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhost4/bastionHostIpConfigurations/IpConf",
+                  "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+                  "type": "Microsoft.Network/bastionHosts/bastionHostIpConfigurations",
+                  "properties": {
+                    "provisioningState": "Succeeded",
+                    "privateIPAllocationMethod": "Dynamic",
+                    "subnet": {
+                      "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet4/subnets/AzureBastionSubnet"
+                    }
+                  }
+                }
+              ]
+            }
           }
         ]
       }
     }
   }
 }
-
diff --git a/...twork/resource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostPatch.json b/...twork/resource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostPatch.json
@@ -20,7 +20,7 @@
     "200": {
       "body": {
         "name": "bastionhosttenant",
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhosttenant'",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhosttenant",
         "type": "Microsoft.Network/bastionHosts",
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
         "location": "West US",
@@ -38,6 +38,7 @@
           "enableShareableLink": false,
           "enableKerberos": false,
           "enableSessionRecording": false,
+          "enablePrivateOnlyBastion": false,
           "ipConfigurations": [
             {
               "name": "bastionHostIpConfiguration",
@@ -64,4 +65,3 @@
     }
   }
 }
-
diff --git a/...network/resource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostPut.json b/...network/resource-manager/Microsoft.Network/stable/2024-05-01/examples/BastionHostPut.json
@@ -47,6 +47,7 @@
           "enableShareableLink": false,
           "enableKerberos": false,
           "enableSessionRecording": false,
+          "enablePrivateOnlyBastion": false,
           "ipConfigurations": [
             {
               "name": "bastionHostIpConfiguration",
@@ -70,8 +71,8 @@
     },
     "201": {
       "body": {
-        "name": "bastionhost'",
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhosttenant'",
+        "name": "bastionhosttenant'",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/bastionHosts/bastionhosttenant",
         "type": "Microsoft.Network/bastionHosts",
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
         "location": "West US",
@@ -88,6 +89,7 @@
           "enableShareableLink": false,
           "enableKerberos": false,
           "enableSessionRecording": false,
+          "enablePrivateOnlyBastion": false,
           "ipConfigurations": [
             {
               "name": "bastionHostIpConfiguration",
@@ -111,4 +113,3 @@
     }
   }
 }
-