Remove never used properties (#22423)

Co-authored-by: Vincent He <dashe@microsoft.com>
Azure · Feb 7, 2023 · 27489e4 · 27489e4
1 parent 23e82ab
commit 27489e4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 142 deletions.
diff --git a/...on/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ManagedEnvironments.json b/...on/app/resource-manager/Microsoft.App/preview/2022-11-01-preview/ManagedEnvironments.json
@@ -1041,31 +1041,6 @@
     }
   },
   "definitions": {
-    "ManagedEnvironmentOutboundSettings": {
-      "type": "object",
-      "description": "Configuration used to control the Environment Egress outbound traffic",
-      "properties": {
-        "outBoundType": {
-          "$ref": "#/definitions/ManagedEnvironmentOutBoundType"
-        },
-        "virtualNetworkApplianceIp": {
-          "description": "Virtual Appliance IP used as the Egress controller for the Environment",
-          "type": "string"
-        }
-      }
-    },
-    "ManagedEnvironmentOutBoundType": {
-      "enum": [
-        "LoadBalancer",
-        "UserDefinedRouting"
-      ],
-      "description": "Outbound type for the cluster",
-      "type": "string",
-      "x-ms-enum": {
-        "name": "ManagedEnvironmentOutBoundType",
-        "modelAsString": true
-      }
-    },
     "AppLogsConfiguration": {
       "description": "Configuration of application logs",
       "type": "object",
@@ -1108,23 +1083,15 @@
       "properties": {
         "internal": {
           "type": "boolean",
-          "description": "Boolean indicating the environment only has an internal load balancer. These environments do not have a public static IP resource. They must provide runtimeSubnetId and infrastructureSubnetId if enabling this property",
+          "description": "Boolean indicating the environment only has an internal load balancer. These environments do not have a public static IP resource. They must provide infrastructureSubnetId if enabling this property",
           "x-ms-mutability": [
             "create",
             "read"
           ]
         },
         "infrastructureSubnetId": {
           "type": "string",
-          "description": "Resource ID of a subnet for infrastructure components. This subnet must be in the same VNET as the subnet defined in runtimeSubnetId. Must not overlap with any other provided IP ranges.",
-          "x-ms-mutability": [
-            "create",
-            "read"
-          ]
-        },
-        "runtimeSubnetId": {
-          "type": "string",
-          "description": "This field is deprecated and not used. If you wish to provide your own subnet that Container App containers are injected into, then you should leverage the infrastructureSubnetId.",
+          "description": "Resource ID of a subnet for infrastructure components. Must not overlap with any other provided IP ranges.",
           "x-ms-mutability": [
             "create",
             "read"
@@ -1153,10 +1120,6 @@
             "create",
             "read"
           ]
-        },
-        "outboundSettings": {
-          "$ref": "#/definitions/ManagedEnvironmentOutboundSettings",
-          "description": "Configuration used to control the Environment Egress outbound traffic"
         }
       }
     },
@@ -1169,10 +1132,6 @@
         }
       ],
       "properties": {
-        "sku": {
-          "$ref": "#/definitions/EnvironmentSkuProperties",
-          "description": "SKU properties of the Environment."
-        },
         "kind": {
           "type": "string",
           "description": "Kind of the Environment."
@@ -1370,40 +1329,6 @@
         "maximumCount"
       ]
     },
-    "EnvironmentSkuProperties": {
-      "description": "Managed Environment resource SKU properties.",
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "description": "Name of the Sku.",
-          "externalDocs": {
-            "url": "https://aka.ms/container-apps-pricing"
-          },
-          "enum": [
-            "Consumption",
-            "Premium"
-          ],
-          "x-ms-enum": {
-            "name": "SkuName",
-            "modelAsString": true,
-            "values": [
-              {
-                "value": "Consumption",
-                "description": "Consumption SKU of Managed Environment."
-              },
-              {
-                "value": "Premium",
-                "description": "Premium SKU of Managed Environment."
-              }
-            ]
-          }
-        }
-      },
-      "required": [
-        "name"
-      ]
-    },
     "workloadProfileStates": {
       "description": "Collection of all the workload Profile States for a Premium Managed Environment..",
       "type": "object",

diff --git a/...Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_CreateOrUpdate.json b/...Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_CreateOrUpdate.json
@@ -6,9 +6,6 @@
     "api-version": "2022-11-01-preview",
     "environmentEnvelope": {
       "location": "East US",
-      "sku": {
-        "name": "Premium"
-      },
       "properties": {
         "daprAIConnectionString": "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://northcentralus-0.in.applicationinsights.azure.com/",
         "appLogsConfiguration": {
@@ -19,10 +16,7 @@
         },
         "zoneRedundant": true,
         "vnetConfiguration": {
-          "outboundSettings": {
-            "outBoundType": "UserDefinedRouting",
-            "virtualNetworkApplianceIp": "192.168.1.20"
-          }
+          "infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1"
         },
         "customDomainConfiguration": {
           "dnsSuffix": "www.my-name.com",
@@ -56,9 +50,6 @@
         "name": "testcontainerenv",
         "type": "Microsoft.App/managedEnvironments",
         "location": "East US",
-        "sku": {
-          "name": "Premium"
-        },
         "properties": {
           "provisioningState": "Succeeded",
           "deploymentErrors": null,
@@ -71,10 +62,7 @@
           },
           "zoneRedundant": true,
           "vnetConfiguration": {
-            "outboundSettings": {
-              "outBoundType": "UserDefinedRouting",
-              "virtualNetworkApplianceIp": "192.168.1.20"
-            }
+            "infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1"
           },
           "customDomainConfiguration": {
             "customDomainVerificationId": "custom domain verification id",
@@ -110,9 +98,6 @@
         "name": "testcontainerenv",
         "type": "Microsoft.App/managedEnvironments",
         "location": "East US",
-        "sku": {
-          "name": "Premium"
-        },
         "properties": {
           "provisioningState": "InitializationInProgress",
           "deploymentErrors": null,
@@ -125,10 +110,7 @@
           },
           "zoneRedundant": true,
           "vnetConfiguration": {
-            "outboundSettings": {
-              "outBoundType": "UserDefinedRouting",
-              "virtualNetworkApplianceIp": "192.168.1.20"
-            }
+            "infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1"
           },
           "customDomainConfiguration": {
             "customDomainVerificationId": "custom domain verification id",

diff --git a/...ce-manager/Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_Get.json b/...ce-manager/Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_Get.json
@@ -13,20 +13,14 @@
         "type": "Microsoft.App/managedEnvironments",
         "location": "North Central US",
         "tags": {},
-        "sku": {
-          "name": "Premium"
-        },
         "properties": {
           "provisioningState": "Succeeded",
           "deploymentErrors": null,
           "defaultDomain": "jlaw-demo1.k4apps.io",
           "staticIp": "20.42.33.145",
           "zoneRedundant": true,
           "vnetConfiguration": {
-            "outboundSettings": {
-              "outBoundType": "UserDefinedRouting",
-              "virtualNetworkApplianceIp": "192.168.1.20"
-            }
+            "infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1"
           },
           "customDomainConfiguration": {
             "customDomainVerificationId": "custom domain verification id",

diff --git a/...soft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_ListByResourceGroup.json b/...soft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_ListByResourceGroup.json
@@ -14,9 +14,6 @@
             "type": "Microsoft.App/managedEnvironments",
             "location": "North Central US",
             "tags": {},
-            "sku": {
-              "name": "Premium"
-            },
             "properties": {
               "provisioningState": "Succeeded",
               "deploymentErrors": null,
@@ -25,10 +22,7 @@
               "appLogsConfiguration": null,
               "zoneRedundant": true,
               "vnetConfiguration": {
-                "outboundSettings": {
-                  "outBoundType": "UserDefinedRouting",
-                  "virtualNetworkApplianceIp": "192.168.1.20"
-                }
+                "infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1"
               },
               "customDomainConfiguration": {
                 "customDomainVerificationId": "custom domain verification id",
@@ -63,9 +57,6 @@
             "type": "Microsoft.App/managedEnvironments",
             "location": "North Central US",
             "tags": {},
-            "sku": {
-              "name": "Consumption"
-            },
             "properties": {
               "provisioningState": "Succeeded",
               "deploymentErrors": null,
@@ -82,10 +73,7 @@
               },
               "eventStreamEndpoint": "testEndpoint",
               "vnetConfiguration": {
-                "outboundSettings": {
-                  "outBoundType": "UserDefinedRouting",
-                  "virtualNetworkApplianceIp": "192.168.1.20"
-                }
+                "infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1"
               }
             }
           }

diff --git a/...osoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_ListBySubscription.json b/...osoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_ListBySubscription.json
@@ -13,9 +13,6 @@
             "type": "Microsoft.App/managedEnvironments",
             "location": "North Central US",
             "tags": {},
-            "sku": {
-              "name": "Premium"
-            },
             "properties": {
               "provisioningState": "Succeeded",
               "deploymentErrors": null,
@@ -24,10 +21,7 @@
               "appLogsConfiguration": null,
               "zoneRedundant": true,
               "vnetConfiguration": {
-                "outboundSettings": {
-                  "outBoundType": "UserDefinedRouting",
-                  "virtualNetworkApplianceIp": "192.168.1.20"
-                }
+                "infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1"
               },
               "customDomainConfiguration": {
                 "customDomainVerificationId": "custom domain verification id",
@@ -62,9 +56,6 @@
             "type": "Microsoft.App/managedEnvironments",
             "location": "North Central US",
             "tags": {},
-            "sku": {
-              "name": "Consumption"
-            },
             "properties": {
               "provisioningState": "Succeeded",
               "deploymentErrors": null,
@@ -73,10 +64,7 @@
               "appLogsConfiguration": null,
               "zoneRedundant": true,
               "vnetConfiguration": {
-                "outboundSettings": {
-                  "outBoundType": "UserDefinedRouting",
-                  "virtualNetworkApplianceIp": "192.168.1.20"
-                }
+                "infrastructureSubnetId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/RGName/providers/Microsoft.Network/virtualNetworks/VNetName/subnets/subnetName1"
               },
               "customDomainConfiguration": {
                 "customDomainVerificationId": "custom domain verification id",

diff --git a/...-manager/Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_Patch.json b/...-manager/Microsoft.App/preview/2022-11-01-preview/examples/ManagedEnvironments_Patch.json
@@ -20,21 +20,12 @@
         "type": "Microsoft.App/managedEnvironments",
         "location": "North Central US",
         "tags": {},
-        "sku": {
-          "name": "Premium"
-        },
         "properties": {
           "provisioningState": "Succeeded",
           "deploymentErrors": null,
           "defaultDomain": "jlaw-demo1.k4apps.io",
           "staticIp": "20.42.33.145",
           "zoneRedundant": true,
-          "vnetConfiguration": {
-            "outboundSettings": {
-              "outBoundType": "UserDefinedRouting",
-              "virtualNetworkApplianceIp": "192.168.1.20"
-            }
-          },
           "customDomainConfiguration": {
             "customDomainVerificationId": "custom domain verification id",
             "dnsSuffix": "www.my-name.com",