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

feat: add web_server_network_access_control #102

Merged
merged 5 commits into from
Nov 30, 2023
Merged

feat: add web_server_network_access_control #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7d94e7
feat: add web_server_network_access_control
imrannayer Nov 30, 2023
8fa438c
fixed handle null value for web_server_network_access_control
imrannayer Nov 30, 2023
3251f51
fixed handle null value for web_server_network_access_control
imrannayer Nov 30, 2023
c942869
change sequence in lint test
imrannayer Nov 30, 2023
085f938
Merge branch 'master' into feat/add-allowed_ip_range
imrannayer Nov 30, 2023
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
80 changes: 40 additions & 40 deletions build/int.cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,48 +28,11 @@ steps:
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create']

# ----- SUITE airflow-connection-local

- id: converge airflow-connection-local
waitFor:
- create all
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge airflow-connection-local']
- id: verify airflow-connection-local
waitFor:
- converge airflow-connection-local
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do verify airflow-connection-local']
# - id: destroy airflow-connection-local
# waitFor:
# - verify airflow-connection-local
# name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
# args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy airflow-connection-local']


# ----- SUITE airflow-pool-local

- id: converge airflow-pool-local
waitFor:
- create all
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge airflow-pool-local']
- id: verify airflow-pool-local
waitFor:
- converge airflow-pool-local
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do verify airflow-pool-local']
# - id: destroy airflow-pool-local
# waitFor:
# - verify airflow-pool-local
# name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
# args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy airflow-pool-local']

# ----- SUITE simple-composer-env-v2-local
# ----- SUITE simple-composer-env-v2

- id: init-simple-composer-env-v2
waitFor:
- verify airflow-pool-local
- create all
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2Module --stage init --verbose']
- id: apply-simple-composer-env-v2
Expand All @@ -88,6 +51,7 @@ steps:
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2Module --stage destroy --verbose']


# ----- SUITE composer-v2-sharedvpc-prereq-local

- id: init-composer-v2-sharedvpc-prereq
Expand Down Expand Up @@ -115,7 +79,7 @@ steps:

- id: init-simple-composer-env-v1
waitFor:
- destroy-composer-v2-sharedvpc-prereq
- destroy-simple-composer-env-v2
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV1Module --stage init --verbose']
- id: apply-simple-composer-env-v1
Expand All @@ -133,6 +97,42 @@ steps:
- verify-simple-composer-env-v1
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV1Module --stage destroy --verbose']
# ----- SUITE airflow-connection-local

- id: converge airflow-connection-local
waitFor:
- destroy-simple-composer-env-v1
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge airflow-connection-local']
- id: verify airflow-connection-local
waitFor:
- converge airflow-connection-local
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do verify airflow-connection-local']
# - id: destroy airflow-connection-local
# waitFor:
# - verify airflow-connection-local
# name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
# args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy airflow-connection-local']


# ----- SUITE airflow-pool-local

- id: converge airflow-pool-local
waitFor:
- destroy-simple-composer-env-v1
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge airflow-pool-local']
- id: verify airflow-pool-local
waitFor:
- converge airflow-pool-local
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do verify airflow-pool-local']
# - id: destroy airflow-pool-local
# waitFor:
# - verify airflow-pool-local
# name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
# args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy airflow-pool-local']
tags:
- 'ci'
- 'integration'
Expand Down
10 changes: 10 additions & 0 deletions examples/simple_composer_env_v2/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,14 @@ module "simple-composer-environment" {
depends_on = [
google_storage_bucket_iam_member.object_admin,
]
web_server_network_access_control = [
{
allowed_ip_range = "192.0.2.0/24"
description = "office net 1"
},
{
allowed_ip_range = "192.0.4.0/24"
description = "office net 2"
},
]
}
1 change: 1 addition & 0 deletions modules/create_environment_v2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ module "simple-composer-environment" {
| triggerer | Configuration for resources used by Airflow triggerer | <pre>object({<br> cpu = string<br> memory_gb = number<br> count = number<br> })</pre> | `null` | no |
| use\_private\_environment | Create a private environment. | `bool` | `false` | no |
| web\_server | Configuration for resources used by Airflow web server. | <pre>object({<br> cpu = string<br> memory_gb = number<br> storage_gb = number<br> })</pre> | <pre>{<br> "cpu": 2,<br> "memory_gb": 7.5,<br> "storage_gb": 5<br>}</pre> | no |
| web\_server\_network\_access\_control | The network-level access control policy for the Airflow web server. If unspecified, no network-level access restrictions are applied | <pre>list(object({<br> allowed_ip_range = string<br> description = string<br> }))</pre> | `null` | no |
| worker | Configuration for resources used by Airflow workers. | <pre>object({<br> cpu = string<br> memory_gb = number<br> storage_gb = number<br> min_count = number<br> max_count = number<br> })</pre> | <pre>{<br> "cpu": 2,<br> "max_count": 6,<br> "memory_gb": 7.5,<br> "min_count": 2,<br> "storage_gb": 5<br>}</pre> | no |

## Outputs
Expand Down
13 changes: 13 additions & 0 deletions modules/create_environment_v2/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,19 @@ resource "google_composer_environment" "composer_env" {
}
}

dynamic "web_server_network_access_control" {
for_each = var.web_server_network_access_control == null ? [] : ["web_server_network_access_control"]
content {
dynamic "allowed_ip_range" {
for_each = { for x in var.web_server_network_access_control : x.allowed_ip_range => x }
content {
value = allowed_ip_range.value["allowed_ip_range"]
description = allowed_ip_range.value["description"]
}
}
}
}

}

depends_on = [google_project_iam_member.composer_agent_service_account]
Expand Down
9 changes: 9 additions & 0 deletions modules/create_environment_v2/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,3 +273,12 @@ variable "cloud_data_lineage_integration" {
type = bool
default = false
}

variable "web_server_network_access_control" {
type = list(object({
allowed_ip_range = string
description = string
}))
default = null
description = "The network-level access control policy for the Airflow web server. If unspecified, no network-level access restrictions are applied"
}