From 2526217119da9e594f972a136381f1b64709f0c4 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Tue, 19 Jul 2022 15:40:10 -0500 Subject: [PATCH 01/12] adding ip-restriction feat --- .../stable/2022-05-01/ContainerApps.json | 45 +++++++++++++++++++ .../ContainerApps_CreateOrUpdate.json | 14 ++++++ 2 files changed, 59 insertions(+) diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/ContainerApps.json index 454e2c81a224..0ca452b85112 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/ContainerApps.json @@ -638,6 +638,16 @@ "name" ] }, + "ipSecurityRestrictionRules": { + "description": "Rules to restrict incoming IP address.", + "type": "array", + "items": { + "$ref": "#/definitions/IpSecurityRestrictionRules" + }, + "x-ms-identifiers": [ + "name" + ] + }, "allowInsecure": { "description": "Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections", "type": "boolean" @@ -756,6 +766,41 @@ } } }, + "IpSecurityRestrictionRules": { + "description": "Rules to restrict incoming IP address.", + "type": "object", + "required": [ + "name", + "ipAddress", + "action" + ], + "properties": { + "name": { + "description": "Name for the ip restriction rule.", + "type": "string" + }, + "description": { + "description": "Describe the IP restriction rules that are being sent to the container-app. This is an optional field.", + "type": "string" + }, + "ipAddress": { + "description": "CIDR notation to match incoming ip address", + "type": "string" + }, + "action": { + "description": "Allow or Deny rules to determine for incoming ip", + "enum": [ + "Allow", + "Deny" + ], + "type": "string", + "x-ms-enum": { + "name": "action", + "modelAsString": true + } + } + } + }, "CustomHostnameAnalysisResult": { "description": "Custom domain analysis.", "type": "object", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/examples/ContainerApps_CreateOrUpdate.json index b6370daf190c..f2f1a2e71d08 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/examples/ContainerApps_CreateOrUpdate.json @@ -30,6 +30,20 @@ "revisionName": "testcontainerApp0-ab1234", "label": "production" } + ], + "ipSecurityRestrictionRules": [ + { + "name": "name", + "description": "desc", + "ipAddress": "192.168.1.1/32", + "action": "Allow" + }, + { + "name": "name", + "description": "desc", + "ipAddress": "192.168.1.1/16", + "action": "Deny" + } ] }, "dapr": { From f8541a7800b2088a5834fe37d0b50c4cf43e27ff Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Tue, 19 Jul 2022 16:18:29 -0500 Subject: [PATCH 02/12] remove from stable, add to preview --- .../2022-06-01-preview/ContainerApps.json | 45 +++++++++++++++++++ .../ContainerApps_CreateOrUpdate.json | 14 ++++++ .../stable/2022-05-01/ContainerApps.json | 45 ------------------- .../ContainerApps_CreateOrUpdate.json | 14 ------ 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json index 9894d96bd5ae..d489146ba979 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json @@ -644,6 +644,16 @@ } } }, + "ipSecurityRestrictionRules": { + "description": "Rules to restrict incoming IP address.", + "type": "array", + "items": { + "$ref": "#/definitions/IpSecurityRestrictionRules" + }, + "x-ms-identifiers": [ + "name" + ] + }, "RegistryCredentials": { "description": "Container App Private Registry", "type": "object", @@ -756,6 +766,41 @@ } } }, + "IpSecurityRestrictionRules": { + "description": "Rules to restrict incoming IP address.", + "type": "object", + "required": [ + "name", + "ipAddress", + "action" + ], + "properties": { + "name": { + "description": "Name for the IP restriction rule.", + "type": "string" + }, + "description": { + "description": "Describe the IP restriction rules that are being sent to the container-app. This is an optional field.", + "type": "string" + }, + "ipAddress": { + "description": "CIDR notation to match incoming IP address", + "type": "string" + }, + "action": { + "description": "Allow or Deny rules to determine for incoming IP", + "enum": [ + "Allow", + "Deny" + ], + "type": "string", + "x-ms-enum": { + "name": "action", + "modelAsString": true + } + } + } + }, "CustomHostnameAnalysisResult": { "description": "Custom domain analysis.", "type": "object", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json index 538658bd88b5..a4f97b776b54 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json @@ -30,6 +30,20 @@ "revisionName": "testcontainerApp0-ab1234", "label": "production" } + ], + "ipSecurityRestrictionRules": [ + { + "name": "name", + "description": "desc", + "ipAddress": "192.168.1.1/32", + "action": "Allow" + }, + { + "name": "name", + "description": "desc", + "ipAddress": "192.168.1.1/16", + "action": "Deny" + } ] }, "dapr": { diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/ContainerApps.json index 0ca452b85112..454e2c81a224 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/ContainerApps.json @@ -638,16 +638,6 @@ "name" ] }, - "ipSecurityRestrictionRules": { - "description": "Rules to restrict incoming IP address.", - "type": "array", - "items": { - "$ref": "#/definitions/IpSecurityRestrictionRules" - }, - "x-ms-identifiers": [ - "name" - ] - }, "allowInsecure": { "description": "Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections", "type": "boolean" @@ -766,41 +756,6 @@ } } }, - "IpSecurityRestrictionRules": { - "description": "Rules to restrict incoming IP address.", - "type": "object", - "required": [ - "name", - "ipAddress", - "action" - ], - "properties": { - "name": { - "description": "Name for the ip restriction rule.", - "type": "string" - }, - "description": { - "description": "Describe the IP restriction rules that are being sent to the container-app. This is an optional field.", - "type": "string" - }, - "ipAddress": { - "description": "CIDR notation to match incoming ip address", - "type": "string" - }, - "action": { - "description": "Allow or Deny rules to determine for incoming ip", - "enum": [ - "Allow", - "Deny" - ], - "type": "string", - "x-ms-enum": { - "name": "action", - "modelAsString": true - } - } - } - }, "CustomHostnameAnalysisResult": { "description": "Custom domain analysis.", "type": "object", diff --git a/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/examples/ContainerApps_CreateOrUpdate.json index f2f1a2e71d08..b6370daf190c 100644 --- a/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/stable/2022-05-01/examples/ContainerApps_CreateOrUpdate.json @@ -30,20 +30,6 @@ "revisionName": "testcontainerApp0-ab1234", "label": "production" } - ], - "ipSecurityRestrictionRules": [ - { - "name": "name", - "description": "desc", - "ipAddress": "192.168.1.1/32", - "action": "Allow" - }, - { - "name": "name", - "description": "desc", - "ipAddress": "192.168.1.1/16", - "action": "Deny" - } ] }, "dapr": { From 6e0e062805733fa985701ea64e35770d3c32cba7 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Tue, 19 Jul 2022 16:24:24 -0500 Subject: [PATCH 03/12] fix lintDiff error --- .../preview/2022-06-01-preview/ContainerApps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json index d489146ba979..32c1bf8d2c14 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json @@ -648,7 +648,7 @@ "description": "Rules to restrict incoming IP address.", "type": "array", "items": { - "$ref": "#/definitions/IpSecurityRestrictionRules" + "$ref": "#/definitions/IpSecurityRestrictionRule" }, "x-ms-identifiers": [ "name" @@ -766,7 +766,7 @@ } } }, - "IpSecurityRestrictionRules": { + "IpSecurityRestrictionRule": { "description": "Rules to restrict incoming IP address.", "type": "object", "required": [ From ec0eff916a2058c390d94e1aeee5e74a9d888ff5 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Wed, 20 Jul 2022 13:23:58 -0500 Subject: [PATCH 04/12] fix modelvalidation error --- .../2022-06-01-preview/ContainerApps.json | 20 +++++++++---------- .../ContainerApps_CreateOrUpdate.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json index 32c1bf8d2c14..c8c1a786a4c8 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json @@ -642,17 +642,17 @@ "description": "Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections", "type": "boolean" } - } - }, - "ipSecurityRestrictionRules": { - "description": "Rules to restrict incoming IP address.", - "type": "array", - "items": { - "$ref": "#/definitions/IpSecurityRestrictionRule" }, - "x-ms-identifiers": [ - "name" - ] + "ipSecurityRestrictionRules": { + "description": "Rules to restrict incoming IP address.", + "type": "array", + "items": { + "$ref": "#/definitions/IpSecurityRestrictionRule" + }, + "x-ms-identifiers": [ + "name" + ] + } }, "RegistryCredentials": { "description": "Container App Private Registry", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json index a4f97b776b54..8e9d262fb00e 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json @@ -42,7 +42,7 @@ "name": "name", "description": "desc", "ipAddress": "192.168.1.1/16", - "action": "Deny" + "action": "Allow" } ] }, From 8bc68874f8ac72d92489977c27304db25fe8b93b Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Wed, 20 Jul 2022 13:36:46 -0500 Subject: [PATCH 05/12] fix formatting changes --- .../preview/2022-06-01-preview/ContainerApps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json index c8c1a786a4c8..6c8dcb1c51b3 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json @@ -641,8 +641,7 @@ "allowInsecure": { "description": "Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections", "type": "boolean" - } - }, + }, "ipSecurityRestrictionRules": { "description": "Rules to restrict incoming IP address.", "type": "array", @@ -653,6 +652,7 @@ "name" ] } + } }, "RegistryCredentials": { "description": "Container App Private Registry", From abd4a31a782bae6f5917c90e5847f3990590bc79 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Wed, 20 Jul 2022 13:47:00 -0500 Subject: [PATCH 06/12] rename names, add note to all allow or all deny --- .../preview/2022-06-01-preview/ContainerApps.json | 2 +- .../examples/ContainerApps_CreateOrUpdate.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json index 6c8dcb1c51b3..0eaf973a4a67 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json @@ -788,7 +788,7 @@ "type": "string" }, "action": { - "description": "Allow or Deny rules to determine for incoming IP", + "description": "Allow or Deny rules to determine for incoming IP. Note: Rules can only consist of ALL Allow's or ALL Deny's", "enum": [ "Allow", "Deny" diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json index 8e9d262fb00e..0acac419c554 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json @@ -33,14 +33,14 @@ ], "ipSecurityRestrictionRules": [ { - "name": "name", - "description": "desc", + "name": "Allow work IP A subnet", + "description": "Allowing all IP's within the subnet below to access containerapp", "ipAddress": "192.168.1.1/32", "action": "Allow" }, { - "name": "name", - "description": "desc", + "name": "Allow work IP B subnet", + "description": "Allowing all IP's within the subnet below to access containerapp", "ipAddress": "192.168.1.1/16", "action": "Allow" } From ad99eb4b8c1b708ffa6b9a6757fea4eb3ab4d104 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Wed, 20 Jul 2022 16:21:14 -0500 Subject: [PATCH 07/12] fix spell check error --- .../Microsoft.App/preview/2022-06-01-preview/ContainerApps.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json index 0eaf973a4a67..8709527406ef 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json @@ -788,7 +788,7 @@ "type": "string" }, "action": { - "description": "Allow or Deny rules to determine for incoming IP. Note: Rules can only consist of ALL Allow's or ALL Deny's", + "description": "Allow or Deny rules to determine for incoming IP. Note: Rules can only consist of ALL Allow or ALL Deny", "enum": [ "Allow", "Deny" From 3025a6ff0b5348f5573af7d9ccc9ca770cddd122 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Fri, 22 Jul 2022 16:13:37 -0500 Subject: [PATCH 08/12] update name and examples --- .../2022-06-01-preview/ContainerApps.json | 2 +- .../examples/ContainerApps_CreateOrUpdate.json | 16 +++++++++++++++- .../examples/ContainerApps_Get.json | 14 ++++++++++++++ .../ContainerApps_ListByResourceGroup.json | 14 ++++++++++++++ .../ContainerApps_ListBySubscription.json | 14 ++++++++++++++ .../examples/ContainerApps_Patch.json | 14 ++++++++++++++ 6 files changed, 72 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json index 8709527406ef..2b76f792f232 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json @@ -642,7 +642,7 @@ "description": "Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections", "type": "boolean" }, - "ipSecurityRestrictionRules": { + "ipSecurityRestrictions": { "description": "Rules to restrict incoming IP address.", "type": "array", "items": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json index 0acac419c554..15862e36cab1 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json @@ -31,7 +31,7 @@ "label": "production" } ], - "ipSecurityRestrictionRules": [ + "ipSecurityRestrictions": [ { "name": "Allow work IP A subnet", "description": "Allowing all IP's within the subnet below to access containerapp", @@ -136,6 +136,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", + "ipAddress": "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", + "ipAddress": "192.168.1.1/16", + "action": "Allow" + } ] }, "dapr": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json index d48160502b2f..918cfe2823d4 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json @@ -45,6 +45,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", + "ipAddress": "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", + "ipAddress": "192.168.1.1/16", + "action": "Allow" + } ] }, "dapr": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json index 93204d1cf0f0..c16802c38cd7 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json @@ -46,6 +46,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", + "ipAddress": "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", + "ipAddress": "192.168.1.1/16", + "action": "Allow" + } ] }, "dapr": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json index 7a5d0252899b..4983b83f7595 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json @@ -45,6 +45,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", + "ipAddress": "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", + "ipAddress": "192.168.1.1/16", + "action": "Allow" + } ] }, "dapr": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json index b7e19ec6d042..5e84996eeadd 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json @@ -33,6 +33,20 @@ "revisionName": "testcontainerApp0-ab1234", "label": "production" } + ], + "ipSecurityRestrictions": [ + { + "name": "Allow work IP A subnet", + "description": "Allowing all IP's within the subnet below to access containerapp", + "ipAddress": "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", + "ipAddress": "192.168.1.1/16", + "action": "Allow" + } ] }, "dapr": { From 7fb62c148e4ccd9ce2dda3d91a490405d1996777 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Tue, 26 Jul 2022 00:52:59 -0500 Subject: [PATCH 09/12] rename `ipAddress` to `ipAddressRange` --- .../preview/2022-06-01-preview/ContainerApps.json | 4 ++-- .../examples/ContainerApps_CreateOrUpdate.json | 8 ++++---- .../2022-06-01-preview/examples/ContainerApps_Get.json | 4 ++-- .../examples/ContainerApps_ListByResourceGroup.json | 4 ++-- .../examples/ContainerApps_ListBySubscription.json | 4 ++-- .../2022-06-01-preview/examples/ContainerApps_Patch.json | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json index 2b76f792f232..20d6501eef56 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json @@ -771,7 +771,7 @@ "type": "object", "required": [ "name", - "ipAddress", + "ipAddressRange", "action" ], "properties": { @@ -783,7 +783,7 @@ "description": "Describe the IP restriction rules that are being sent to the container-app. This is an optional field.", "type": "string" }, - "ipAddress": { + "ipAddressRange": { "description": "CIDR notation to match incoming IP address", "type": "string" }, diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json index 15862e36cab1..cf13459c3751 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json @@ -35,13 +35,13 @@ { "name": "Allow work IP A subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddress": "192.168.1.1/32", + "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", - "ipAddress": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/16", "action": "Allow" } ] @@ -141,13 +141,13 @@ { "name": "Allow work IP A subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddress": "192.168.1.1/32", + "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", - "ipAddress": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/16", "action": "Allow" } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json index 918cfe2823d4..370a69caac5a 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json @@ -50,13 +50,13 @@ { "name": "Allow work IP A subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddress": "192.168.1.1/32", + "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", - "ipAddress": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/16", "action": "Allow" } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json index c16802c38cd7..f54548815eff 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json @@ -51,13 +51,13 @@ { "name": "Allow work IP A subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddress": "192.168.1.1/32", + "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", - "ipAddress": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/16", "action": "Allow" } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json index 4983b83f7595..ed2a83f8a1c0 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json @@ -50,13 +50,13 @@ { "name": "Allow work IP A subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddress": "192.168.1.1/32", + "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", - "ipAddress": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/16", "action": "Allow" } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json index 5e84996eeadd..7fe577b97e90 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json @@ -38,13 +38,13 @@ { "name": "Allow work IP A subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddress": "192.168.1.1/32", + "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", - "ipAddress": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/16", "action": "Allow" } ] From 8b3a5c960d4a5278e26682354fd38e848d8a0683 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Thu, 28 Jul 2022 17:49:20 -0500 Subject: [PATCH 10/12] making small change to re-run build pipeline --- .../examples/ContainerApps_CreateOrUpdate.json | 4 ++-- .../2022-06-01-preview/examples/ContainerApps_Get.json | 2 +- .../examples/ContainerApps_ListByResourceGroup.json | 2 +- .../examples/ContainerApps_ListBySubscription.json | 2 +- .../2022-06-01-preview/examples/ContainerApps_Patch.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json index cf13459c3751..61a37c40e20b 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json @@ -41,7 +41,7 @@ { "name": "Allow work IP B subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddressRange": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/8", "action": "Allow" } ] @@ -147,7 +147,7 @@ { "name": "Allow work IP B subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddressRange": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/8", "action": "Allow" } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json index 370a69caac5a..28b0449e1e9b 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json @@ -56,7 +56,7 @@ { "name": "Allow work IP B subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddressRange": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/8", "action": "Allow" } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json index f54548815eff..084f8d835f39 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json @@ -57,7 +57,7 @@ { "name": "Allow work IP B subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddressRange": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/8", "action": "Allow" } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json index ed2a83f8a1c0..7138b918f35c 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json @@ -56,7 +56,7 @@ { "name": "Allow work IP B subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddressRange": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/8", "action": "Allow" } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json index 7fe577b97e90..559cf28e79d4 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json @@ -44,7 +44,7 @@ { "name": "Allow work IP B subnet", "description": "Allowing all IP's within the subnet below to access containerapp", - "ipAddressRange": "192.168.1.1/16", + "ipAddressRange": "192.168.1.1/8", "action": "Allow" } ] From 4c3bee6c25ddddbba30359443bc6f4dffdffc6f9 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Tue, 9 Aug 2022 01:10:53 -0500 Subject: [PATCH 11/12] trigger GitHub actions From 782e51d79330b8aae21659477f0ebc4612684eb6 Mon Sep 17 00:00:00 2001 From: Taher Darolywala Date: Tue, 9 Aug 2022 13:39:37 -0500 Subject: [PATCH 12/12] resolve comments --- .../preview/2022-06-01-preview/ContainerApps.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json index 20d6501eef56..87a958542ec8 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json @@ -767,7 +767,7 @@ } }, "IpSecurityRestrictionRule": { - "description": "Rules to restrict incoming IP address.", + "description": "Rule to restrict incoming IP address.", "type": "object", "required": [ "name", @@ -780,7 +780,7 @@ "type": "string" }, "description": { - "description": "Describe the IP restriction rules that are being sent to the container-app. This is an optional field.", + "description": "Describe the IP restriction rule that is being sent to the container-app. This is an optional field.", "type": "string" }, "ipAddressRange": {