Skip to content

Modify terraform #1

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

Open
Stretch96 wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −472
Open

Modify terraform #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration-terraform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
push:
branches: main
paths:
- './terraform'
- 'terraform/**'
pull_request:
paths:
- './terraform'
- 'terraform/**'

jobs:
continuous-integration-terraform:
Expand Down
46 changes: 13 additions & 33 deletions terraform/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 5 additions & 41 deletions terraform/README.md
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 2 additions & 34 deletions terraform/container-apps-hosting.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,11 @@ module "azure_container_apps_hosting" {
tags = local.tags

enable_container_registry = local.enable_container_registry
registry_admin_enabled = local.registry_admin_enabled
registry_server = local.registry_server
registry_use_managed_identity = local.registry_use_managed_identity
registry_managed_identity_assign_role = local.registry_managed_identity_assign_role
registry_server = local.registry_server
registry_admin_enabled = local.registry_admin_enabled

enable_dns_zone = local.enable_dns_zone
dns_zone_domain_name = local.dns_zone_domain_name
dns_ns_records = local.dns_ns_records
dns_txt_records = local.dns_txt_records
dns_mx_records = local.dns_mx_records
dns_alias_records = local.dns_alias_records
enable_container_app_file_share = local.enable_container_app_file_share
storage_account_file_share_quota_gb = local.storage_account_file_share_quota_gb
container_app_file_share_mount_path = local.container_app_file_share_mount_path
storage_account_public_access_enabled = local.storage_account_public_access_enabled
storage_account_ipv4_allow_list = local.storage_account_ipv4_allow_list
image_name = local.image_name
container_command = local.container_command
container_secret_environment_variables = local.container_secret_environment_variables
Expand All @@ -42,9 +31,6 @@ module "azure_container_apps_hosting" {
launch_in_vnet = true
container_app_name_override = local.container_app_name_override

storage_subnet_cidr = local.storage_subnet_cidr
mssql_private_endpoint_subnet_cidr = local.mssql_private_endpoint_subnet_cidr

enable_monitoring = local.enable_monitoring
monitor_email_receivers = local.monitor_email_receivers
container_health_probe_path = local.container_health_probe_path
Expand All @@ -57,25 +43,7 @@ module "azure_container_apps_hosting" {
existing_network_watcher_resource_group_name = local.existing_network_watcher_resource_group_name
restrict_container_apps_to_cdn_inbound_only = local.restrict_container_apps_to_cdn_inbound_only

custom_container_apps = local.custom_container_apps
enable_init_container = local.enable_init_container
init_container_image = local.init_container_image
init_container_command = local.init_container_command

enable_mssql_database = local.enable_mssql_database
mssql_server_admin_password = local.mssql_server_admin_password
mssql_azuread_admin_username = local.mssql_azuread_admin_username
mssql_azuread_admin_object_id = local.mssql_azuread_admin_object_id
mssql_sku_name = local.mssql_sku_name
mssql_database_name = local.mssql_database_name
mssql_extra_databases = local.mssql_extra_databases
mssql_firewall_ipv4_allow_list = local.mssql_firewall_ipv4_allow_list
enable_mssql_vulnerability_assessment = local.enable_mssql_vulnerability_assessment
mssql_managed_identity_assign_role = local.mssql_managed_identity_assign_role
mssql_server_public_access_enabled = local.mssql_server_public_access_enabled
mssql_azuread_auth_only = local.mssql_azuread_auth_only

enable_signalr = local.enable_signalr
signalr_sku = local.signalr_sku
signalr_service_mode = local.signalr_service_mode
}
41 changes: 2 additions & 39 deletions terraform/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,16 @@ locals {
azure_location = var.azure_location
tags = var.tags
enable_container_registry = var.enable_container_registry
registry_admin_enabled = var.registry_admin_enabled
registry_server = var.registry_server
registry_use_managed_identity = var.registry_use_managed_identity
registry_managed_identity_assign_role = var.registry_managed_identity_assign_role
registry_server = var.registry_server
registry_admin_enabled = var.registry_admin_enabled
image_name = var.image_name
container_command = var.container_command
container_secret_environment_variables = var.container_secret_environment_variables
container_scale_http_concurrency = var.container_scale_http_concurrency
container_min_replicas = var.container_min_replicas
container_port = var.container_port
enable_container_app_file_share = var.enable_container_app_file_share
storage_account_file_share_quota_gb = var.storage_account_file_share_quota_gb
container_app_file_share_mount_path = var.container_app_file_share_mount_path
storage_account_public_access_enabled = var.storage_account_public_access_enabled
storage_account_ipv4_allow_list = var.storage_account_ipv4_allow_list
enable_dns_zone = var.enable_dns_zone
dns_zone_domain_name = var.dns_zone_domain_name
dns_ns_records = var.dns_ns_records
dns_txt_records = var.dns_txt_records
dns_mx_records = var.dns_mx_records
tfvars_access_ipv4 = var.tfvars_access_ipv4
tfvars_filename = var.tfvars_filename
enable_monitoring = var.enable_monitoring
Expand All @@ -34,45 +24,18 @@ locals {
existing_logic_app_workflow = var.existing_logic_app_workflow
existing_network_watcher_name = var.existing_network_watcher_name
existing_network_watcher_resource_group_name = var.existing_network_watcher_resource_group_name
statuscake_monitored_resource_addresses = var.statuscake_monitored_resource_addresses
statuscake_contact_group_name = var.statuscake_contact_group_name
statuscake_contact_group_integrations = var.statuscake_contact_group_integrations
statuscake_contact_group_email_addresses = var.statuscake_contact_group_email_addresses
custom_container_apps = var.custom_container_apps
enable_health_insights_api = var.enable_health_insights_api
health_insights_api_cors_origins = var.health_insights_api_cors_origins
health_insights_api_ipv4_allow_list = var.health_insights_api_ipv4_allow_list
enable_init_container = var.enable_init_container
init_container_image = var.init_container_image
init_container_command = var.init_container_command
monitor_http_availability_fqdn = var.monitor_http_availability_fqdn
dns_alias_records = var.dns_alias_records
enable_monitoring_traces = var.enable_monitoring_traces
existing_container_app_environment = var.existing_container_app_environment
existing_virtual_network = var.existing_virtual_network
virtual_network_address_space = var.virtual_network_address_space
virtual_network_address_space_mask = element(split("/", local.virtual_network_address_space), 1)
key_vault_subnet_cidr = cidrsubnet(local.virtual_network_address_space, 21 - local.virtual_network_address_space_mask, 2)
enable_keyvault_private_endpoint = var.enable_keyvault_private_endpoint
storage_subnet_cidr = var.storage_subnet_cidr
mssql_private_endpoint_subnet_cidr = var.mssql_private_endpoint_subnet_cidr
existing_resource_group = var.existing_resource_group
container_app_name_override = var.container_app_name_override
enable_mssql_database = var.enable_mssql_database
mssql_server_admin_password = var.mssql_server_admin_password
mssql_azuread_admin_username = var.mssql_azuread_admin_username
mssql_azuread_admin_object_id = var.mssql_azuread_admin_object_id
mssql_sku_name = var.mssql_sku_name
mssql_database_name = var.mssql_database_name
mssql_extra_databases = var.mssql_extra_databases
mssql_firewall_ipv4_allow_list = var.mssql_firewall_ipv4_allow_list
enable_mssql_vulnerability_assessment = var.enable_mssql_vulnerability_assessment
mssql_managed_identity_assign_role = var.mssql_managed_identity_assign_role
mssql_server_public_access_enabled = var.mssql_server_public_access_enabled
mssql_azuread_auth_only = var.mssql_azuread_auth_only
enable_signalr = var.enable_signalr
signalr_sku = var.signalr_sku
signalr_service_mode = var.signalr_service_mode
restrict_container_apps_to_cdn_inbound_only = var.restrict_container_apps_to_cdn_inbound_only
container_apps_infra_subnet_cidr = var.container_apps_infra_subnet_cidr

Expand Down
4 changes: 0 additions & 4 deletions terraform/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,3 @@ provider "azurerm" {
provider "azapi" {
enable_hcl_output_for_data_source = true
}

provider "statuscake" {
api_token = var.statuscake_api_token
}
11 changes: 0 additions & 11 deletions terraform/statuscake-tls-monitor.tf
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions terraform/tfvars-storage.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "azurerm_storage_account" "tfvars" {
name = "${replace(local.existing_resource_group, "-", "")}tfvars"
name = "${replace("${local.environment}${local.project_name}", "-", "")}tfvar"
resource_group_name = local.existing_resource_group
location = local.azure_location
account_tier = "Standard"
Expand All @@ -12,7 +12,7 @@ resource "azurerm_storage_account" "tfvars" {
}

resource "azurerm_storage_container" "tfvars" {
name = "${local.existing_resource_group}-tfvars"
name = "${local.environment}${local.project_name}-tfvar"
storage_account_name = azurerm_storage_account.tfvars.name
container_access_type = "private"
}
Expand Down
Loading
Loading