[fix S360] add missing property to REVISIONS/REPLICAS/ (Azure#21037)

* [fix S360] add missing property to REVISIONS/REPLICAS/ fix s360 https://portal.azure-devex-tools.com/amekpis/correctness/detail?errorId=6F43822E-1FAA-4D7C-BCFE-9B8816F67241 * add 200 response for patch action to fix s360 * add example of patch200 * Update ManagedEnvironments_GetAuthToken.json Co-authored-by: Nan Jiang <naji@microsoft.com>
anandMicro · Dec 16, 2022 · 2326ef3 · 2326ef3
1 parent 209a982
commit 2326ef3
Show file tree

Hide file tree

Showing 10 changed files with 329 additions and 2 deletions.
diff --git a/...fication/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/...fication/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json
@@ -293,6 +293,12 @@
           }
         ],
         "responses": {
+          "200": {
+            "description": "Ok.",
+            "schema": {
+              "$ref": "#/definitions/ContainerApp"
+            }
+          },
           "202": {
             "description": "Patch operation is in progress."
           },

diff --git a/...on/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ManagedEnvironments.json b/...on/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ManagedEnvironments.json
@@ -289,6 +289,12 @@
           }
         ],
         "responses": {
+          "200": {
+            "description": "Ok",
+            "schema": {
+              "$ref": "#/definitions/ManagedEnvironment"
+            }
+          },
           "202": {
             "description": "Patch operation is in progress."
           },

diff --git a/...source-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json b/...source-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json
@@ -114,6 +114,133 @@
     }
   },
   "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",
+          "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-06-01-preview"

diff --git a/...r/Microsoft.App/preview/2022-06-01-preview/examples/ManagedEnvironments_GetAuthToken.json b/...r/Microsoft.App/preview/2022-06-01-preview/examples/ManagedEnvironments_GetAuthToken.json
@@ -18,7 +18,6 @@
           "expires": "2022-07-14T19:22:50.3080223Z"
         }
       }
-    },
-    "404": {}
+    }
   }
 }
diff --git a/...-manager/Microsoft.App/preview/2022-06-01-preview/examples/ManagedEnvironments_Patch.json b/...-manager/Microsoft.App/preview/2022-06-01-preview/examples/ManagedEnvironments_Patch.json
@@ -13,6 +13,60 @@
     }
   },
   "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",
+        "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-06-01-preview"

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

diff --git a/...fication/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerAppsRevisions.json b/...fication/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerAppsRevisions.json
@@ -571,6 +571,16 @@
           "format": "int32",
           "description": "The container restart count",
           "type": "integer"
+        },
+        "logStreamEndpoint": {
+          "description": "Log Stream endpoint",
+          "type": "string",
+          "readOnly": true
+        },
+        "execEndpoint": {
+          "description": "Container exec endpoint",
+          "type": "string",
+          "readOnly": true
         }
       }
     }

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

diff --git a/...on/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_Patch.json b/...on/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_Patch.json
@@ -89,6 +89,99 @@
       "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-03-01"
       }
+    },
+    "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",
+          "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"
+                }
+              ]
+            },
+            "dapr": {
+              "enabled": true,
+              "appPort": 3000,
+              "appProtocol": "http"
+            }
+          },
+          "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
+                  }
+                ]
+              }
+            ],
+            "scale": {
+              "minReplicas": 1,
+              "maxReplicas": 5,
+              "rules": [
+                {
+                  "name": "httpscalingrule",
+                  "http": {
+                    "metadata": {
+                      "concurrentRequests": "50"
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      }
     }
   }
 }
diff --git a/.../resource-manager/Microsoft.App/stable/2022-03-01/examples/ManagedEnvironments_Patch.json b/.../resource-manager/Microsoft.App/stable/2022-03-01/examples/ManagedEnvironments_Patch.json
@@ -13,6 +13,26 @@
     }
   },
   "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",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "deploymentErrors": null,
+          "defaultDomain": "testcontainerenv.k4apps.io",
+          "staticIp": "1.2.3.4",
+          "appLogsConfiguration": {
+            "logAnalyticsConfiguration": {
+              "customerId": "string"
+            }
+          },
+          "zoneRedundant": true
+        }
+      }
+    },
     "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-03-01"