Skip to content

Commit

Permalink
Fix Lint issues in ContainerApps.json (#24107)
Browse files Browse the repository at this point in the history 
* Fix lint issue

* Fix format issue

* Fix json format issue

* Fix model validation

* Fix lint error
  • Loading branch information
@Zijian-Ju
Zijian-Ju authored May 24, 2023
1 parent dad7d3c commit 1e26714
Show file tree
Hide file tree
Showing 3 changed files with 224 additions and 4 deletions.
10 changes: 8 additions & 2 deletions ...fication/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerApps.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,10 @@
],
"responses": {
"200": {
"description": "Container App started successfully."
"description": "Container App started successfully.",
"schema": {
"$ref": "#/definitions/ContainerApp"
}
},
"202": {
"description": "Start operation is in progress.",
Expand Down Expand Up @@ -568,7 +571,10 @@
],
"responses": {
"200": {
"description": "Container App stopped successfully."
"description": "Container App stopped successfully.",
"schema": {
"$ref": "#/definitions/ContainerApp"
}
},
"202": {
"description": "Stop operation is in progress.",
Expand Down
109 changes: 108 additions & 1 deletion ...source-manager/Microsoft.App/preview/2023-04-01-preview/examples/ContainerApps_Start.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,114 @@
"api-version": "2023-04-01-preview"
},
"responses": {
"200": {},
"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",
"workloadProfileName": "My-GP-01",
"latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io",
"latestReadyRevisionName": "testcontainerApp0-pjxhsye",
"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,
"httpMaxRequestSize": 10,
"logLevel": "debug",
"enableApiLogging": true
},
"maxInactiveRevisions": 10
},
"template": {
"containers": [
{
"image": "repo/testcontainerApp0:v4",
"name": "testcontainerApp0",
"resources": {
"cpu": 0.2,
"memory": "100Mi"
}
}
],
"initContainers": [
{
"image": "repo/testcontainerApp0:v4",
"name": "testinitcontainerApp0",
"resources": {
"cpu": 0.2,
"memory": "100Mi"
}
}
],
"scale": {
"minReplicas": 1,
"maxReplicas": 5,
"rules": [
{
"name": "httpscalingrule",
"http": {
"metadata": {
"concurrentRequests": "50"
}
}
}
]
}
},
"eventStreamEndpoint": "testEndpoint"
}
}
},
"202": {
"headers": {
"location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/containerApps/testWorkerApp0/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2023-04-01-preview"
Expand Down
109 changes: 108 additions & 1 deletion ...esource-manager/Microsoft.App/preview/2023-04-01-preview/examples/ContainerApps_Stop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,114 @@
"api-version": "2023-04-01-preview"
},
"responses": {
"200": {},
"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",
"workloadProfileName": "My-GP-01",
"latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io",
"latestReadyRevisionName": "testcontainerApp0-pjxhsye",
"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,
"httpMaxRequestSize": 10,
"logLevel": "debug",
"enableApiLogging": true
},
"maxInactiveRevisions": 10
},
"template": {
"containers": [
{
"image": "repo/testcontainerApp0:v4",
"name": "testcontainerApp0",
"resources": {
"cpu": 0.2,
"memory": "100Mi"
}
}
],
"initContainers": [
{
"image": "repo/testcontainerApp0:v4",
"name": "testinitcontainerApp0",
"resources": {
"cpu": 0.2,
"memory": "100Mi"
}
}
],
"scale": {
"minReplicas": 1,
"maxReplicas": 5,
"rules": [
{
"name": "httpscalingrule",
"http": {
"metadata": {
"concurrentRequests": "50"
}
}
}
]
}
},
"eventStreamEndpoint": "testEndpoint"
}
}
},
"202": {
"headers": {
"location": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/containerApps/testWorkerApp0/operationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2023-04-01-preview"
Expand Down

0 comments on commit 1e26714

Please sign in to comment.