Release app microsoft.app 2022 10 01 (Azure#21683)

* Adds base for updating Microsoft.App from version preview/2022-06-01-preview to version 2022-10-01 * Updates readme * Updates API version in new specs and examples * Add AppState and LatestReadyRevisionName (Azure#21034) * Add new props * add defaults * Add swagger for client cert & CORS policy (Azure#21126) * Fix password format of env domain for 2022-10-01 (Azure#21463) * fix * fix * Remove AppState property as we decided to postpone it (Azure#21483) * Remove AppState property as we decided to postpone it * Fix swagger issues * More swagger fixes * s360 swagger correctness fixes (Azure#21472) Co-authored-by: Nan Jiang <naji@microsoft.com> * Add kind for managed environment (Azure#21589) * add * fix * fix (Azure#21730) * fix (Azure#21747) Co-authored-by: p-bouchon <107427816+p-bouchon@users.noreply.github.com> Co-authored-by: Ruslan Yakushev <1664475+ruslany@users.noreply.github.com> Co-authored-by: zhenqxuMSFT <zhenqxu@microsoft.com> Co-authored-by: najian <jiangnan8924@gmail.com> Co-authored-by: Nan Jiang <naji@microsoft.com>
anandMicro · Dec 16, 2022 · f1547c4 · f1547c4
1 parent 2447d7e
commit f1547c4
Show file tree

Hide file tree

Showing 15 changed files with 231 additions and 44 deletions.
diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/CommonDefinitions.json
@@ -317,7 +317,6 @@
           "x-ms-secret": true
         },
         "certificatePassword": {
-          "format": "byte",
           "description": "Certificate password",
           "type": "string",
           "x-ms-secret": true
@@ -687,7 +686,8 @@
             },
             "ignoreErrors": {
               "description": "Boolean describing if the component errors are ignores",
-              "type": "boolean"
+              "type": "boolean",
+              "default": false
             },
             "initTimeout": {
               "description": "Initialization timeout",
@@ -758,7 +758,7 @@
           "description": "Collection of secrets used by a Dapr component",
           "type": "array",
           "items": {
-            "$ref": "./CommonDefinitions.json#/definitions/Secret"
+            "$ref": "./CommonDefinitions.json#/definitions/DaprSecret"
           },
           "x-ms-identifiers": [
             "name"

diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ContainerApps.json
@@ -293,6 +293,12 @@
           }
         ],
         "responses": {
+          "200": {
+            "description": "Ok",
+            "schema": {
+              "$ref": "#/definitions/ContainerApp"
+            }
+          },
           "202": {
             "description": "Patch operation is in progress."
           },

diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ManagedEnvironments.json b/specification/app/resource-manager/Microsoft.App/stable/2022-10-01/ManagedEnvironments.json
@@ -289,6 +289,12 @@
           }
         ],
         "responses": {
+          "200": {
+            "description": "Ok",
+            "schema": {
+              "$ref": "#/definitions/ManagedEnvironment"
+            }
+          },
           "202": {
             "description": "Patch operation is in progress."
           },
@@ -804,7 +810,7 @@
         },
         "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 that Container App containers are injected into. This subnet must be in the same VNET as the subnet defined in infrastructureSubnetId. Must not overlap with any other provided IP ranges.",
           "x-ms-mutability": [
             "create",
             "read"
@@ -849,6 +855,10 @@
         }
       ],
       "properties": {
+        "kind": {
+          "type": "string",
+          "description": "Kind of the Environment."
+        },
         "sku": {
           "$ref": "#/definitions/EnvironmentSkuProperties",
           "description": "SKU properties of the Environment."

diff --git a/...osoft.App/stable/2022-10-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json b/...osoft.App/stable/2022-10-01/examples/ConnectedEnvironmentsCertificate_CreateOrUpdate.json
@@ -9,7 +9,7 @@
       "location": "East US",
       "properties": {
         "password": "private key password",
-        "value": "PFX-or-PEM-blob"
+        "value": "Y2VydA=="
       }
     }
   },

diff --git a/...anager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_CreateOrUpdate.json b/...anager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_CreateOrUpdate.json
@@ -4,20 +4,19 @@
     "resourceGroupName": "examplerg",
     "connectedEnvironmentName": "testenv",
     "api-version": "2022-10-01",
-    "kind": "kubernetes",
     "location": "East US",
-    "extendedLocation": {
-      "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
-      "type": "CustomLocation"
-    },
     "environmentEnvelope": {
+      "extendedLocation": {
+        "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
+        "type": "CustomLocation"
+      },
       "location": "East US",
       "properties": {
         "staticIp": "1.2.3.4",
         "daprAIConnectionString": "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://northcentralus-0.in.applicationinsights.azure.com/",
         "customDomainConfiguration": {
           "dnsSuffix": "www.my-name.com",
-          "certificateValue": "PFX-or-PEM-blob",
+          "certificateValue": "Y2VydA==",
           "certificatePassword": "private key password"
         }
       }

diff --git a/...source-manager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_Delete.json b/...source-manager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_Delete.json
@@ -13,7 +13,11 @@
   },
   "responses": {
     "200": {},
-    "202": {},
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/localtions/eastus/operationResults/00000"
+      }
+    },
     "204": {}
   }
 }
diff --git a/.../resource-manager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_Get.json b/.../resource-manager/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_Get.json
@@ -5,11 +5,7 @@
     "connectedEnvironmentName": "examplekenv",
     "api-version": "2022-10-01",
     "kind": "kubernetes",
-    "location": "East US",
-    "extendedLocation": {
-      "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
-      "type": "CustomLocation"
-    }
+    "location": "East US"
   },
   "responses": {
     "200": {

diff --git a/...er/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_ListBySubscription.json b/...er/Microsoft.App/stable/2022-10-01/examples/ConnectedEnvironments_ListBySubscription.json
@@ -12,6 +12,10 @@
             "name": "sample1",
             "type": "Microsoft.App/connectedEnvironments",
             "location": "North Central US",
+            "extendedLocation": {
+              "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
+              "type": "CustomLocation"
+            },
             "tags": {},
             "properties": {
               "provisioningState": "Succeeded",
@@ -32,6 +36,10 @@
             "name": "sample2",
             "type": "Microsoft.App/connectedEnvironments",
             "location": "North Central US",
+            "extendedLocation": {
+              "name": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.ExtendedLocation/customLocations/testcustomlocation",
+              "type": "CustomLocation"
+            },
             "tags": {},
             "properties": {
               "provisioningState": "Succeeded",

diff --git a/...on/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Patch.json b/...on/app/resource-manager/Microsoft.App/stable/2022-10-01/examples/ContainerApps_Patch.json
@@ -114,6 +114,135 @@
     }
   },
   "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0",
+        "name": "testcontainerApp0",
+        "type": "Microsoft.App/containerApps",
+        "location": "East US",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
+          "workloadProfileType": "GeneralPurpose",
+          "latestRevisionName": "testcontainerApp0-pjxhsye",
+          "latestReadyRevisionName": "testcontainerApp0-pjxhsye",
+          "latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io",
+          "configuration": {
+            "ingress": {
+              "fqdn": "testcontainerApp0.demokube-t24clv0g.eastus.containerApps.k4apps.io",
+              "external": true,
+              "targetPort": 3000,
+              "transport": "auto",
+              "customDomains": [
+                {
+                  "name": "www.my-name.com",
+                  "bindingType": "SniEnabled",
+                  "certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-name-dot-com"
+                },
+                {
+                  "name": "www.my-other-name.com",
+                  "bindingType": "SniEnabled",
+                  "certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
+                }
+              ],
+              "traffic": [
+                {
+                  "weight": 80,
+                  "revisionName": "testcontainerApp0-ab1234"
+                },
+                {
+                  "weight": 20,
+                  "revisionName": "testcontainerApp0-ab4321",
+                  "label": "staging"
+                }
+              ],
+              "ipSecurityRestrictions": [
+                {
+                  "name": "Allow work IP A subnet",
+                  "description": "Allowing all IP's within the subnet below to access containerapp",
+                  "ipAddressRange": "192.168.1.1/32",
+                  "action": "Allow"
+                },
+                {
+                  "name": "Allow work IP B subnet",
+                  "description": "Allowing all IP's within the subnet below to access containerapp",
+                  "ipAddressRange": "192.168.1.1/8",
+                  "action": "Allow"
+                }
+              ]
+            },
+            "dapr": {
+              "enabled": true,
+              "appPort": 3000,
+              "appProtocol": "http",
+              "httpReadBufferSize": 30
+            }
+          },
+          "template": {
+            "containers": [
+              {
+                "image": "repo/testcontainerApp0:v4",
+                "name": "testcontainerApp0",
+                "resources": {
+                  "cpu": 0.2,
+                  "memory": "100Mi"
+                },
+                "probes": [
+                  {
+                    "type": "Liveness",
+                    "httpGet": {
+                      "path": "/health",
+                      "port": 8080,
+                      "httpHeaders": [
+                        {
+                          "name": "Custom-Header",
+                          "value": "Awesome"
+                        }
+                      ]
+                    },
+                    "initialDelaySeconds": 3,
+                    "periodSeconds": 3
+                  }
+                ]
+              }
+            ],
+            "initContainers": [
+              {
+                "image": "repo/testcontainerApp0:v4",
+                "name": "testinitcontainerApp0",
+                "resources": {
+                  "cpu": 0.2,
+                  "memory": "100Mi"
+                },
+                "command": [
+                  "/bin/sh"
+                ],
+                "args": [
+                  "-c",
+                  "while true; do echo hello; sleep 10;done"
+                ]
+              }
+            ],
+            "scale": {
+              "minReplicas": 1,
+              "maxReplicas": 5,
+              "rules": [
+                {
+                  "name": "httpscalingrule",
+                  "http": {
+                    "metadata": {
+                      "concurrentRequests": "50"
+                    }
+                  }
+                }
+              ]
+            }
+          },
+          "eventStreamEndpoint": "testEndpoint"
+        }
+      }
+    },
     "202": {
       "headers": {
         "azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/locations/eastus/containerappOperationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2022-10-01"

diff --git a/...-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json b/...-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_CreateOrUpdate.json
@@ -6,6 +6,7 @@
     "api-version": "2022-10-01",
     "environmentEnvelope": {
       "location": "East US",
+      "kind": "serverless",
       "sku": {
         "name": "Premium"
       },
@@ -27,7 +28,7 @@
         "customDomainConfiguration": {
           "dnsSuffix": "www.my-name.com",
           "certificateValue": "Y2VydA==",
-          "certificatePassword": "Y2VydA=="
+          "certificatePassword": "private key password"
         },
         "workloadProfiles": [
           {

diff --git a/...pp/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_Get.json b/...pp/resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_Get.json
@@ -13,6 +13,7 @@
         "type": "Microsoft.App/managedEnvironments",
         "location": "North Central US",
         "tags": {},
+        "kind": "serverless",
         "sku": {
           "name": "Premium"
         },

diff --git a/...ger/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_ListByResourceGroup.json b/...ger/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_ListByResourceGroup.json
@@ -14,6 +14,7 @@
             "type": "Microsoft.App/managedEnvironments",
             "location": "North Central US",
             "tags": {},
+            "kind": "serverless",
             "sku": {
               "name": "Premium"
             },

diff --git a/...ager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_ListBySubscription.json b/...ager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_ListBySubscription.json
@@ -13,6 +13,7 @@
             "type": "Microsoft.App/managedEnvironments",
             "location": "North Central US",
             "tags": {},
+            "kind": "serverless",
             "sku": {
               "name": "Premium"
             },

diff --git a/.../resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_Patch.json b/.../resource-manager/Microsoft.App/stable/2022-10-01/examples/ManagedEnvironments_Patch.json
@@ -13,6 +13,61 @@
     }
   },
   "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv",
+        "name": "testcontainerenv",
+        "type": "Microsoft.App/managedEnvironments",
+        "location": "East US",
+        "kind": "serverless",
+        "sku": {
+          "name": "Premium"
+        },
+        "properties": {
+          "provisioningState": "Succeeded",
+          "deploymentErrors": null,
+          "defaultDomain": "testcontainerenv.k4apps.io",
+          "staticIp": "1.2.3.4",
+          "appLogsConfiguration": {
+            "logAnalyticsConfiguration": {
+              "customerId": "string"
+            }
+          },
+          "zoneRedundant": true,
+          "vnetConfiguration": {
+            "outboundSettings": {
+              "outBoundType": "UserDefinedRouting",
+              "virtualNetworkApplianceIp": "192.168.1.20"
+            }
+          },
+          "customDomainConfiguration": {
+            "customDomainVerificationId": "custom domain verification id",
+            "dnsSuffix": "www.my-name.com",
+            "subjectName": "CN=www.my-name.com",
+            "expirationDate": "2022-11-06T04:00:00Z",
+            "thumbprint": "CERTIFICATE_THUMBPRINT"
+          },
+          "eventStreamEndpoint": "testEndpoint",
+          "workloadProfiles": [
+            {
+              "workloadProfileType": "GeneralPurpose",
+              "minimumCount": 3,
+              "maximumCount": 12
+            },
+            {
+              "workloadProfileType": "MemoryOptimized",
+              "minimumCount": 3,
+              "maximumCount": 6
+            },
+            {
+              "workloadProfileType": "ComputeOptimized",
+              "minimumCount": 3,
+              "maximumCount": 6
+            }
+          ]
+        }
+      }
+    },
     "202": {
       "headers": {
         "azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/locations/eastus/managedEnvironmentOperationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2022-10-01"