Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding ip-restriction feat #19841

Merged
merged 12 commits into from
Aug 12, 2022
Merged

adding ip-restriction feat #19841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2526217
adding ip-restriction feat
Jul 19, 2022
f8541a7
remove from stable, add to preview
Jul 19, 2022
6e0e062
fix lintDiff error
Jul 19, 2022
ec0eff9
fix modelvalidation error
Jul 20, 2022
8bc6887
fix formatting changes
Jul 20, 2022
abd4a31
rename names, add note to all allow or all deny
Jul 20, 2022
ad99eb4
fix spell check error
Jul 20, 2022
3025a6f
update name and examples
Jul 22, 2022
7fb62c1
rename `ipAddress` to `ipAddressRange`
Jul 26, 2022
8b3a5c9
making small change to re-run build pipeline
Jul 28, 2022
4c3bee6
trigger GitHub actions
Aug 9, 2022
782e51d
resolve comments
Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions ...fication/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,16 @@
"allowInsecure": {
"description": "Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections",
"type": "boolean"
},
"ipSecurityRestrictions": {
"description": "Rules to restrict incoming IP address.",
"type": "array",
"items": {
"$ref": "#/definitions/IpSecurityRestrictionRule"
},
"x-ms-identifiers": [
"name"
]
}
}
},
Expand Down Expand Up @@ -756,6 +766,41 @@
}
}
},
"IpSecurityRestrictionRule": {
"description": "Rule to restrict incoming IP address.",
"type": "object",
"required": [
"name",
"ipAddressRange",
"action"
],
"properties": {
"name": {
"description": "Name for the IP restriction rule.",
"type": "string"
},
"description": {
"description": "Describe the IP restriction rule that is being sent to the container-app. This is an optional field.",
"type": "string"
},
"ipAddressRange": {
"description": "CIDR notation to match incoming IP address",
"type": "string"
},
"action": {
"description": "Allow or Deny rules to determine for incoming IP. Note: Rules can only consist of ALL Allow or ALL Deny",
"enum": [
"Allow",
"Deny"
],
"type": "string",
"x-ms-enum": {
"name": "action",
"modelAsString": true
}
}
}
},
"CustomHostnameAnalysisResult": {
"description": "Custom domain analysis.",
"type": "object",
Expand Down
28 changes: 28 additions & 0 deletions ...nager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,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",
"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": {
Expand Down Expand Up @@ -122,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",
"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": {
Expand Down
14 changes: 14 additions & 0 deletions ...resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"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": {
Expand Down
14 changes: 14 additions & 0 deletions .../Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"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": {
Expand Down
14 changes: 14 additions & 0 deletions ...r/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"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": {
Expand Down
14 changes: 14 additions & 0 deletions ...source-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"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": {
Expand Down