From eca4aeb1b9c9fd8a11abe00382e1e9a0ac3a0566 Mon Sep 17 00:00:00 2001 From: lolorol Date: Thu, 25 Mar 2021 03:55:36 +0000 Subject: [PATCH] fmt --- .github/workflows/master-100-tf13.yaml | 2 +- .github/workflows/master-standalone-tf14.yaml | 2 +- .pre-commit-config.yaml | 2 +- aks_clusters.tf | 4 +- app_config.tf | 6 +- app_service_plans.tf | 2 +- application_security_groups.tf | 10 +- automations.tf | 4 +- availability_sets.tf | 4 +- azuread.tf | 14 +- azuread_roles.tf | 10 +- azurerm_application_insights.tf | 4 +- bastion_service.tf | 2 +- container_groups.tf | 4 +- container_registry.tf | 4 +- cosmos_db.tf | 6 +- databricks.tf | 4 +- diagnostics.tf | 8 +- disk_encryption_sets.tf | 2 +- dynamic_secrets.tf | 4 +- event_hubs.tf | 12 +- .../standalone/variables.tf | 20 +- .../standalone/variables.tf | 20 +- .../standalone/variables.tf | 52 ++--- .../standalone/variables.tf | 12 +- .../100-simple/standalone/variables.tf | 12 +- .../standalone/variables.tf | 12 +- .../standalone/variables.tf | 24 +- .../standalone/variables.tf | 26 +-- .../azure_ad/102-password-rotation/README.md | 2 +- .../standalone/variables.tf | 24 +- .../standalone/variables.tf | 28 +-- .../100-simple-availabilityset/readme.md | 2 +- .../standalone/variables.tf | 20 +- .../100-simple-acr/standalone/variables.tf | 12 +- .../standalone/variables.tf | 18 +- .../101-single-cluster/standalone/output.tf | 4 +- .../standalone/variables.tf | 20 +- .../102-multi-nodepools/standalone/output.tf | 4 +- .../standalone/variables.tf | 24 +- .../standalone/variables.tf | 18 +- .../100-single-linux-vm/configuration.tfvars | 4 +- .../standalone/readme.md | 2 +- .../standalone/readme.md | 2 +- .../standalone/readme.md | 2 +- .../configuration.tfvars | 2 +- .../standalone/variables.tf | 4 +- .../nsg_definitions.tfvars | 64 +++--- .../virtual_machines.tfvars | 10 +- .../standalone/variables.tf | 74 +++--- .../standalone/variables.tf | 74 +++--- .../standalone/variables.tf | 72 +++--- .../standalone/variables.tf | 12 +- .../standalone/variables.tf | 74 +++--- .../standalone/variables.tf | 20 +- .../standalone/variables.tf | 12 +- .../standalone/module.tf | 8 +- .../standalone/variables.tf | 16 +- .../standalone/variables.tf | 12 +- .../standalone/variables.tf | 14 +- .../standalone/readme.md | 2 +- .../standalone/variables.tf | 18 +- .../standalone/readme.md | 2 +- .../standalone/variables.tf | 20 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 18 +- .../100-aml/standalone/variables.tf | 18 +- .../standalone/variables.tf | 16 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 12 +- .../mssql_mi/200-mi/standalone/variables.tf | 26 +-- examples/mssql_mi/standalone/variables.tf | 40 ++-- .../standalone/variables.tf | 30 +-- .../standalone/variables.tf | 16 +- .../100-simple-mysql/standalone/variables.tf | 18 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 18 +- examples/netapp/101-nfs/standalone/output.tf | 2 +- .../netapp/101-nfs/standalone/variables.tf | 74 +++--- .../dns_zone_records.tfvars | 2 +- .../100-simple-dns_zone/standalone/module.tf | 2 +- .../standalone/variables.tf | 22 +- .../configuration.tfvars | 4 +- .../express_routes/standalone/output.tf | 4 +- .../express_routes/standalone/variables.tf | 76 +++---- .../standalone/variables.tf | 16 +- .../standalone/variables.tf | 36 +-- .../standalone/variables.tf | 16 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 22 +- .../standalone/variables.tf | 22 +- .../configuration.tfvars | 10 +- .../standalone/variables.tf | 26 +-- .../standalone/variables.tf | 16 +- .../centralized/standalone/module.tf | 2 +- .../centralized/standalone/variables.tf | 78 +++---- .../standalone/variables.tf | 20 +- .../standalone/variables.tf | 20 +- .../standalone/variables.tf | 22 +- .../200-nsg-flow-logs/standalone/variables.tf | 22 +- .../standalone/variables.tf | 16 +- .../standalone/variables.tf | 16 +- .../standalone/variables.tf | 16 +- .../standalone/variables.tf | 20 +- .../standalone/variables.tf | 24 +- .../standalone/variables.tf | 14 +- .../standalone/variables.tf | 14 +- .../standalone/variables.tf | 14 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 20 +- .../101-simple-asrv/standalone/variables.tf | 12 +- .../standalone/variables.tf | 12 +- .../standalone/variables.tf | 18 +- .../standalone/variables.tf | 12 +- .../standalone/module.tf | 2 +- .../standalone/variables.tf | 18 +- .../configuration.tfvars | 6 +- .../standalone/module.tf | 10 +- .../standalone/variables.tf | 12 +- .../100-synapse/standalone/variables.tf | 18 +- .../standalone/variables.tf | 18 +- examples/variables.tf | 212 +++++++++--------- .../standalone/variables.tf | 14 +- .../standalone/variables.tf | 14 +- .../configuration.tfvars | 2 +- .../standalone/variables.tf | 14 +- .../standalone/variables.tf | 16 +- .../standalone/variables.tf | 16 +- front_door_waf_policies.tf | 2 +- front_doors.tf | 2 +- function_app.tf | 32 +-- keyvault.tf | 12 +- keyvault_certificate_issuers.tf | 4 +- keyvault_certificate_requests.tf | 4 +- keyvault_certificates.tf | 4 +- keyvault_keys.tf | 6 +- landingzones/caf_example/README.md | 70 +++--- landingzones/caf_example/module.tf | 2 +- landingzones/caf_example/outputs.tf | 10 +- landingzones/caf_example/variables.tf | 18 +- landingzones/caf_launchpad/dynamic_secrets.tf | 2 +- landingzones/caf_launchpad/main.tf | 6 +- landingzones/caf_launchpad/output.tf | 12 +- landingzones/caf_launchpad/variables.tf | 116 +++++----- .../add-ons/databricks/variables.tf | 70 +++--- load_balancers.tf | 2 +- locals.tf | 36 +-- log_analytics.tf | 4 +- machine_learning.tf | 4 +- managed_identities.tf | 4 +- mariadb_servers.tf | 2 +- .../analytics/databricks_workspace/output.tf | 8 +- .../databricks_workspace/variables.tf | 16 +- .../machine_learning/compute_instance.tf | 2 +- .../compute_instance/variables.tf | 16 +- modules/analytics/machine_learning/output.tf | 10 +- .../analytics/machine_learning/variables.tf | 22 +- modules/analytics/synapse/output.tf | 14 +- modules/analytics/synapse/spark_pool.tf | 2 +- .../analytics/synapse/spark_pool/output.tf | 2 +- .../analytics/synapse/spark_pool/variables.tf | 10 +- modules/analytics/synapse/sql_pool.tf | 2 +- modules/analytics/synapse/sql_pool/output.tf | 2 +- .../analytics/synapse/sql_pool/variables.tf | 10 +- modules/analytics/synapse/variables.tf | 16 +- modules/app_insights/output.tf | 8 +- modules/app_insights/variables.tf | 30 +-- modules/automation/output.tf | 10 +- modules/automation/variables.tf | 14 +- modules/azuread/applications/output.tf | 10 +- modules/azuread/applications/variables.tf | 14 +- modules/azuread/groups/output.tf | 8 +- modules/azuread/groups/variables.tf | 6 +- .../azuread/groups_members/member/member.tf | 4 +- modules/azuread/groups_members/members.tf | 10 +- modules/azuread/groups_members/variables.tf | 8 +- modules/azuread/roles/variables.tf | 4 +- modules/azuread/users/output.tf | 4 +- modules/azuread/users/variables.tf | 10 +- modules/compute/aks/diagnostics.tf | 2 +- modules/compute/aks/output.tf | 28 +-- modules/compute/aks/variables.tf | 20 +- modules/compute/availability_set/output.tf | 4 +- modules/compute/availability_set/variables.tf | 24 +- modules/compute/container_group/output.tf | 6 +- modules/compute/container_group/variables.tf | 18 +- .../compute/container_registry/diagnostics.tf | 2 +- modules/compute/container_registry/output.tf | 18 +- .../container_registry/private_endpoint.tf | 2 +- .../compute/container_registry/variables.tf | 38 ++-- .../proximity_placement_group/output.tf | 2 +- .../proximity_placement_group/variables.tf | 16 +- .../application_security_group.tf | 38 ++-- .../compute/virtual_machine/diagnostics.tf | 2 +- .../virtual_machine/network_interface.tf | 2 +- modules/compute/virtual_machine/output.tf | 16 +- modules/compute/virtual_machine/variables.tf | 46 ++-- modules/compute/virtual_machine/vm_windows.tf | 4 +- .../virtual_machine_extensions/variables.tf | 10 +- modules/data_factory/data_factory/output.tf | 12 +- .../data_factory/data_factory/variables.tf | 18 +- .../data_factory_pipeline/output.tf | 4 +- .../data_factory_pipeline/variables.tf | 16 +- .../data_factory_trigger_schedule/output.tf | 4 +- .../variables.tf | 20 +- .../datasets/azure_blob/output.tf | 4 +- .../datasets/azure_blob/variables.tf | 24 +- .../datasets/cosmosdb_sqlapi/output.tf | 4 +- .../datasets/cosmosdb_sqlapi/variables.tf | 22 +- .../datasets/delimited_text/output.tf | 4 +- .../datasets/delimited_text/variables.tf | 38 ++-- modules/data_factory/datasets/http/output.tf | 4 +- .../data_factory/datasets/http/variables.tf | 26 +-- modules/data_factory/datasets/json/output.tf | 4 +- .../data_factory/datasets/json/variables.tf | 26 +-- modules/data_factory/datasets/mysql/output.tf | 4 +- .../data_factory/datasets/mysql/variables.tf | 22 +- .../datasets/postgresql/output.tf | 4 +- .../datasets/postgresql/variables.tf | 22 +- .../datasets/sql_server_table/output.tf | 4 +- .../datasets/sql_server_table/variables.tf | 22 +- .../azure_blob_storage/output.tf | 4 +- .../azure_blob_storage/variables.tf | 18 +- .../azure_file_storage/output.tf | 4 +- .../azure_file_storage/variables.tf | 18 +- .../linked_services/azure_function/output.tf | 4 +- .../azure_function/variables.tf | 20 +- .../azure_sql_database/output.tf | 4 +- .../azure_sql_database/variables.tf | 18 +- .../linked_services/cosmosdb/output.tf | 4 +- .../linked_services/cosmosdb/variables.tf | 24 +- .../data_lake_storage_gen2/output.tf | 4 +- .../data_lake_storage_gen2/variables.tf | 26 +-- .../linked_services/key_vault/output.tf | 4 +- .../linked_services/key_vault/variables.tf | 18 +- .../linked_services/mysql/output.tf | 4 +- .../linked_services/mysql/variables.tf | 18 +- .../linked_services/postgresql/output.tf | 4 +- .../linked_services/postgresql/variables.tf | 18 +- .../linked_services/sftp/output.tf | 4 +- .../linked_services/sftp/variables.tf | 26 +-- .../linked_services/sql_server/output.tf | 6 +- .../linked_services/sql_server/variables.tf | 18 +- .../linked_services/web/output.tf | 4 +- .../linked_services/web/variables.tf | 20 +- .../databases/app_config/dynamic_settings.tf | 14 +- .../app_config/local.dynamic_settings.tf | 8 +- modules/databases/app_config/output.tf | 6 +- .../app_config/settings/variables.tf | 20 +- modules/databases/app_config/variables.tf | 22 +- modules/databases/cosmos_dbs/README.md | 23 +- .../cosmos_dbs/cassandra_keyspace.tf | 4 +- .../cosmos_dbs/cassandra_keyspace/output.tf | 2 +- .../cassandra_keyspace/variables.tf | 10 +- .../databases/cosmos_dbs/gremlin_database.tf | 4 +- .../gremlin_database/gremlin_database.tf | 4 +- .../gremlin_graph/variables.tf | 10 +- .../cosmos_dbs/gremlin_database/output.tf | 2 +- .../cosmos_dbs/gremlin_database/variables.tf | 10 +- .../databases/cosmos_dbs/mongo_database.tf | 4 +- .../mongo_collection/variables.tf | 10 +- .../mongo_database/mongo_database.tf | 4 +- .../cosmos_dbs/mongo_database/output.tf | 2 +- .../cosmos_dbs/mongo_database/variables.tf | 8 +- modules/databases/cosmos_dbs/output.tf | 16 +- modules/databases/cosmos_dbs/sql_database.tf | 4 +- .../cosmos_dbs/sql_database/variables.tf | 10 +- modules/databases/cosmos_dbs/table.tf | 4 +- modules/databases/cosmos_dbs/table/output.tf | 2 +- .../databases/cosmos_dbs/table/variables.tf | 10 +- modules/databases/cosmos_dbs/variables.tf | 12 +- .../database_migration_service/variables.tf | 12 +- .../databases/mariadb_server/diagnostics.tf | 2 +- modules/databases/mariadb_server/output.tf | 8 +- .../mariadb_server/private_endpoints.tf | 2 +- modules/databases/mariadb_server/variables.tf | 34 +-- .../mssql_database/db_permissions.tf | 14 +- modules/databases/mssql_database/main.tf | 6 +- modules/databases/mssql_database/output.tf | 2 +- .../scripts/set_db_permissions.sql | 4 +- modules/databases/mssql_database/variables.tf | 20 +- .../databases/mssql_elastic_pool/output.tf | 2 +- .../databases/mssql_elastic_pool/variables.tf | 14 +- .../backup_ltr/arm_backup_ltr.json | 2 +- .../backup_ltr/variables.tf | 8 +- .../mssql_managed_database/output.tf | 4 +- .../mssql_managed_database/variables.tf | 16 +- .../administrator/variables.tf | 12 +- .../failover_group/variables.tf | 12 +- .../mssql_managed_instance/output.tf | 8 +- .../mssql_managed_instance/tde/mi_tde.tf | 2 +- .../tde/secondary/variables.tf | 4 +- .../mssql_managed_instance/tde/variables.tf | 10 +- .../mssql_managed_instance/variables.tf | 16 +- .../mssql_server/failover_group/variables.tf | 14 +- modules/databases/mssql_server/output.tf | 18 +- .../mssql_server/private_endpoints.tf | 2 +- modules/databases/mssql_server/variables.tf | 26 +-- modules/databases/mysql_server/diagnostics.tf | 2 +- modules/databases/mysql_server/output.tf | 12 +- .../mysql_server/private_endpoints.tf | 2 +- modules/databases/mysql_server/variables.tf | 36 +-- modules/databases/postgresql_server/output.tf | 12 +- .../postgresql_server/private_endpoint.tf | 2 +- .../databases/postgresql_server/variables.tf | 30 +-- modules/diagnostics/variables.tf | 10 +- modules/event_hubs/consumer_groups/output.tf | 2 +- .../event_hubs/consumer_groups/variables.tf | 12 +- modules/event_hubs/hubs/auth_rules.tf | 2 +- modules/event_hubs/hubs/auth_rules/output.tf | 14 +- .../event_hubs/hubs/auth_rules/variables.tf | 12 +- modules/event_hubs/hubs/output.tf | 6 +- modules/event_hubs/hubs/variables.tf | 14 +- modules/event_hubs/namespaces/README.md | 24 +- modules/event_hubs/namespaces/auth_rules.tf | 2 +- .../namespaces/auth_rules/output.tf | 10 +- .../namespaces/auth_rules/variables.tf | 10 +- modules/event_hubs/namespaces/event_hubs.tf | 2 +- modules/event_hubs/namespaces/output.tf | 8 +- modules/event_hubs/namespaces/variables.tf | 16 +- modules/log_analytics/output.tf | 10 +- modules/log_analytics/variables.tf | 10 +- modules/logic_app/action_custom/output.tf | 2 +- modules/logic_app/action_custom/variables.tf | 6 +- modules/logic_app/action_http/output.tf | 2 +- modules/logic_app/action_http/variables.tf | 14 +- .../logic_app/integration_account/output.tf | 2 +- .../integration_account/variables.tf | 14 +- .../integration_service_environment/output.tf | 10 +- .../variables.tf | 18 +- modules/logic_app/trigger_custom/output.tf | 2 +- modules/logic_app/trigger_custom/variables.tf | 6 +- .../logic_app/trigger_http_request/output.tf | 2 +- .../trigger_http_request/variables.tf | 10 +- .../logic_app/trigger_recurrence/module.tf | 2 +- .../logic_app/trigger_recurrence/output.tf | 2 +- .../logic_app/trigger_recurrence/variables.tf | 10 +- modules/logic_app/workflow/output.tf | 12 +- modules/logic_app/workflow/variables.tf | 24 +- modules/netapp/output.tf | 2 +- modules/netapp/pool/output.tf | 4 +- modules/netapp/pool/pool.tf | 2 +- modules/netapp/pool/variables.tf | 16 +- modules/netapp/pools.tf | 2 +- modules/netapp/variables.tf | 14 +- modules/netapp/volume/output.tf | 2 +- modules/netapp/volume/variables.tf | 16 +- .../application_gateway/diagnostics.tf | 2 +- .../networking/application_gateway/output.tf | 4 +- .../application_security_group/variables.tf | 10 +- modules/networking/dns_zone/output.tf | 2 +- modules/networking/dns_zone/records.tf | 2 +- modules/networking/dns_zone/records/output.tf | 18 +- .../networking/dns_zone/records/variables.tf | 14 +- modules/networking/dns_zone/variables.tf | 14 +- .../domain_name_registrations/variables.tf | 14 +- .../express_route_circuit/diagnostics.tf | 2 +- .../express_route_circuit/output.tf | 10 +- .../express_route_circuit/variables.tf | 12 +- .../output.tf | 6 +- .../variables.tf | 6 +- modules/networking/firewall/diagnostics.tf | 2 +- modules/networking/firewall/output.tf | 8 +- modules/networking/front_door/diagnostics.tf | 2 +- modules/networking/front_door/variables.tf | 22 +- .../front_door_waf_policy/variables.tf | 14 +- modules/networking/load_balancers/output.tf | 2 +- .../networking/load_balancers/variables.tf | 20 +- .../local_network_gateways/output.tf | 2 +- .../local_network_gateways/variables.tf | 12 +- .../network_security_group/diagnostics.tf | 2 +- .../network_security_group/module.tf | 2 +- .../network_security_group/variables.tf | 14 +- .../networking/network_watcher/variables.tf | 16 +- .../asg_associations.tf | 2 +- .../main.tf | 2 +- .../variables.tf | 22 +- modules/networking/private-dns/output.tf | 6 +- modules/networking/private-dns/variables.tf | 20 +- modules/networking/private_endpoint/output.tf | 6 +- .../private_endpoint/private_endpoint.tf | 2 +- .../networking/private_endpoint/variables.tf | 24 +- .../endpoints/private_endpoint/output.tf | 6 +- .../private_endpoint/private_endpoint.tf | 2 +- .../endpoints/private_endpoint/variables.tf | 24 +- .../endpoints/subnet/variables.tf | 22 +- .../private_links/endpoints/subnets.tf | 2 +- .../private_links/endpoints/variables.tf | 20 +- .../public_ip_addresses/diagnostics.tf | 2 +- .../networking/public_ip_addresses/output.tf | 6 +- .../public_ip_addresses/variables.tf | 32 +-- modules/networking/route_tables/output.tf | 4 +- modules/networking/route_tables/variables.tf | 16 +- modules/networking/routes/output.tf | 2 +- modules/networking/routes/variables.tf | 16 +- .../networking/virtual_network/diagnostics.tf | 2 +- .../virtual_network/nsg/diagnostics.tf | 2 +- .../nsg/flow_logs/variables.tf | 12 +- .../networking/virtual_network/nsg/module.tf | 32 +-- .../virtual_network/nsg/nsg_flow_logs.tf | 2 +- .../virtual_network/nsg/variables.tf | 24 +- modules/networking/virtual_network/output.tf | 12 +- .../virtual_network/subnet/output.tf | 6 +- .../virtual_network/subnet/variables.tf | 18 +- .../networking/virtual_network/variables.tf | 30 +-- .../output.tf | 2 +- .../variables.tf | 24 +- .../virtual_network_gateways/output.tf | 2 +- .../virtual_network_gateways/variables.tf | 20 +- modules/networking/virtual_wan/variables.tf | 16 +- .../virtual_wan/virtual_hub/variables.tf | 2 +- modules/networking/virtual_wan/virtual_wan.tf | 6 +- modules/recovery_vault/diagnostics.tf | 2 +- modules/recovery_vault/outputs.tf | 2 +- modules/recovery_vault/private_endpoints.tf | 2 +- modules/recovery_vault/variables.tf | 26 +-- modules/redis_cache/variables.tf | 16 +- modules/resource_group/output.tf | 10 +- modules/resource_group/variables.tf | 10 +- modules/roles/custom_roles/output.tf | 4 +- modules/roles/custom_roles/variables.tf | 6 +- .../role_assignment/assignment/variables.tf | 16 +- modules/roles/role_assignment/module.tf | 2 +- modules/roles/role_assignment/variables.tf | 18 +- .../security/disk_encryption_set/output.tf | 8 +- .../security/disk_encryption_set/variables.tf | 14 +- .../dynamic_keyvault_secrets/keyvault.tf | 6 +- .../secret/variables.tf | 6 +- .../secret_immutable/variables.tf | 6 +- .../dynamic_keyvault_secrets/variables.tf | 6 +- modules/security/keyvault/diagnostics.tf | 2 +- .../keyvault/examples/101-simple/variables.tf | 6 +- .../examples/102-with-networking/variables.tf | 10 +- modules/security/keyvault/output.tf | 10 +- .../security/keyvault/private_endpoints.tf | 2 +- modules/security/keyvault/variables.tf | 22 +- .../access_policy/variables.tf | 8 +- .../keyvault_access_policies/policies.tf | 18 +- .../keyvault_access_policies/variables.tf | 16 +- .../security/keyvault_certificate/output.tf | 12 +- .../keyvault_certificate/variables.tf | 4 +- .../keyvault_certificate_issuer/output.tf | 4 +- .../keyvault_certificate_issuer/variables.tf | 24 +- .../keyvault_certificate_request/module.tf | 4 +- .../keyvault_certificate_request/output.tf | 14 +- .../scripts/GlobalSign_cancel_orders.sh | 2 +- .../keyvault_certificate_request/variables.tf | 8 +- modules/security/keyvault_key/output.tf | 4 +- modules/security/keyvault_key/variables.tf | 10 +- modules/security/managed_identity/output.tf | 10 +- .../security/managed_identity/variables.tf | 14 +- .../image_definitions/output.tf | 2 +- .../image_definitions/variables.tf | 16 +- .../image_galleries/output.tf | 2 +- .../image_galleries/variables.tf | 14 +- .../packer_service_principal/variables.tf | 22 +- modules/storage_account/blob/output.tf | 4 +- modules/storage_account/blob/variables.tf | 6 +- modules/storage_account/container/output.tf | 4 +- .../storage_account/container/storage_blob.tf | 2 +- .../storage_account/container/variables.tf | 4 +- .../data_lake_filesystem/output.tf | 2 +- .../data_lake_filesystem/variables.tf | 4 +- modules/storage_account/output.tf | 22 +- modules/storage_account/private_endpoint.tf | 2 +- modules/storage_account/storage_account.tf | 4 +- modules/storage_account/variables.tf | 22 +- .../billing_role_assignment.tf | 6 +- .../billing_role_assignment.tf | 4 +- .../role_assignment/variables.tf | 12 +- .../variables.tf | 10 +- modules/subscriptions/README.md | 2 +- modules/subscriptions/diagnostics.tf | 2 +- modules/subscriptions/output.tf | 6 +- .../scripts/refresh_access_token.sh | 4 +- modules/subscriptions/variables.tf | 10 +- .../appservice/locals.dynamic_app_settings.tf | 8 +- modules/webapps/appservice/module.tf | 2 +- modules/webapps/appservice/output.tf | 8 +- modules/webapps/appservice/variables.tf | 36 +-- modules/webapps/ase/diagnostic.tf | 2 +- modules/webapps/ase/output.tf | 12 +- modules/webapps/ase/variables.tf | 36 +-- modules/webapps/asp/output.tf | 6 +- modules/webapps/asp/variables.tf | 18 +- .../locals.dynamic_app_settings.tf | 8 +- modules/webapps/function_app/module.tf | 28 +-- modules/webapps/function_app/output.tf | 6 +- modules/webapps/function_app/variables.tf | 36 +-- monitoring.tf | 2 +- mssql_databases.tf | 18 +- mssql_elastic_pools.tf | 2 +- mssql_servers.tf | 2 +- msssql_managed_databases.tf | 2 +- msssql_managed_instances.tf | 4 +- mysql_servers.tf | 2 +- network_security_groups.tf | 2 +- networking.tf | 6 +- networking_dns_zones.tf | 8 +- networking_domain_name_registrations.tf | 4 +- networking_express_route.tf | 8 +- networking_private_links.tf | 2 +- networking_virtual_wan.tf | 4 +- networking_vngw.tf | 6 +- output.tf | 4 +- postgresql_servers.tf | 2 +- proximity_placement_groups.tf | 4 +- recovery_vaults.tf | 4 +- resource_groups.tf | 4 +- roles.tf | 2 +- shared_image_gallery.tf | 6 +- storage_account_blobs.tf | 2 +- storage_accounts.tf | 2 +- subscriptions.tf | 16 +- synapses.tf | 4 +- variables.tf | 30 +-- virtual_machines.tf | 4 +- 522 files changed, 3327 insertions(+), 3290 deletions(-) diff --git a/.github/workflows/master-100-tf13.yaml b/.github/workflows/master-100-tf13.yaml index 87ebb1e437..1e5d265049 100755 --- a/.github/workflows/master-100-tf13.yaml +++ b/.github/workflows/master-100-tf13.yaml @@ -200,7 +200,7 @@ jobs: steps: - uses: actions/checkout@v2 - + - name: Login azure run: | az login --service-principal -u '${{ env.ARM_CLIENT_ID }}' -p '${{ env.ARM_CLIENT_SECRET }}' --tenant '${{ env.ARM_TENANT_ID }}' diff --git a/.github/workflows/master-standalone-tf14.yaml b/.github/workflows/master-standalone-tf14.yaml index 0e7c8fffdb..969fb78407 100755 --- a/.github/workflows/master-standalone-tf14.yaml +++ b/.github/workflows/master-standalone-tf14.yaml @@ -110,7 +110,7 @@ jobs: "recovery_vault/103-asr-with-private-endpoint", "redis_cache/100-redis-standard", "storage_accounts/100-simple-storage-account-blob-container", - "storage_accounts/102-storage-account-advanced-options", + "storage_accounts/102-storage-account-advanced-options", "synapse_analytics/100-synapse", "synapse_analytics/101-synapse-sparkpool", "webapps/appservice/101-appservice-simple", diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9fcdeafca6..29ec618206 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: hooks: - id: check-merge-conflict - id: trailing-whitespace - - id: check-yaml + # - id: check-yaml - id: check-added-large-files - id: detect-private-key # - repo: git://github.com/markdownlint/markdownlint diff --git a/aks_clusters.tf b/aks_clusters.tf index 48150c11ff..ee40eb5c62 100755 --- a/aks_clusters.tf +++ b/aks_clusters.tf @@ -1,8 +1,8 @@ -output aks_clusters { +output "aks_clusters" { value = module.aks_clusters } -module aks_clusters { +module "aks_clusters" { source = "./modules/compute/aks" depends_on = [module.networking] for_each = local.compute.aks_clusters diff --git a/app_config.tf b/app_config.tf index 4e8135e439..0559e3df73 100644 --- a/app_config.tf +++ b/app_config.tf @@ -1,4 +1,4 @@ -module app_config { +module "app_config" { source = "./modules/databases/app_config" for_each = local.database.app_config name = each.value.name @@ -13,6 +13,6 @@ module app_config { tags = try(each.value.tags, {}) } -output app_config { - value = module.app_config +output "app_config" { + value = module.app_config } \ No newline at end of file diff --git a/app_service_plans.tf b/app_service_plans.tf index e6d8592b84..99534871fa 100755 --- a/app_service_plans.tf +++ b/app_service_plans.tf @@ -14,7 +14,7 @@ module "app_service_plans" { global_settings = local.global_settings } -output app_service_plans { +output "app_service_plans" { value = module.app_service_plans } diff --git a/application_security_groups.tf b/application_security_groups.tf index d206145623..44691dbcdf 100644 --- a/application_security_groups.tf +++ b/application_security_groups.tf @@ -1,17 +1,17 @@ -module application_security_groups { +module "application_security_groups" { source = "./modules/networking/application_security_group" - + for_each = local.networking.application_security_groups - + settings = each.value global_settings = local.global_settings resource_group_name = module.resource_groups[each.value.resource_group_key].name base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} location = lookup(each.value, "region", null) == null ? module.resource_groups[each.value.resource_group_key].location : local.global_settings.regions[each.value.region] - + } -output application_security_groups { +output "application_security_groups" { value = module.application_security_groups } diff --git a/automations.tf b/automations.tf index 1f5b828055..d040f68153 100644 --- a/automations.tf +++ b/automations.tf @@ -1,5 +1,5 @@ -module automations { +module "automations" { source = "./modules/automation" for_each = local.shared_services.automations @@ -11,7 +11,7 @@ module automations { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -output automations { +output "automations" { value = module.automations } diff --git a/availability_sets.tf b/availability_sets.tf index 7e01699a16..384585ceec 100644 --- a/availability_sets.tf +++ b/availability_sets.tf @@ -1,4 +1,4 @@ -module availability_sets { +module "availability_sets" { source = "./modules/compute/availability_set" for_each = local.compute.availability_sets @@ -17,7 +17,7 @@ module availability_sets { -output availability_sets { +output "availability_sets" { value = module.availability_sets } \ No newline at end of file diff --git a/azuread.tf b/azuread.tf index cd642434c3..08c3a03452 100755 --- a/azuread.tf +++ b/azuread.tf @@ -2,7 +2,7 @@ # Azure Active Directory Applications # -module azuread_applications { +module "azuread_applications" { source = "./modules/azuread/applications" depends_on = [module.keyvault_access_policies] for_each = var.azuread_apps @@ -15,7 +15,7 @@ module azuread_applications { user_type = var.user_type } -output aad_apps { +output "aad_apps" { value = module.azuread_applications } @@ -24,7 +24,7 @@ output aad_apps { # Azure Active Directory Groups # -module azuread_groups { +module "azuread_groups" { source = "./modules/azuread/groups" for_each = var.azuread_groups @@ -33,12 +33,12 @@ module azuread_groups { tenant_id = local.client_config.tenant_id } -output azuread_groups { +output "azuread_groups" { value = module.azuread_groups } -module azuread_groups_members { +module "azuread_groups_members" { source = "./modules/azuread/groups_members" for_each = var.azuread_groups @@ -52,7 +52,7 @@ module azuread_groups_members { # Azure Active Directory Users # -module azuread_users { +module "azuread_users" { source = "./modules/azuread/users" depends_on = [module.keyvault_access_policies] for_each = var.azuread_users @@ -63,7 +63,7 @@ module azuread_users { settings = each.value } -output azuread_users { +output "azuread_users" { value = module.azuread_users } \ No newline at end of file diff --git a/azuread_roles.tf b/azuread_roles.tf index 00367b3516..18f63152b5 100644 --- a/azuread_roles.tf +++ b/azuread_roles.tf @@ -1,5 +1,5 @@ -module azuread_roles_applications { +module "azuread_roles_applications" { source = "./modules/azuread/roles" for_each = try(var.azuread_roles.azuread_apps, {}) @@ -7,7 +7,7 @@ module azuread_roles_applications { azuread_roles = each.value.roles } -module azuread_roles_msi { +module "azuread_roles_msi" { source = "./modules/azuread/roles" for_each = try(var.azuread_roles.managed_identities, {}) @@ -15,7 +15,7 @@ module azuread_roles_msi { azuread_roles = each.value.roles } -module azuread_roles_sql_mi { +module "azuread_roles_sql_mi" { source = "./modules/azuread/roles" for_each = try(var.azuread_roles.mssql_managed_instances, {}) @@ -23,7 +23,7 @@ module azuread_roles_sql_mi { azuread_roles = each.value.roles } -module azuread_roles_sql_mi_secondary { +module "azuread_roles_sql_mi_secondary" { source = "./modules/azuread/roles" for_each = try(var.azuread_roles.mssql_managed_instances_secondary, {}) @@ -31,7 +31,7 @@ module azuread_roles_sql_mi_secondary { azuread_roles = each.value.roles } -module azuread_roles_mssql_server { +module "azuread_roles_mssql_server" { source = "./modules/azuread/roles" for_each = try(var.azuread_roles.mssql_servers, {}) diff --git a/azurerm_application_insights.tf b/azurerm_application_insights.tf index 3ffa226e70..c1801a4f94 100755 --- a/azurerm_application_insights.tf +++ b/azurerm_application_insights.tf @@ -17,6 +17,6 @@ module "azurerm_application_insights" { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -output application_insights { - value = module.azurerm_application_insights +output "application_insights" { + value = module.azurerm_application_insights } \ No newline at end of file diff --git a/bastion_service.tf b/bastion_service.tf index 22d470dbb6..a246e6551d 100755 --- a/bastion_service.tf +++ b/bastion_service.tf @@ -33,7 +33,7 @@ resource "azurerm_bastion_host" "host" { } } -module bastion_host_diagnostics { +module "bastion_host_diagnostics" { source = "./modules/diagnostics" for_each = try(local.compute.bastion_hosts, {}) diff --git a/container_groups.tf b/container_groups.tf index 6a3d348e55..b3cea9d4ae 100644 --- a/container_groups.tf +++ b/container_groups.tf @@ -1,4 +1,4 @@ -module container_groups { +module "container_groups" { source = "./modules/compute/container_group" for_each = local.compute.container_groups @@ -20,7 +20,7 @@ module container_groups { } } -output container_groups { +output "container_groups" { value = module.container_groups } diff --git a/container_registry.tf b/container_registry.tf index 2858fd3fea..a0c16da3e2 100755 --- a/container_registry.tf +++ b/container_registry.tf @@ -1,4 +1,4 @@ -module container_registry { +module "container_registry" { source = "./modules/compute/container_registry" for_each = local.compute.azure_container_registries @@ -21,7 +21,7 @@ module container_registry { private_dns = local.combined_objects_private_dns } -output azure_container_registries { +output "azure_container_registries" { value = module.container_registry } diff --git a/cosmos_db.tf b/cosmos_db.tf index ed5e489862..5cd7635e6d 100644 --- a/cosmos_db.tf +++ b/cosmos_db.tf @@ -1,4 +1,4 @@ -module cosmos_dbs { +module "cosmos_dbs" { source = "./modules/databases/cosmos_dbs" for_each = local.database.cosmos_dbs @@ -9,6 +9,6 @@ module cosmos_dbs { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -output cosmos_dbs { - value = module.cosmos_dbs +output "cosmos_dbs" { + value = module.cosmos_dbs } \ No newline at end of file diff --git a/databricks.tf b/databricks.tf index 444a40c2c3..da4c62e111 100644 --- a/databricks.tf +++ b/databricks.tf @@ -1,4 +1,4 @@ -module databricks_workspaces { +module "databricks_workspaces" { source = "./modules/analytics/databricks_workspace" for_each = local.database.databricks_workspaces @@ -11,7 +11,7 @@ module databricks_workspaces { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -output databricks_workspaces { +output "databricks_workspaces" { value = module.databricks_workspaces } diff --git a/diagnostics.tf b/diagnostics.tf index 307f1b79ae..9524a8709c 100644 --- a/diagnostics.tf +++ b/diagnostics.tf @@ -17,12 +17,12 @@ locals { } # Output diagnostics -output diagnostics { +output "diagnostics" { value = local.combined_diagnostics } -module diagnostic_storage_accounts { +module "diagnostic_storage_accounts" { source = "./modules/storage_account" for_each = local.diagnostics.diagnostic_storage_accounts @@ -46,7 +46,7 @@ module "diagnostic_event_hub_namespaces" { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -module diagnostic_event_hub_namespaces_diagnostics { +module "diagnostic_event_hub_namespaces_diagnostics" { source = "./modules/diagnostics" for_each = local.diagnostics.diagnostic_event_hub_namespaces @@ -66,7 +66,7 @@ module "diagnostic_log_analytics" { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -module diagnostic_log_analytics_diagnostics { +module "diagnostic_log_analytics_diagnostics" { source = "./modules/diagnostics" for_each = local.diagnostics.diagnostic_log_analytics diff --git a/disk_encryption_sets.tf b/disk_encryption_sets.tf index 1f2b6b5b9b..52d6e4d98e 100644 --- a/disk_encryption_sets.tf +++ b/disk_encryption_sets.tf @@ -11,6 +11,6 @@ module "disk_encryption_sets" { keyvault_id = local.combined_objects_keyvaults[try(each.value.keyvault.lz_key, local.client_config.landingzone_key)][each.value.keyvault.key].id } -output disk_encryption_sets { +output "disk_encryption_sets" { value = module.disk_encryption_sets } diff --git a/dynamic_secrets.tf b/dynamic_secrets.tf index 7c57c81450..612f944206 100644 --- a/dynamic_secrets.tf +++ b/dynamic_secrets.tf @@ -3,7 +3,7 @@ # For that reason, object must not be set. # This is only used here for examples to run # the normal recommendation for dynamic keyvault secrets is to call it from a landingzone -module dynamic_keyvault_secrets { +module "dynamic_keyvault_secrets" { source = "./modules/security/dynamic_keyvault_secrets" depends_on = [module.keyvaults] for_each = try(var.security.dynamic_keyvault_secrets, {}) @@ -12,6 +12,6 @@ module dynamic_keyvault_secrets { keyvault = local.combined_objects_keyvaults[local.client_config.landingzone_key][each.key] } -output dynamic_keyvault_secrets { +output "dynamic_keyvault_secrets" { value = module.dynamic_keyvault_secrets } \ No newline at end of file diff --git a/event_hubs.tf b/event_hubs.tf index bbdbd55b54..cd3e488d68 100644 --- a/event_hubs.tf +++ b/event_hubs.tf @@ -12,7 +12,7 @@ module "event_hub_namespaces" { base_tags = try(local.global_settings.inherit_tags, false) ? local.combined_objects_resource_groups[try(each.value.resource_group.lz_key, local.client_config.landingzone_key)][each.value.resource_group.key].tags : {} } -module event_hub_namespace_auth_rules { +module "event_hub_namespace_auth_rules" { source = "./modules/event_hubs/namespaces/auth_rules" for_each = try(var.event_hub_namespace_auth_rules, {}) @@ -27,7 +27,7 @@ module event_hub_namespace_auth_rules { ] } -module event_hub_namespaces_diagnostics { +module "event_hub_namespaces_diagnostics" { source = "./modules/diagnostics" for_each = var.event_hub_namespaces @@ -42,7 +42,7 @@ module event_hub_namespaces_diagnostics { # private endpoint to be done at the root module to prevent circular references # -module event_hub_namespaces_private_endpoints { +module "event_hub_namespaces_private_endpoints" { depends_on = [module.event_hub_namespaces] source = "./modules/networking/private_endpoint" for_each = local.event_hub_namespaces_private_endpoints @@ -82,7 +82,7 @@ locals { } -module event_hubs { +module "event_hubs" { source = "./modules/event_hubs/hubs" depends_on = [module.event_hub_namespaces] for_each = try(var.event_hubs, {}) @@ -96,7 +96,7 @@ module event_hubs { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -module event_hub_auth_rules { +module "event_hub_auth_rules" { source = "./modules/event_hubs/hubs/auth_rules" for_each = try(var.event_hub_auth_rules, {}) @@ -113,7 +113,7 @@ module event_hub_auth_rules { ] } -module event_hub_consumer_groups { +module "event_hub_consumer_groups" { source = "./modules/event_hubs/consumer_groups" for_each = try(var.event_hub_consumer_groups, {}) diff --git a/examples/app_gateway/100-simple-app-gateway/standalone/variables.tf b/examples/app_gateway/100-simple-app-gateway/standalone/variables.tf index 68f68adf5c..7a7c73f96d 100644 --- a/examples/app_gateway/100-simple-app-gateway/standalone/variables.tf +++ b/examples/app_gateway/100-simple-app-gateway/standalone/variables.tf @@ -1,37 +1,37 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/app_gateway/101-private-public/standalone/variables.tf b/examples/app_gateway/101-private-public/standalone/variables.tf index 3a0c76e1a2..aaacab7898 100644 --- a/examples/app_gateway/101-private-public/standalone/variables.tf +++ b/examples/app_gateway/101-private-public/standalone/variables.tf @@ -1,36 +1,36 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/app_gateway/210-agw-with-keyvault/standalone/variables.tf b/examples/app_gateway/210-agw-with-keyvault/standalone/variables.tf index d2c6c2d58f..8b1f76e0a1 100644 --- a/examples/app_gateway/210-agw-with-keyvault/standalone/variables.tf +++ b/examples/app_gateway/210-agw-with-keyvault/standalone/variables.tf @@ -1,78 +1,78 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_environments { +variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable keyvault_certificates { +variable "keyvault_certificates" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } \ No newline at end of file diff --git a/examples/app_insights/100-all-attributes/standalone/variables.tf b/examples/app_insights/100-all-attributes/standalone/variables.tf index 69c465b323..9b5b135c15 100644 --- a/examples/app_insights/100-all-attributes/standalone/variables.tf +++ b/examples/app_insights/100-all-attributes/standalone/variables.tf @@ -1,20 +1,20 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/app_insights/100-simple/standalone/variables.tf b/examples/app_insights/100-simple/standalone/variables.tf index 69c465b323..9b5b135c15 100644 --- a/examples/app_insights/100-simple/standalone/variables.tf +++ b/examples/app_insights/100-simple/standalone/variables.tf @@ -1,20 +1,20 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/automation/100-simple-automation-account/standalone/variables.tf b/examples/automation/100-simple-automation-account/standalone/variables.tf index a722beb4fa..7a41f0f04f 100644 --- a/examples/automation/100-simple-automation-account/standalone/variables.tf +++ b/examples/automation/100-simple-automation-account/standalone/variables.tf @@ -1,20 +1,20 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable automations { +variable "automations" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/variables.tf b/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/variables.tf index c088adcd5b..c880cb8931 100644 --- a/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/variables.tf +++ b/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/variables.tf @@ -1,45 +1,45 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable keyvaults { +variable "keyvaults" { default = {} } -variable azuread_apps { +variable "azuread_apps" { default = {} } -variable azuread_users { +variable "azuread_users" { default = {} } -variable azuread_roles { +variable "azuread_roles" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable keyvault_access_policies_azuread_apps { +variable "keyvault_access_policies_azuread_apps" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/azure_ad/101-service-principle-with-custom-roles/standalone/variables.tf b/examples/azure_ad/101-service-principle-with-custom-roles/standalone/variables.tf index 9b315f23af..2733051378 100644 --- a/examples/azure_ad/101-service-principle-with-custom-roles/standalone/variables.tf +++ b/examples/azure_ad/101-service-principle-with-custom-roles/standalone/variables.tf @@ -1,48 +1,48 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable keyvaults { +variable "keyvaults" { default = {} } -variable azuread_apps { +variable "azuread_apps" { default = {} } -variable azuread_users { +variable "azuread_users" { default = {} } -variable azuread_roles { +variable "azuread_roles" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable keyvault_access_policies_azuread_apps { +variable "keyvault_access_policies_azuread_apps" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable custom_role_definitions { +variable "custom_role_definitions" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/azure_ad/102-password-rotation/README.md b/examples/azure_ad/102-password-rotation/README.md index 9f2181df27..702fe51872 100644 --- a/examples/azure_ad/102-password-rotation/README.md +++ b/examples/azure_ad/102-password-rotation/README.md @@ -3,7 +3,7 @@ You can test this module outside of a landingzone using ```bash cd /tf/caf/examples/azure_ad/102-password-rotation -# Replace the ci number to identify +# Replace the ci number to identify ./standalone/ci.sh 32321321 ``` diff --git a/examples/azure_ad/102-password-rotation/standalone/variables.tf b/examples/azure_ad/102-password-rotation/standalone/variables.tf index c088adcd5b..c880cb8931 100644 --- a/examples/azure_ad/102-password-rotation/standalone/variables.tf +++ b/examples/azure_ad/102-password-rotation/standalone/variables.tf @@ -1,45 +1,45 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable keyvaults { +variable "keyvaults" { default = {} } -variable azuread_apps { +variable "azuread_apps" { default = {} } -variable azuread_users { +variable "azuread_users" { default = {} } -variable azuread_roles { +variable "azuread_roles" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable keyvault_access_policies_azuread_apps { +variable "keyvault_access_policies_azuread_apps" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/azure_ad/201-groups-and-roles/standalone/variables.tf b/examples/azure_ad/201-groups-and-roles/standalone/variables.tf index 79ae301bba..d8e58e484d 100644 --- a/examples/azure_ad/201-groups-and-roles/standalone/variables.tf +++ b/examples/azure_ad/201-groups-and-roles/standalone/variables.tf @@ -1,52 +1,52 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable keyvaults { +variable "keyvaults" { default = {} } -variable azuread_apps { +variable "azuread_apps" { default = {} } -variable azuread_users { +variable "azuread_users" { default = {} } -variable azuread_roles { +variable "azuread_roles" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable keyvault_access_policies_azuread_apps { +variable "keyvault_access_policies_azuread_apps" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable custom_role_definitions { +variable "custom_role_definitions" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/compute/availability_set/100-simple-availabilityset/readme.md b/examples/compute/availability_set/100-simple-availabilityset/readme.md index d8edfbb241..31fe74e769 100644 --- a/examples/compute/availability_set/100-simple-availabilityset/readme.md +++ b/examples/compute/availability_set/100-simple-availabilityset/readme.md @@ -9,7 +9,7 @@ cd /tf/caf/landingzones/caf_example terraform init eval terraform plan ${parameter_files} \ - -var var_folder_path="${configuration_folder}" + -var var_folder_path="${configuration_folder}" ``` diff --git a/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/variables.tf b/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/variables.tf index 7874159c37..3f4073fe7b 100644 --- a/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/variables.tf +++ b/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/variables.tf @@ -1,36 +1,36 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable availability_sets { +variable "availability_sets" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable proximity_placement_groups { +variable "proximity_placement_groups" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/compute/container_registry/100-simple-acr/standalone/variables.tf b/examples/compute/container_registry/100-simple-acr/standalone/variables.tf index ec35c79b9a..d39e53bdca 100644 --- a/examples/compute/container_registry/100-simple-acr/standalone/variables.tf +++ b/examples/compute/container_registry/100-simple-acr/standalone/variables.tf @@ -1,20 +1,20 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable azure_container_registries { +variable "azure_container_registries" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/compute/container_registry/200-acr-private-link/standalone/variables.tf b/examples/compute/container_registry/200-acr-private-link/standalone/variables.tf index bfd4c3dbd2..f4546657b7 100644 --- a/examples/compute/container_registry/200-acr-private-link/standalone/variables.tf +++ b/examples/compute/container_registry/200-acr-private-link/standalone/variables.tf @@ -1,32 +1,32 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable azure_container_registries { +variable "azure_container_registries" { default = {} } -variable log_analytics { +variable "log_analytics" { default = {} } -variable diagnostics_destinations { +variable "diagnostics_destinations" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/compute/kubernetes_services/101-single-cluster/standalone/output.tf b/examples/compute/kubernetes_services/101-single-cluster/standalone/output.tf index 81823e976c..99cf7b5c6f 100644 --- a/examples/compute/kubernetes_services/101-single-cluster/standalone/output.tf +++ b/examples/compute/kubernetes_services/101-single-cluster/standalone/output.tf @@ -1,4 +1,4 @@ -output aks_clusters_kubeconfig { +output "aks_clusters_kubeconfig" { value = { for key, aks_cluster in module.caf.aks_clusters : key => { aks_kubeconfig_cmd = aks_cluster.aks_kubeconfig_cmd @@ -8,7 +8,7 @@ output aks_clusters_kubeconfig { sensitive = false } -output aks_clusters { +output "aks_clusters" { value = module.caf.aks_clusters sensitive = false } diff --git a/examples/compute/kubernetes_services/101-single-cluster/standalone/variables.tf b/examples/compute/kubernetes_services/101-single-cluster/standalone/variables.tf index 8c66f27921..4c353fb79d 100644 --- a/examples/compute/kubernetes_services/101-single-cluster/standalone/variables.tf +++ b/examples/compute/kubernetes_services/101-single-cluster/standalone/variables.tf @@ -1,36 +1,36 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable diagnostic_log_analytics { +variable "diagnostic_log_analytics" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/compute/kubernetes_services/102-multi-nodepools/standalone/output.tf b/examples/compute/kubernetes_services/102-multi-nodepools/standalone/output.tf index 81823e976c..99cf7b5c6f 100644 --- a/examples/compute/kubernetes_services/102-multi-nodepools/standalone/output.tf +++ b/examples/compute/kubernetes_services/102-multi-nodepools/standalone/output.tf @@ -1,4 +1,4 @@ -output aks_clusters_kubeconfig { +output "aks_clusters_kubeconfig" { value = { for key, aks_cluster in module.caf.aks_clusters : key => { aks_kubeconfig_cmd = aks_cluster.aks_kubeconfig_cmd @@ -8,7 +8,7 @@ output aks_clusters_kubeconfig { sensitive = false } -output aks_clusters { +output "aks_clusters" { value = module.caf.aks_clusters sensitive = false } diff --git a/examples/compute/kubernetes_services/102-multi-nodepools/standalone/variables.tf b/examples/compute/kubernetes_services/102-multi-nodepools/standalone/variables.tf index 6c3e7f6dc3..74a85e1cee 100644 --- a/examples/compute/kubernetes_services/102-multi-nodepools/standalone/variables.tf +++ b/examples/compute/kubernetes_services/102-multi-nodepools/standalone/variables.tf @@ -1,44 +1,44 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable role_mapping { +variable "role_mapping" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable azure_container_registries { +variable "azure_container_registries" { default = {} } -variable diagnostic_log_analytics { +variable "diagnostic_log_analytics" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/compute/proximity_placement_group/standalone/variables.tf b/examples/compute/proximity_placement_group/standalone/variables.tf index 09d5d81cab..7b52652d8e 100644 --- a/examples/compute/proximity_placement_group/standalone/variables.tf +++ b/examples/compute/proximity_placement_group/standalone/variables.tf @@ -1,32 +1,32 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable proximity_placement_groups { +variable "proximity_placement_groups" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/compute/virtual_machine/100-single-linux-vm/configuration.tfvars b/examples/compute/virtual_machine/100-single-linux-vm/configuration.tfvars index 0cd7d345c7..f71d613f54 100644 --- a/examples/compute/virtual_machine/100-single-linux-vm/configuration.tfvars +++ b/examples/compute/virtual_machine/100-single-linux-vm/configuration.tfvars @@ -48,7 +48,7 @@ virtual_machines = { disable_password_authentication = true #custom_data = "scripts/cloud-init/install-rover-tools.config" - custom_data = "../../examples/compute/virtual_machine/100-single-linux-vm/scripts/cloud-init/install-rover-tools.config" + custom_data = "../../examples/compute/virtual_machine/100-single-linux-vm/scripts/cloud-init/install-rover-tools.config" # Spot VM to save money priority = "Spot" @@ -140,7 +140,7 @@ disk_encryption_sets = { name = "deskey1" resource_group_key = "vm_region1" key_vault_key_key = "key1" - keyvault = { + keyvault = { key = "example_vm_rg1" } } diff --git a/examples/compute/virtual_machine/101-single-windows-vm/standalone/readme.md b/examples/compute/virtual_machine/101-single-windows-vm/standalone/readme.md index 291519e547..544ecdea63 100644 --- a/examples/compute/virtual_machine/101-single-windows-vm/standalone/readme.md +++ b/examples/compute/virtual_machine/101-single-windows-vm/standalone/readme.md @@ -19,6 +19,6 @@ rover \ -lz /tf/caf/landingzones/caf_example \ -var-folder /tf/caf/examples/compute/virtual_machine/101-single-windows-vm/ \ -level level1 \ - -a [plan | apply | destroy ] + -a [plan | apply | destroy ] ``` \ No newline at end of file diff --git a/examples/compute/virtual_machine/102-single-vm-data-disks/standalone/readme.md b/examples/compute/virtual_machine/102-single-vm-data-disks/standalone/readme.md index f86fecd9dc..5da85d781e 100644 --- a/examples/compute/virtual_machine/102-single-vm-data-disks/standalone/readme.md +++ b/examples/compute/virtual_machine/102-single-vm-data-disks/standalone/readme.md @@ -19,6 +19,6 @@ rover \ -lz /tf/caf/landingzones/caf_example \ -var-folder /tf/caf/examples/compute/virtual_machine/102-single-vm-data-disks/ \ -level level1 \ - -a [plan | apply | destroy ] + -a [plan | apply | destroy ] ``` \ No newline at end of file diff --git a/examples/compute/virtual_machine/104-single-windows-backup/standalone/readme.md b/examples/compute/virtual_machine/104-single-windows-backup/standalone/readme.md index 0b1ea8e6c7..54689922f0 100644 --- a/examples/compute/virtual_machine/104-single-windows-backup/standalone/readme.md +++ b/examples/compute/virtual_machine/104-single-windows-backup/standalone/readme.md @@ -19,6 +19,6 @@ rover \ -lz /tf/caf/landingzones/caf_example \ -var-folder /tf/caf/examples/compute/virtual_machine/104-single-windows-backup/ \ -level level1 \ - -a [plan | apply | destroy ] + -a [plan | apply | destroy ] ``` \ No newline at end of file diff --git a/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/configuration.tfvars b/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/configuration.tfvars index 3915ec4bde..f12b225073 100644 --- a/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/configuration.tfvars +++ b/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/configuration.tfvars @@ -204,7 +204,7 @@ disk_encryption_sets = { name = "deskey1" resource_group_key = "vm_region1" key_vault_key_key = "key1" - keyvault = { + keyvault = { key = "example_vm_rg1" } } diff --git a/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/variables.tf b/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/variables.tf index ab3a52287a..4d6d68ee41 100644 --- a/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/variables.tf +++ b/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/variables.tf @@ -110,9 +110,9 @@ variable "application_gateway_applications" { variable "dynamic_keyvault_secrets" { default = {} } -variable disk_encryption_sets { +variable "disk_encryption_sets" { default = {} } -variable keyvault_keys { +variable "keyvault_keys" { default = {} } \ No newline at end of file diff --git a/examples/compute/virtual_machine/210-vm-bastion-winrm/nsg_definitions.tfvars b/examples/compute/virtual_machine/210-vm-bastion-winrm/nsg_definitions.tfvars index 6e4e04cc1f..5c75dc6450 100644 --- a/examples/compute/virtual_machine/210-vm-bastion-winrm/nsg_definitions.tfvars +++ b/examples/compute/virtual_machine/210-vm-bastion-winrm/nsg_definitions.tfvars @@ -1,14 +1,14 @@ application_security_groups = { bastion = { - name = "bastionappsecgw1" + name = "bastionappsecgw1" resource_group_key = "vm_region1" - + } app_server = { - name = "appserverappsecgw1" + name = "appserverappsecgw1" resource_group_key = "vm_region1" - + } } @@ -51,13 +51,13 @@ network_security_group_definition = { nsg = [ { - name = "winrm", - priority = "200" - direction = "Inbound" - access = "Allow" - protocol = "tcp" - source_port_range = "*" - destination_port_range = "5985" + name = "winrm", + priority = "200" + direction = "Inbound" + access = "Allow" + protocol = "tcp" + source_port_range = "*" + destination_port_range = "5985" source_application_security_groups = { keys = ["bastion"] } @@ -66,13 +66,13 @@ network_security_group_definition = { } }, { - name = "winrms", - priority = "201" - direction = "Inbound" - access = "Allow" - protocol = "tcp" - source_port_range = "*" - destination_port_range = "5986" + name = "winrms", + priority = "201" + direction = "Inbound" + access = "Allow" + protocol = "tcp" + source_port_range = "*" + destination_port_range = "5986" source_application_security_groups = { keys = ["bastion"] } @@ -81,13 +81,13 @@ network_security_group_definition = { } }, { - name = "rdp-inbound-3389", - priority = "210" - direction = "Inbound" - access = "Allow" - protocol = "tcp" - source_port_range = "*" - destination_port_range = "3389" + name = "rdp-inbound-3389", + priority = "210" + direction = "Inbound" + access = "Allow" + protocol = "tcp" + source_port_range = "*" + destination_port_range = "3389" source_application_security_groups = { keys = ["bastion"] } @@ -102,13 +102,13 @@ network_security_group_definition = { nsg = [ { - name = "bastion-vnet-out-allow-22", - priority = "103" - direction = "Outbound" - access = "Allow" - protocol = "tcp" - source_port_range = "*" - destination_port_range = "22" + name = "bastion-vnet-out-allow-22", + priority = "103" + direction = "Outbound" + access = "Allow" + protocol = "tcp" + source_port_range = "*" + destination_port_range = "22" source_application_security_groups = { keys = ["bastion"] } diff --git a/examples/compute/virtual_machine/210-vm-bastion-winrm/virtual_machines.tfvars b/examples/compute/virtual_machine/210-vm-bastion-winrm/virtual_machines.tfvars index a9158053fd..14c0dbcc7f 100644 --- a/examples/compute/virtual_machine/210-vm-bastion-winrm/virtual_machines.tfvars +++ b/examples/compute/virtual_machine/210-vm-bastion-winrm/virtual_machines.tfvars @@ -22,12 +22,12 @@ virtual_machines = { enable_ip_forwarding = false internal_dns_name_label = "bastion-host-nic0" public_ip_address_key = "bastion_host_pip1" - + networking_interface_asg_associations = { bastion = { key = "bastion" } - } + } } } @@ -67,7 +67,7 @@ virtual_machines = { provision_vm_agent = true os_type = "windows" - + # when not set the password is auto-generated and stored into the keyvault keyvault_key = "ssh_keys" @@ -85,12 +85,12 @@ virtual_machines = { app_server = { key = "app_server" } - } + } } } - + virtual_machine_settings = { windows = { name = "server1" diff --git a/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/variables.tf b/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/variables.tf index e80290ad8d..93afba20f7 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/variables.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/variables.tf @@ -1,111 +1,111 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_environments { +variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable bastion_hosts { +variable "bastion_hosts" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable cosmos_dbs { +variable "cosmos_dbs" { default = {} } \ No newline at end of file diff --git a/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/variables.tf b/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/variables.tf index 87d0a3262d..e0bc3af007 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/variables.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/variables.tf @@ -1,110 +1,110 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_environments { +variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable bastion_hosts { +variable "bastion_hosts" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable cosmos_dbs { +variable "cosmos_dbs" { default = {} } \ No newline at end of file diff --git a/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/variables.tf b/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/variables.tf index 6baa903e88..3839d375e1 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/variables.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/variables.tf @@ -1,109 +1,109 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_environments { +variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable bastion_hosts { +variable "bastion_hosts" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable cosmos_dbs { +variable "cosmos_dbs" { default = {} } \ No newline at end of file diff --git a/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/variables.tf b/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/variables.tf index 516173a225..7bd3039c9b 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/variables.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/variables.tf @@ -1,21 +1,21 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable resource_groups { +variable "resource_groups" { default = null } -variable cosmos_dbs { +variable "cosmos_dbs" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/cosmos_db/100-simple-cosmos-db-table/standalone/variables.tf b/examples/cosmos_db/100-simple-cosmos-db-table/standalone/variables.tf index 218bd527e7..7f001da844 100644 --- a/examples/cosmos_db/100-simple-cosmos-db-table/standalone/variables.tf +++ b/examples/cosmos_db/100-simple-cosmos-db-table/standalone/variables.tf @@ -1,109 +1,109 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_environments { +variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable bastion_hosts { +variable "bastion_hosts" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable cosmos_dbs { +variable "cosmos_dbs" { default = {} } \ No newline at end of file diff --git a/examples/databricks/100-simple-databricks/standalone/variables.tf b/examples/databricks/100-simple-databricks/standalone/variables.tf index 28d6b8b92e..e8b3a8f2d1 100644 --- a/examples/databricks/100-simple-databricks/standalone/variables.tf +++ b/examples/databricks/100-simple-databricks/standalone/variables.tf @@ -1,37 +1,37 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable keyvaults { +variable "keyvaults" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/datalake/101-datalake-storage/standalone/variables.tf b/examples/datalake/101-datalake-storage/standalone/variables.tf index 64e2369003..9719914378 100644 --- a/examples/datalake/101-datalake-storage/standalone/variables.tf +++ b/examples/datalake/101-datalake-storage/standalone/variables.tf @@ -1,21 +1,21 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/standalone/module.tf b/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/standalone/module.tf index 4faf7f5e1a..fe61390028 100644 --- a/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/standalone/module.tf +++ b/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/standalone/module.tf @@ -1,15 +1,15 @@ module "caf" { source = "../../../../" resource_groups = var.resource_groups - tags = var.tags + tags = var.tags diagnostics = { - diagnostics_definition = var.diagnostics_definition - diagnostics_destinations = var.diagnostics_destinations + diagnostics_definition = var.diagnostics_definition + diagnostics_destinations = var.diagnostics_destinations diagnostic_event_hub_namespaces = var.diagnostic_event_hub_namespaces } } -output objects { +output "objects" { value = module.caf } \ No newline at end of file diff --git a/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/standalone/variables.tf b/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/standalone/variables.tf index 6b457686ea..5f72a0c9c5 100644 --- a/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/standalone/variables.tf +++ b/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/standalone/variables.tf @@ -1,28 +1,28 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable diagnostic_event_hub_namespaces { +variable "diagnostic_event_hub_namespaces" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = {} } -variable diagnostics_destinations { +variable "diagnostics_destinations" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/eventhub/100-simple-eventhub-namespace/standalone/variables.tf b/examples/eventhub/100-simple-eventhub-namespace/standalone/variables.tf index 9be7edc512..c76108a382 100644 --- a/examples/eventhub/100-simple-eventhub-namespace/standalone/variables.tf +++ b/examples/eventhub/100-simple-eventhub-namespace/standalone/variables.tf @@ -1,20 +1,20 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/eventhub/101-evh-namespace-with-private-endpoint/standalone/variables.tf b/examples/eventhub/101-evh-namespace-with-private-endpoint/standalone/variables.tf index c44d6360cd..9bc3447f4f 100644 --- a/examples/eventhub/101-evh-namespace-with-private-endpoint/standalone/variables.tf +++ b/examples/eventhub/101-evh-namespace-with-private-endpoint/standalone/variables.tf @@ -1,24 +1,24 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/eventhub/102-namespace-and-evh-with-auth-rules/standalone/readme.md b/examples/eventhub/102-namespace-and-evh-with-auth-rules/standalone/readme.md index e3e81a7eaa..c0a10e81e8 100644 --- a/examples/eventhub/102-namespace-and-evh-with-auth-rules/standalone/readme.md +++ b/examples/eventhub/102-namespace-and-evh-with-auth-rules/standalone/readme.md @@ -6,7 +6,7 @@ cd /tf/caf/examples/eventhub/102-namespace-and-evh-with-auth-rules/standalone terraform init terraform plan \ - -var-file ../configuration.tfvars + -var-file ../configuration.tfvars ``` diff --git a/examples/eventhub/102-namespace-and-evh-with-auth-rules/standalone/variables.tf b/examples/eventhub/102-namespace-and-evh-with-auth-rules/standalone/variables.tf index e4c9746eb5..ddc04dc60f 100644 --- a/examples/eventhub/102-namespace-and-evh-with-auth-rules/standalone/variables.tf +++ b/examples/eventhub/102-namespace-and-evh-with-auth-rules/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable event_hub_auth_rules { +variable "event_hub_auth_rules" { default = {} } -variable event_hubs { +variable "event_hubs" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/eventhub/103-eventhub-consumer-groups/standalone/readme.md b/examples/eventhub/103-eventhub-consumer-groups/standalone/readme.md index f9b09728d3..d05b8821ad 100644 --- a/examples/eventhub/103-eventhub-consumer-groups/standalone/readme.md +++ b/examples/eventhub/103-eventhub-consumer-groups/standalone/readme.md @@ -6,7 +6,7 @@ cd /tf/caf/examples/eventhub/103-eventhub-consumer-groups/standalone terraform init terraform plan \ - -var-file ../configuration.tfvars + -var-file ../configuration.tfvars ``` diff --git a/examples/eventhub/103-eventhub-consumer-groups/standalone/variables.tf b/examples/eventhub/103-eventhub-consumer-groups/standalone/variables.tf index 333f4f8ed2..399ef3c4ba 100644 --- a/examples/eventhub/103-eventhub-consumer-groups/standalone/variables.tf +++ b/examples/eventhub/103-eventhub-consumer-groups/standalone/variables.tf @@ -1,36 +1,36 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable event_hub_auth_rules { +variable "event_hub_auth_rules" { default = {} } -variable event_hubs { +variable "event_hubs" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable event_hub_consumer_groups { +variable "event_hub_consumer_groups" { default = {} } \ No newline at end of file diff --git a/examples/keyvault/101-keyvault-policies/standalone/variables.tf b/examples/keyvault/101-keyvault-policies/standalone/variables.tf index 897cc2f016..4bc7ef463c 100644 --- a/examples/keyvault/101-keyvault-policies/standalone/variables.tf +++ b/examples/keyvault/101-keyvault-policies/standalone/variables.tf @@ -1,28 +1,28 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } \ No newline at end of file diff --git a/examples/keyvault/102-keyvault-cert-issuer/standalone/variables.tf b/examples/keyvault/102-keyvault-cert-issuer/standalone/variables.tf index 1fefedf6fe..f63d1e82bb 100644 --- a/examples/keyvault/102-keyvault-cert-issuer/standalone/variables.tf +++ b/examples/keyvault/102-keyvault-cert-issuer/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable dynamic_keyvault_secrets { +variable "dynamic_keyvault_secrets" { default = {} } -variable keyvault_certificate_issuers { +variable "keyvault_certificate_issuers" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/machine_learning/100-aml/standalone/variables.tf b/examples/machine_learning/100-aml/standalone/variables.tf index 5fb2d24921..6636952660 100644 --- a/examples/machine_learning/100-aml/standalone/variables.tf +++ b/examples/machine_learning/100-aml/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/mariadb_server/100-simple-mariadb/standalone/variables.tf b/examples/mariadb_server/100-simple-mariadb/standalone/variables.tf index 2ba4ec3c64..d15ddb65f9 100644 --- a/examples/mariadb_server/100-simple-mariadb/standalone/variables.tf +++ b/examples/mariadb_server/100-simple-mariadb/standalone/variables.tf @@ -1,29 +1,29 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable mariadb_servers { +variable "mariadb_servers" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/mariadb_server/101-vnet-rule-mariadb/standalone/variables.tf b/examples/mariadb_server/101-vnet-rule-mariadb/standalone/variables.tf index 6f6b6fd7cd..e4e194384d 100644 --- a/examples/mariadb_server/101-vnet-rule-mariadb/standalone/variables.tf +++ b/examples/mariadb_server/101-vnet-rule-mariadb/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable mariadb_servers { +variable "mariadb_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/mariadb_server/102-private-endpoint-mariadb/standalone/variables.tf b/examples/mariadb_server/102-private-endpoint-mariadb/standalone/variables.tf index 6f6b6fd7cd..e4e194384d 100644 --- a/examples/mariadb_server/102-private-endpoint-mariadb/standalone/variables.tf +++ b/examples/mariadb_server/102-private-endpoint-mariadb/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable mariadb_servers { +variable "mariadb_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/variables.tf b/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/variables.tf index 6f6b6fd7cd..e4e194384d 100644 --- a/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/variables.tf +++ b/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable mariadb_servers { +variable "mariadb_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/monitoring/100-service-health-alerts/standalone/variables.tf b/examples/monitoring/100-service-health-alerts/standalone/variables.tf index bfc119df4c..f8008a8bd0 100644 --- a/examples/monitoring/100-service-health-alerts/standalone/variables.tf +++ b/examples/monitoring/100-service-health-alerts/standalone/variables.tf @@ -1,21 +1,21 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable monitoring { +variable "monitoring" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/mssql_mi/200-mi/standalone/variables.tf b/examples/mssql_mi/200-mi/standalone/variables.tf index b95183a3ec..f6c3a7d448 100644 --- a/examples/mssql_mi/200-mi/standalone/variables.tf +++ b/examples/mssql_mi/200-mi/standalone/variables.tf @@ -1,48 +1,48 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable route_tables { +variable "route_tables" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable mssql_managed_instances { +variable "mssql_managed_instances" { default = {} } -variable mssql_managed_databases { +variable "mssql_managed_databases" { default = {} } -variable mssql_mi_administrators { +variable "mssql_mi_administrators" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable azuread_roles { +variable "azuread_roles" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/mssql_mi/standalone/variables.tf b/examples/mssql_mi/standalone/variables.tf index 7d3a41d369..04ff912dad 100644 --- a/examples/mssql_mi/standalone/variables.tf +++ b/examples/mssql_mi/standalone/variables.tf @@ -1,5 +1,5 @@ -variable global_settings { +variable "global_settings" { default = { default_region = "region1" regions = { @@ -8,58 +8,58 @@ variable global_settings { } } } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable route_tables { +variable "route_tables" { default = {} } -variable azurerm_routes { +variable "azurerm_routes" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable vnet_peerings { +variable "vnet_peerings" { default = {} } -variable mssql_managed_instances { +variable "mssql_managed_instances" { default = {} } -variable mssql_managed_instances_secondary { +variable "mssql_managed_instances_secondary" { default = {} } -variable mssql_managed_databases { +variable "mssql_managed_databases" { default = {} } -variable mssql_managed_databases_restore { +variable "mssql_managed_databases_restore" { default = {} } -variable mssql_managed_databases_backup_ltr { +variable "mssql_managed_databases_backup_ltr" { default = {} } -variable mssql_mi_failover_groups { +variable "mssql_mi_failover_groups" { default = {} } -variable mssql_mi_administrators { +variable "mssql_mi_administrators" { default = {} } -variable mssql_mi_tdes { +variable "mssql_mi_tdes" { default = {} } -variable mssql_mi_secondary_tdes { +variable "mssql_mi_secondary_tdes" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable azuread_roles { +variable "azuread_roles" { default = {} } \ No newline at end of file diff --git a/examples/mssql_server/104-sqlserver-elastic_pools/standalone/variables.tf b/examples/mssql_server/104-sqlserver-elastic_pools/standalone/variables.tf index 809b3b7a02..710b572845 100644 --- a/examples/mssql_server/104-sqlserver-elastic_pools/standalone/variables.tf +++ b/examples/mssql_server/104-sqlserver-elastic_pools/standalone/variables.tf @@ -1,56 +1,56 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable route_tables { +variable "route_tables" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable azuread_roles { +variable "azuread_roles" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/mssql_server/105-sqlserver-failover_groups/standalone/variables.tf b/examples/mssql_server/105-sqlserver-failover_groups/standalone/variables.tf index 7af7463942..42e08cc15f 100644 --- a/examples/mssql_server/105-sqlserver-failover_groups/standalone/variables.tf +++ b/examples/mssql_server/105-sqlserver-failover_groups/standalone/variables.tf @@ -1,29 +1,29 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_failover_groups { +variable "mssql_failover_groups" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/mysql_server/100-simple-mysql/standalone/variables.tf b/examples/mysql_server/100-simple-mysql/standalone/variables.tf index 1b201afd4f..6033929431 100644 --- a/examples/mysql_server/100-simple-mysql/standalone/variables.tf +++ b/examples/mysql_server/100-simple-mysql/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable mysql_servers { +variable "mysql_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/mysql_server/101-vnet-rule-mysql/standalone/variables.tf b/examples/mysql_server/101-vnet-rule-mysql/standalone/variables.tf index 3191da273f..64f8a601fa 100644 --- a/examples/mysql_server/101-vnet-rule-mysql/standalone/variables.tf +++ b/examples/mysql_server/101-vnet-rule-mysql/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable mysql_servers { +variable "mysql_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/mysql_server/102-private-endpoint-mysql/standalone/variables.tf b/examples/mysql_server/102-private-endpoint-mysql/standalone/variables.tf index 1b201afd4f..6033929431 100644 --- a/examples/mysql_server/102-private-endpoint-mysql/standalone/variables.tf +++ b/examples/mysql_server/102-private-endpoint-mysql/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable mysql_servers { +variable "mysql_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/variables.tf b/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/variables.tf index 2fa8a8c653..751cb77eca 100644 --- a/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/variables.tf +++ b/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable mysql_servers { +variable "mysql_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/netapp/101-nfs/standalone/output.tf b/examples/netapp/101-nfs/standalone/output.tf index ecd8136ea4..5fecd6a687 100644 --- a/examples/netapp/101-nfs/standalone/output.tf +++ b/examples/netapp/101-nfs/standalone/output.tf @@ -1,3 +1,3 @@ -output netapp_accounts { +output "netapp_accounts" { value = module.caf.netapp_accounts } diff --git a/examples/netapp/101-nfs/standalone/variables.tf b/examples/netapp/101-nfs/standalone/variables.tf index b04de89de7..3d8d82e47a 100644 --- a/examples/netapp/101-nfs/standalone/variables.tf +++ b/examples/netapp/101-nfs/standalone/variables.tf @@ -1,111 +1,111 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable client_config { +variable "client_config" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_environments { +variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable bastion_hosts { +variable "bastion_hosts" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable netapp_accounts { +variable "netapp_accounts" { default = {} } diff --git a/examples/networking/dns_zones/100-simple-dns_zone/dns_zone_records.tfvars b/examples/networking/dns_zones/100-simple-dns_zone/dns_zone_records.tfvars index 360fbb27b3..650316a343 100644 --- a/examples/networking/dns_zones/100-simple-dns_zone/dns_zone_records.tfvars +++ b/examples/networking/dns_zones/100-simple-dns_zone/dns_zone_records.tfvars @@ -3,7 +3,7 @@ dns_zone_records = { record1 = { dns_zone = { - # name = "name of an existing dns_zone" + # name = "name of an existing dns_zone" # resource_group_name = "set the name when the id is provided" key = "dns_zone1" # lz_key = "name of the remote landingzone" diff --git a/examples/networking/dns_zones/100-simple-dns_zone/standalone/module.tf b/examples/networking/dns_zones/100-simple-dns_zone/standalone/module.tf index db41a5ec85..b0d471cc43 100644 --- a/examples/networking/dns_zones/100-simple-dns_zone/standalone/module.tf +++ b/examples/networking/dns_zones/100-simple-dns_zone/standalone/module.tf @@ -15,6 +15,6 @@ module "caf" { } } -output dns_zones { +output "dns_zones" { value = module.caf.dns_zones } diff --git a/examples/networking/dns_zones/100-simple-dns_zone/standalone/variables.tf b/examples/networking/dns_zones/100-simple-dns_zone/standalone/variables.tf index 1cefb2fe03..e5df1e637a 100644 --- a/examples/networking/dns_zones/100-simple-dns_zone/standalone/variables.tf +++ b/examples/networking/dns_zones/100-simple-dns_zone/standalone/variables.tf @@ -1,36 +1,36 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable dns_zones { +variable "dns_zones" { default = {} } -variable dns_zone_records { +variable "dns_zone_records" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } \ No newline at end of file diff --git a/examples/networking/domain_name_registrations/100-register-domain-default_domain_registrar_dns/configuration.tfvars b/examples/networking/domain_name_registrations/100-register-domain-default_domain_registrar_dns/configuration.tfvars index 48a27f0711..2c201f256e 100644 --- a/examples/networking/domain_name_registrations/100-register-domain-default_domain_registrar_dns/configuration.tfvars +++ b/examples/networking/domain_name_registrations/100-register-domain-default_domain_registrar_dns/configuration.tfvars @@ -51,7 +51,7 @@ dns_zones = { domain_name_registrations = { # # Register for a random domain name - # As dnsType as not be set + # As dnsType as not be set # random_domain = { name = "" // Set as empty for CI. this will creation a random_domain_name.com @@ -97,4 +97,4 @@ domain_name_registrations = { } } } -} \ No newline at end of file +} \ No newline at end of file diff --git a/examples/networking/express_routes/standalone/output.tf b/examples/networking/express_routes/standalone/output.tf index 311b453849..881689e38d 100644 --- a/examples/networking/express_routes/standalone/output.tf +++ b/examples/networking/express_routes/standalone/output.tf @@ -1,10 +1,10 @@ -output express_route_circuits { +output "express_route_circuits" { value = module.caf.express_route_circuits description = "Express Route Circuit output" } -output express_route_circuit_authorizations { +output "express_route_circuit_authorizations" { value = module.caf.express_route_circuit_authorizations description = "Express Route Circuit Authorizations Keys output" diff --git a/examples/networking/express_routes/standalone/variables.tf b/examples/networking/express_routes/standalone/variables.tf index ddfa802ab4..6cf2f697f7 100644 --- a/examples/networking/express_routes/standalone/variables.tf +++ b/examples/networking/express_routes/standalone/variables.tf @@ -1,116 +1,116 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_environments { +variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable bastion_hosts { +variable "bastion_hosts" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable express_route_circuit_authorizations { +variable "express_route_circuit_authorizations" { default = {} } -variable express_route_circuits { +variable "express_route_circuits" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/networking/firewall/100-simple-firewall-with-routes/standalone/variables.tf b/examples/networking/firewall/100-simple-firewall-with-routes/standalone/variables.tf index e065f45c8a..657a71d7b4 100644 --- a/examples/networking/firewall/100-simple-firewall-with-routes/standalone/variables.tf +++ b/examples/networking/firewall/100-simple-firewall-with-routes/standalone/variables.tf @@ -1,28 +1,28 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable azurerm_firewalls { +variable "azurerm_firewalls" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/networking/front_door/100-simple-front_door/standalone/variables.tf b/examples/networking/front_door/100-simple-front_door/standalone/variables.tf index 036f57f329..cc06b923f4 100644 --- a/examples/networking/front_door/100-simple-front_door/standalone/variables.tf +++ b/examples/networking/front_door/100-simple-front_door/standalone/variables.tf @@ -1,68 +1,68 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable keyvault_certificate_requests { +variable "keyvault_certificate_requests" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable dynamic_keyvault_secrets { +variable "dynamic_keyvault_secrets" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable dns_zones { +variable "dns_zones" { default = {} } -variable front_door_waf_policies { +variable "front_door_waf_policies" { default = {} } -variable front_doors { +variable "front_doors" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = {} } -variable diagnostics_destinations { +variable "diagnostics_destinations" { default = {} } -variable keyvault_certificate_issuers { +variable "keyvault_certificate_issuers" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/networking/front_door/101-front_door_waf/standalone/variables.tf b/examples/networking/front_door/101-front_door_waf/standalone/variables.tf index 200f911ccb..3dcb7b45fd 100644 --- a/examples/networking/front_door/101-front_door_waf/standalone/variables.tf +++ b/examples/networking/front_door/101-front_door_waf/standalone/variables.tf @@ -1,28 +1,28 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable front_door_waf_policies { +variable "front_door_waf_policies" { default = {} } -variable front_doors { +variable "front_doors" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/networking/load_balancers/100-simple-load-balancer-basic-sku/standalone/variables.tf b/examples/networking/load_balancers/100-simple-load-balancer-basic-sku/standalone/variables.tf index db9c382722..5696c3a835 100644 --- a/examples/networking/load_balancers/100-simple-load-balancer-basic-sku/standalone/variables.tf +++ b/examples/networking/load_balancers/100-simple-load-balancer-basic-sku/standalone/variables.tf @@ -1,32 +1,32 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable load_balancers { +variable "load_balancers" { default = {} } diff --git a/examples/networking/load_balancers/101-load-balancer-with-rules/standalone/variables.tf b/examples/networking/load_balancers/101-load-balancer-with-rules/standalone/variables.tf index 50df32299d..73997d34df 100644 --- a/examples/networking/load_balancers/101-load-balancer-with-rules/standalone/variables.tf +++ b/examples/networking/load_balancers/101-load-balancer-with-rules/standalone/variables.tf @@ -1,40 +1,40 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable load_balancers { +variable "load_balancers" { default = {} } -variable load_balancer_rules { +variable "load_balancer_rules" { default = {} } -variable load_balancer_probe { +variable "load_balancer_probe" { default = {} } \ No newline at end of file diff --git a/examples/networking/load_balancers/102-internal-load-balancer/standalone/variables.tf b/examples/networking/load_balancers/102-internal-load-balancer/standalone/variables.tf index 30018f7b59..e2c7921e52 100644 --- a/examples/networking/load_balancers/102-internal-load-balancer/standalone/variables.tf +++ b/examples/networking/load_balancers/102-internal-load-balancer/standalone/variables.tf @@ -1,25 +1,25 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } @@ -27,17 +27,17 @@ variable virtual_network_gateways { # default = {} # } -variable load_balancers { +variable "load_balancers" { default = {} } -variable load_balancer_rules { +variable "load_balancer_rules" { default = {} } -variable load_balancer_probe { +variable "load_balancer_probe" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/networking/load_balancers/103-load-balancer-nic-association/configuration.tfvars b/examples/networking/load_balancers/103-load-balancer-nic-association/configuration.tfvars index 9bdfddd282..7a6e939285 100644 --- a/examples/networking/load_balancers/103-load-balancer-nic-association/configuration.tfvars +++ b/examples/networking/load_balancers/103-load-balancer-nic-association/configuration.tfvars @@ -40,7 +40,7 @@ public_ip_addresses = { pip = { name = "lb_pip1" resource_group_key = "lb" - sku = "Basic" #SKU must match with the SKU of the LB + sku = "Basic" #SKU must match with the SKU of the LB allocation_method = "Static" ip_version = "IPv4" idle_timeout_in_minutes = "4" @@ -50,8 +50,8 @@ public_ip_addresses = { virtual_machines = { vm1 = { - resource_group_key = "lb" - os_type = "linux" + resource_group_key = "lb" + os_type = "linux" # the auto-generated ssh key in keyvault secret. Secret name being {VM name}-ssh-public and {VM name}-ssh-private keyvault_key = "example_vm_rg1" @@ -112,7 +112,7 @@ load_balancers = { resource_group_key = "lb" backend_address_pool_name = "web-app" nic_key = "nic0" - + frontend_ip_configurations = { config1 = { name = "config1" @@ -121,7 +121,7 @@ load_balancers = { private_ip_address_allocation = "Dynamic" } } - + #multiple VMs and NICs can be attached to the Load Balancer. Specify the respective VMs and NICs in the following syntac nic_bap_association = { bap0 = { diff --git a/examples/networking/load_balancers/103-load-balancer-nic-association/standalone/variables.tf b/examples/networking/load_balancers/103-load-balancer-nic-association/standalone/variables.tf index a4547b15a8..959757a949 100644 --- a/examples/networking/load_balancers/103-load-balancer-nic-association/standalone/variables.tf +++ b/examples/networking/load_balancers/103-load-balancer-nic-association/standalone/variables.tf @@ -1,25 +1,25 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } @@ -27,18 +27,18 @@ variable virtual_network_gateways { # default = {} # } -variable load_balancers { +variable "load_balancers" { default = {} } -variable load_balancer_rules { +variable "load_balancer_rules" { default = {} } -variable load_balancer_probe { +variable "load_balancer_probe" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } @@ -46,6 +46,6 @@ variable "virtual_machines" { default = {} } -variable keyvault_access_policies {} +variable "keyvault_access_policies" {} -variable keyvaults {} \ No newline at end of file +variable "keyvaults" {} \ No newline at end of file diff --git a/examples/networking/private_dns/100-private-dns-vnet-links/standalone/variables.tf b/examples/networking/private_dns/100-private-dns-vnet-links/standalone/variables.tf index f3768b0ebf..ae4d4179b6 100644 --- a/examples/networking/private_dns/100-private-dns-vnet-links/standalone/variables.tf +++ b/examples/networking/private_dns/100-private-dns-vnet-links/standalone/variables.tf @@ -1,30 +1,30 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable logged_aad_app_objectId { +variable "logged_aad_app_objectId" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/networking/private_links/endpoints/centralized/standalone/module.tf b/examples/networking/private_links/endpoints/centralized/standalone/module.tf index 0e9ca27c54..3860dd6ee4 100644 --- a/examples/networking/private_links/endpoints/centralized/standalone/module.tf +++ b/examples/networking/private_links/endpoints/centralized/standalone/module.tf @@ -28,6 +28,6 @@ module "caf" { } } -output diagnostics { +output "diagnostics" { value = module.caf.diagnostics } diff --git a/examples/networking/private_links/endpoints/centralized/standalone/variables.tf b/examples/networking/private_links/endpoints/centralized/standalone/variables.tf index 2d12e2459f..9e071c69c2 100644 --- a/examples/networking/private_links/endpoints/centralized/standalone/variables.tf +++ b/examples/networking/private_links/endpoints/centralized/standalone/variables.tf @@ -1,115 +1,115 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable diagnostic_log_analytics { +variable "diagnostic_log_analytics" { default = {} } -variable app_service_environments { +variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable bastion_hosts { +variable "bastion_hosts" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable diagnostic_event_hub_namespaces { +variable "diagnostic_event_hub_namespaces" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable private_endpoints { +variable "private_endpoints" { default = {} } \ No newline at end of file diff --git a/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/variables.tf b/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/variables.tf index 10dea55c1b..0071cf92b5 100644 --- a/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/variables.tf +++ b/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/variables.tf @@ -1,37 +1,37 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable azurerm_routes { +variable "azurerm_routes" { default = {} } -variable route_tables { +variable "route_tables" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/networking/virtual_network/100-subnet-delegation/standalone/variables.tf b/examples/networking/virtual_network/100-subnet-delegation/standalone/variables.tf index 551b6b411d..38781d8cdb 100644 --- a/examples/networking/virtual_network/100-subnet-delegation/standalone/variables.tf +++ b/examples/networking/virtual_network/100-subnet-delegation/standalone/variables.tf @@ -1,38 +1,38 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable azurerm_routes { +variable "azurerm_routes" { default = {} } -variable route_tables { +variable "route_tables" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/variables.tf b/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/variables.tf index 873ad760d0..e9514209c7 100644 --- a/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/variables.tf +++ b/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/variables.tf @@ -1,41 +1,41 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable azurerm_routes { +variable "azurerm_routes" { default = {} } -variable route_tables { +variable "route_tables" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnet_peerings { +variable "vnet_peerings" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/networking/virtual_network/200-nsg-flow-logs/standalone/variables.tf b/examples/networking/virtual_network/200-nsg-flow-logs/standalone/variables.tf index 873ad760d0..e9514209c7 100644 --- a/examples/networking/virtual_network/200-nsg-flow-logs/standalone/variables.tf +++ b/examples/networking/virtual_network/200-nsg-flow-logs/standalone/variables.tf @@ -1,41 +1,41 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable azurerm_routes { +variable "azurerm_routes" { default = {} } -variable route_tables { +variable "route_tables" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable vnet_peerings { +variable "vnet_peerings" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/variables.tf b/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/variables.tf index 1efadbeb91..684d1a60d3 100644 --- a/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/variables.tf +++ b/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/variables.tf @@ -1,29 +1,29 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/variables.tf b/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/variables.tf index 1efadbeb91..684d1a60d3 100644 --- a/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/variables.tf +++ b/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/variables.tf @@ -1,29 +1,29 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/variables.tf b/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/variables.tf index 1efadbeb91..684d1a60d3 100644 --- a/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/variables.tf +++ b/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/variables.tf @@ -1,29 +1,29 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/variables.tf b/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/variables.tf index f06d50b8aa..f8bf29572c 100644 --- a/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/variables.tf +++ b/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/variables.tf @@ -1,37 +1,37 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } -variable local_network_gateways { +variable "local_network_gateways" { default = {} } -variable virtual_network_gateway_connections { +variable "virtual_network_gateway_connections" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/variables.tf b/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/variables.tf index 21bb50a6f5..a19777b613 100644 --- a/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/variables.tf +++ b/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/variables.tf @@ -1,45 +1,45 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } -variable local_network_gateways { +variable "local_network_gateways" { default = {} } -variable virtual_network_gateway_connections { +variable "virtual_network_gateway_connections" { default = {} } -variable express_route_circuits { +variable "express_route_circuits" { default = {} } -variable express_route_circuit_authorizations { +variable "express_route_circuit_authorizations" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/variables.tf b/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/variables.tf index 27675ebf78..7d8e4dc92f 100644 --- a/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/variables.tf +++ b/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/variables.tf @@ -1,23 +1,23 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/variables.tf b/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/variables.tf index 27675ebf78..7d8e4dc92f 100644 --- a/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/variables.tf +++ b/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/variables.tf @@ -1,23 +1,23 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/variables.tf b/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/variables.tf index 27675ebf78..7d8e4dc92f 100644 --- a/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/variables.tf +++ b/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/variables.tf @@ -1,23 +1,23 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable vnets { +variable "vnets" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/postgresql_server/100-simple-postgresql/standalone/variables.tf b/examples/postgresql_server/100-simple-postgresql/standalone/variables.tf index c6942c2696..efe5d38187 100644 --- a/examples/postgresql_server/100-simple-postgresql/standalone/variables.tf +++ b/examples/postgresql_server/100-simple-postgresql/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable postgresql_servers { +variable "postgresql_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/postgresql_server/101-vnet-rule-postgresql/standalone/variables.tf b/examples/postgresql_server/101-vnet-rule-postgresql/standalone/variables.tf index 22190271d8..78ead1769c 100644 --- a/examples/postgresql_server/101-vnet-rule-postgresql/standalone/variables.tf +++ b/examples/postgresql_server/101-vnet-rule-postgresql/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable postgresql_servers { +variable "postgresql_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/postgresql_server/102-private-endpoint-postgresql/standalone/variables.tf b/examples/postgresql_server/102-private-endpoint-postgresql/standalone/variables.tf index 975d40f954..9fb9c737c7 100644 --- a/examples/postgresql_server/102-private-endpoint-postgresql/standalone/variables.tf +++ b/examples/postgresql_server/102-private-endpoint-postgresql/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable postgresql_servers { +variable "postgresql_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/variables.tf b/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/variables.tf index 4d53a27936..cc19852d04 100644 --- a/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/variables.tf +++ b/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/variables.tf @@ -1,36 +1,36 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable postgresql_servers { +variable "postgresql_servers" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/recovery_vault/101-simple-asrv/standalone/variables.tf b/examples/recovery_vault/101-simple-asrv/standalone/variables.tf index c8d6f67656..a07cc9880d 100644 --- a/examples/recovery_vault/101-simple-asrv/standalone/variables.tf +++ b/examples/recovery_vault/101-simple-asrv/standalone/variables.tf @@ -1,23 +1,23 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable recovery_vaults { +variable "recovery_vaults" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/recovery_vault/102-asr-protection/standalone/variables.tf b/examples/recovery_vault/102-asr-protection/standalone/variables.tf index 17e2f32341..f53adbd2ae 100644 --- a/examples/recovery_vault/102-asr-protection/standalone/variables.tf +++ b/examples/recovery_vault/102-asr-protection/standalone/variables.tf @@ -1,24 +1,24 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable recovery_vaults { +variable "recovery_vaults" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/recovery_vault/103-asr-with-private-endpoint/standalone/variables.tf b/examples/recovery_vault/103-asr-with-private-endpoint/standalone/variables.tf index db6eb187f7..ec3f4e6056 100644 --- a/examples/recovery_vault/103-asr-with-private-endpoint/standalone/variables.tf +++ b/examples/recovery_vault/103-asr-with-private-endpoint/standalone/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable recovery_vaults { +variable "recovery_vaults" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable private_endpoints { +variable "private_endpoints" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/redis_cache/100-redis-standard/standalone/variables.tf b/examples/redis_cache/100-redis-standard/standalone/variables.tf index bd23d43ae2..07111a7308 100644 --- a/examples/redis_cache/100-redis-standard/standalone/variables.tf +++ b/examples/redis_cache/100-redis-standard/standalone/variables.tf @@ -1,23 +1,23 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } diff --git a/examples/storage_accounts/100-simple-storage-account-blob-container/standalone/module.tf b/examples/storage_accounts/100-simple-storage-account-blob-container/standalone/module.tf index bb25cc1598..888aa02e62 100644 --- a/examples/storage_accounts/100-simple-storage-account-blob-container/standalone/module.tf +++ b/examples/storage_accounts/100-simple-storage-account-blob-container/standalone/module.tf @@ -12,6 +12,6 @@ module "caf" { } } -output storage_accounts { +output "storage_accounts" { value = module.caf.storage_accounts } diff --git a/examples/storage_accounts/100-simple-storage-account-blob-container/standalone/variables.tf b/examples/storage_accounts/100-simple-storage-account-blob-container/standalone/variables.tf index 1fb12c99d1..48cf165071 100644 --- a/examples/storage_accounts/100-simple-storage-account-blob-container/standalone/variables.tf +++ b/examples/storage_accounts/100-simple-storage-account-blob-container/standalone/variables.tf @@ -1,25 +1,25 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable resource_groups { +variable "resource_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_keys { +variable "keyvault_keys" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } diff --git a/examples/storage_accounts/102-storage-account-advanced-options/configuration.tfvars b/examples/storage_accounts/102-storage-account-advanced-options/configuration.tfvars index 81770bc0c6..80b7bce93c 100644 --- a/examples/storage_accounts/102-storage-account-advanced-options/configuration.tfvars +++ b/examples/storage_accounts/102-storage-account-advanced-options/configuration.tfvars @@ -19,11 +19,11 @@ storage_accounts = { resource_group_key = "test" account_kind = "StorageV2" #Valid options are BlobStorage, BlockBlobStorage, FileStorage, Storage and StorageV2. Defaults to StorageV2 account_tier = "Standard" #Valid options are Standard and Premium. For BlockBlobStorage and FileStorage accounts only Premium is valid - account_replication_type = "LRS" # https://docs.microsoft.com/en-us/azure/storage/common/storage-redundancy - min_tls_version = "TLS1_2" # Possible values are TLS1_0, TLS1_1, and TLS1_2. Defaults to TLS1_0 for new storage accounts. + account_replication_type = "LRS" # https://docs.microsoft.com/en-us/azure/storage/common/storage-redundancy + min_tls_version = "TLS1_2" # Possible values are TLS1_0, TLS1_1, and TLS1_2. Defaults to TLS1_0 for new storage accounts. allow_blob_public_access = false is_hns_enabled = false - + # Enable this block, if you have a valid domain name # custom_domain = { # name = "any-valid-domain.name" #will be validated by Azure diff --git a/examples/storage_accounts/102-storage-account-advanced-options/standalone/module.tf b/examples/storage_accounts/102-storage-account-advanced-options/standalone/module.tf index eec2e7f436..5b3884e9cb 100644 --- a/examples/storage_accounts/102-storage-account-advanced-options/standalone/module.tf +++ b/examples/storage_accounts/102-storage-account-advanced-options/standalone/module.tf @@ -1,9 +1,9 @@ module "caf" { - source = "../../../../" - global_settings = var.global_settings - tags = var.tags - resource_groups = var.resource_groups - storage_accounts= var.storage_accounts + source = "../../../../" + global_settings = var.global_settings + tags = var.tags + resource_groups = var.resource_groups + storage_accounts = var.storage_accounts } diff --git a/examples/storage_accounts/102-storage-account-advanced-options/standalone/variables.tf b/examples/storage_accounts/102-storage-account-advanced-options/standalone/variables.tf index 64e2369003..9719914378 100644 --- a/examples/storage_accounts/102-storage-account-advanced-options/standalone/variables.tf +++ b/examples/storage_accounts/102-storage-account-advanced-options/standalone/variables.tf @@ -1,21 +1,21 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/synapse_analytics/100-synapse/standalone/variables.tf b/examples/synapse_analytics/100-synapse/standalone/variables.tf index bf1fb944a2..0884b4cba6 100644 --- a/examples/synapse_analytics/100-synapse/standalone/variables.tf +++ b/examples/synapse_analytics/100-synapse/standalone/variables.tf @@ -1,32 +1,32 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/synapse_analytics/101-synapse-sparkpool/standalone/variables.tf b/examples/synapse_analytics/101-synapse-sparkpool/standalone/variables.tf index bf1fb944a2..0884b4cba6 100644 --- a/examples/synapse_analytics/101-synapse-sparkpool/standalone/variables.tf +++ b/examples/synapse_analytics/101-synapse-sparkpool/standalone/variables.tf @@ -1,32 +1,32 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/variables.tf b/examples/variables.tf index 0532b8ae39..a4216cc9d6 100644 --- a/examples/variables.tf +++ b/examples/variables.tf @@ -1,16 +1,16 @@ # Map of the remote data state for lower level -variable lower_storage_account_name {} -variable lower_container_name {} -variable lower_resource_group_name {} +variable "lower_storage_account_name" {} +variable "lower_container_name" {} +variable "lower_resource_group_name" {} -variable tfstate_storage_account_name {} -variable tfstate_container_name {} -variable tfstate_key {} -variable tfstate_resource_group_name {} +variable "tfstate_storage_account_name" {} +variable "tfstate_container_name" {} +variable "tfstate_key" {} +variable "tfstate_resource_group_name" {} -variable tfstate_subscription_id {} +variable "tfstate_subscription_id" {} -variable global_settings { +variable "global_settings" { default = { default_region = "region1" regions = { @@ -20,7 +20,7 @@ variable global_settings { } } -variable landingzone { +variable "landingzone" { default = { backend_type = "azurerm" global_settings_key = "launchpad" @@ -35,288 +35,288 @@ variable landingzone { } } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable tenant_id {} +variable "tenant_id" {} -variable environment { +variable "environment" { default = "sandpit" } -variable rover_version { +variable "rover_version" { default = null } -variable logged_user_objectId { +variable "logged_user_objectId" { default = null } -variable logged_aad_app_objectId { +variable "logged_aad_app_objectId" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_environments { +variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = null } -variable networking_interface_asg_associations { +variable "networking_interface_asg_associations" { default = {} } -variable route_tables { +variable "route_tables" { default = {} } -variable azurerm_routes { +variable "azurerm_routes" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable mssql_managed_instances { +variable "mssql_managed_instances" { default = {} } -variable mssql_managed_instances_secondary { +variable "mssql_managed_instances_secondary" { default = {} } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_managed_databases { +variable "mssql_managed_databases" { default = {} } -variable mssql_managed_databases_restore { +variable "mssql_managed_databases_restore" { default = {} } -variable mssql_managed_databases_backup_ltr { +variable "mssql_managed_databases_backup_ltr" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } -variable mariadb_servers { +variable "mariadb_servers" { default = {} } -variable mariadb_databases { +variable "mariadb_databases" { default = {} } -variable mssql_failover_groups { +variable "mssql_failover_groups" { default = {} } -variable mssql_mi_failover_groups { +variable "mssql_mi_failover_groups" { default = {} } -variable mssql_mi_administrators { +variable "mssql_mi_administrators" { default = {} } -variable mssql_mi_tdes { +variable "mssql_mi_tdes" { default = {} } -variable mssql_mi_secondary_tdes { +variable "mssql_mi_secondary_tdes" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable azuread_roles { +variable "azuread_roles" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable keyvault_certificate_issuers { +variable "keyvault_certificate_issuers" { default = {} } -variable keyvault_keys { +variable "keyvault_keys" { default = {} } -variable keyvault_certificate_requests { +variable "keyvault_certificate_requests" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable bastion_hosts { +variable "bastion_hosts" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable diagnostic_event_hub_namespaces { +variable "diagnostic_event_hub_namespaces" { default = {} } -variable diagnostic_log_analytics { +variable "diagnostic_log_analytics" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable mysql_servers { +variable "mysql_servers" { default = {} } -variable postgresql_servers { +variable "postgresql_servers" { default = {} } -variable cosmos_db { +variable "cosmos_db" { default = {} } -variable log_analytics { +variable "log_analytics" { default = {} } -variable recovery_vaults { +variable "recovery_vaults" { default = {} } -variable availability_sets { +variable "availability_sets" { default = {} } -variable proximity_placement_groups { +variable "proximity_placement_groups" { default = {} } -variable network_watchers { +variable "network_watchers" { default = {} } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } -variable virtual_network_gateway_connections { +variable "virtual_network_gateway_connections" { default = {} } -variable express_route_circuits { +variable "express_route_circuits" { default = {} } -variable express_route_circuit_authorizations { +variable "express_route_circuit_authorizations" { default = {} } -variable diagnostics_destinations { +variable "diagnostics_destinations" { default = {} } -variable vnet_peerings { +variable "vnet_peerings" { default = {} } -variable cosmos_dbs { +variable "cosmos_dbs" { default = {} } -variable dynamic_keyvault_secrets { +variable "dynamic_keyvault_secrets" { default = {} } -variable front_doors { +variable "front_doors" { default = {} } -variable front_door_waf_policies { +variable "front_door_waf_policies" { default = {} } -variable dns_zones { +variable "dns_zones" { default = {} } -variable dns_zone_records { +variable "dns_zone_records" { default = {} } -variable private_endpoints { +variable "private_endpoints" { default = {} } -variable local_network_gateways { +variable "local_network_gateways" { default = {} } -variable domain_name_registrations { +variable "domain_name_registrations" { default = {} } -variable azuread_apps { +variable "azuread_apps" { default = {} - type = map + type = map(any) } -variable azuread_users { +variable "azuread_users" { default = {} - type = map + type = map(any) } -variable custom_role_definitions { +variable "custom_role_definitions" { default = {} } -variable azurerm_firewalls { +variable "azurerm_firewalls" { default = {} } -variable azurerm_firewall_network_rule_collection_definition { +variable "azurerm_firewall_network_rule_collection_definition" { default = {} } -variable azurerm_firewall_application_rule_collection_definition { +variable "azurerm_firewall_application_rule_collection_definition" { default = {} } -variable azurerm_firewall_nat_rule_collection_definition { +variable "azurerm_firewall_nat_rule_collection_definition" { default = {} } -variable netapp_accounts { +variable "netapp_accounts" { default = {} } -variable automations { +variable "automations" { default = {} } -variable application_security_groups { +variable "application_security_groups" { default = {} } \ No newline at end of file diff --git a/examples/webapps/appservice/101-appservice-simple/standalone/variables.tf b/examples/webapps/appservice/101-appservice-simple/standalone/variables.tf index 12f476c895..f64340f100 100644 --- a/examples/webapps/appservice/101-appservice-simple/standalone/variables.tf +++ b/examples/webapps/appservice/101-appservice-simple/standalone/variables.tf @@ -1,24 +1,24 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/webapps/appservice/102-appservice-slots/standalone/variables.tf b/examples/webapps/appservice/102-appservice-slots/standalone/variables.tf index 12f476c895..f64340f100 100644 --- a/examples/webapps/appservice/102-appservice-slots/standalone/variables.tf +++ b/examples/webapps/appservice/102-appservice-slots/standalone/variables.tf @@ -1,24 +1,24 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/webapps/appservice/103-appservice-extend/configuration.tfvars b/examples/webapps/appservice/103-appservice-extend/configuration.tfvars index aa14367eff..919cf48dfa 100644 --- a/examples/webapps/appservice/103-appservice-extend/configuration.tfvars +++ b/examples/webapps/appservice/103-appservice-extend/configuration.tfvars @@ -33,7 +33,7 @@ app_services = { app_service_plan_key = "asp_extend" identity = { - type = "SystemAssigned" + type = "SystemAssigned" } settings = { diff --git a/examples/webapps/appservice/103-appservice-extend/standalone/variables.tf b/examples/webapps/appservice/103-appservice-extend/standalone/variables.tf index 4b3f72797c..b113923042 100644 --- a/examples/webapps/appservice/103-appservice-extend/standalone/variables.tf +++ b/examples/webapps/appservice/103-appservice-extend/standalone/variables.tf @@ -1,25 +1,25 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } diff --git a/examples/webapps/appservice/104-appservice-appinsight/standalone/variables.tf b/examples/webapps/appservice/104-appservice-appinsight/standalone/variables.tf index c20a8d45d0..ca4a50e4e4 100644 --- a/examples/webapps/appservice/104-appservice-appinsight/standalone/variables.tf +++ b/examples/webapps/appservice/104-appservice-appinsight/standalone/variables.tf @@ -1,29 +1,29 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/examples/webapps/appservice/105-appservice-backup/standalone/variables.tf b/examples/webapps/appservice/105-appservice-backup/standalone/variables.tf index 2fe29318f3..3a889f71f7 100644 --- a/examples/webapps/appservice/105-appservice-backup/standalone/variables.tf +++ b/examples/webapps/appservice/105-appservice-backup/standalone/variables.tf @@ -1,28 +1,28 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable resource_groups { +variable "resource_groups" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } \ No newline at end of file diff --git a/front_door_waf_policies.tf b/front_door_waf_policies.tf index bbaf10ee34..9240987f3d 100644 --- a/front_door_waf_policies.tf +++ b/front_door_waf_policies.tf @@ -8,7 +8,7 @@ module "front_door_waf_policies" { } -output front_door_waf_policies { +output "front_door_waf_policies" { value = module.front_door_waf_policies } \ No newline at end of file diff --git a/front_doors.tf b/front_doors.tf index 4aee4293d4..150c20214d 100644 --- a/front_doors.tf +++ b/front_doors.tf @@ -13,7 +13,7 @@ module "front_doors" { settings = each.value } -output front_doors { +output "front_doors" { value = module.front_doors } diff --git a/function_app.tf b/function_app.tf index 9098810800..18ff221ee1 100755 --- a/function_app.tf +++ b/function_app.tf @@ -4,22 +4,22 @@ module "function_apps" { for_each = local.webapp.function_apps - name = each.value.name - client_config = local.client_config - dynamic_app_settings = try(each.value.dynamic_app_settings, {}) - combined_objects = local.dynamic_app_settings_combined_objects - resource_group_name = module.resource_groups[each.value.resource_group_key].name - location = lookup(each.value, "region", null) == null ? module.resource_groups[each.value.resource_group_key].location : local.global_settings.regions[each.value.region] - app_service_plan_id = try(each.value.lz_key, null) == null ? local.combined_objects_app_service_plans[local.client_config.landingzone_key][each.value.app_service_plan_key].id : local.combined_objects_app_service_plans[each.value.lz_key][each.value.app_service_plan_key].id - settings = each.value.settings - application_insight = try(each.value.application_insight_key, null) == null ? null : module.azurerm_application_insights[each.value.application_insight_key] - identity = try(each.value.identity, null) - connection_strings = try(each.value.connection_strings, {}) - storage_account_name = try(each.value.storage_account_key) == null ? null : module.storage_accounts[each.value.storage_account_key].name - storage_account_access_key = try(each.value.storage_account_key) == null ? null : module.storage_accounts[each.value.storage_account_key].primary_access_key - global_settings = local.global_settings - base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} - tags = try(each.value.tags, null) + name = each.value.name + client_config = local.client_config + dynamic_app_settings = try(each.value.dynamic_app_settings, {}) + combined_objects = local.dynamic_app_settings_combined_objects + resource_group_name = module.resource_groups[each.value.resource_group_key].name + location = lookup(each.value, "region", null) == null ? module.resource_groups[each.value.resource_group_key].location : local.global_settings.regions[each.value.region] + app_service_plan_id = try(each.value.lz_key, null) == null ? local.combined_objects_app_service_plans[local.client_config.landingzone_key][each.value.app_service_plan_key].id : local.combined_objects_app_service_plans[each.value.lz_key][each.value.app_service_plan_key].id + settings = each.value.settings + application_insight = try(each.value.application_insight_key, null) == null ? null : module.azurerm_application_insights[each.value.application_insight_key] + identity = try(each.value.identity, null) + connection_strings = try(each.value.connection_strings, {}) + storage_account_name = try(each.value.storage_account_key) == null ? null : module.storage_accounts[each.value.storage_account_key].name + storage_account_access_key = try(each.value.storage_account_key) == null ? null : module.storage_accounts[each.value.storage_account_key].primary_access_key + global_settings = local.global_settings + base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} + tags = try(each.value.tags, null) } output "function_apps" { diff --git a/keyvault.tf b/keyvault.tf index 746d38b371..d6c9f7cfeb 100755 --- a/keyvault.tf +++ b/keyvault.tf @@ -24,11 +24,11 @@ module "keyvault_access_policies" { source = "./modules/security/keyvault_access_policies" for_each = var.keyvault_access_policies - keyvault_key = each.key - keyvaults = local.combined_objects_keyvaults - access_policies = each.value - azuread_groups = local.combined_objects_azuread_groups - client_config = local.client_config + keyvault_key = each.key + keyvaults = local.combined_objects_keyvaults + access_policies = each.value + azuread_groups = local.combined_objects_azuread_groups + client_config = local.client_config resources = { managed_identities = local.combined_objects_managed_identities mssql_managed_instances = local.combined_objects_mssql_managed_instances @@ -52,7 +52,7 @@ module "keyvault_access_policies_azuread_apps" { } -output keyvaults { +output "keyvaults" { value = module.keyvaults } diff --git a/keyvault_certificate_issuers.tf b/keyvault_certificate_issuers.tf index 20ffa607d6..76e194e21f 100644 --- a/keyvault_certificate_issuers.tf +++ b/keyvault_certificate_issuers.tf @@ -1,4 +1,4 @@ -module keyvault_certificate_issuers { +module "keyvault_certificate_issuers" { source = "./modules/security/keyvault_certificate_issuer" depends_on = [module.keyvaults] for_each = local.security.keyvault_certificate_issuers @@ -23,7 +23,7 @@ data "azurerm_key_vault_secret" "certificate_issuer_password" { key_vault_id = try(local.combined_objects_keyvaults[each.value.lz_key][each.value.keyvault_key].id, local.combined_objects_keyvaults[local.client_config.landingzone_key][each.value.keyvault_key].id) } -output keyvault_certificate_issuers { +output "keyvault_certificate_issuers" { value = module.keyvault_certificate_issuers } diff --git a/keyvault_certificate_requests.tf b/keyvault_certificate_requests.tf index 95f914b45d..b5cf19ec14 100644 --- a/keyvault_certificate_requests.tf +++ b/keyvault_certificate_requests.tf @@ -2,7 +2,7 @@ # Evolution of the keyvault_certificate module. Plan is to transition to this module over time. # configuration breaking change when migration from module keyvault_certificate # -module keyvault_certificate_requests { +module "keyvault_certificate_requests" { depends_on = [module.keyvault_certificate_issuers, module.domain_name_registrations] source = "./modules/security/keyvault_certificate_request" for_each = local.security.keyvault_certificate_requests @@ -13,6 +13,6 @@ module keyvault_certificate_requests { domain_name_registrations = module.domain_name_registrations } -output keyvault_certificate_requests { +output "keyvault_certificate_requests" { value = module.keyvault_certificate_requests } diff --git a/keyvault_certificates.tf b/keyvault_certificates.tf index 04e8a2db70..5babfc4e1a 100644 --- a/keyvault_certificates.tf +++ b/keyvault_certificates.tf @@ -1,4 +1,4 @@ -module keyvault_certificates { +module "keyvault_certificates" { source = "./modules/security/keyvault_certificate" depends_on = [module.keyvaults, module.keyvault_access_policies] @@ -8,6 +8,6 @@ module keyvault_certificates { keyvault = try(local.combined_objects_keyvaults[local.client_config.landingzone_key][each.value.keyvault_key], local.combined_objects_keyvaults[each.value.lz_key][each.value.keyvault_key]) } -output keyvault_certificates { +output "keyvault_certificates" { value = module.keyvault_certificates } \ No newline at end of file diff --git a/keyvault_keys.tf b/keyvault_keys.tf index c22d5f4d84..f1e0c7eb79 100644 --- a/keyvault_keys.tf +++ b/keyvault_keys.tf @@ -1,4 +1,4 @@ -module keyvault_keys { +module "keyvault_keys" { depends_on = [module.keyvaults, module.keyvault_access_policies] source = "./modules/security/keyvault_key" @@ -12,6 +12,6 @@ module keyvault_keys { } -output keyvault_keys { - value = module.keyvault_keys +output "keyvault_keys" { + value = module.keyvault_keys } \ No newline at end of file diff --git a/landingzones/caf_example/README.md b/landingzones/caf_example/README.md index d5d87d1a32..9c7318f940 100755 --- a/landingzones/caf_example/README.md +++ b/landingzones/caf_example/README.md @@ -91,20 +91,22 @@ You can customize the examples execution by modifying the variables as follow: | Name | Version | |------|---------| | terraform | >= 0.13 | -| azuread | ~> 1.0.0 | -| azurecaf | ~> 1.1.0 | -| azurerm | ~> 2.47.0 | -| external | ~> 1.2.0 | -| null | ~> 2.1.0 | -| random | ~> 2.2.1 | -| time | ~> 0.6.0 | -| tls | ~> 2.2.0 | ## Providers -| Name | Version | -|------|---------| -| terraform | n/a | +No provider. + +## Modules + +| Name | Source | Version | +|------|--------|---------| +| example | ../.. | | +| vm_extension_diagnostics | ../../modules/compute/virtual_machine_extensions | | +| vm_extension_monitoring_agent | ../../modules/compute/virtual_machine_extensions | | + +## Resources + +No resources. ## Inputs @@ -116,12 +118,15 @@ You can customize the examples execution by modifying the variables as follow: | app\_services | n/a | `map` | `{}` | no | | application\_gateway\_applications | n/a | `map` | `{}` | no | | application\_gateways | n/a | `map` | `{}` | no | +| application\_security\_groups | n/a | `map` | `{}` | no | | automations | n/a | `map` | `{}` | no | | availability\_sets | n/a | `map` | `{}` | no | -| azuread\_apps | n/a | `map` | `{}` | no | +| azure\_container\_registries | n/a | `map` | `{}` | no | +| azuread\_api\_permissions | n/a | `map` | `{}` | no | +| azuread\_apps | n/a | `map(any)` | `{}` | no | | azuread\_groups | n/a | `map` | `{}` | no | | azuread\_roles | n/a | `map` | `{}` | no | -| azuread\_users | n/a | `map` | `{}` | no | +| azuread\_users | n/a | `map(any)` | `{}` | no | | azurerm\_application\_insights | n/a | `map` | `{}` | no | | azurerm\_firewall\_application\_rule\_collection\_definition | n/a | `map` | `{}` | no | | azurerm\_firewall\_nat\_rule\_collection\_definition | n/a | `map` | `{}` | no | @@ -130,6 +135,7 @@ You can customize the examples execution by modifying the variables as follow: | azurerm\_redis\_caches | n/a | `map` | `{}` | no | | azurerm\_routes | n/a | `map` | `{}` | no | | bastion\_hosts | n/a | `map` | `{}` | no | +| container\_groups | n/a | `map` | `{}` | no | | cosmos\_db | n/a | `map` | `{}` | no | | cosmos\_dbs | n/a | `map` | `{}` | no | | custom\_role\_definitions | n/a | `map` | `{}` | no | @@ -139,30 +145,36 @@ You can customize the examples execution by modifying the variables as follow: | diagnostic\_storage\_accounts | n/a | `map` | `{}` | no | | diagnostics\_definition | n/a | `any` | `null` | no | | diagnostics\_destinations | n/a | `map` | `{}` | no | +| disk\_encryption\_sets | n/a | `map` | `{}` | no | | dns\_zone\_records | n/a | `map` | `{}` | no | | dns\_zones | n/a | `map` | `{}` | no | | domain\_name\_registrations | n/a | `map` | `{}` | no | | dynamic\_keyvault\_secrets | n/a | `map` | `{}` | no | | environment | n/a | `string` | `"sandpit"` | no | +| event\_hub\_auth\_rules | n/a | `map` | `{}` | no | +| event\_hub\_consumer\_groups | n/a | `map` | `{}` | no | +| event\_hub\_namespace\_auth\_rules | n/a | `map` | `{}` | no | | event\_hub\_namespaces | n/a | `map` | `{}` | no | +| event\_hubs | n/a | `map` | `{}` | no | | express\_route\_circuit\_authorizations | n/a | `map` | `{}` | no | | express\_route\_circuits | n/a | `map` | `{}` | no | | front\_door\_waf\_policies | n/a | `map` | `{}` | no | | front\_doors | n/a | `map` | `{}` | no | -| global\_settings | n/a | `map` | 
{
  "default_region": "region1",
  "regions": {
    "region1": "southeastasia",
    "region2": "eastasia"
  }
}
| no | +| global\_settings | n/a | `map` | 
{
  "default_region": "region1",
  "prefix": null,
  "regions": {
    "region1": "southeastasia",
    "region2": "eastasia"
  }
}
| no | +| image\_definitions | n/a | `map` | `{}` | no | +| ip\_groups | n/a | `map` | `{}` | no | | keyvault\_access\_policies | n/a | `map` | `{}` | no | +| keyvault\_access\_policies\_azuread\_apps | n/a | `map` | `{}` | no | | keyvault\_certificate\_issuers | n/a | `map` | `{}` | no | | keyvault\_certificate\_requests | n/a | `map` | `{}` | no | | keyvault\_keys | n/a | `map` | `{}` | no | | keyvaults | n/a | `map` | `{}` | no | -| landingzone | n/a | `map` | 
{
  "backend_type": "azurerm",
  "global_settings_key": "launchpad",
  "key": "examples",
  "level": "level0",
  "tfstates": {
    "launchpad": {
      "level": "lower",
      "tfstate": "caf_launchpad.tfstate"
    }
  }
}
| no | +| landingzone | n/a | `map` | 
{
  "backend_type": "azurerm",
  "global_settings_key": "launchpad",
  "key": "examples",
  "level": "level0"
}
| no | +| load\_balancers | n/a | `map` | `{}` | no | | local\_network\_gateways | n/a | `map` | `{}` | no | | log\_analytics | n/a | `map` | `{}` | no | | logged\_aad\_app\_objectId | n/a | `any` | `null` | no | | logged\_user\_objectId | n/a | `any` | `null` | no | -| lower\_container\_name | n/a | `any` | n/a | yes | -| lower\_resource\_group\_name | n/a | `any` | n/a | yes | -| lower\_storage\_account\_name | Map of the remote data state for lower level | `any` | n/a | yes | | machine\_learning\_workspaces | n/a | `map` | `{}` | no | | managed\_identities | n/a | `map` | `{}` | no | | mariadb\_databases | n/a | `map` | `{}` | no | @@ -183,8 +195,10 @@ You can customize the examples execution by modifying the variables as follow: | mssql\_servers | n/a | `map` | `{}` | no | | mysql\_servers | n/a | `map` | `{}` | no | | netapp\_accounts | n/a | `map` | `{}` | no | -| network\_security\_group\_definition | n/a | `any` | `null` | no | +| network\_security\_group\_definition | n/a | `map` | `{}` | no | | network\_watchers | n/a | `map` | `{}` | no | +| packer\_managed\_identity | n/a | `map` | `{}` | no | +| packer\_service\_principal | n/a | `map` | `{}` | no | | postgresql\_servers | n/a | `map` | `{}` | no | | private\_dns | n/a | `map` | `{}` | no | | private\_endpoints | n/a | `map` | `{}` | no | @@ -195,15 +209,10 @@ You can customize the examples execution by modifying the variables as follow: | role\_mapping | n/a | `map` | `{}` | no | | route\_tables | n/a | `map` | `{}` | no | | rover\_version | n/a | `any` | `null` | no | +| shared\_image\_galleries | n/a | `map` | `{}` | no | | storage\_accounts | n/a | `map` | `{}` | no | | synapse\_workspaces | n/a | `map` | `{}` | no | -| tags | n/a | `map` | `null` | no | -| tenant\_id | n/a | `any` | n/a | yes | -| tfstate\_container\_name | n/a | `any` | n/a | yes | -| tfstate\_key | n/a | `any` | n/a | yes | -| tfstate\_resource\_group\_name | n/a | `any` | n/a | yes | -| tfstate\_storage\_account\_name | n/a | `any` | n/a | yes | -| tfstate\_subscription\_id | n/a | `any` | n/a | yes | +| tags | n/a | `map(any)` | `null` | no | | var\_folder\_path | n/a | `map` | `{}` | no | | virtual\_machines | n/a | `map` | `{}` | no | | virtual\_network\_gateway\_connections | n/a | `map` | `{}` | no | @@ -216,12 +225,5 @@ You can customize the examples execution by modifying the variables as follow: | Name | Description | |------|-------------| -| dns\_zone\_records | n/a | -| dns\_zones | n/a | -| keyvault\_certificate\_requests | n/a | -| keyvault\_certificates | n/a | -| mssql\_managed\_instances | n/a | -| mssql\_managed\_instances\_secondary | n/a | -| virtual\_machines | n/a | - +| objects | n/a | \ No newline at end of file diff --git a/landingzones/caf_example/module.tf b/landingzones/caf_example/module.tf index be11fcc5e6..ed1c4e8df7 100644 --- a/landingzones/caf_example/module.tf +++ b/landingzones/caf_example/module.tf @@ -73,7 +73,7 @@ module "example" { vnet_peerings = var.vnet_peerings vnets = var.vnets } - + diagnostics = { diagnostic_event_hub_namespaces = var.diagnostic_event_hub_namespaces diagnostic_log_analytics = var.diagnostic_log_analytics diff --git a/landingzones/caf_example/outputs.tf b/landingzones/caf_example/outputs.tf index 969719fd12..b7b9077f2a 100644 --- a/landingzones/caf_example/outputs.tf +++ b/landingzones/caf_example/outputs.tf @@ -1,10 +1,10 @@ -output objects { - value = tomap( +output "objects" { + value = tomap( { (var.landingzone.key) = { - for key, value in module.example : key => value - if try(value, {}) != {} - } + for key, value in module.example : key => value + if try(value, {}) != {} + } } ) sensitive = false diff --git a/landingzones/caf_example/variables.tf b/landingzones/caf_example/variables.tf index a98c05c976..8a38ccd1a5 100644 --- a/landingzones/caf_example/variables.tf +++ b/landingzones/caf_example/variables.tf @@ -234,34 +234,34 @@ variable "express_route_circuit_authorizations" { default = {} } -variable shared_image_galleries { +variable "shared_image_galleries" { default = {} } -variable image_definitions { +variable "image_definitions" { default = {} } -variable diagnostics_destinations { +variable "diagnostics_destinations" { default = {} } variable "vnet_peerings" { default = {} } -variable packer_service_principal { +variable "packer_service_principal" { default = {} } -variable packer_managed_identity { +variable "packer_managed_identity" { default = {} } -variable azuread_api_permissions { +variable "azuread_api_permissions" { default = {} } -variable keyvault_access_policies_azuread_apps { +variable "keyvault_access_policies_azuread_apps" { default = {} } @@ -288,10 +288,10 @@ variable "private_endpoints" { default = {} } -variable event_hubs { +variable "event_hubs" { default = {} } -variable automations { +variable "automations" { default = {} } diff --git a/landingzones/caf_launchpad/dynamic_secrets.tf b/landingzones/caf_launchpad/dynamic_secrets.tf index c485b2fd88..4c2862c2c2 100644 --- a/landingzones/caf_launchpad/dynamic_secrets.tf +++ b/landingzones/caf_launchpad/dynamic_secrets.tf @@ -1,5 +1,5 @@ -module dynamic_keyvault_secrets { +module "dynamic_keyvault_secrets" { source = "../../modules/security/dynamic_keyvault_secrets/" for_each = try(var.dynamic_keyvault_secrets, {}) diff --git a/landingzones/caf_launchpad/main.tf b/landingzones/caf_launchpad/main.tf index c9183a2c06..2c52ea02bd 100644 --- a/landingzones/caf_launchpad/main.tf +++ b/landingzones/caf_launchpad/main.tf @@ -50,8 +50,8 @@ locals { "landingzone" = var.landingzone.key } - tags = merge(local.global_settings.tags, local.landingzone_tag, { "level" = var.landingzone.level }, { "environment" = local.global_settings.environment }, { "rover_version" = var.rover_version }, var.tags) - + tags = merge(local.global_settings.tags, local.landingzone_tag, { "level" = var.landingzone.level }, { "environment" = local.global_settings.environment }, { "rover_version" = var.rover_version }, var.tags) + global_settings = { default_region = var.default_region environment = var.environment @@ -59,7 +59,7 @@ locals { passthrough = var.passthrough prefix = var.prefix prefixes = var.prefix == "" ? null : [try(random_string.prefix.0.result, var.prefix)] - prefix_with_hyphen = var.prefix == "" ? null : format("%s",try(random_string.prefix.0.result, var.prefix)) + prefix_with_hyphen = var.prefix == "" ? null : format("%s", try(random_string.prefix.0.result, var.prefix)) random_length = var.random_length regions = var.regions tags = var.tags diff --git a/landingzones/caf_launchpad/output.tf b/landingzones/caf_launchpad/output.tf index ee00e981b7..313425b129 100644 --- a/landingzones/caf_launchpad/output.tf +++ b/landingzones/caf_launchpad/output.tf @@ -1,16 +1,16 @@ -output objects { - value = tomap( +output "objects" { + value = tomap( { (var.landingzone.key) = { - for key, value in module.launchpad : key => value - if try(value, {}) != {} - } + for key, value in module.launchpad : key => value + if try(value, {}) != {} + } } ) sensitive = true } -output tfstates { +output "tfstates" { value = local.tfstates sensitive = true } diff --git a/landingzones/caf_launchpad/variables.tf b/landingzones/caf_launchpad/variables.tf index c4df499696..a59c78e693 100644 --- a/landingzones/caf_launchpad/variables.tf +++ b/landingzones/caf_launchpad/variables.tf @@ -1,208 +1,208 @@ # Map of the current tfstate -variable tfstate_storage_account_name { +variable "tfstate_storage_account_name" { default = null } -variable tfstate_container_name { +variable "tfstate_container_name" { default = null } -variable tfstate_key { +variable "tfstate_key" { default = null } -variable tfstate_resource_group_name { +variable "tfstate_resource_group_name" { default = null } -variable tenant_id {} -variable landingzone { +variable "tenant_id" {} +variable "landingzone" { description = "The landing zone name is used to reference the tfstate in configuration files. Therefore while set it is recommended not to change" } -variable passthrough { +variable "passthrough" { default = false } -variable random_length { +variable "random_length" { default = null } -variable inherit_tags { +variable "inherit_tags" { default = false } -variable default_region { +variable "default_region" { description = "Define the default region where services are deployed if the location is not set at the resource level" default = "region1" } -variable regions { - type = map +variable "regions" { + type = map(any) description = "List of the regions where services can be deployed. This impact the diagnostics logs settings" default = { region1 = "southeastasia" } } -variable enable { +variable "enable" { description = "Map of services defined in the configuration file you want to disable during a deployment" default = {} } -variable prefix { +variable "prefix" { default = null } -variable use_slug { +variable "use_slug" { default = true } -variable log_analytics { +variable "log_analytics" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } # Do not change the default value to be able to upgrade to the standard launchpad -variable tf_name { +variable "tf_name" { description = "Name of the terraform state in the blob storage (Does not include the extension .tfstate). Setup by the rover. Leave empty in the configuration file" default = "" } -variable resource_groups {} +variable "resource_groups" {} -variable storage_accounts {} -variable keyvaults {} -variable keyvault_access_policies { +variable "storage_accounts" {} +variable "keyvaults" {} +variable "keyvault_access_policies" { default = {} } -variable dynamic_keyvault_secrets {} +variable "dynamic_keyvault_secrets" {} -variable subscriptions { +variable "subscriptions" { default = {} } ## Azure Active Directory -variable azuread_apps { +variable "azuread_apps" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable azuread_users { +variable "azuread_users" { default = {} } -variable azuread_roles { +variable "azuread_roles" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable networking { +variable "networking" { default = {} } -variable compute { +variable "compute" { default = {} } -variable launchpad_key_names {} +variable "launchpad_key_names" {} -variable custom_role_definitions { +variable "custom_role_definitions" { default = {} } -variable role_mapping { +variable "role_mapping" { default = { built_in_role_mapping = {} custom_role_mapping = {} } } -variable tags { - type = map +variable "tags" { + type = map(any) default = {} } -variable rover_version {} +variable "rover_version" {} -variable user_type {} +variable "user_type" {} -variable logged_user_objectId { +variable "logged_user_objectId" { default = null } -variable logged_aad_app_objectId { +variable "logged_aad_app_objectId" { default = null } -variable aad_users { +variable "aad_users" { default = {} } -variable aad_roles { +variable "aad_roles" { default = {} } -variable azuread_api_permissions { +variable "azuread_api_permissions" { default = {} } -variable environment { +variable "environment" { type = string description = "This variable is set by the rover during the deployment based on the -env or -environment flags. Default to sandpit" } -variable diagnostics { +variable "diagnostics" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = {} } -variable diagnostics_destinations { +variable "diagnostics_destinations" { default = {} } -variable diagnostic_event_hub_namespaces { +variable "diagnostic_event_hub_namespaces" { default = {} } -variable diagnostic_log_analytics { +variable "diagnostic_log_analytics" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable keyvault_access_policies_azuread_apps { +variable "keyvault_access_policies_azuread_apps" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable bastion_hosts { +variable "bastion_hosts" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable azurerm_routes { +variable "azurerm_routes" { default = {} } -variable route_tables { +variable "route_tables" { default = {} } \ No newline at end of file diff --git a/landingzones/caf_solution/add-ons/databricks/variables.tf b/landingzones/caf_solution/add-ons/databricks/variables.tf index 2ddbfffcb7..6c3a9e993e 100644 --- a/landingzones/caf_solution/add-ons/databricks/variables.tf +++ b/landingzones/caf_solution/add-ons/databricks/variables.tf @@ -31,59 +31,59 @@ variable "logged_user_objectId" { variable "logged_aad_app_objectId" { default = null } -variable tags { +variable "tags" { default = null - type = map + type = map(any) } -variable diagnostic_log_analytics { +variable "diagnostic_log_analytics" { default = {} } variable "app_service_environments" { default = {} } -variable app_service_plans { +variable "app_service_plans" { default = {} } -variable app_services { +variable "app_services" { default = {} } -variable diagnostics_definition { +variable "diagnostics_definition" { default = null } -variable resource_groups { +variable "resource_groups" { default = null } variable "network_security_group_definition" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable azurerm_redis_caches { +variable "azurerm_redis_caches" { default = {} } -variable mssql_servers { +variable "mssql_servers" { default = {} } -variable mssql_databases { +variable "mssql_databases" { default = {} } -variable mssql_elastic_pools { +variable "mssql_elastic_pools" { default = {} } variable "storage_accounts" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_access_policies { +variable "keyvault_access_policies" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } variable "azure_container_registries" { @@ -92,63 +92,63 @@ variable "azure_container_registries" { variable "bastion_hosts" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable diagnostic_storage_accounts { +variable "diagnostic_storage_accounts" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } -variable synapse_workspaces { +variable "synapse_workspaces" { default = {} } -variable azurerm_application_insights { +variable "azurerm_application_insights" { default = {} } -variable role_mapping { +variable "role_mapping" { default = {} } -variable aks_clusters { +variable "aks_clusters" { default = {} } -variable databricks_workspaces { +variable "databricks_workspaces" { default = {} } -variable machine_learning_workspaces { +variable "machine_learning_workspaces" { default = {} } -variable monitoring { +variable "monitoring" { default = {} } -variable virtual_wans { +variable "virtual_wans" { default = {} } -variable event_hub_namespaces { +variable "event_hub_namespaces" { default = {} } -variable application_gateways { +variable "application_gateways" { default = {} } -variable application_gateway_applications { +variable "application_gateway_applications" { default = {} } -variable dynamic_keyvault_secrets { +variable "dynamic_keyvault_secrets" { default = {} } -variable disk_encryption_sets { +variable "disk_encryption_sets" { default = {} } -variable keyvault_keys { +variable "keyvault_keys" { default = {} } variable "databricks" { default = {} } -variable var_folder_path { +variable "var_folder_path" { default = {} } \ No newline at end of file diff --git a/load_balancers.tf b/load_balancers.tf index 47ed571856..c79f4bfb10 100644 --- a/load_balancers.tf +++ b/load_balancers.tf @@ -1,4 +1,4 @@ -module load_balancers { +module "load_balancers" { source = "./modules/networking/load_balancers" for_each = try(local.networking.load_balancers, {}) diff --git a/locals.tf b/locals.tf index 340611798f..6173457230 100644 --- a/locals.tf +++ b/locals.tf @@ -9,25 +9,25 @@ resource "random_string" "prefix" { locals { dynamic_app_settings_combined_objects = { - app_config = local.combined_objects_app_config - keyvaults = local.combined_objects_keyvaults - machine_learning_workspaces = local.combined_objects_machine_learning - managed_identities = local.combined_objects_managed_identities - storage_accounts = local.combined_objects_storage_accounts - azure_container_registries = local.combined_objects_azure_container_registries - client_config = tomap({ (local.client_config.landingzone_key) = {config = local.client_config} }) + app_config = local.combined_objects_app_config + keyvaults = local.combined_objects_keyvaults + machine_learning_workspaces = local.combined_objects_machine_learning + managed_identities = local.combined_objects_managed_identities + storage_accounts = local.combined_objects_storage_accounts + azure_container_registries = local.combined_objects_azure_container_registries + client_config = tomap({ (local.client_config.landingzone_key) = { config = local.client_config } }) } dynamic_app_config_combined_objects = { - keyvaults = local.combined_objects_keyvaults - machine_learning_workspaces = local.combined_objects_machine_learning - azure_container_registries = local.combined_objects_azure_container_registries - logic_app_workflow = local.combined_objects_logic_app_workflow - resource_groups = local.combined_objects_resource_groups - storage_accounts = local.combined_objects_storage_accounts - client_config = tomap({ (local.client_config.landingzone_key) = {config = local.client_config} }) - managed_identities = local.combined_objects_managed_identities - azurerm_application_insights = tomap({ (local.client_config.landingzone_key) = module.azurerm_application_insights }) + keyvaults = local.combined_objects_keyvaults + machine_learning_workspaces = local.combined_objects_machine_learning + azure_container_registries = local.combined_objects_azure_container_registries + logic_app_workflow = local.combined_objects_logic_app_workflow + resource_groups = local.combined_objects_resource_groups + storage_accounts = local.combined_objects_storage_accounts + client_config = tomap({ (local.client_config.landingzone_key) = { config = local.client_config } }) + managed_identities = local.combined_objects_managed_identities + azurerm_application_insights = tomap({ (local.client_config.landingzone_key) = module.azurerm_application_insights }) } global_settings = { @@ -103,7 +103,7 @@ locals { database = { azurerm_redis_caches = try(var.database.azurerm_redis_caches, {}) - app_config = try(var.database.app_config, {}) + app_config = try(var.database.app_config, {}) cosmos_dbs = try(var.database.cosmos_dbs, {}) databricks_workspaces = try(var.database.databricks_workspaces, {}) machine_learning_workspaces = try(var.database.machine_learning_workspaces, {}) @@ -152,7 +152,7 @@ locals { landingzone_key = var.current_landingzone_key logged_aad_app_objectId = local.object_id logged_user_objectId = local.object_id - landingzone_key = var.current_landingzone_key + landingzone_key = var.current_landingzone_key object_id = local.object_id subscription_id = data.azurerm_client_config.current.subscription_id tenant_id = data.azurerm_client_config.current.tenant_id diff --git a/log_analytics.tf b/log_analytics.tf index f56b592c6b..f652e15218 100755 --- a/log_analytics.tf +++ b/log_analytics.tf @@ -9,7 +9,7 @@ module "log_analytics" { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -module log_analytics_diagnostics { +module "log_analytics_diagnostics" { source = "./modules/diagnostics" for_each = var.log_analytics @@ -19,7 +19,7 @@ module log_analytics_diagnostics { profiles = try(each.value.diagnostic_profiles, {}) } -output log_analytics { +output "log_analytics" { value = module.log_analytics } diff --git a/machine_learning.tf b/machine_learning.tf index b9b42d05a5..46ca4a1266 100644 --- a/machine_learning.tf +++ b/machine_learning.tf @@ -1,4 +1,4 @@ -module machine_learning_workspaces { +module "machine_learning_workspaces" { source = "./modules/analytics/machine_learning" for_each = local.database.machine_learning_workspaces @@ -14,7 +14,7 @@ module machine_learning_workspaces { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -output machine_learning_workspaces { +output "machine_learning_workspaces" { value = module.machine_learning_workspaces } diff --git a/managed_identities.tf b/managed_identities.tf index 0b20a592b6..83b9f7d098 100755 --- a/managed_identities.tf +++ b/managed_identities.tf @@ -1,5 +1,5 @@ -module managed_identities { +module "managed_identities" { source = "./modules/security/managed_identity" for_each = var.managed_identities @@ -10,7 +10,7 @@ module managed_identities { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -output managed_identities { +output "managed_identities" { value = module.managed_identities } diff --git a/mariadb_servers.tf b/mariadb_servers.tf index 2b8b21cac0..6a1d9dfac1 100644 --- a/mariadb_servers.tf +++ b/mariadb_servers.tf @@ -1,5 +1,5 @@ -output mariadb_servers { +output "mariadb_servers" { value = module.mariadb_servers } diff --git a/modules/analytics/databricks_workspace/output.tf b/modules/analytics/databricks_workspace/output.tf index 01da2b7731..f58924ea18 100644 --- a/modules/analytics/databricks_workspace/output.tf +++ b/modules/analytics/databricks_workspace/output.tf @@ -1,22 +1,22 @@ -output id { +output "id" { description = "The ID of the Databricks Workspace in the Azure management plane." value = azurerm_databricks_workspace.ws.id } -output managed_resource_group_id { +output "managed_resource_group_id" { description = "The ID of the Managed Resource Group created by the Databricks Workspace." value = azurerm_databricks_workspace.ws.managed_resource_group_id } -output workspace_url { +output "workspace_url" { description = "The workspace URL which is of the format 'adb-{workspaceId}.{random}.azuredatabricks.net'" value = azurerm_databricks_workspace.ws.workspace_url } -output workspace_id { +output "workspace_id" { description = "The unique identifier of the databricks workspace in Databricks control plane." value = azurerm_databricks_workspace.ws.workspace_id diff --git a/modules/analytics/databricks_workspace/variables.tf b/modules/analytics/databricks_workspace/variables.tf index a2049b37b4..b8d27c69e0 100644 --- a/modules/analytics/databricks_workspace/variables.tf +++ b/modules/analytics/databricks_workspace/variables.tf @@ -1,4 +1,4 @@ -variable settings { +variable "settings" { description = "Configuration object for the Databricks workspace." # # optional fields supported after TF14 # type = object({ @@ -16,30 +16,30 @@ variable settings { # }) } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable location { +variable "location" { description = "Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable resource_group_name { +variable "resource_group_name" { description = "The name of the resource group where to create the resource." type = string } -variable vnets { +variable "vnets" { description = "Virtual networks objects - contains all virtual networks that could potentially be used by the module." } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } diff --git a/modules/analytics/machine_learning/compute_instance.tf b/modules/analytics/machine_learning/compute_instance.tf index 02aea23503..b401de2cfb 100644 --- a/modules/analytics/machine_learning/compute_instance.tf +++ b/modules/analytics/machine_learning/compute_instance.tf @@ -1,4 +1,4 @@ -module compute_instance { +module "compute_instance" { source = "./compute_instance" for_each = try(var.settings.compute_instances, {}) diff --git a/modules/analytics/machine_learning/compute_instance/variables.tf b/modules/analytics/machine_learning/compute_instance/variables.tf index f15dfd6e9c..1641cf0400 100644 --- a/modules/analytics/machine_learning/compute_instance/variables.tf +++ b/modules/analytics/machine_learning/compute_instance/variables.tf @@ -1,18 +1,18 @@ -variable settings {} -variable global_settings { +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable machine_learning_workspace_name {} -variable subnet_id {} -variable resource_group_name { +variable "machine_learning_workspace_name" {} +variable "subnet_id" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable tags { +variable "tags" { description = "(Required) Map of tags to be applied to the resource" - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/analytics/machine_learning/output.tf b/modules/analytics/machine_learning/output.tf index 72393748c0..3af8a035a1 100644 --- a/modules/analytics/machine_learning/output.tf +++ b/modules/analytics/machine_learning/output.tf @@ -1,18 +1,18 @@ -output id { +output "id" { description = "The ID of the Machine Learning Workspace." value = azurerm_machine_learning_workspace.ws.id } -output name { +output "name" { description = "Name of the Machine Learning Workspac." value = azurerm_machine_learning_workspace.ws.name } -output identity { +output "identity" { description = "An identity block exports the following: - principal_id: The (Client) ID of the Service Principal, -tenant_id: The ID of the Tenant the Service Principal is assigned in." - value = azurerm_machine_learning_workspace.ws.identity + value = azurerm_machine_learning_workspace.ws.identity } -output rbac_id { +output "rbac_id" { value = azurerm_machine_learning_workspace.ws.identity[0].principal_id } \ No newline at end of file diff --git a/modules/analytics/machine_learning/variables.tf b/modules/analytics/machine_learning/variables.tf index 78b89b728b..63174622b1 100644 --- a/modules/analytics/machine_learning/variables.tf +++ b/modules/analytics/machine_learning/variables.tf @@ -1,4 +1,4 @@ -variable settings { +variable "settings" { description = "Configuration object for the machine learning workspace." # # optional fields supported after TF14 # type = object({ @@ -13,43 +13,43 @@ variable settings { # }) } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable keyvault_id { +variable "keyvault_id" { description = "The ID of the Key Vault to be used by the machine learning workspace." type = string } -variable storage_account_id { +variable "storage_account_id" { description = "The ID of the Storage Account to be used by the nachine learning workspace." type = string } -variable application_insights_id { +variable "application_insights_id" { description = "The ID of the App Insights to be used by the nachine learning workspace." type = string } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable vnets { +variable "vnets" { description = "Virtual networks objects - contains all virtual networks that could potentially be used by the module." } \ No newline at end of file diff --git a/modules/analytics/synapse/output.tf b/modules/analytics/synapse/output.tf index b71dd986cc..25b77b1493 100644 --- a/modules/analytics/synapse/output.tf +++ b/modules/analytics/synapse/output.tf @@ -1,36 +1,36 @@ -output id { +output "id" { description = "The ID of the Synapse Workspace." value = azurerm_synapse_workspace.ws.id } -output connectivity_endpoints { +output "connectivity_endpoints" { description = "A list of Connectivity endpoints for this Synapse Workspace." value = azurerm_synapse_workspace.ws.connectivity_endpoints } -output managed_resource_group_name { +output "managed_resource_group_name" { description = "Workspace managed resource group." value = azurerm_synapse_workspace.ws.managed_resource_group_name } -output identity { +output "identity" { description = "An identity block which contains the Managed Service Identity information for this Synapse Workspace. - type - The Identity Type for the Service Principal associated with the Managed Service Identity of this Synapse Workspace. principal_id - The Principal ID for the Service Principal associated with the Managed Service Identity of this Synapse Workspace. tenant_id - The Tenant ID for the Service Principal associated with the Managed Service Identity of this Synapse Workspace." value = azurerm_synapse_workspace.ws.identity } -output spark_pool { +output "spark_pool" { description = "Spark pool object" value = module.spark_pool } -output sql_pool { +output "sql_pool" { description = "SQL pool object" value = module.sql_pool } -output rbac_id { +output "rbac_id" { value = azurerm_synapse_workspace.ws.identity[0].principal_id } \ No newline at end of file diff --git a/modules/analytics/synapse/spark_pool.tf b/modules/analytics/synapse/spark_pool.tf index e82b4f3f5b..bcc3c70f17 100644 --- a/modules/analytics/synapse/spark_pool.tf +++ b/modules/analytics/synapse/spark_pool.tf @@ -1,4 +1,4 @@ -module spark_pool { +module "spark_pool" { source = "./spark_pool" for_each = try(var.settings.synapse_spark_pools, {}) diff --git a/modules/analytics/synapse/spark_pool/output.tf b/modules/analytics/synapse/spark_pool/output.tf index 7845e02eb6..1bcde1c6bd 100644 --- a/modules/analytics/synapse/spark_pool/output.tf +++ b/modules/analytics/synapse/spark_pool/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { description = "The ID of the Synapse Spark Pool." value = azurerm_synapse_spark_pool.spark_pool.id } \ No newline at end of file diff --git a/modules/analytics/synapse/spark_pool/variables.tf b/modules/analytics/synapse/spark_pool/variables.tf index f2c2a3cdbf..d2b7636372 100644 --- a/modules/analytics/synapse/spark_pool/variables.tf +++ b/modules/analytics/synapse/spark_pool/variables.tf @@ -1,9 +1,9 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable synapse_workspace_id {} -variable tags { +variable "settings" {} +variable "synapse_workspace_id" {} +variable "tags" { description = "(Required) Map of tags to be applied to the resource" - type = map + type = map(any) } diff --git a/modules/analytics/synapse/sql_pool.tf b/modules/analytics/synapse/sql_pool.tf index b3549c0aab..bc89682f51 100644 --- a/modules/analytics/synapse/sql_pool.tf +++ b/modules/analytics/synapse/sql_pool.tf @@ -1,4 +1,4 @@ -module sql_pool { +module "sql_pool" { source = "./sql_pool" for_each = try(var.settings.synapse_sql_pools, {}) diff --git a/modules/analytics/synapse/sql_pool/output.tf b/modules/analytics/synapse/sql_pool/output.tf index 82ac2b079e..d59a0b8c6b 100644 --- a/modules/analytics/synapse/sql_pool/output.tf +++ b/modules/analytics/synapse/sql_pool/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { description = "The ID of the Synapse Spark Pool." value = azurerm_synapse_sql_pool.sql_pool.id } \ No newline at end of file diff --git a/modules/analytics/synapse/sql_pool/variables.tf b/modules/analytics/synapse/sql_pool/variables.tf index 2765fd6f1d..a5908844c4 100644 --- a/modules/analytics/synapse/sql_pool/variables.tf +++ b/modules/analytics/synapse/sql_pool/variables.tf @@ -1,10 +1,10 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable synapse_workspace_id {} -variable tags { +variable "settings" {} +variable "synapse_workspace_id" {} +variable "tags" { description = "(Required) Map of tags to be applied to the resource" - type = map + type = map(any) } diff --git a/modules/analytics/synapse/variables.tf b/modules/analytics/synapse/variables.tf index 4d4921fa3c..d19a48a3fe 100644 --- a/modules/analytics/synapse/variables.tf +++ b/modules/analytics/synapse/variables.tf @@ -1,32 +1,32 @@ -variable settings { +variable "settings" { description = "Configuration object for the Synapse workspace." } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable storage_data_lake_gen2_filesystem_id { +variable "storage_data_lake_gen2_filesystem_id" { description = "The ID of the Datalake filesystem to be used by Synapse." } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable keyvault_id { +variable "keyvault_id" { description = "The ID of the Key Vault to be used by the Synapse workspace." type = string default = null } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/app_insights/output.tf b/modules/app_insights/output.tf index a8912b787a..947a40e760 100644 --- a/modules/app_insights/output.tf +++ b/modules/app_insights/output.tf @@ -1,19 +1,19 @@ -output id { +output "id" { description = "The ID of the Application Insights component." value = azurerm_application_insights.appinsights.id } -output app_id { +output "app_id" { description = "The App ID associated with this Application Insights component." value = azurerm_application_insights.appinsights.app_id } -output instrumentation_key { +output "instrumentation_key" { description = "The Instrumentation Key for this Application Insights component." value = azurerm_application_insights.appinsights.instrumentation_key } -output connection_string { +output "connection_string" { description = "The Connection String for this Application Insights component. (Sensitive)" value = azurerm_application_insights.appinsights.connection_string diff --git a/modules/app_insights/variables.tf b/modules/app_insights/variables.tf index 65980a84d5..8cd93bfdfd 100644 --- a/modules/app_insights/variables.tf +++ b/modules/app_insights/variables.tf @@ -1,29 +1,29 @@ -variable prefix { +variable "prefix" { description = "You can use a prefix to add to the list of resource groups you want to create" default = null } -variable tags { +variable "tags" { description = "(Required) Map of tags to be applied to the resource" - type = map + type = map(any) } -variable name { +variable "name" { description = "(Required) Specifies the name of the Application Insights component. Changing this forces a new resource to be created." type = string } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable application_type { +variable "application_type" { description = "(Required) Specifies the type of Application Insights to create. Valid values are ios for iOS, java for Java web, MobileCenter for App Center, Node.JS for Node.js, other for General, phone for Windows Phone, store for Windows Store and web for ASP.NET. Please note these values are case sensitive; unmatched values are treated as ASP.NET by Azure. Changing this forces a new resource to be created." default = "other" @@ -33,19 +33,19 @@ variable application_type { } } -variable daily_data_cap_in_gb { +variable "daily_data_cap_in_gb" { description = "(Optional) Specifies the Application Insights component daily data volume cap in GB." default = null type = number } -variable daily_data_cap_notifications_disabled { +variable "daily_data_cap_notifications_disabled" { description = "(Optional) Specifies if a notification email will be send when the daily data volume cap is met. (set to false to enable)" default = true type = bool } -variable retention_in_days { +variable "retention_in_days" { description = "(Optional) Specifies the retention period in days. Possible values are 30, 60, 90, 120, 180, 270, 365, 550 or 730. Defaults to 90." default = 90 type = number @@ -56,25 +56,25 @@ variable retention_in_days { } } -variable sampling_percentage { +variable "sampling_percentage" { description = "(Optional) Specifies the percentage of the data produced by the monitored application that is sampled for Application Insights telemetry." default = null type = number } -variable disable_ip_masking { +variable "disable_ip_masking" { description = "(Optional) By default the real client ip is masked as 0.0.0.0 in the logs. Use this argument to disable masking and log the real client ip. Defaults to false." default = false type = bool } -variable global_settings { +variable "global_settings" { description = "Global settings object when the resource is deploye in landing zones context." default = null type = any } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/automation/output.tf b/modules/automation/output.tf index 517338a8e3..49fcb0ac8c 100644 --- a/modules/automation/output.tf +++ b/modules/automation/output.tf @@ -1,24 +1,24 @@ -output id { +output "id" { description = "The Automation Account ID." value = azurerm_automation_account.auto_account.id } -output name { +output "name" { description = "The Automation Account name." value = azurerm_automation_account.auto_account.name } -output dsc_server_endpoint { +output "dsc_server_endpoint" { description = "The DSC Server Endpoint associated with this Automation Account." value = azurerm_automation_account.auto_account.dsc_server_endpoint } -output dsc_primary_access_key { +output "dsc_primary_access_key" { description = "The Primary Access Key for the DSC Endpoint associated with this Automation Account." value = azurerm_automation_account.auto_account.dsc_primary_access_key } -output dsc_secondary_access_key { +output "dsc_secondary_access_key" { description = "The Secondary Access Key for the DSC Endpoint associated with this Automation Account." value = azurerm_automation_account.auto_account.dsc_secondary_access_key } \ No newline at end of file diff --git a/modules/automation/variables.tf b/modules/automation/variables.tf index e8490a318f..0f2c49187d 100644 --- a/modules/automation/variables.tf +++ b/modules/automation/variables.tf @@ -1,9 +1,9 @@ -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable settings { +variable "settings" { description = "Configuration object for the Automation account." # # optional fields supported after TF14 # type = object({ @@ -13,18 +13,18 @@ variable settings { # }) } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable diagnostics {} +variable "diagnostics" {} -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/azuread/applications/output.tf b/modules/azuread/applications/output.tf index 45faa53289..de558f13db 100755 --- a/modules/azuread/applications/output.tf +++ b/modules/azuread/applications/output.tf @@ -1,10 +1,10 @@ -output tenant_id { +output "tenant_id" { value = var.client_config.tenant_id } -output azuread_application { +output "azuread_application" { value = { id = azuread_application.app.id object_id = azuread_application.app.object_id @@ -14,7 +14,7 @@ output azuread_application { } -output azuread_service_principal { +output "azuread_service_principal" { value = { id = azuread_service_principal.app.id object_id = azuread_service_principal.app.object_id @@ -22,7 +22,7 @@ output azuread_service_principal { } -output keyvaults { +output "keyvaults" { value = { for key, value in try(var.settings.keyvaults, {}) : key => { id = azurerm_key_vault_secret.client_id[key].key_vault_id @@ -31,7 +31,7 @@ output keyvaults { } } -output rbac_id { +output "rbac_id" { value = azuread_service_principal.app.object_id description = "This attribute is used to set the role assignment" } \ No newline at end of file diff --git a/modules/azuread/applications/variables.tf b/modules/azuread/applications/variables.tf index afcf577f35..ac4e2d6244 100755 --- a/modules/azuread/applications/variables.tf +++ b/modules/azuread/applications/variables.tf @@ -1,20 +1,20 @@ -variable global_settings { +variable "global_settings" { default = {} } -variable settings { +variable "settings" { default = {} } -variable azuread_api_permissions { +variable "azuread_api_permissions" { default = {} } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable user_type {} -variable keyvaults { +variable "user_type" {} +variable "keyvaults" { default = {} } -variable password_policy { +variable "password_policy" { description = "Default password policy applies when not set in tfvars." default = { # Length of the password diff --git a/modules/azuread/groups/output.tf b/modules/azuread/groups/output.tf index 5e40ee372b..e56c371c95 100755 --- a/modules/azuread/groups/output.tf +++ b/modules/azuread/groups/output.tf @@ -1,22 +1,22 @@ -output id { +output "id" { description = "The ID of the group created." value = azuread_group.group.id } -output name { +output "name" { description = "The name of the group created." value = azuread_group.group.name } -output tenant_id { +output "tenant_id" { description = "The tenand_id of the group created." value = var.tenant_id } -output rbac_id { +output "rbac_id" { description = "This attribute is used to set the role assignment." value = azuread_group.group.id diff --git a/modules/azuread/groups/variables.tf b/modules/azuread/groups/variables.tf index b2a6bc85d4..289aca87c9 100755 --- a/modules/azuread/groups/variables.tf +++ b/modules/azuread/groups/variables.tf @@ -1,10 +1,10 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable azuread_groups { +variable "azuread_groups" { description = "Set of groups to be created." } -variable tenant_id { +variable "tenant_id" { description = "The tenant ID of the Azure AD environment where to create the groups." type = string } \ No newline at end of file diff --git a/modules/azuread/groups_members/member/member.tf b/modules/azuread/groups_members/member/member.tf index 332740a461..ad997183c3 100755 --- a/modules/azuread/groups_members/member/member.tf +++ b/modules/azuread/groups_members/member/member.tf @@ -1,5 +1,5 @@ -variable group_object_id {} -variable member_object_id {} +variable "group_object_id" {} +variable "member_object_id" {} resource "azuread_group_member" "id" { group_object_id = var.group_object_id diff --git a/modules/azuread/groups_members/members.tf b/modules/azuread/groups_members/members.tf index ba334b76b5..197e8c1995 100755 --- a/modules/azuread/groups_members/members.tf +++ b/modules/azuread/groups_members/members.tf @@ -4,7 +4,7 @@ data "azuread_user" "upn" { user_principal_name = each.value } -module user_principal_names { +module "user_principal_names" { source = "./member" for_each = toset(try(var.settings.members.user_principal_names, [])) @@ -13,7 +13,7 @@ module user_principal_names { } -module service_principals { +module "service_principals" { source = "./member" for_each = toset(try(var.settings.members.service_principal_keys, [])) @@ -22,7 +22,7 @@ module service_principals { } -module object_id { +module "object_id" { source = "./member" for_each = toset(try(var.settings.members.object_ids, [])) @@ -36,7 +36,7 @@ data "azuread_group" "name" { display_name = each.value } -module group_name { +module "group_name" { source = "./member" for_each = toset(try(var.settings.members.group_names, [])) @@ -44,7 +44,7 @@ module group_name { member_object_id = data.azuread_group.name[each.key].id } -module group_keys { +module "group_keys" { source = "./member" for_each = toset(try(var.settings.members.group_keys, [])) diff --git a/modules/azuread/groups_members/variables.tf b/modules/azuread/groups_members/variables.tf index 57b7d97f5f..24c8ff6e87 100755 --- a/modules/azuread/groups_members/variables.tf +++ b/modules/azuread/groups_members/variables.tf @@ -1,8 +1,8 @@ -variable group_id {} -variable azuread_groups { +variable "group_id" {} +variable "azuread_groups" { default = {} } -variable azuread_apps { +variable "azuread_apps" { default = {} } -variable settings {} \ No newline at end of file +variable "settings" {} \ No newline at end of file diff --git a/modules/azuread/roles/variables.tf b/modules/azuread/roles/variables.tf index 7b7a084f4d..175fd39e9b 100755 --- a/modules/azuread/roles/variables.tf +++ b/modules/azuread/roles/variables.tf @@ -1,2 +1,2 @@ -variable object_id {} -variable azuread_roles {} +variable "object_id" {} +variable "azuread_roles" {} diff --git a/modules/azuread/users/output.tf b/modules/azuread/users/output.tf index 489a73c7ee..0ddb5e38f7 100644 --- a/modules/azuread/users/output.tf +++ b/modules/azuread/users/output.tf @@ -1,10 +1,10 @@ -output rbac_id { +output "rbac_id" { value = azuread_user.account.object_id description = "This attribute is used to set the role assignment" } -output id { +output "id" { value = azuread_user.account.id } diff --git a/modules/azuread/users/variables.tf b/modules/azuread/users/variables.tf index 228d85e385..8788595a35 100755 --- a/modules/azuread/users/variables.tf +++ b/modules/azuread/users/variables.tf @@ -1,12 +1,12 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable settings {} -variable keyvaults {} -variable password_policy { +variable "settings" {} +variable "keyvaults" {} +variable "password_policy" { description = "Map to define the password policy to apply" default = { # Length of the password diff --git a/modules/compute/aks/diagnostics.tf b/modules/compute/aks/diagnostics.tf index 764422dc53..eb3fb6b543 100644 --- a/modules/compute/aks/diagnostics.tf +++ b/modules/compute/aks/diagnostics.tf @@ -1,5 +1,5 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" count = var.diagnostic_profiles == null ? 0 : 1 diff --git a/modules/compute/aks/output.tf b/modules/compute/aks/output.tf index 9589c94926..2da00913e7 100644 --- a/modules/compute/aks/output.tf +++ b/modules/compute/aks/output.tf @@ -1,57 +1,57 @@ -output id { +output "id" { value = azurerm_kubernetes_cluster.aks.id } -output cluster_name { +output "cluster_name" { value = azurecaf_name.aks.result } -output resource_group_name { +output "resource_group_name" { value = var.resource_group.name } -output aks_kubeconfig_cmd { +output "aks_kubeconfig_cmd" { value = format("az aks get-credentials --name %s --resource-group %s --overwrite-existing", azurecaf_name.aks.result, var.resource_group.name) } -output aks_kubeconfig_admin_cmd { +output "aks_kubeconfig_admin_cmd" { value = format("az aks get-credentials --name %s --resource-group %s --overwrite-existing --admin", azurecaf_name.aks.result, var.resource_group.name) } -output kubelet_identity { +output "kubelet_identity" { description = "User-defined Managed Identity assigned to the Kubelets" value = azurerm_kubernetes_cluster.aks.kubelet_identity } -output identity { +output "identity" { description = "System assigned identity which is used by master components" value = azurerm_kubernetes_cluster.aks.identity } -output enable_rbac { +output "enable_rbac" { value = lookup(var.settings, "enable_rbac", true) } -output kube_admin_config { +output "kube_admin_config" { value = azurerm_kubernetes_cluster.aks.kube_admin_config } -output kube_admin_config_raw { +output "kube_admin_config_raw" { value = azurerm_kubernetes_cluster.aks.kube_admin_config_raw } -output kube_config { +output "kube_config" { value = azurerm_kubernetes_cluster.aks.kube_config } -output rbac_id { +output "rbac_id" { value = azurerm_kubernetes_cluster.aks.kubelet_identity[0].object_id } -output node_resource_group { +output "node_resource_group" { value = azurerm_kubernetes_cluster.aks.node_resource_group } -output private_fqdn { +output "private_fqdn" { value = azurerm_kubernetes_cluster.aks.private_fqdn } \ No newline at end of file diff --git a/modules/compute/aks/variables.tf b/modules/compute/aks/variables.tf index 0e0af2ddf2..7cfb14c2e3 100644 --- a/modules/compute/aks/variables.tf +++ b/modules/compute/aks/variables.tf @@ -1,17 +1,17 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config {} -variable diagnostics {} -variable settings {} -variable subnets {} -variable resource_group {} -variable admin_group_object_ids {} -variable base_tags { +variable "client_config" {} +variable "diagnostics" {} +variable "settings" {} +variable "subnets" {} +variable "resource_group" {} +variable "admin_group_object_ids" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable diagnostic_profiles { +variable "diagnostic_profiles" { default = null } \ No newline at end of file diff --git a/modules/compute/availability_set/output.tf b/modules/compute/availability_set/output.tf index 5e7a7b2077..18a745b23d 100644 --- a/modules/compute/availability_set/output.tf +++ b/modules/compute/availability_set/output.tf @@ -1,7 +1,7 @@ -output id { +output "id" { value = azurerm_availability_set.avset.id } -output name { +output "name" { value = azurecaf_name.avset.result } \ No newline at end of file diff --git a/modules/compute/availability_set/variables.tf b/modules/compute/availability_set/variables.tf index 475b01bdae..4a7a98f0ca 100644 --- a/modules/compute/availability_set/variables.tf +++ b/modules/compute/availability_set/variables.tf @@ -1,25 +1,25 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable resource_group_name { +variable "resource_group_name" { description = "Name of the existing resource group to deploy the virtual machine" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable settings {} -variable availability_sets {} -variable tags { +variable "settings" {} +variable "availability_sets" {} +variable "tags" { default = null } -variable name {} -variable ppg_id {} -variable proximity_placement_groups {} \ No newline at end of file +variable "name" {} +variable "ppg_id" {} +variable "proximity_placement_groups" {} \ No newline at end of file diff --git a/modules/compute/container_group/output.tf b/modules/compute/container_group/output.tf index d90223dd5b..0c0113abc6 100644 --- a/modules/compute/container_group/output.tf +++ b/modules/compute/container_group/output.tf @@ -1,11 +1,11 @@ -output id { +output "id" { value = azurerm_container_group.acg.id } -output ip_address { +output "ip_address" { value = azurerm_container_group.acg.ip_address } -output fqdn { +output "fqdn" { value = azurerm_container_group.acg.fqdn } \ No newline at end of file diff --git a/modules/compute/container_group/variables.tf b/modules/compute/container_group/variables.tf index 25d4123f9b..3d44c311d0 100644 --- a/modules/compute/container_group/variables.tf +++ b/modules/compute/container_group/variables.tf @@ -1,12 +1,12 @@ -variable base_tags {} -variable client_config {} -variable diagnostic_profiles {} -variable combined_diagnostics {} -variable combined_resources { +variable "base_tags" {} +variable "client_config" {} +variable "diagnostic_profiles" {} +variable "combined_diagnostics" {} +variable "combined_resources" { description = "Provide a map of combined resources for environment_variables_from_resources" default = {} } -variable global_settings {} -variable location {} -variable resource_group_name {} -variable settings {} \ No newline at end of file +variable "global_settings" {} +variable "location" {} +variable "resource_group_name" {} +variable "settings" {} \ No newline at end of file diff --git a/modules/compute/container_registry/diagnostics.tf b/modules/compute/container_registry/diagnostics.tf index 6f62c344aa..4396782d35 100755 --- a/modules/compute/container_registry/diagnostics.tf +++ b/modules/compute/container_registry/diagnostics.tf @@ -1,4 +1,4 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" resource_id = azurerm_container_registry.acr.id diff --git a/modules/compute/container_registry/output.tf b/modules/compute/container_registry/output.tf index c4e0ac013b..9d8f932970 100755 --- a/modules/compute/container_registry/output.tf +++ b/modules/compute/container_registry/output.tf @@ -1,20 +1,20 @@ -output id { +output "id" { value = azurerm_container_registry.acr.id } -output login_server { - value = azurerm_container_registry.acr.login_server +output "login_server" { + value = azurerm_container_registry.acr.login_server } -output login_server_url { - value = "https://${azurerm_container_registry.acr.login_server}" +output "login_server_url" { + value = "https://${azurerm_container_registry.acr.login_server}" } -output admin_username { - value = azurerm_container_registry.acr.admin_username +output "admin_username" { + value = azurerm_container_registry.acr.admin_username } -output admin_password { - value = azurerm_container_registry.acr.admin_password +output "admin_password" { + value = azurerm_container_registry.acr.admin_password } \ No newline at end of file diff --git a/modules/compute/container_registry/private_endpoint.tf b/modules/compute/container_registry/private_endpoint.tf index f4d36c4004..508ed9f593 100755 --- a/modules/compute/container_registry/private_endpoint.tf +++ b/modules/compute/container_registry/private_endpoint.tf @@ -1,5 +1,5 @@ -module private_endpoint { +module "private_endpoint" { source = "../../networking/private_endpoint" for_each = var.private_endpoints diff --git a/modules/compute/container_registry/variables.tf b/modules/compute/container_registry/variables.tf index 8959852b32..328a872b91 100755 --- a/modules/compute/container_registry/variables.tf +++ b/modules/compute/container_registry/variables.tf @@ -1,74 +1,74 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable name { +variable "name" { type = string description = "(Required) Specifies the name of the Container Registry. Changing this forces a new resource to be created." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Container Registry. Changing this forces a new resource to be created." } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created." } -variable admin_enabled { +variable "admin_enabled" { description = "(Optional) Specifies whether the admin user is enabled. Defaults to false." default = false } -variable sku { +variable "sku" { description = "(Optional) The SKU name of the container registry. Possible values are Basic, Standard and Premium. Defaults to Basic" default = "Basic" } -variable tags { - type = map +variable "tags" { + type = map(any) description = "(Optional) A mapping of tags to assign to the resource." default = {} } -variable georeplication_locations { +variable "georeplication_locations" { description = "(Optional) A list of Azure locations where the container registry should be geo-replicated." default = null } -variable vnets { +variable "vnets" { default = {} } -variable network_rule_set { +variable "network_rule_set" { description = " (Optional) A network_rule_set block as documented https://www.terraform.io/docs/providers/azurerm/r/container_registry.html" default = {} } -variable diagnostic_profiles { +variable "diagnostic_profiles" { default = {} } -variable diagnostics { +variable "diagnostics" { default = {} } -variable private_endpoints { +variable "private_endpoints" { default = {} } -variable resource_groups { +variable "resource_groups" { default = {} } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable private_dns { +variable "private_dns" { default = {} } \ No newline at end of file diff --git a/modules/compute/proximity_placement_group/output.tf b/modules/compute/proximity_placement_group/output.tf index d64b1ef3f5..342466b95d 100644 --- a/modules/compute/proximity_placement_group/output.tf +++ b/modules/compute/proximity_placement_group/output.tf @@ -1,3 +1,3 @@ -output id { +output "id" { value = azurerm_proximity_placement_group.ppg.id } diff --git a/modules/compute/proximity_placement_group/variables.tf b/modules/compute/proximity_placement_group/variables.tf index feec51f13b..658f2d3bc4 100755 --- a/modules/compute/proximity_placement_group/variables.tf +++ b/modules/compute/proximity_placement_group/variables.tf @@ -1,21 +1,21 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable resource_group_name { +variable "resource_group_name" { description = "Name of the existing resource group to deploy the virtual machine" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable tags { +variable "tags" { default = null } -variable name {} \ No newline at end of file +variable "name" {} \ No newline at end of file diff --git a/modules/compute/virtual_machine/application_security_group.tf b/modules/compute/virtual_machine/application_security_group.tf index bf29ea0e8c..2bae8d7cc4 100644 --- a/modules/compute/virtual_machine/application_security_group.tf +++ b/modules/compute/virtual_machine/application_security_group.tf @@ -3,24 +3,24 @@ resource "azurerm_network_interface_application_security_group_association" "ass network_interface_id = azurerm_network_interface.nic[each.value.nic_key].id application_security_group_id = each.value.asg_id - } +} - locals { - nic_asg = { - for nic in flatten( - [ - for nic_key, nic_value in var.settings.networking_interfaces : [ - for asg_key, asg_value in try(nic_value.networking_interface_asg_associations, {}) : { - nic_key = nic_key - asg_key = asg_key - asg_id = var.application_security_groups[try(asg_value.lz_key, var.client_config.landingzone_key)][asg_value.key].id - } - ] - ] - ) : format("%s-%s", nic.nic_key, nic.asg_key) => nic - } - } +locals { + nic_asg = { + for nic in flatten( + [ + for nic_key, nic_value in var.settings.networking_interfaces : [ + for asg_key, asg_value in try(nic_value.networking_interface_asg_associations, {}) : { + nic_key = nic_key + asg_key = asg_key + asg_id = var.application_security_groups[try(asg_value.lz_key, var.client_config.landingzone_key)][asg_value.key].id + } + ] + ] + ) : format("%s-%s", nic.nic_key, nic.asg_key) => nic + } +} - output network_interface_application_security_group_associations { - value = azurerm_network_interface_application_security_group_association.assoc - } \ No newline at end of file +output "network_interface_application_security_group_associations" { + value = azurerm_network_interface_application_security_group_association.assoc +} \ No newline at end of file diff --git a/modules/compute/virtual_machine/diagnostics.tf b/modules/compute/virtual_machine/diagnostics.tf index ae53be449b..5730ed4d66 100755 --- a/modules/compute/virtual_machine/diagnostics.tf +++ b/modules/compute/virtual_machine/diagnostics.tf @@ -1,5 +1,5 @@ -module nics { +module "nics" { source = "../../diagnostics" for_each = var.settings.networking_interfaces diff --git a/modules/compute/virtual_machine/network_interface.tf b/modules/compute/virtual_machine/network_interface.tf index 19fc6ff64f..80f28fe9e1 100644 --- a/modules/compute/virtual_machine/network_interface.tf +++ b/modules/compute/virtual_machine/network_interface.tf @@ -54,7 +54,7 @@ resource "azurerm_network_interface" "nic" { public_ip_address_id = lookup(each.value, "public_ip_address_key", null) == null ? null : try(var.public_ip_addresses[var.client_config.landingzone_key][each.value.public_ip_address_key].id, var.public_ip_addresses[each.value.lz_key][each.value.public_ip_address_key].id) } - dynamic ip_configuration { + dynamic "ip_configuration" { for_each = try(each.value.ip_configurations, {}) content { diff --git a/modules/compute/virtual_machine/output.tf b/modules/compute/virtual_machine/output.tf index 0525cc2f65..46003c1baa 100644 --- a/modules/compute/virtual_machine/output.tf +++ b/modules/compute/virtual_machine/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = local.os_type == "linux" ? try(azurerm_linux_virtual_machine.vm["linux"].id, null) : try(azurerm_windows_virtual_machine.vm["windows"].id, null) } @@ -6,34 +6,34 @@ output id { # value = azurerm_network_interface.nic.id # } -output os_type { +output "os_type" { value = local.os_type } -output internal_fqdns { +output "internal_fqdns" { value = flatten([ for nic_key in var.settings.virtual_machine_settings[local.os_type].network_interface_keys : format("%s.%s", try(azurerm_network_interface.nic[nic_key].internal_dns_name_label, try(azurerm_linux_virtual_machine.vm["linux"].name, azurerm_windows_virtual_machine.vm["windows"].name)), azurerm_network_interface.nic[nic_key].internal_domain_name_suffix) ]) } -output admin_username { +output "admin_username" { value = try(local.admin_username, null) == null ? var.settings.virtual_machine_settings[local.os_type].admin_username : local.admin_username description = "Local admin username" } -output admin_password_secret_id { +output "admin_password_secret_id" { value = try(azurerm_key_vault_secret.admin_password[local.os_type].id, null) description = "Local admin password Key Vault secret id" } -output winrm { +output "winrm" { value = local.os_type == "windows" ? { keyvault_id = local.keyvault.id certificate_url = try(azurerm_key_vault_certificate.self_signed_winrm[local.os_type].secret_id, null) } : null } -output ssh_keys { +output "ssh_keys" { value = local.create_sshkeys ? { keyvault_id = local.keyvault.id ssh_private_key_pem = azurerm_key_vault_secret.ssh_private_key[local.os_type].name @@ -41,7 +41,7 @@ output ssh_keys { } : null } -output nic_id { +output "nic_id" { value = flatten([ for nic_key in var.settings.virtual_machine_settings[local.os_type].network_interface_keys : format("%s.%s", try(azurerm_network_interface.nic[nic_key].id, try(azurerm_linux_virtual_machine.vm["linux"].name, azurerm_windows_virtual_machine.vm["windows"].name)), azurerm_network_interface.nic[nic_key].id) ]) diff --git a/modules/compute/virtual_machine/variables.tf b/modules/compute/virtual_machine/variables.tf index 6b2544f751..d6640a0fab 100755 --- a/modules/compute/virtual_machine/variables.tf +++ b/modules/compute/virtual_machine/variables.tf @@ -1,83 +1,83 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable resource_group_name { +variable "resource_group_name" { description = "Name of the existing resource group to deploy the virtual machine" } -variable keyvaults { +variable "keyvaults" { description = "Keyvault to store the SSH public and private keys when not provided by the var.public_key_pem_file or retrieve admin username and password" default = "" } -variable boot_diagnostics_storage_account { +variable "boot_diagnostics_storage_account" { description = "(Optional) The Primary/Secondary Endpoint for the Azure Storage Account (general purpose) which should be used to store Boot Diagnostics, including Console Output and Screenshots from the Hypervisor." default = {} } -variable settings {} +variable "settings" {} -variable vnets {} +variable "vnets" {} # Security -variable public_key_pem_file { +variable "public_key_pem_file" { default = "" description = "If disable_password_authentication is set to true, ssh authentication is enabled. You can provide a list of file path of the public ssh key in PEM format. If left blank a new RSA/4096 key is created and the key is stored in the keyvault_id. The secret name being the {computer name}-ssh-public and {computer name}-ssh-private" } -variable managed_identities { +variable "managed_identities" { default = {} } -variable diagnostics { +variable "diagnostics" { default = {} } -variable public_ip_addresses { +variable "public_ip_addresses" { default = {} } -variable recovery_vaults { +variable "recovery_vaults" { default = {} } -variable availability_sets { +variable "availability_sets" { default = {} } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable proximity_placement_groups { +variable "proximity_placement_groups" { default = {} } -variable disk_encryption_sets { +variable "disk_encryption_sets" { default = {} } -variable application_security_groups { +variable "application_security_groups" { default = {} } -variable virtual_machines { +variable "virtual_machines" { default = {} } -variable custom_image_ids { +variable "custom_image_ids" { default = {} } -variable network_security_groups { - default = {} +variable "network_security_groups" { + default = {} description = "Require a version 1 NSG definition to be attached to a nic." } diff --git a/modules/compute/virtual_machine/vm_windows.tf b/modules/compute/virtual_machine/vm_windows.tf index bc0469efb5..e0cd0df7a1 100644 --- a/modules/compute/virtual_machine/vm_windows.tf +++ b/modules/compute/virtual_machine/vm_windows.tf @@ -205,7 +205,7 @@ locals { # # With for_each it is not possible to change the provider's subscription at runtime so using the following pattern. # -data external windows_admin_username { +data "external" "windows_admin_username" { count = try(var.settings.virtual_machine_settings["windows"].admin_username_key, null) == null ? 0 : 1 program = [ "bash", "-c", @@ -217,7 +217,7 @@ data external windows_admin_username { ] } -data external windows_admin_password { +data "external" "windows_admin_password" { count = try(var.settings.virtual_machine_settings["windows"].admin_password_key, null) == null ? 0 : 1 program = [ "bash", "-c", diff --git a/modules/compute/virtual_machine_extensions/variables.tf b/modules/compute/virtual_machine_extensions/variables.tf index d5ae328d7f..a3a37a6552 100644 --- a/modules/compute/virtual_machine_extensions/variables.tf +++ b/modules/compute/virtual_machine_extensions/variables.tf @@ -1,7 +1,7 @@ -variable virtual_machine_id {} -variable extension {} -variable extension_name {} -variable settings {} -variable client_config { +variable "virtual_machine_id" {} +variable "extension" {} +variable "extension_name" {} +variable "settings" {} +variable "client_config" { description = "Client configuration object (see module README.md)." } \ No newline at end of file diff --git a/modules/data_factory/data_factory/output.tf b/modules/data_factory/data_factory/output.tf index b4007f5b1a..65f1eefedc 100644 --- a/modules/data_factory/data_factory/output.tf +++ b/modules/data_factory/data_factory/output.tf @@ -1,11 +1,11 @@ -output id { - value = azurerm_data_factory.df.id +output "id" { + value = azurerm_data_factory.df.id } -output name { - value = azurerm_data_factory.df.name +output "name" { + value = azurerm_data_factory.df.name } -output identity { - value = azurerm_data_factory.df.identity +output "identity" { + value = azurerm_data_factory.df.identity } diff --git a/modules/data_factory/data_factory/variables.tf b/modules/data_factory/data_factory/variables.tf index 2c6508858a..82cd214f37 100644 --- a/modules/data_factory/data_factory/variables.tf +++ b/modules/data_factory/data_factory/variables.tf @@ -1,31 +1,31 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory" } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where the resource exists" } -variable github_configuration { +variable "github_configuration" { description = "(Optional) A github_configuration block" } -variable identity { +variable "identity" { description = "(Optional) An identity block" } -variable vsts_configuration { +variable "vsts_configuration" { description = "(Optional) A vsts_configuration block" } -variable tags { +variable "tags" { description = "(Optional) A mapping of tags to assign to the resource" } -variable base_tags {} +variable "base_tags" {} -variable global_settings {} +variable "global_settings" {} diff --git a/modules/data_factory/data_factory_pipeline/output.tf b/modules/data_factory/data_factory_pipeline/output.tf index 263ca12d4d..c3a715bfd0 100644 --- a/modules/data_factory/data_factory_pipeline/output.tf +++ b/modules/data_factory/data_factory_pipeline/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_pipeline.pipeline.id +output "id" { + value = azurerm_data_factory_pipeline.pipeline.id } diff --git a/modules/data_factory/data_factory_pipeline/variables.tf b/modules/data_factory/data_factory_pipeline/variables.tf index 527dcca980..43f1e74b4c 100644 --- a/modules/data_factory/data_factory_pipeline/variables.tf +++ b/modules/data_factory/data_factory_pipeline/variables.tf @@ -1,31 +1,31 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Pipeline" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Pipeline" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Pipeline with. Changing this forces a new resource" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Pipeline" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Pipeline" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Pipeline" } -variable variables { +variable "variables" { description = "(Optional) A map of variables to associate with the Data Factory Pipeline" } -variable activities_json { +variable "activities_json" { description = "(Optional) A JSON object that contains the activities that will be associated with the Data Factory Pipeline" } diff --git a/modules/data_factory/data_factory_trigger_schedule/output.tf b/modules/data_factory/data_factory_trigger_schedule/output.tf index e636cb0098..7587e1005f 100644 --- a/modules/data_factory/data_factory_trigger_schedule/output.tf +++ b/modules/data_factory/data_factory_trigger_schedule/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_trigger_schedule.schedule.id +output "id" { + value = azurerm_data_factory_trigger_schedule.schedule.id } diff --git a/modules/data_factory/data_factory_trigger_schedule/variables.tf b/modules/data_factory/data_factory_trigger_schedule/variables.tf index b5db988aab..5d4f34f81b 100644 --- a/modules/data_factory/data_factory_trigger_schedule/variables.tf +++ b/modules/data_factory/data_factory_trigger_schedule/variables.tf @@ -1,39 +1,39 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Schedule Trigger" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Schedule Trigger" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Schedule Trigger with" } -variable pipeline_name { +variable "pipeline_name" { description = "(Required) The Data Factory Pipeline name that the trigger will act on" } -variable start_time { +variable "start_time" { description = "(Optional) The time the Schedule Trigger will start" } -variable end_time { +variable "end_time" { description = "(Optional) The time the Schedule Trigger should end" } -variable interval { +variable "interval" { description = " (Optional) The interval for how often the trigger occurs. This defaults to 1" } -variable frequency { +variable "frequency" { description = "(Optional) The trigger freqency. Valid values include Minute, Hour, Day, Week, Month. Defaults to Minute" } -variable pipeline_parameters { +variable "pipeline_parameters" { description = "(Optional) The pipeline parameters that the trigger will act upon" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Schedule Trigger" } \ No newline at end of file diff --git a/modules/data_factory/datasets/azure_blob/output.tf b/modules/data_factory/datasets/azure_blob/output.tf index 5d1495c8f2..6572127650 100644 --- a/modules/data_factory/datasets/azure_blob/output.tf +++ b/modules/data_factory/datasets/azure_blob/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_dataset_azure_blob.dataset.id +output "id" { + value = azurerm_data_factory_dataset_azure_blob.dataset.id } diff --git a/modules/data_factory/datasets/azure_blob/variables.tf b/modules/data_factory/datasets/azure_blob/variables.tf index e10306f93e..edbea47e36 100644 --- a/modules/data_factory/datasets/azure_blob/variables.tf +++ b/modules/data_factory/datasets/azure_blob/variables.tf @@ -1,47 +1,47 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Dataset" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Dataset" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Dataset with" } -variable linked_service_name { +variable "linked_service_name" { description = "(Required) The Data Factory Linked Service name in which to associate the Dataset with" } -variable folder { +variable "folder" { description = "(Optional) The folder that this Dataset is in. If not specified, the Dataset will appear at the root level" } -variable schema_column { +variable "schema_column" { description = "(Optional) A schema_column block" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Dataset" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Dataset" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Dataset" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Dataset" } -variable path { +variable "path" { description = "(Required) The path of the Azure Blob" } -variable filename { +variable "filename" { description = "(Required) The filename of the Azure Blob" } diff --git a/modules/data_factory/datasets/cosmosdb_sqlapi/output.tf b/modules/data_factory/datasets/cosmosdb_sqlapi/output.tf index 6c487fbeb9..a6f978bb49 100644 --- a/modules/data_factory/datasets/cosmosdb_sqlapi/output.tf +++ b/modules/data_factory/datasets/cosmosdb_sqlapi/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_dataset_cosmosdb_sqlapi.dataset.id +output "id" { + value = azurerm_data_factory_dataset_cosmosdb_sqlapi.dataset.id } diff --git a/modules/data_factory/datasets/cosmosdb_sqlapi/variables.tf b/modules/data_factory/datasets/cosmosdb_sqlapi/variables.tf index 2df28c72f0..1d05970553 100644 --- a/modules/data_factory/datasets/cosmosdb_sqlapi/variables.tf +++ b/modules/data_factory/datasets/cosmosdb_sqlapi/variables.tf @@ -1,43 +1,43 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Dataset" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Dataset" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Dataset with" } -variable linked_service_name { +variable "linked_service_name" { description = "(Required) The Data Factory Linked Service name in which to associate the Dataset with" } -variable folder { +variable "folder" { description = "(Optional) The folder that this Dataset is in. If not specified, the Dataset will appear at the root level" } -variable schema_column { +variable "schema_column" { description = "(Optional) A schema_column block" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Dataset" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Dataset" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Dataset" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Dataset" } -variable collection_name { +variable "collection_name" { description = "(Optional) The collection name of the Data Factory Dataset Azure Cosmos DB SQL API" } diff --git a/modules/data_factory/datasets/delimited_text/output.tf b/modules/data_factory/datasets/delimited_text/output.tf index d62eacb0f7..3e400e9bb9 100644 --- a/modules/data_factory/datasets/delimited_text/output.tf +++ b/modules/data_factory/datasets/delimited_text/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_dataset_delimited_text.dataset.id +output "id" { + value = azurerm_data_factory_dataset_delimited_text.dataset.id } diff --git a/modules/data_factory/datasets/delimited_text/variables.tf b/modules/data_factory/datasets/delimited_text/variables.tf index 88270ea9bc..f0cfeaf92e 100644 --- a/modules/data_factory/datasets/delimited_text/variables.tf +++ b/modules/data_factory/datasets/delimited_text/variables.tf @@ -1,75 +1,75 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Dataset" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Dataset" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Dataset with" } -variable linked_service_name { +variable "linked_service_name" { description = "(Required) The Data Factory Linked Service name in which to associate the Dataset with" } -variable folder { +variable "folder" { description = "(Optional) The folder that this Dataset is in. If not specified, the Dataset will appear at the root level" } -variable schema_column { +variable "schema_column" { description = "(Optional) A schema_column block" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Dataset" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Dataset" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Dataset" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Dataset" } -variable column_delimiter { +variable "column_delimiter" { description = "(Required) The column delimiter" } -variable row_delimiter { +variable "row_delimiter" { description = "(Required) The row delimiter" } -variable encoding { +variable "encoding" { description = "(Required) The encoding format for the file" } -variable quote_character { +variable "quote_character" { description = "(Required) The quote character" } -variable escape_character { +variable "escape_character" { description = "(Required) The escape character" } -variable first_row_as_header { +variable "first_row_as_header" { description = "(Required) When used as input, treat the first row of data as headers" } -variable null_value { +variable "null_value" { description = "(Required) The null value string" } -variable http_server_location { +variable "http_server_location" { description = "(Required) A http_server_location block" } -variable azure_blob_storage_location { +variable "azure_blob_storage_location" { description = "(Required) A azure_blob_storage_location block" } \ No newline at end of file diff --git a/modules/data_factory/datasets/http/output.tf b/modules/data_factory/datasets/http/output.tf index 61fb6da1dc..95e59cdf9f 100644 --- a/modules/data_factory/datasets/http/output.tf +++ b/modules/data_factory/datasets/http/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_dataset_http.dataset.id +output "id" { + value = azurerm_data_factory_dataset_http.dataset.id } diff --git a/modules/data_factory/datasets/http/variables.tf b/modules/data_factory/datasets/http/variables.tf index 6c086a6a76..68322f98e3 100644 --- a/modules/data_factory/datasets/http/variables.tf +++ b/modules/data_factory/datasets/http/variables.tf @@ -1,51 +1,51 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Dataset" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Dataset" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Dataset with" } -variable linked_service_name { +variable "linked_service_name" { description = "(Required) The Data Factory Linked Service name in which to associate the Dataset with" } -variable folder { +variable "folder" { description = "(Optional) The folder that this Dataset is in. If not specified, the Dataset will appear at the root level" } -variable schema_column { +variable "schema_column" { description = "(Optional) A schema_column block" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Dataset" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Dataset" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Dataset" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Dataset" } -variable relative_url { +variable "relative_url" { description = "(Required) The relative URL based on the URL in the HTTP Linked Service" } -variable request_body { +variable "request_body" { description = "(Required) The body for the HTTP request" } -variable request_method { +variable "request_method" { description = "(Required) The HTTP method for the HTTP request. (e.g. GET, POST)" } diff --git a/modules/data_factory/datasets/json/output.tf b/modules/data_factory/datasets/json/output.tf index 101de27f99..68e6e54852 100644 --- a/modules/data_factory/datasets/json/output.tf +++ b/modules/data_factory/datasets/json/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_dataset_json.dataset.id +output "id" { + value = azurerm_data_factory_dataset_json.dataset.id } diff --git a/modules/data_factory/datasets/json/variables.tf b/modules/data_factory/datasets/json/variables.tf index 89a9ac9e55..f875ea3e7d 100644 --- a/modules/data_factory/datasets/json/variables.tf +++ b/modules/data_factory/datasets/json/variables.tf @@ -1,51 +1,51 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Dataset" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Dataset" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Dataset with" } -variable linked_service_name { +variable "linked_service_name" { description = "(Required) The Data Factory Linked Service name in which to associate the Dataset with" } -variable folder { +variable "folder" { description = "(Optional) The folder that this Dataset is in. If not specified, the Dataset will appear at the root level" } -variable schema_column { +variable "schema_column" { description = "(Optional) A schema_column block" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Dataset" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Dataset" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Dataset" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Dataset" } -variable http_server_location { +variable "http_server_location" { description = "(Required) A http_server_location block" } -variable azure_blob_storage_location { +variable "azure_blob_storage_location" { description = "(Required) A azure_blob_storage_location block" } -variable encoding { +variable "encoding" { description = "(Required) The encoding format for the file" } diff --git a/modules/data_factory/datasets/mysql/output.tf b/modules/data_factory/datasets/mysql/output.tf index 86e20999e8..cc7008e463 100644 --- a/modules/data_factory/datasets/mysql/output.tf +++ b/modules/data_factory/datasets/mysql/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_dataset_mysql.dataset.id +output "id" { + value = azurerm_data_factory_dataset_mysql.dataset.id } diff --git a/modules/data_factory/datasets/mysql/variables.tf b/modules/data_factory/datasets/mysql/variables.tf index 68d35d6f1d..d6be1fcfce 100644 --- a/modules/data_factory/datasets/mysql/variables.tf +++ b/modules/data_factory/datasets/mysql/variables.tf @@ -1,43 +1,43 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Dataset" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Dataset" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Dataset with" } -variable linked_service_name { +variable "linked_service_name" { description = "(Required) The Data Factory Linked Service name in which to associate the Dataset with" } -variable folder { +variable "folder" { description = "(Optional) The folder that this Dataset is in. If not specified, the Dataset will appear at the root level" } -variable schema_column { +variable "schema_column" { description = "(Optional) A schema_column block" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Dataset" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Dataset" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Dataset" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Dataset" } -variable table_name { +variable "table_name" { description = "(Optional) The table name of the Data Factory Dataset MySQL" } \ No newline at end of file diff --git a/modules/data_factory/datasets/postgresql/output.tf b/modules/data_factory/datasets/postgresql/output.tf index fdbb45978e..5cc7fa002e 100644 --- a/modules/data_factory/datasets/postgresql/output.tf +++ b/modules/data_factory/datasets/postgresql/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_dataset_postgresql.dataset.id +output "id" { + value = azurerm_data_factory_dataset_postgresql.dataset.id } diff --git a/modules/data_factory/datasets/postgresql/variables.tf b/modules/data_factory/datasets/postgresql/variables.tf index f7ab9e9b4c..a515540857 100644 --- a/modules/data_factory/datasets/postgresql/variables.tf +++ b/modules/data_factory/datasets/postgresql/variables.tf @@ -1,43 +1,43 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Dataset" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Dataset" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Dataset with" } -variable linked_service_name { +variable "linked_service_name" { description = "(Required) The Data Factory Linked Service name in which to associate the Dataset with" } -variable folder { +variable "folder" { description = "(Optional) The folder that this Dataset is in. If not specified, the Dataset will appear at the root level" } -variable schema_column { +variable "schema_column" { description = "(Optional) A schema_column block" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Dataset" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Dataset" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Dataset" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Dataset" } -variable table_name { +variable "table_name" { description = "(Optional) The table name of the Data Factory Dataset PostgreSQL" } \ No newline at end of file diff --git a/modules/data_factory/datasets/sql_server_table/output.tf b/modules/data_factory/datasets/sql_server_table/output.tf index 1bfb89a1a8..fff1702e6b 100644 --- a/modules/data_factory/datasets/sql_server_table/output.tf +++ b/modules/data_factory/datasets/sql_server_table/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_dataset_sql_server_table.dataset.id +output "id" { + value = azurerm_data_factory_dataset_sql_server_table.dataset.id } diff --git a/modules/data_factory/datasets/sql_server_table/variables.tf b/modules/data_factory/datasets/sql_server_table/variables.tf index f0f082d694..05e25393da 100644 --- a/modules/data_factory/datasets/sql_server_table/variables.tf +++ b/modules/data_factory/datasets/sql_server_table/variables.tf @@ -1,43 +1,43 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Dataset" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Dataset" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Dataset with" } -variable linked_service_name { +variable "linked_service_name" { description = "(Required) The Data Factory Linked Service name in which to associate the Dataset with" } -variable folder { +variable "folder" { description = "(Optional) The folder that this Dataset is in. If not specified, the Dataset will appear at the root level" } -variable schema_column { +variable "schema_column" { description = "(Optional) A schema_column block" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Dataset" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Dataset" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Dataset" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Dataset" } -variable table_name { +variable "table_name" { description = "(Optional) The table name of the Data Factory Dataset SQL Server Table" } diff --git a/modules/data_factory/linked_services/azure_blob_storage/output.tf b/modules/data_factory/linked_services/azure_blob_storage/output.tf index c7035d5955..b7cad001e5 100644 --- a/modules/data_factory/linked_services/azure_blob_storage/output.tf +++ b/modules/data_factory/linked_services/azure_blob_storage/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_azure_blob_storage.linked_service_azure_blob_storage.id +output "id" { + value = azurerm_data_factory_linked_service_azure_blob_storage.linked_service_azure_blob_storage.id } diff --git a/modules/data_factory/linked_services/azure_blob_storage/variables.tf b/modules/data_factory/linked_services/azure_blob_storage/variables.tf index a2eb0c08f3..d85c22a61f 100644 --- a/modules/data_factory/linked_services/azure_blob_storage/variables.tf +++ b/modules/data_factory/linked_services/azure_blob_storage/variables.tf @@ -1,35 +1,35 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service." } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service." } -variable connection_string { +variable "connection_string" { description = "(Optional) The connection string. Required if account_endpoint, account_key, and database are unspecified." } \ No newline at end of file diff --git a/modules/data_factory/linked_services/azure_file_storage/output.tf b/modules/data_factory/linked_services/azure_file_storage/output.tf index 84b0640290..7cf516d69d 100644 --- a/modules/data_factory/linked_services/azure_file_storage/output.tf +++ b/modules/data_factory/linked_services/azure_file_storage/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_azure_file_storage.linked_service_azure_file_storage.id +output "id" { + value = azurerm_data_factory_linked_service_azure_file_storage.linked_service_azure_file_storage.id } diff --git a/modules/data_factory/linked_services/azure_file_storage/variables.tf b/modules/data_factory/linked_services/azure_file_storage/variables.tf index 15d0bccddb..88c2e2cae5 100644 --- a/modules/data_factory/linked_services/azure_file_storage/variables.tf +++ b/modules/data_factory/linked_services/azure_file_storage/variables.tf @@ -1,35 +1,35 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service. Changing this forces a new resource to be created. Must be globally unique." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service. Changing this forces a new resource." } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service." } -variable connection_string { +variable "connection_string" { description = "(Required) The connection string." } \ No newline at end of file diff --git a/modules/data_factory/linked_services/azure_function/output.tf b/modules/data_factory/linked_services/azure_function/output.tf index 9018a5bac6..14012cd5a3 100644 --- a/modules/data_factory/linked_services/azure_function/output.tf +++ b/modules/data_factory/linked_services/azure_function/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_azure_function.linked_service_azure_function.id +output "id" { + value = azurerm_data_factory_linked_service_azure_function.linked_service_azure_function.id } diff --git a/modules/data_factory/linked_services/azure_function/variables.tf b/modules/data_factory/linked_services/azure_function/variables.tf index 518a763a3e..81b45ebf24 100644 --- a/modules/data_factory/linked_services/azure_function/variables.tf +++ b/modules/data_factory/linked_services/azure_function/variables.tf @@ -1,39 +1,39 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service. Changing this forces a new resource to be created. Must be globally unique." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service. Changing this forces a new resource." } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service." } -variable url { +variable "url" { description = "(Required) The url of the Azure Function." } -variable key { +variable "key" { description = "(Required) The system key of the Azure Function." } \ No newline at end of file diff --git a/modules/data_factory/linked_services/azure_sql_database/output.tf b/modules/data_factory/linked_services/azure_sql_database/output.tf index affb6ad602..bce18feb4f 100644 --- a/modules/data_factory/linked_services/azure_sql_database/output.tf +++ b/modules/data_factory/linked_services/azure_sql_database/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_azure_sql_database.linked_service_azure_sql_database.id +output "id" { + value = azurerm_data_factory_linked_service_azure_sql_database.linked_service_azure_sql_database.id } diff --git a/modules/data_factory/linked_services/azure_sql_database/variables.tf b/modules/data_factory/linked_services/azure_sql_database/variables.tf index 0f902d6e31..e2b217a7a1 100644 --- a/modules/data_factory/linked_services/azure_sql_database/variables.tf +++ b/modules/data_factory/linked_services/azure_sql_database/variables.tf @@ -1,35 +1,35 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service Azure SQL Database. Changing this forces a new resource to be created. Must be globally unique." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service Azure SQL Database. Changing this forces a new resource to be created." } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource to be created." } -variable connection_string { +variable "connection_string" { description = "(Required) The connection string in which to authenticate with Azure SQL Database." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service Azure SQL Database." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service Azure SQL Database." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service Azure SQL Database." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service Azure SQL Database." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service Azure SQL Database." } \ No newline at end of file diff --git a/modules/data_factory/linked_services/cosmosdb/output.tf b/modules/data_factory/linked_services/cosmosdb/output.tf index 40e6db5453..1869885039 100644 --- a/modules/data_factory/linked_services/cosmosdb/output.tf +++ b/modules/data_factory/linked_services/cosmosdb/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_cosmosdb.linked_service_cosmosdb.id +output "id" { + value = azurerm_data_factory_linked_service_cosmosdb.linked_service_cosmosdb.id } diff --git a/modules/data_factory/linked_services/cosmosdb/variables.tf b/modules/data_factory/linked_services/cosmosdb/variables.tf index e8b521e2bb..4c85deeb9a 100644 --- a/modules/data_factory/linked_services/cosmosdb/variables.tf +++ b/modules/data_factory/linked_services/cosmosdb/variables.tf @@ -1,47 +1,47 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service. Changing this forces a new resource to be created. Must be globally unique" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service. Changing this forces a new resource" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service" } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service" } -variable account_endpoint { +variable "account_endpoint" { description = "(Optional) The endpoint of the Azure CosmosDB account. Required if connection_string is unspecified" } -variable account_key { +variable "account_key" { description = "(Optional) The account key of the Azure Cosmos DB account. Required if connection_string is unspecified" } -variable database { +variable "database" { description = "(Optional) The name of the database. Required if connection_string is unspecified" } -variable connection_string { +variable "connection_string" { description = "(Optional) The connection string. Required if account_endpoint, account_key, and database are unspecified" } \ No newline at end of file diff --git a/modules/data_factory/linked_services/data_lake_storage_gen2/output.tf b/modules/data_factory/linked_services/data_lake_storage_gen2/output.tf index 770861d1f1..0e0b0334fc 100644 --- a/modules/data_factory/linked_services/data_lake_storage_gen2/output.tf +++ b/modules/data_factory/linked_services/data_lake_storage_gen2/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_data_lake_storage_gen2.linked_service_data_lake_storage_gen2.id +output "id" { + value = azurerm_data_factory_linked_service_data_lake_storage_gen2.linked_service_data_lake_storage_gen2.id } \ No newline at end of file diff --git a/modules/data_factory/linked_services/data_lake_storage_gen2/variables.tf b/modules/data_factory/linked_services/data_lake_storage_gen2/variables.tf index 3f823b9b55..6b9ac59c4c 100644 --- a/modules/data_factory/linked_services/data_lake_storage_gen2/variables.tf +++ b/modules/data_factory/linked_services/data_lake_storage_gen2/variables.tf @@ -1,51 +1,51 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service. Changing this forces a new resource to be created. Must be globally unique" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service. Changing this forces a new resource" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource" } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service" } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service" } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service" } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service" } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service" } -variable url { +variable "url" { description = "(Required) The endpoint for the Azure Data Lake Storage Gen2 service" } -variable use_managed_identity { +variable "use_managed_identity" { description = "(Optional) Whether to use the Data Factory's managed identity to authenticate against the Azure Data Lake Storage Gen2 account. Incompatible with service_principal_id and service_principal_key" } -variable service_principal_id { +variable "service_principal_id" { description = "(Optional) The service principal id in which to authenticate against the Azure Data Lake Storage Gen2 account. Required if use_managed_identity is true" } -variable service_principal_key { +variable "service_principal_key" { description = "(Optional) The service principal key in which to authenticate against the Azure Data Lake Storage Gen2 account. Required if use_managed_identity is true" } -variable tenant { +variable "tenant" { description = "(Required) The tenant id or name in which to authenticate against the Azure Data Lake Storage Gen2 account" } \ No newline at end of file diff --git a/modules/data_factory/linked_services/key_vault/output.tf b/modules/data_factory/linked_services/key_vault/output.tf index 800ba728b9..13897a2788 100644 --- a/modules/data_factory/linked_services/key_vault/output.tf +++ b/modules/data_factory/linked_services/key_vault/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_key_vault.linked_service_key_vault.id +output "id" { + value = azurerm_data_factory_linked_service_key_vault.linked_service_key_vault.id } diff --git a/modules/data_factory/linked_services/key_vault/variables.tf b/modules/data_factory/linked_services/key_vault/variables.tf index e936c71939..107407e890 100644 --- a/modules/data_factory/linked_services/key_vault/variables.tf +++ b/modules/data_factory/linked_services/key_vault/variables.tf @@ -1,35 +1,35 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service Key Vault. Changing this forces a new resource to be created. Must be globally unique." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service Key Vault. Changing this forces a new resource." } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service Key Vault." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service Key Vault." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service Key Vault." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service Key Vault." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service Key Vault." } -variable key_vault_id { +variable "key_vault_id" { description = "(Required) The ID the Azure Key Vault resource." } \ No newline at end of file diff --git a/modules/data_factory/linked_services/mysql/output.tf b/modules/data_factory/linked_services/mysql/output.tf index 6191ec394e..a3812c93ae 100644 --- a/modules/data_factory/linked_services/mysql/output.tf +++ b/modules/data_factory/linked_services/mysql/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_mysql.linked_service_mysql.id +output "id" { + value = azurerm_data_factory_linked_service_mysql.linked_service_mysql.id } diff --git a/modules/data_factory/linked_services/mysql/variables.tf b/modules/data_factory/linked_services/mysql/variables.tf index 03fe39540b..973362ac44 100644 --- a/modules/data_factory/linked_services/mysql/variables.tf +++ b/modules/data_factory/linked_services/mysql/variables.tf @@ -1,35 +1,35 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service MySQL. Changing this forces a new resource to be created. Must be globally unique." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service MySQL. Changing this forces a new resource" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service MySQL." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service MySQL." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service MySQL." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service MySQL." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service MySQL." } -variable connection_string { +variable "connection_string" { description = "(Required) The connection string in which to authenticate with MySQL." } \ No newline at end of file diff --git a/modules/data_factory/linked_services/postgresql/output.tf b/modules/data_factory/linked_services/postgresql/output.tf index bff5edefa6..0b3033cedf 100644 --- a/modules/data_factory/linked_services/postgresql/output.tf +++ b/modules/data_factory/linked_services/postgresql/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_postgresql.linked_service_postgresql.id +output "id" { + value = azurerm_data_factory_linked_service_postgresql.linked_service_postgresql.id } diff --git a/modules/data_factory/linked_services/postgresql/variables.tf b/modules/data_factory/linked_services/postgresql/variables.tf index 45b6e0ce72..a025b98b84 100644 --- a/modules/data_factory/linked_services/postgresql/variables.tf +++ b/modules/data_factory/linked_services/postgresql/variables.tf @@ -1,35 +1,35 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service PostgreSQL. Changing this forces a new resource to be created. Must be globally unique." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service PostgreSQL. Changing this forces a new resource" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service PostgreSQL." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service PostgreSQL." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service PostgreSQL." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service PostgreSQL." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service PostgreSQL." } -variable connection_string { +variable "connection_string" { description = "(Required) The connection string in which to authenticate with PostgreSQL." } \ No newline at end of file diff --git a/modules/data_factory/linked_services/sftp/output.tf b/modules/data_factory/linked_services/sftp/output.tf index c27cada491..b7c1a27e26 100644 --- a/modules/data_factory/linked_services/sftp/output.tf +++ b/modules/data_factory/linked_services/sftp/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_sftp.linked_service_sftp.id +output "id" { + value = azurerm_data_factory_linked_service_sftp.linked_service_sftp.id } diff --git a/modules/data_factory/linked_services/sftp/variables.tf b/modules/data_factory/linked_services/sftp/variables.tf index d3b34f4833..df61504b9f 100644 --- a/modules/data_factory/linked_services/sftp/variables.tf +++ b/modules/data_factory/linked_services/sftp/variables.tf @@ -1,51 +1,51 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service. Changing this forces a new resource to be created. Must be globally unique." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service. Changing this forces a new resource" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service." } -variable authentication_type { +variable "authentication_type" { description = "(Required) The type of authentication used to connect to the web table source. Valid options are Anonymous, Basic and ClientCertificate." } -variable host { +variable "host" { description = "(Required) The SFTP server hostname." } -variable port { +variable "port" { description = "(Required) The TCP port number that the SFTP server uses to lsiten for client connection. Default value is 22." } -variable username { +variable "username" { description = "(Required) The username used to log on to the SFTP server." } -variable password { +variable "password" { description = "(Required) Password to logon to the SFTP Server for Basic Authentication." } \ No newline at end of file diff --git a/modules/data_factory/linked_services/sql_server/output.tf b/modules/data_factory/linked_services/sql_server/output.tf index 16c29d5ab3..76b0ca162b 100644 --- a/modules/data_factory/linked_services/sql_server/output.tf +++ b/modules/data_factory/linked_services/sql_server/output.tf @@ -1,4 +1,4 @@ -output id { - value = azurerm_data_factory_linked_service_sql_server.linked_service_sql_server.id - +output "id" { + value = azurerm_data_factory_linked_service_sql_server.linked_service_sql_server.id + } diff --git a/modules/data_factory/linked_services/sql_server/variables.tf b/modules/data_factory/linked_services/sql_server/variables.tf index 3f607a17a9..bed7028b01 100644 --- a/modules/data_factory/linked_services/sql_server/variables.tf +++ b/modules/data_factory/linked_services/sql_server/variables.tf @@ -1,35 +1,35 @@ -variable name { +variable "name" { description = " (Required) Specifies the name of the Data Factory Linked Service SQL Server. Changing this forces a new resource to be created. Must be globally unique. See the Microsoft documentation for all restrictions." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service SQL Server. Changing this forces a new resource" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service SQL Server." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service SQL Server." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service SQL Server." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service SQL Server." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service SQL Server." } -variable connection_string { +variable "connection_string" { description = "(Required) The connection string in which to authenticate with the SQL Server." } \ No newline at end of file diff --git a/modules/data_factory/linked_services/web/output.tf b/modules/data_factory/linked_services/web/output.tf index 8a2b870698..74efa10dc6 100644 --- a/modules/data_factory/linked_services/web/output.tf +++ b/modules/data_factory/linked_services/web/output.tf @@ -1,3 +1,3 @@ -output id { - value = azurerm_data_factory_linked_service_web.linked_service_web.id +output "id" { + value = azurerm_data_factory_linked_service_web.linked_service_web.id } diff --git a/modules/data_factory/linked_services/web/variables.tf b/modules/data_factory/linked_services/web/variables.tf index f0facfc674..719fcabe23 100644 --- a/modules/data_factory/linked_services/web/variables.tf +++ b/modules/data_factory/linked_services/web/variables.tf @@ -1,39 +1,39 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Data Factory Linked Service. Changing this forces a new resource to be created. Must be globally unique." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the Data Factory Linked Service. Changing this forces a new resource" } -variable data_factory_name { +variable "data_factory_name" { description = "(Required) The Data Factory name in which to associate the Linked Service with. Changing this forces a new resource." } -variable description { +variable "description" { description = "(Optional) The description for the Data Factory Linked Service." } -variable integration_runtime_name { +variable "integration_runtime_name" { description = "(Optional) The integration runtime reference to associate with the Data Factory Linked Service." } -variable annotations { +variable "annotations" { description = "(Optional) List of tags that can be used for describing the Data Factory Linked Service." } -variable parameters { +variable "parameters" { description = "(Optional) A map of parameters to associate with the Data Factory Linked Service." } -variable additional_properties { +variable "additional_properties" { description = "(Optional) A map of additional properties to associate with the Data Factory Linked Service." } -variable authentication_type { +variable "authentication_type" { description = "(Required) The type of authentication used to connect to the web table source. Valid options are Anonymous, Basic and ClientCertificate." } -variable url { +variable "url" { description = "(Required) The URL of the web service endpoint (e.g. http://www.microsoft.com)." } \ No newline at end of file diff --git a/modules/databases/app_config/dynamic_settings.tf b/modules/databases/app_config/dynamic_settings.tf index 293bf9cdf6..ef8666e0d4 100644 --- a/modules/databases/app_config/dynamic_settings.tf +++ b/modules/databases/app_config/dynamic_settings.tf @@ -1,11 +1,11 @@ -module compute_instance { +module "compute_instance" { source = "./settings" depends_on = [azurerm_app_configuration.config] - resource_group_name = var.resource_group_name - key_names = keys(local.config_settings) - key_values = values(local.config_settings) - config_name = azurecaf_name.app_config.result - tags = local.tags - global_settings = var.global_settings + resource_group_name = var.resource_group_name + key_names = keys(local.config_settings) + key_values = values(local.config_settings) + config_name = azurecaf_name.app_config.result + tags = local.tags + global_settings = var.global_settings } \ No newline at end of file diff --git a/modules/databases/app_config/local.dynamic_settings.tf b/modules/databases/app_config/local.dynamic_settings.tf index 8f93c1b2c5..7f052431a9 100644 --- a/modules/databases/app_config/local.dynamic_settings.tf +++ b/modules/databases/app_config/local.dynamic_settings.tf @@ -2,12 +2,12 @@ locals { dynamic_settings_to_process = { for setting in flatten( - [ + [ for setting_name, resources in var.settings.dynamic_settings : [ - for resource_type_key, resource in resources : [ + for resource_type_key, resource in resources : [ for object_id_key, object_attributes in resource : { - key = setting_name - value = try(var.combined_objects[resource_type_key][object_attributes.lz_key][object_id_key][object_attributes.attribute_key], var.combined_objects[resource_type_key][var.client_config.landingzone_key][object_id_key][object_attributes.attribute_key]) + key = setting_name + value = try(var.combined_objects[resource_type_key][object_attributes.lz_key][object_id_key][object_attributes.attribute_key], var.combined_objects[resource_type_key][var.client_config.landingzone_key][object_id_key][object_attributes.attribute_key]) } ] ] diff --git a/modules/databases/app_config/output.tf b/modules/databases/app_config/output.tf index c358679593..4cb0c6c163 100755 --- a/modules/databases/app_config/output.tf +++ b/modules/databases/app_config/output.tf @@ -1,14 +1,14 @@ -output id { +output "id" { value = azurerm_app_configuration.config.id description = "The ID of the App Config." } -output endpoint { +output "endpoint" { value = azurerm_app_configuration.config.endpoint description = "The URL of the App Configuration." } -output identity { +output "identity" { value = azurerm_app_configuration.config.identity description = "The managed service identity object." } \ No newline at end of file diff --git a/modules/databases/app_config/settings/variables.tf b/modules/databases/app_config/settings/variables.tf index f5af268c6d..d86f3efd45 100644 --- a/modules/databases/app_config/settings/variables.tf +++ b/modules/databases/app_config/settings/variables.tf @@ -1,28 +1,28 @@ -variable resource_group_name { +variable "resource_group_name" { description = "The name of the resource group where to create the resource." type = string } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable tags { +variable "tags" { description = "Map of tags to be applied to the resource" - type = map + type = map(any) } -variable key_values { - type = list(string) +variable "key_values" { + type = list(string) description = "App Config Setting Values List" } -variable key_names { - type = list(string) +variable "key_names" { + type = list(string) description = "App Config Setting Key Names" } -variable config_name { - type = string +variable "config_name" { + type = string description = "App Config Resource Name" } \ No newline at end of file diff --git a/modules/databases/app_config/variables.tf b/modules/databases/app_config/variables.tf index e3ecb130d6..4b7c727f50 100644 --- a/modules/databases/app_config/variables.tf +++ b/modules/databases/app_config/variables.tf @@ -1,35 +1,35 @@ -variable settings {} +variable "settings" {} -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable tags { +variable "tags" { description = "(Required) map of tags for the deployment" - type = map + type = map(any) } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable name { +variable "name" { description = "(Required) Name of the App Config" } -variable combined_objects { +variable "combined_objects" { default = {} } -variable client_config {} \ No newline at end of file +variable "client_config" {} \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/README.md b/modules/databases/cosmos_dbs/README.md index 04420bb3e9..76d36cb767 100755 --- a/modules/databases/cosmos_dbs/README.md +++ b/modules/databases/cosmos_dbs/README.md @@ -24,11 +24,28 @@ No requirements. | azurecaf | n/a | | azurerm | n/a | +## Modules + +| Name | Source | Version | +|------|--------|---------| +| cassandra_keyspaces | ./cassandra_keyspace | | +| gremlin_databases | ./gremlin_database | | +| mongo_databases | ./mongo_database | | +| sql_databases | ./sql_database | | +| tables | ./table | | + +## Resources + +| Name | +|------| +| [azurecaf_name](https://registry.terraform.io/providers/aztfmod/azurecaf/latest/docs/resources/name) | +| [azurerm_cosmosdb_account](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cosmosdb_account) | + ## Inputs | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| base\_tags | Base tags for the resource to be inherited from the resource group. | `map` | n/a | yes | +| base\_tags | Base tags for the resource to be inherited from the resource group. | `map(any)` | n/a | yes | | global\_settings | Global settings object (see module README.md) | `any` | n/a | yes | | location | (Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created. | `string` | n/a | yes | | resource\_group\_name | (Required) The name of the resource group where to create the resource. | `string` | n/a | yes | @@ -39,10 +56,12 @@ No requirements. | Name | Description | |------|-------------| | cassandra\_keyspaces | n/a | +| connection\_string | n/a | | cosmos\_account | n/a | +| endpoint | n/a | | gremlin\_databases | n/a | | mongo\_databases | n/a | +| primary\_key | n/a | | sql\_databases | n/a | | tables | n/a | - \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/cassandra_keyspace.tf b/modules/databases/cosmos_dbs/cassandra_keyspace.tf index 57fbb1222d..782d2c6ef8 100644 --- a/modules/databases/cosmos_dbs/cassandra_keyspace.tf +++ b/modules/databases/cosmos_dbs/cassandra_keyspace.tf @@ -1,4 +1,4 @@ -module cassandra_keyspaces { +module "cassandra_keyspaces" { source = "./cassandra_keyspace" for_each = try(var.settings.cassandra_keyspaces, {}) @@ -9,7 +9,7 @@ module cassandra_keyspaces { cosmosdb_account_name = azurerm_cosmosdb_account.cosmos_account.name } -output cassandra_keyspaces { +output "cassandra_keyspaces" { value = module.cassandra_keyspaces } \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/cassandra_keyspace/output.tf b/modules/databases/cosmos_dbs/cassandra_keyspace/output.tf index 489ec186ab..0768c6148e 100644 --- a/modules/databases/cosmos_dbs/cassandra_keyspace/output.tf +++ b/modules/databases/cosmos_dbs/cassandra_keyspace/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { description = "The ID of the CosmosDB Cassandra KeySpace." value = azurerm_cosmosdb_cassandra_keyspace.keyspace.id diff --git a/modules/databases/cosmos_dbs/cassandra_keyspace/variables.tf b/modules/databases/cosmos_dbs/cassandra_keyspace/variables.tf index 10375965e8..35b0e9af3a 100644 --- a/modules/databases/cosmos_dbs/cassandra_keyspace/variables.tf +++ b/modules/databases/cosmos_dbs/cassandra_keyspace/variables.tf @@ -1,5 +1,5 @@ -variable settings {} -variable global_settings {} -variable resource_group_name {} -variable location {} -variable cosmosdb_account_name {} \ No newline at end of file +variable "settings" {} +variable "global_settings" {} +variable "resource_group_name" {} +variable "location" {} +variable "cosmosdb_account_name" {} \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/gremlin_database.tf b/modules/databases/cosmos_dbs/gremlin_database.tf index 2dac2150fd..3ee6c51b43 100644 --- a/modules/databases/cosmos_dbs/gremlin_database.tf +++ b/modules/databases/cosmos_dbs/gremlin_database.tf @@ -1,4 +1,4 @@ -module gremlin_databases { +module "gremlin_databases" { source = "./gremlin_database" for_each = try(var.settings.gremlin_databases, {}) @@ -9,7 +9,7 @@ module gremlin_databases { cosmosdb_account_name = azurerm_cosmosdb_account.cosmos_account.name } -output gremlin_databases { +output "gremlin_databases" { value = module.gremlin_databases } \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/gremlin_database/gremlin_database.tf b/modules/databases/cosmos_dbs/gremlin_database/gremlin_database.tf index 9088d2dc21..703a38ce82 100644 --- a/modules/databases/cosmos_dbs/gremlin_database/gremlin_database.tf +++ b/modules/databases/cosmos_dbs/gremlin_database/gremlin_database.tf @@ -18,7 +18,7 @@ resource "azurerm_cosmosdb_gremlin_database" "database" { } # Create graphs -module gremlin_graphs { +module "gremlin_graphs" { source = "./gremlin_graph" for_each = try(var.settings.graphs, {}) @@ -29,7 +29,7 @@ module gremlin_graphs { gremlin_database_name = azurerm_cosmosdb_gremlin_database.database.name } -output gremlin_graphs { +output "gremlin_graphs" { value = module.gremlin_graphs } diff --git a/modules/databases/cosmos_dbs/gremlin_database/gremlin_graph/variables.tf b/modules/databases/cosmos_dbs/gremlin_database/gremlin_graph/variables.tf index 1656304f7d..730a7713a4 100644 --- a/modules/databases/cosmos_dbs/gremlin_database/gremlin_graph/variables.tf +++ b/modules/databases/cosmos_dbs/gremlin_database/gremlin_graph/variables.tf @@ -1,5 +1,5 @@ -variable settings {} -variable global_settings {} -variable resource_group_name {} -variable gremlin_database_name {} -variable cosmosdb_account_name {} \ No newline at end of file +variable "settings" {} +variable "global_settings" {} +variable "resource_group_name" {} +variable "gremlin_database_name" {} +variable "cosmosdb_account_name" {} \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/gremlin_database/output.tf b/modules/databases/cosmos_dbs/gremlin_database/output.tf index 9db5d49ba2..bb539fdf50 100644 --- a/modules/databases/cosmos_dbs/gremlin_database/output.tf +++ b/modules/databases/cosmos_dbs/gremlin_database/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { description = "The ID of the CosmosDB Gremlin Database." value = azurerm_cosmosdb_gremlin_database.database.id diff --git a/modules/databases/cosmos_dbs/gremlin_database/variables.tf b/modules/databases/cosmos_dbs/gremlin_database/variables.tf index 10375965e8..35b0e9af3a 100644 --- a/modules/databases/cosmos_dbs/gremlin_database/variables.tf +++ b/modules/databases/cosmos_dbs/gremlin_database/variables.tf @@ -1,5 +1,5 @@ -variable settings {} -variable global_settings {} -variable resource_group_name {} -variable location {} -variable cosmosdb_account_name {} \ No newline at end of file +variable "settings" {} +variable "global_settings" {} +variable "resource_group_name" {} +variable "location" {} +variable "cosmosdb_account_name" {} \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/mongo_database.tf b/modules/databases/cosmos_dbs/mongo_database.tf index 25f54b1cc9..22197d4efe 100644 --- a/modules/databases/cosmos_dbs/mongo_database.tf +++ b/modules/databases/cosmos_dbs/mongo_database.tf @@ -1,4 +1,4 @@ -module mongo_databases { +module "mongo_databases" { source = "./mongo_database" for_each = try(var.settings.mongo_databases, {}) @@ -8,7 +8,7 @@ module mongo_databases { cosmosdb_account_name = azurerm_cosmosdb_account.cosmos_account.name } -output mongo_databases { +output "mongo_databases" { value = module.mongo_databases } \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/mongo_database/mongo_collection/variables.tf b/modules/databases/cosmos_dbs/mongo_database/mongo_collection/variables.tf index bcbc7aaa42..b2c1ed0d90 100644 --- a/modules/databases/cosmos_dbs/mongo_database/mongo_collection/variables.tf +++ b/modules/databases/cosmos_dbs/mongo_database/mongo_collection/variables.tf @@ -1,5 +1,5 @@ -variable settings {} -variable global_settings {} -variable resource_group_name {} -variable cosmosdb_account_name {} -variable database_name {} \ No newline at end of file +variable "settings" {} +variable "global_settings" {} +variable "resource_group_name" {} +variable "cosmosdb_account_name" {} +variable "database_name" {} \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/mongo_database/mongo_database.tf b/modules/databases/cosmos_dbs/mongo_database/mongo_database.tf index 2f5697407a..793992c530 100644 --- a/modules/databases/cosmos_dbs/mongo_database/mongo_database.tf +++ b/modules/databases/cosmos_dbs/mongo_database/mongo_database.tf @@ -18,7 +18,7 @@ resource "azurerm_cosmosdb_mongo_database" "database" { } # Iterate through collections using sub-module -module mongo_collections { +module "mongo_collections" { source = "./mongo_collection" for_each = try(var.settings.collections, {}) @@ -29,7 +29,7 @@ module mongo_collections { database_name = azurerm_cosmosdb_mongo_database.database.name } -output mongo_collections { +output "mongo_collections" { value = module.mongo_collections } \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/mongo_database/output.tf b/modules/databases/cosmos_dbs/mongo_database/output.tf index 5754bc75a2..6725683da9 100644 --- a/modules/databases/cosmos_dbs/mongo_database/output.tf +++ b/modules/databases/cosmos_dbs/mongo_database/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { description = "The ID of the Cosmos DB Mongo Database." value = azurerm_cosmosdb_mongo_database.database.id diff --git a/modules/databases/cosmos_dbs/mongo_database/variables.tf b/modules/databases/cosmos_dbs/mongo_database/variables.tf index 6fddb02dc5..0ab9a88e48 100644 --- a/modules/databases/cosmos_dbs/mongo_database/variables.tf +++ b/modules/databases/cosmos_dbs/mongo_database/variables.tf @@ -1,11 +1,11 @@ -variable settings {} +variable "settings" {} -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable cosmosdb_account_name {} \ No newline at end of file +variable "cosmosdb_account_name" {} \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/output.tf b/modules/databases/cosmos_dbs/output.tf index e62fed8099..74a55e229a 100644 --- a/modules/databases/cosmos_dbs/output.tf +++ b/modules/databases/cosmos_dbs/output.tf @@ -1,15 +1,15 @@ -output cosmos_account { - value = azurerm_cosmosdb_account.cosmos_account.id +output "cosmos_account" { + value = azurerm_cosmosdb_account.cosmos_account.id } -output connection_string { - value = azurerm_cosmosdb_account.cosmos_account.connection_strings[0] +output "connection_string" { + value = azurerm_cosmosdb_account.cosmos_account.connection_strings[0] } -output primary_key { - value = azurerm_cosmosdb_account.cosmos_account.primary_key +output "primary_key" { + value = azurerm_cosmosdb_account.cosmos_account.primary_key } -output endpoint { - value = azurerm_cosmosdb_account.cosmos_account.endpoint +output "endpoint" { + value = azurerm_cosmosdb_account.cosmos_account.endpoint } \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/sql_database.tf b/modules/databases/cosmos_dbs/sql_database.tf index 70a44146a3..1e98b88d0a 100644 --- a/modules/databases/cosmos_dbs/sql_database.tf +++ b/modules/databases/cosmos_dbs/sql_database.tf @@ -1,4 +1,4 @@ -module sql_databases { +module "sql_databases" { source = "./sql_database" for_each = try(var.settings.sql_databases, {}) @@ -9,7 +9,7 @@ module sql_databases { cosmosdb_account_name = azurerm_cosmosdb_account.cosmos_account.name } -output sql_databases { +output "sql_databases" { value = module.sql_databases } \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/sql_database/variables.tf b/modules/databases/cosmos_dbs/sql_database/variables.tf index 4e6bc6dddf..4b51adc0c2 100644 --- a/modules/databases/cosmos_dbs/sql_database/variables.tf +++ b/modules/databases/cosmos_dbs/sql_database/variables.tf @@ -1,13 +1,13 @@ -variable settings {} -variable global_settings { +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable cosmosdb_account_name {} \ No newline at end of file +variable "cosmosdb_account_name" {} \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/table.tf b/modules/databases/cosmos_dbs/table.tf index 5f84c4228b..96e29396b9 100644 --- a/modules/databases/cosmos_dbs/table.tf +++ b/modules/databases/cosmos_dbs/table.tf @@ -1,4 +1,4 @@ -module tables { +module "tables" { source = "./table" for_each = try(var.settings.tables, {}) @@ -9,7 +9,7 @@ module tables { cosmosdb_account_name = azurerm_cosmosdb_account.cosmos_account.name } -output tables { +output "tables" { value = module.tables } \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/table/output.tf b/modules/databases/cosmos_dbs/table/output.tf index f95d1406f6..35a197557c 100644 --- a/modules/databases/cosmos_dbs/table/output.tf +++ b/modules/databases/cosmos_dbs/table/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { description = "The ID of the CosmosDB Table." value = azurerm_cosmosdb_table.table.id diff --git a/modules/databases/cosmos_dbs/table/variables.tf b/modules/databases/cosmos_dbs/table/variables.tf index 10375965e8..35b0e9af3a 100644 --- a/modules/databases/cosmos_dbs/table/variables.tf +++ b/modules/databases/cosmos_dbs/table/variables.tf @@ -1,5 +1,5 @@ -variable settings {} -variable global_settings {} -variable resource_group_name {} -variable location {} -variable cosmosdb_account_name {} \ No newline at end of file +variable "settings" {} +variable "global_settings" {} +variable "resource_group_name" {} +variable "location" {} +variable "cosmosdb_account_name" {} \ No newline at end of file diff --git a/modules/databases/cosmos_dbs/variables.tf b/modules/databases/cosmos_dbs/variables.tf index e36d5953ff..11d85a34f7 100644 --- a/modules/databases/cosmos_dbs/variables.tf +++ b/modules/databases/cosmos_dbs/variables.tf @@ -1,16 +1,16 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable settings {} -variable base_tags { +variable "settings" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/databases/database_migration_service/variables.tf b/modules/databases/database_migration_service/variables.tf index d1103151b9..9f820efb2a 100644 --- a/modules/databases/database_migration_service/variables.tf +++ b/modules/databases/database_migration_service/variables.tf @@ -1,14 +1,14 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable subnet_id {} -variable resource_groups {} +variable "subnet_id" {} +variable "resource_groups" {} diff --git a/modules/databases/mariadb_server/diagnostics.tf b/modules/databases/mariadb_server/diagnostics.tf index 7f32c99dc3..264d5a9a32 100644 --- a/modules/databases/mariadb_server/diagnostics.tf +++ b/modules/databases/mariadb_server/diagnostics.tf @@ -1,4 +1,4 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" count = var.diagnostic_profiles == null ? 0 : 1 diff --git a/modules/databases/mariadb_server/output.tf b/modules/databases/mariadb_server/output.tf index 2857da1eca..bf56601953 100644 --- a/modules/databases/mariadb_server/output.tf +++ b/modules/databases/mariadb_server/output.tf @@ -1,15 +1,15 @@ -output id { +output "id" { value = azurerm_mariadb_server.mariadb.id } -output name { +output "name" { value = azurecaf_name.mariadb.result } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name } -output location { +output "location" { value = var.location } diff --git a/modules/databases/mariadb_server/private_endpoints.tf b/modules/databases/mariadb_server/private_endpoints.tf index 5f9e8974d0..4495a93c89 100644 --- a/modules/databases/mariadb_server/private_endpoints.tf +++ b/modules/databases/mariadb_server/private_endpoints.tf @@ -4,7 +4,7 @@ # Private endpoint # -module private_endpoint { +module "private_endpoint" { source = "../../networking/private_endpoint" for_each = try(var.private_endpoints, {}) diff --git a/modules/databases/mariadb_server/variables.tf b/modules/databases/mariadb_server/variables.tf index a0ebbc3485..1831f72d9c 100644 --- a/modules/databases/mariadb_server/variables.tf +++ b/modules/databases/mariadb_server/variables.tf @@ -1,35 +1,35 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable keyvault_id {} -variable storage_accounts {} -variable azuread_groups {} -variable vnets {} -variable subnet_id {} -variable private_endpoints {} -variable resource_groups {} -variable diagnostic_profiles { +variable "keyvault_id" {} +variable "storage_accounts" {} +variable "azuread_groups" {} +variable "vnets" {} +variable "subnet_id" {} +variable "private_endpoints" {} +variable "resource_groups" {} +variable "diagnostic_profiles" { default = null } -variable diagnostics { +variable "diagnostics" { default = {} } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable private_dns { +variable "private_dns" { default = {} } diff --git a/modules/databases/mssql_database/db_permissions.tf b/modules/databases/mssql_database/db_permissions.tf index 7199464dd7..05edca4e77 100644 --- a/modules/databases/mssql_database/db_permissions.tf +++ b/modules/databases/mssql_database/db_permissions.tf @@ -2,8 +2,8 @@ resource "null_resource" "set_db_permissions" { for_each = local.db_permissions triggers = { - db_usernames = join(",",each.value.db_usernames) - db_roles = join(",",each.value.db_roles) + db_usernames = join(",", each.value.db_usernames) + db_roles = join(",", each.value.db_roles) } provisioner "local-exec" { @@ -12,11 +12,11 @@ resource "null_resource" "set_db_permissions" { on_failure = fail environment = { - SQLCMDSERVER = local.server_name - SQLCMDDBNAME = azurerm_mssql_database.mssqldb.name - DBUSERNAMES = join(",",each.value.db_usernames) - DBROLES = join(",",each.value.db_roles) - SQLFILEPATH = format("%s/scripts/set_db_permissions.sql", path.module) + SQLCMDSERVER = local.server_name + SQLCMDDBNAME = azurerm_mssql_database.mssqldb.name + DBUSERNAMES = join(",", each.value.db_usernames) + DBROLES = join(",", each.value.db_roles) + SQLFILEPATH = format("%s/scripts/set_db_permissions.sql", path.module) } } diff --git a/modules/databases/mssql_database/main.tf b/modules/databases/mssql_database/main.tf index f45a0da1e0..d829d2627e 100755 --- a/modules/databases/mssql_database/main.tf +++ b/modules/databases/mssql_database/main.tf @@ -14,11 +14,11 @@ locals { } tags = merge(local.module_tag, try(var.settings.tags, null), var.base_tags) db_permissions = { - for group_key, group in try(var.settings.db_permissions, {}): group_key => { + for group_key, group in try(var.settings.db_permissions, {}) : group_key => { db_roles = group.db_roles db_usernames = flatten([ - for lz_key, value in group.managed_identities: [ - for managed_identity_key in value.managed_identity_keys: [var.managed_identities[lz_key][managed_identity_key].name] + for lz_key, value in group.managed_identities : [ + for managed_identity_key in value.managed_identity_keys : [var.managed_identities[lz_key][managed_identity_key].name] ] ]) } diff --git a/modules/databases/mssql_database/output.tf b/modules/databases/mssql_database/output.tf index e0eaeb7751..887b8cdaeb 100644 --- a/modules/databases/mssql_database/output.tf +++ b/modules/databases/mssql_database/output.tf @@ -1,3 +1,3 @@ -output id { +output "id" { value = azurerm_mssql_database.mssqldb.id } \ No newline at end of file diff --git a/modules/databases/mssql_database/scripts/set_db_permissions.sql b/modules/databases/mssql_database/scripts/set_db_permissions.sql index 925becd27f..341a1bf636 100644 --- a/modules/databases/mssql_database/scripts/set_db_permissions.sql +++ b/modules/databases/mssql_database/scripts/set_db_permissions.sql @@ -7,14 +7,14 @@ SET @dbusernames = $(DBUSERNAMES) WHILE len(@dbusernames) > 0 BEGIN SET @username = left(@dbusernames, charindex(',', @dbusernames+',')-1) - + SET @create_user_cmd='CREATE USER [' + @username + '] FROM EXTERNAL PROVIDER' -- User creation IF NOT EXISTS (SELECT NAME FROM sys.database_principals WHERE NAME = @username) BEGIN EXEC(@create_user_cmd); - PRINT 'User ' + @username + ' created.'; + PRINT 'User ' + @username + ' created.'; END ELSE PRINT 'User ' + @username + ' already exist.'; diff --git a/modules/databases/mssql_database/variables.tf b/modules/databases/mssql_database/variables.tf index c8dd8d9fdc..9a36ee3519 100755 --- a/modules/databases/mssql_database/variables.tf +++ b/modules/databases/mssql_database/variables.tf @@ -1,20 +1,20 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable server_id {} -variable server_name {} -variable storage_accounts {} -variable elastic_pool_id { +variable "settings" {} +variable "server_id" {} +variable "server_name" {} +variable "storage_accounts" {} +variable "elastic_pool_id" { default = null } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable sqlcmd_dbname { +variable "sqlcmd_dbname" { default = null } -variable managed_identities { +variable "managed_identities" { default = null } \ No newline at end of file diff --git a/modules/databases/mssql_elastic_pool/output.tf b/modules/databases/mssql_elastic_pool/output.tf index 9c31652457..1b302c54d1 100644 --- a/modules/databases/mssql_elastic_pool/output.tf +++ b/modules/databases/mssql_elastic_pool/output.tf @@ -1,3 +1,3 @@ -output id { +output "id" { value = azurerm_mssql_elasticpool.elasticpool.id } \ No newline at end of file diff --git a/modules/databases/mssql_elastic_pool/variables.tf b/modules/databases/mssql_elastic_pool/variables.tf index 47cfc0a861..29ba576758 100755 --- a/modules/databases/mssql_elastic_pool/variables.tf +++ b/modules/databases/mssql_elastic_pool/variables.tf @@ -1,17 +1,17 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable server_name {} -variable base_tags { +variable "server_name" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } diff --git a/modules/databases/mssql_managed_database/backup_ltr/arm_backup_ltr.json b/modules/databases/mssql_managed_database/backup_ltr/arm_backup_ltr.json index 93d3ef27ba..ca86c153b4 100644 --- a/modules/databases/mssql_managed_database/backup_ltr/arm_backup_ltr.json +++ b/modules/databases/mssql_managed_database/backup_ltr/arm_backup_ltr.json @@ -46,7 +46,7 @@ "weeklyRetention": "[if(equals(parameters('weeklyRetention'), ''), json('null'), parameters('weeklyRetention'))]", "monthlyRetention": "[if(equals(parameters('monthlyRetention'), ''), json('null'), parameters('monthlyRetention'))]", "yearlyRetention": "[if(equals(parameters('yearlyRetention'), ''), json('null'), parameters('yearlyRetention'))]", - "weekOfYear": "[if(equals(parameters('weekOfYear'), 0), json('null'), parameters('weekOfYear'))]" + "weekOfYear": "[if(equals(parameters('weekOfYear'), 0), json('null'), parameters('weekOfYear'))]" } } ] diff --git a/modules/databases/mssql_managed_database/backup_ltr/variables.tf b/modules/databases/mssql_managed_database/backup_ltr/variables.tf index 1098872893..a498f98a07 100644 --- a/modules/databases/mssql_managed_database/backup_ltr/variables.tf +++ b/modules/databases/mssql_managed_database/backup_ltr/variables.tf @@ -1,4 +1,4 @@ -variable server_name {} -variable db_name {} -variable settings {} -variable resource_group_name {} +variable "server_name" {} +variable "db_name" {} +variable "settings" {} +variable "resource_group_name" {} diff --git a/modules/databases/mssql_managed_database/output.tf b/modules/databases/mssql_managed_database/output.tf index 232aa5ed98..450a16bb9a 100644 --- a/modules/databases/mssql_managed_database/output.tf +++ b/modules/databases/mssql_managed_database/output.tf @@ -1,10 +1,10 @@ -output name { +output "name" { value = azurecaf_name.manageddb.result description = "SQL Managed DB Name" } -output id { +output "id" { value = lookup(azurerm_template_deployment.manageddb.outputs, "id") description = "SQL Managed DB Id" } \ No newline at end of file diff --git a/modules/databases/mssql_managed_database/variables.tf b/modules/databases/mssql_managed_database/variables.tf index 9077afe8df..f4be403b91 100644 --- a/modules/databases/mssql_managed_database/variables.tf +++ b/modules/databases/mssql_managed_database/variables.tf @@ -1,20 +1,20 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable server_name {} -variable settings {} -variable base_tags { +variable "server_name" {} +variable "settings" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable sourceDatabaseId { +variable "sourceDatabaseId" { default = "" } diff --git a/modules/databases/mssql_managed_instance/administrator/variables.tf b/modules/databases/mssql_managed_instance/administrator/variables.tf index ef5b5b9515..cf2e0c4d16 100644 --- a/modules/databases/mssql_managed_instance/administrator/variables.tf +++ b/modules/databases/mssql_managed_instance/administrator/variables.tf @@ -1,15 +1,15 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable mi_name {} -variable settings {} -variable user_principal_name { +variable "mi_name" {} +variable "settings" {} +variable "user_principal_name" { default = null } -variable group_name { +variable "group_name" { default = null } -variable group_id { +variable "group_id" { default = null } \ No newline at end of file diff --git a/modules/databases/mssql_managed_instance/failover_group/variables.tf b/modules/databases/mssql_managed_instance/failover_group/variables.tf index 1f6e65d273..d3d7516d22 100644 --- a/modules/databases/mssql_managed_instance/failover_group/variables.tf +++ b/modules/databases/mssql_managed_instance/failover_group/variables.tf @@ -1,11 +1,11 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable primaryManagedInstanceId {} -variable partnerManagedInstanceId {} -variable partnerRegion {} \ No newline at end of file +variable "primaryManagedInstanceId" {} +variable "partnerManagedInstanceId" {} +variable "partnerRegion" {} \ No newline at end of file diff --git a/modules/databases/mssql_managed_instance/output.tf b/modules/databases/mssql_managed_instance/output.tf index 9b62aeb95b..40d581a8ca 100644 --- a/modules/databases/mssql_managed_instance/output.tf +++ b/modules/databases/mssql_managed_instance/output.tf @@ -1,19 +1,19 @@ -output name { +output "name" { value = azurecaf_name.mssqlmi.result description = "SQL MI Name" } -output id { +output "id" { value = lookup(azurerm_template_deployment.mssqlmi.outputs, "id") description = "SQL MI Id" } -output location { +output "location" { value = var.location } -output principal_id { +output "principal_id" { value = lookup(azurerm_template_deployment.mssqlmi.outputs, "objectId") description = "SQL MI Identity Principal Id" } \ No newline at end of file diff --git a/modules/databases/mssql_managed_instance/tde/mi_tde.tf b/modules/databases/mssql_managed_instance/tde/mi_tde.tf index f0b6f38ec6..f175558a4d 100644 --- a/modules/databases/mssql_managed_instance/tde/mi_tde.tf +++ b/modules/databases/mssql_managed_instance/tde/mi_tde.tf @@ -1,4 +1,4 @@ -module secondary_tde { +module "secondary_tde" { source = "./secondary" count = var.is_secondary_tde == true ? 1 : 0 diff --git a/modules/databases/mssql_managed_instance/tde/secondary/variables.tf b/modules/databases/mssql_managed_instance/tde/secondary/variables.tf index 57fff4518a..b5966810d0 100644 --- a/modules/databases/mssql_managed_instance/tde/secondary/variables.tf +++ b/modules/databases/mssql_managed_instance/tde/secondary/variables.tf @@ -1,3 +1,3 @@ -variable key {} -variable keyvault {} \ No newline at end of file +variable "key" {} +variable "keyvault" {} \ No newline at end of file diff --git a/modules/databases/mssql_managed_instance/tde/variables.tf b/modules/databases/mssql_managed_instance/tde/variables.tf index 58726b72a2..77a8959eee 100644 --- a/modules/databases/mssql_managed_instance/tde/variables.tf +++ b/modules/databases/mssql_managed_instance/tde/variables.tf @@ -1,9 +1,9 @@ -variable resource_group_name {} -variable mi_name {} -variable keyvault_key {} -variable is_secondary_tde { +variable "resource_group_name" {} +variable "mi_name" {} +variable "keyvault_key" {} +variable "is_secondary_tde" { default = false } -variable secondary_keyvault { +variable "secondary_keyvault" { default = {} } \ No newline at end of file diff --git a/modules/databases/mssql_managed_instance/variables.tf b/modules/databases/mssql_managed_instance/variables.tf index 93653aad44..8fa59c0d89 100644 --- a/modules/databases/mssql_managed_instance/variables.tf +++ b/modules/databases/mssql_managed_instance/variables.tf @@ -1,20 +1,20 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable base_tags { +variable "settings" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable subnet_id {} -variable resource_group_name { +variable "subnet_id" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable primary_server_id { +variable "primary_server_id" { default = "" } diff --git a/modules/databases/mssql_server/failover_group/variables.tf b/modules/databases/mssql_server/failover_group/variables.tf index b75b07ab85..3a408311bf 100644 --- a/modules/databases/mssql_server/failover_group/variables.tf +++ b/modules/databases/mssql_server/failover_group/variables.tf @@ -1,14 +1,14 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable primary_server_name {} -variable secondary_server_id {} -variable databases {} \ No newline at end of file +variable "primary_server_name" {} +variable "secondary_server_id" {} +variable "databases" {} \ No newline at end of file diff --git a/modules/databases/mssql_server/output.tf b/modules/databases/mssql_server/output.tf index 3b2b8d20c5..b57722c40b 100644 --- a/modules/databases/mssql_server/output.tf +++ b/modules/databases/mssql_server/output.tf @@ -1,35 +1,35 @@ -output id { +output "id" { value = azurerm_mssql_server.mssql.id } -output rbac_id { +output "rbac_id" { value = try(azurerm_mssql_server.mssql.identity[0].principal_id, null) } -output identity { +output "identity" { value = try(azurerm_mssql_server.mssql.identity, null) } -output azuread_administrator { +output "azuread_administrator" { value = try(azurerm_mssql_server.mssql.azuread_administrator, null) } -output name { +output "name" { value = azurecaf_name.mssql.result } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name } -output location { +output "location" { value = var.location } -output administrator_login { +output "administrator_login" { value = var.settings.administrator_login } -output administrator_login_password { +output "administrator_login_password" { value = try(var.settings.administrator_login_password, random_password.sql_admin.0.result) } \ No newline at end of file diff --git a/modules/databases/mssql_server/private_endpoints.tf b/modules/databases/mssql_server/private_endpoints.tf index 06fc2b4a84..2db0fbc43d 100755 --- a/modules/databases/mssql_server/private_endpoints.tf +++ b/modules/databases/mssql_server/private_endpoints.tf @@ -4,7 +4,7 @@ # Private endpoint # -module private_endpoint { +module "private_endpoint" { source = "../../networking/private_endpoint" for_each = var.private_endpoints diff --git a/modules/databases/mssql_server/variables.tf b/modules/databases/mssql_server/variables.tf index 3021fd5cbc..83d2810c31 100755 --- a/modules/databases/mssql_server/variables.tf +++ b/modules/databases/mssql_server/variables.tf @@ -1,27 +1,27 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable storage_accounts {} -variable azuread_groups {} -variable vnets {} -variable private_endpoints {} -variable resource_groups {} -variable base_tags { +variable "storage_accounts" {} +variable "azuread_groups" {} +variable "vnets" {} +variable "private_endpoints" {} +variable "resource_groups" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable private_dns { +variable "private_dns" { default = {} } diff --git a/modules/databases/mysql_server/diagnostics.tf b/modules/databases/mysql_server/diagnostics.tf index 30a967c0dc..2d61397704 100644 --- a/modules/databases/mysql_server/diagnostics.tf +++ b/modules/databases/mysql_server/diagnostics.tf @@ -1,4 +1,4 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" count = var.diagnostic_profiles == null ? 0 : 1 diff --git a/modules/databases/mysql_server/output.tf b/modules/databases/mysql_server/output.tf index 0f52c1be18..b2e2bc6f40 100644 --- a/modules/databases/mysql_server/output.tf +++ b/modules/databases/mysql_server/output.tf @@ -1,24 +1,24 @@ -output id { +output "id" { value = azurerm_mysql_server.mysql.id } -output rbac_id { +output "rbac_id" { value = try(azurerm_mysql_server.mysql.identity[0].principal_id, null) } -output identity { +output "identity" { value = try(azurerm_mysql_server.mysql.identity, null) } -output name { +output "name" { value = azurecaf_name.mysql.result } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name } -output location { +output "location" { value = var.location } \ No newline at end of file diff --git a/modules/databases/mysql_server/private_endpoints.tf b/modules/databases/mysql_server/private_endpoints.tf index cd52d853aa..07fe05fc6b 100644 --- a/modules/databases/mysql_server/private_endpoints.tf +++ b/modules/databases/mysql_server/private_endpoints.tf @@ -2,7 +2,7 @@ # Private endpoint # -module private_endpoint { +module "private_endpoint" { source = "../../networking/private_endpoint" for_each = try(var.private_endpoints, {}) diff --git a/modules/databases/mysql_server/variables.tf b/modules/databases/mysql_server/variables.tf index a745f9f842..d089b46af3 100644 --- a/modules/databases/mysql_server/variables.tf +++ b/modules/databases/mysql_server/variables.tf @@ -1,38 +1,38 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable client_config { +variable "settings" {} +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable keyvault_id {} -variable storage_accounts {} -variable azuread_groups {} -variable vnets {} -variable subnet_id {} -variable private_endpoints {} -variable resource_groups {} -variable diagnostic_profiles { +variable "keyvault_id" {} +variable "storage_accounts" {} +variable "azuread_groups" {} +variable "vnets" {} +variable "subnet_id" {} +variable "private_endpoints" {} +variable "resource_groups" {} +variable "diagnostic_profiles" { default = null } -variable network_security_group_definition { +variable "network_security_group_definition" { default = null } -variable diagnostics { +variable "diagnostics" { default = {} } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable private_dns { +variable "private_dns" { default = {} } diff --git a/modules/databases/postgresql_server/output.tf b/modules/databases/postgresql_server/output.tf index 62d4ed3e73..b1510db7ab 100644 --- a/modules/databases/postgresql_server/output.tf +++ b/modules/databases/postgresql_server/output.tf @@ -1,23 +1,23 @@ -output id { +output "id" { value = azurerm_postgresql_server.postgresql.id } -output rbac_id { +output "rbac_id" { value = try(azurerm_postgresql_server.postgresql.identity[0].principal_id, null) } -output identity { +output "identity" { value = try(azurerm_postgresql_server.postgresql.identity, null) } -output name { +output "name" { value = azurecaf_name.postgresql.result } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name } -output location { +output "location" { value = var.location } diff --git a/modules/databases/postgresql_server/private_endpoint.tf b/modules/databases/postgresql_server/private_endpoint.tf index d3ad394c33..49fd1c165c 100644 --- a/modules/databases/postgresql_server/private_endpoint.tf +++ b/modules/databases/postgresql_server/private_endpoint.tf @@ -1,4 +1,4 @@ -module private_endpoint { +module "private_endpoint" { source = "../../networking/private_endpoint" for_each = try(var.private_endpoints, {}) diff --git a/modules/databases/postgresql_server/variables.tf b/modules/databases/postgresql_server/variables.tf index 9589755e0a..a8f90a50b4 100644 --- a/modules/databases/postgresql_server/variables.tf +++ b/modules/databases/postgresql_server/variables.tf @@ -1,30 +1,30 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable keyvault_id {} -variable storage_accounts {} -variable azuread_groups {} -variable vnets {} -variable subnet_id {} -variable private_endpoints {} -variable resource_groups {} -variable base_tags { +variable "keyvault_id" {} +variable "storage_accounts" {} +variable "azuread_groups" {} +variable "vnets" {} +variable "subnet_id" {} +variable "private_endpoints" {} +variable "resource_groups" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable private_dns { +variable "private_dns" { default = {} } diff --git a/modules/diagnostics/variables.tf b/modules/diagnostics/variables.tf index f8f83b72d3..8f5c1861e5 100755 --- a/modules/diagnostics/variables.tf +++ b/modules/diagnostics/variables.tf @@ -1,17 +1,17 @@ -variable resource_id { +variable "resource_id" { description = "(Required) Fully qualified Azure resource identifier for which you enable diagnostics." } -variable resource_location { +variable "resource_location" { description = "(Required) location of the resource" } -variable diagnostics { +variable "diagnostics" { description = "(Required) Contains the diagnostics setting object." } -variable profiles { +variable "profiles" { validation { condition = length(var.profiles) < 6 @@ -19,6 +19,6 @@ variable profiles { } } -variable global_settings { +variable "global_settings" { default = {} } \ No newline at end of file diff --git a/modules/event_hubs/consumer_groups/output.tf b/modules/event_hubs/consumer_groups/output.tf index 92a44e853b..441b20fe71 100644 --- a/modules/event_hubs/consumer_groups/output.tf +++ b/modules/event_hubs/consumer_groups/output.tf @@ -1,3 +1,3 @@ -output id { +output "id" { value = azurerm_eventhub_consumer_group.evhcg.id } \ No newline at end of file diff --git a/modules/event_hubs/consumer_groups/variables.tf b/modules/event_hubs/consumer_groups/variables.tf index 418d7b9b63..9c21a58212 100644 --- a/modules/event_hubs/consumer_groups/variables.tf +++ b/modules/event_hubs/consumer_groups/variables.tf @@ -1,7 +1,7 @@ -variable global_settings {} -variable settings {} -variable resource_group_name {} -variable client_config {} -variable namespace_name {} -variable eventhub_name {} +variable "global_settings" {} +variable "settings" {} +variable "resource_group_name" {} +variable "client_config" {} +variable "namespace_name" {} +variable "eventhub_name" {} diff --git a/modules/event_hubs/hubs/auth_rules.tf b/modules/event_hubs/hubs/auth_rules.tf index 70ecc85812..0a61706962 100644 --- a/modules/event_hubs/hubs/auth_rules.tf +++ b/modules/event_hubs/hubs/auth_rules.tf @@ -1,4 +1,4 @@ -module authorization_rules { +module "authorization_rules" { source = "./auth_rules" for_each = try(var.settings.auth_rules, {}) diff --git a/modules/event_hubs/hubs/auth_rules/output.tf b/modules/event_hubs/hubs/auth_rules/output.tf index 403c041dae..69a3e045f3 100644 --- a/modules/event_hubs/hubs/auth_rules/output.tf +++ b/modules/event_hubs/hubs/auth_rules/output.tf @@ -1,27 +1,27 @@ -output id { +output "id" { value = azurerm_eventhub_authorization_rule.evhub_rule.id } -output primary_connection_string_alias { +output "primary_connection_string_alias" { value = azurerm_eventhub_authorization_rule.evhub_rule.primary_connection_string_alias } -output secondary_connection_string_alias { +output "secondary_connection_string_alias" { value = azurerm_eventhub_authorization_rule.evhub_rule.secondary_connection_string_alias } -output primary_connection_string { +output "primary_connection_string" { value = azurerm_eventhub_authorization_rule.evhub_rule.primary_connection_string } -output primary_key { +output "primary_key" { value = azurerm_eventhub_authorization_rule.evhub_rule.primary_key } -output secondary_connection_string { +output "secondary_connection_string" { value = azurerm_eventhub_authorization_rule.evhub_rule.secondary_connection_string } -output secondary_key { +output "secondary_key" { value = azurerm_eventhub_authorization_rule.evhub_rule.secondary_key } \ No newline at end of file diff --git a/modules/event_hubs/hubs/auth_rules/variables.tf b/modules/event_hubs/hubs/auth_rules/variables.tf index edff89dfe2..6db8fa0e60 100644 --- a/modules/event_hubs/hubs/auth_rules/variables.tf +++ b/modules/event_hubs/hubs/auth_rules/variables.tf @@ -1,6 +1,6 @@ -variable global_settings {} -variable settings {} -variable resource_group_name {} -variable client_config {} -variable namespace_name {} -variable eventhub_name {} +variable "global_settings" {} +variable "settings" {} +variable "resource_group_name" {} +variable "client_config" {} +variable "namespace_name" {} +variable "eventhub_name" {} diff --git a/modules/event_hubs/hubs/output.tf b/modules/event_hubs/hubs/output.tf index 143bae8cd5..89514334c1 100644 --- a/modules/event_hubs/hubs/output.tf +++ b/modules/event_hubs/hubs/output.tf @@ -1,8 +1,8 @@ -output id { - value = azurerm_eventhub.evhub.id +output "id" { + value = azurerm_eventhub.evhub.id } -output name { +output "name" { description = "The EventHub name." value = azurerm_eventhub.evhub.name } \ No newline at end of file diff --git a/modules/event_hubs/hubs/variables.tf b/modules/event_hubs/hubs/variables.tf index f51ece03de..7b794dae15 100644 --- a/modules/event_hubs/hubs/variables.tf +++ b/modules/event_hubs/hubs/variables.tf @@ -1,7 +1,7 @@ -variable global_settings {} -variable settings {} -variable resource_group_name {} -variable base_tags {} -variable client_config {} -variable namespace_name {} -variable storage_account_id {} +variable "global_settings" {} +variable "settings" {} +variable "resource_group_name" {} +variable "base_tags" {} +variable "client_config" {} +variable "namespace_name" {} +variable "storage_account_id" {} diff --git a/modules/event_hubs/namespaces/README.md b/modules/event_hubs/namespaces/README.md index 657e8435f8..970ecd3729 100644 --- a/modules/event_hubs/namespaces/README.md +++ b/modules/event_hubs/namespaces/README.md @@ -26,22 +26,38 @@ module "caf_event_hub_namespaces" { | azurecaf | n/a | | azurerm | n/a | +## Modules + +| Name | Source | Version | +|------|--------|---------| +| event_hub_namespace_auth_rules | ./auth_rules | | +| event_hubs | ../hubs | | + +## Resources + +| Name | +|------| +| [azurecaf_name](https://registry.terraform.io/providers/aztfmod/azurecaf/latest/docs/resources/name) | +| [azurerm_eventhub_namespace](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/eventhub_namespace) | + ## Inputs | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| base\_tags | Base tags for the resource to be inherited from the resource group. | `map` | n/a | yes | +| base\_tags | Base tags for the resource to be inherited from the resource group. | `map(any)` | n/a | yes | | client\_config | Client configuration object (see module README.md). | `any` | n/a | yes | | global\_settings | Global settings object (see module README.md) | `any` | n/a | yes | -| resource\_groups | n/a | `any` | n/a | yes | +| location | n/a | `any` | n/a | yes | +| resource\_group\_name | n/a | `any` | n/a | yes | | settings | n/a | `any` | n/a | yes | +| storage\_accounts | n/a | `map` | `{}` | no | ## Outputs | Name | Description | |------|-------------| | id | The EventHub Namespace ID. | -| location | The EventHub Namespace location. | +| location | Location of the service | | name | The EventHub Namespace name. | - +| resource\_group\_name | Name of the resource group | \ No newline at end of file diff --git a/modules/event_hubs/namespaces/auth_rules.tf b/modules/event_hubs/namespaces/auth_rules.tf index 0815d5b77f..cdf6533c03 100644 --- a/modules/event_hubs/namespaces/auth_rules.tf +++ b/modules/event_hubs/namespaces/auth_rules.tf @@ -1,4 +1,4 @@ -module event_hub_namespace_auth_rules { +module "event_hub_namespace_auth_rules" { source = "./auth_rules" for_each = try(var.settings.auth_rules, {}) diff --git a/modules/event_hubs/namespaces/auth_rules/output.tf b/modules/event_hubs/namespaces/auth_rules/output.tf index 83eba970f2..da94cd41d2 100644 --- a/modules/event_hubs/namespaces/auth_rules/output.tf +++ b/modules/event_hubs/namespaces/auth_rules/output.tf @@ -1,21 +1,21 @@ -output id { +output "id" { value = azurerm_eventhub_namespace_authorization_rule.evh_ns_rule.id } -output primary_connection_string_alias { +output "primary_connection_string_alias" { value = azurerm_eventhub_namespace_authorization_rule.evh_ns_rule.primary_connection_string_alias } -output secondary_connection_string_alias { +output "secondary_connection_string_alias" { value = azurerm_eventhub_namespace_authorization_rule.evh_ns_rule.secondary_connection_string_alias } -output name { +output "name" { value = var.namespace_name description = "Name of the authorization rule" } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name description = "Name of the resource group" } diff --git a/modules/event_hubs/namespaces/auth_rules/variables.tf b/modules/event_hubs/namespaces/auth_rules/variables.tf index 3ee66779a2..17cc3cdb82 100644 --- a/modules/event_hubs/namespaces/auth_rules/variables.tf +++ b/modules/event_hubs/namespaces/auth_rules/variables.tf @@ -1,5 +1,5 @@ -variable global_settings {} -variable settings {} -variable resource_group_name {} -variable client_config {} -variable namespace_name {} +variable "global_settings" {} +variable "settings" {} +variable "resource_group_name" {} +variable "client_config" {} +variable "namespace_name" {} diff --git a/modules/event_hubs/namespaces/event_hubs.tf b/modules/event_hubs/namespaces/event_hubs.tf index 9f0ed91049..d021a733a3 100644 --- a/modules/event_hubs/namespaces/event_hubs.tf +++ b/modules/event_hubs/namespaces/event_hubs.tf @@ -1,4 +1,4 @@ -module event_hubs { +module "event_hubs" { source = "../hubs" for_each = try(var.settings.event_hubs, {}) diff --git a/modules/event_hubs/namespaces/output.tf b/modules/event_hubs/namespaces/output.tf index b703390712..d4e22e6246 100644 --- a/modules/event_hubs/namespaces/output.tf +++ b/modules/event_hubs/namespaces/output.tf @@ -1,19 +1,19 @@ -output id { +output "id" { description = "The EventHub Namespace ID." value = azurerm_eventhub_namespace.evh.id } -output name { +output "name" { description = "The EventHub Namespace name." value = azurerm_eventhub_namespace.evh.name } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name description = "Name of the resource group" } -output location { +output "location" { value = var.location description = "Location of the service" } diff --git a/modules/event_hubs/namespaces/variables.tf b/modules/event_hubs/namespaces/variables.tf index b48a7fd003..987b9d13ce 100644 --- a/modules/event_hubs/namespaces/variables.tf +++ b/modules/event_hubs/namespaces/variables.tf @@ -1,16 +1,16 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable resource_group_name {} -variable location {} -variable base_tags { +variable "settings" {} +variable "resource_group_name" {} +variable "location" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable storage_accounts { +variable "storage_accounts" { default = {} } \ No newline at end of file diff --git a/modules/log_analytics/output.tf b/modules/log_analytics/output.tf index cf9f10e22f..39dafdc3a2 100755 --- a/modules/log_analytics/output.tf +++ b/modules/log_analytics/output.tf @@ -1,24 +1,24 @@ -output id { +output "id" { value = azurerm_log_analytics_workspace.law.id } -output location { +output "location" { value = azurerm_log_analytics_workspace.law.location } -output name { +output "name" { value = azurerm_log_analytics_workspace.law.name } -output resource_group_name { +output "resource_group_name" { value = azurerm_log_analytics_workspace.law.resource_group_name } -output workspace_id { +output "workspace_id" { value = azurerm_log_analytics_workspace.law.workspace_id } diff --git a/modules/log_analytics/variables.tf b/modules/log_analytics/variables.tf index 0ff1a61638..300353f94f 100755 --- a/modules/log_analytics/variables.tf +++ b/modules/log_analytics/variables.tf @@ -1,9 +1,9 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable log_analytics {} -variable resource_groups {} -variable base_tags { +variable "log_analytics" {} +variable "resource_groups" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/logic_app/action_custom/output.tf b/modules/logic_app/action_custom/output.tf index 6539b4a7a1..f9a5595f9e 100644 --- a/modules/logic_app/action_custom/output.tf +++ b/modules/logic_app/action_custom/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_logic_app_action_custom.action.id description = "The ID of the HTTP Action within the Logic App Workflow" } diff --git a/modules/logic_app/action_custom/variables.tf b/modules/logic_app/action_custom/variables.tf index 080ac5e401..40114c5eaf 100644 --- a/modules/logic_app/action_custom/variables.tf +++ b/modules/logic_app/action_custom/variables.tf @@ -1,11 +1,11 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the HTTP Action to be created within the Logic App Workflow" } -variable logic_app_id { +variable "logic_app_id" { description = "(Required) Specifies the ID of the Logic App Workflow" } -variable body { +variable "body" { description = "(Required) Specifies the JSON Blob defining the Body of this Custom Action" } \ No newline at end of file diff --git a/modules/logic_app/action_http/output.tf b/modules/logic_app/action_http/output.tf index ebf918c025..dccfa7038e 100644 --- a/modules/logic_app/action_http/output.tf +++ b/modules/logic_app/action_http/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_logic_app_action_http.action.id description = "The ID of the HTTP Action within the Logic App Workflow" } diff --git a/modules/logic_app/action_http/variables.tf b/modules/logic_app/action_http/variables.tf index dcf6b06af3..ae2fd2bb6f 100644 --- a/modules/logic_app/action_http/variables.tf +++ b/modules/logic_app/action_http/variables.tf @@ -1,27 +1,27 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the HTTP Action to be created within the Logic App Workflow" } -variable logic_app_id { +variable "logic_app_id" { description = "(Required) Specifies the ID of the Logic App Workflow" } -variable method { +variable "method" { description = "(Required) Specifies the HTTP Method which should be used for this HTTP Action" } -variable uri { +variable "uri" { description = "(Required) Specifies the URI which will be called when this HTTP Action is triggered" } -variable body { +variable "body" { description = "(Optional) Specifies the HTTP Body that should be sent to the uri when this HTTP Action is triggered" } -variable headers { +variable "headers" { description = "(Optional) Specifies a Map of Key-Value Pairs that should be sent to the uri when this HTTP Action is triggered" } -variable run_after { +variable "run_after" { description = "(Optional) Specifies the place of the HTTP Action in the Logic App Workflow" } \ No newline at end of file diff --git a/modules/logic_app/integration_account/output.tf b/modules/logic_app/integration_account/output.tf index 7289abca27..99e840e651 100644 --- a/modules/logic_app/integration_account/output.tf +++ b/modules/logic_app/integration_account/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_logic_app_integration_account.ia.id description = "The ID of the Logic App Integration Account" } diff --git a/modules/logic_app/integration_account/variables.tf b/modules/logic_app/integration_account/variables.tf index 1c59e21498..7749c3bc4d 100644 --- a/modules/logic_app/integration_account/variables.tf +++ b/modules/logic_app/integration_account/variables.tf @@ -1,23 +1,23 @@ -variable name { +variable "name" { description = "(Required) The name which should be used for this Logic App Integration Account" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the Resource Group where the Logic App Integration Account should exist" } -variable location { +variable "location" { description = "(Required) The Azure Region where the Logic App Integration Account should exist" } -variable sku_name { +variable "sku_name" { description = "(Required) The sku name of the Logic App Integration Account. Possible Values are Basic, Free and Standard" } -variable tags { +variable "tags" { description = "(Optional) A mapping of tags which should be assigned to the Logic App Integration Account" } -variable global_settings {} +variable "global_settings" {} -variable base_tags {} \ No newline at end of file +variable "base_tags" {} \ No newline at end of file diff --git a/modules/logic_app/integration_service_environment/output.tf b/modules/logic_app/integration_service_environment/output.tf index 1f9644692a..022c514b06 100644 --- a/modules/logic_app/integration_service_environment/output.tf +++ b/modules/logic_app/integration_service_environment/output.tf @@ -1,24 +1,24 @@ -output id { +output "id" { value = azurerm_integration_service_environment.ise.id description = "The ID of the Integration Service Environment." } -output connector_endpoint_ip_addresses { +output "connector_endpoint_ip_addresses" { value = azurerm_integration_service_environment.ise.connector_endpoint_ip_addresses description = "The list of access endpoint ip addresses of connector." } -output connector_outbound_ip_addresses { +output "connector_outbound_ip_addresses" { value = azurerm_integration_service_environment.ise.connector_outbound_ip_addresses description = "The list of outgoing ip addresses of connector." } -output workflow_endpoint_ip_addresses { +output "workflow_endpoint_ip_addresses" { value = azurerm_integration_service_environment.ise.workflow_endpoint_ip_addresses description = "The list of access endpoint ip addresses of workflow." } -output workflow_outbound_ip_addresses { +output "workflow_outbound_ip_addresses" { value = azurerm_integration_service_environment.ise.workflow_outbound_ip_addresses description = "The list of outgoing ip addresses of workflow." } diff --git a/modules/logic_app/integration_service_environment/variables.tf b/modules/logic_app/integration_service_environment/variables.tf index b10b5efbc4..df51a399cc 100644 --- a/modules/logic_app/integration_service_environment/variables.tf +++ b/modules/logic_app/integration_service_environment/variables.tf @@ -1,31 +1,31 @@ -variable name { +variable "name" { description = "(Required) The name of the Integration Service Environment" } -variable location { +variable "location" { description = "(Required) The Azure Region where the Integration Service Environment should exist" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the Resource Group where the Integration Service Environment should exist" } -variable sku_name { +variable "sku_name" { description = "(Required) The sku name and capacity of the Integration Service Environment" } -variable access_endpoint_type { +variable "access_endpoint_type" { description = "(Required) The type of access endpoint to use for the Integration Service Environment" } -variable virtual_network_subnet_ids { +variable "virtual_network_subnet_ids" { description = "(Required) A list of virtual network subnet ids to be used by Integration Service Environment" } -variable tags { +variable "tags" { description = "(Optional) A mapping of tags which should be assigned to the Integration Service Environment" } -variable global_settings {} +variable "global_settings" {} -variable base_tags {} \ No newline at end of file +variable "base_tags" {} \ No newline at end of file diff --git a/modules/logic_app/trigger_custom/output.tf b/modules/logic_app/trigger_custom/output.tf index 2e0c7e3626..f692899f34 100644 --- a/modules/logic_app/trigger_custom/output.tf +++ b/modules/logic_app/trigger_custom/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_logic_app_trigger_custom.trigger.id description = "The ID of the HTTP Request Trigger within the Logic App Workflow" } diff --git a/modules/logic_app/trigger_custom/variables.tf b/modules/logic_app/trigger_custom/variables.tf index 9136c47126..c73e032524 100644 --- a/modules/logic_app/trigger_custom/variables.tf +++ b/modules/logic_app/trigger_custom/variables.tf @@ -1,11 +1,11 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the HTTP Trigger to be created within the Logic App Workflow" } -variable logic_app_id { +variable "logic_app_id" { description = "(Required) Specifies the ID of the Logic App Workflow" } -variable body { +variable "body" { description = "(Required) Specifies the JSON Blob defining the Body of this Custom Trigger" } diff --git a/modules/logic_app/trigger_http_request/output.tf b/modules/logic_app/trigger_http_request/output.tf index f592c2af76..68195282ae 100644 --- a/modules/logic_app/trigger_http_request/output.tf +++ b/modules/logic_app/trigger_http_request/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_logic_app_trigger_http_request.trigger.id description = "The ID of the HTTP Request Trigger within the Logic App Workflow" } diff --git a/modules/logic_app/trigger_http_request/variables.tf b/modules/logic_app/trigger_http_request/variables.tf index 1d4b013689..96f68d03c8 100644 --- a/modules/logic_app/trigger_http_request/variables.tf +++ b/modules/logic_app/trigger_http_request/variables.tf @@ -1,19 +1,19 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the HTTP Request Trigger to be created within the Logic App Workflow" } -variable logic_app_id { +variable "logic_app_id" { description = "(Required) Specifies the ID of the Logic App Workflow" } -variable schema { +variable "schema" { description = "(Required) A JSON Blob defining the Schema of the incoming request" } -variable method { +variable "method" { description = "(Optional) Specifies the HTTP Method which the request be using" } -variable relative_path { +variable "relative_path" { description = "(Optional) Specifies the Relative Path used for this Request" } \ No newline at end of file diff --git a/modules/logic_app/trigger_recurrence/module.tf b/modules/logic_app/trigger_recurrence/module.tf index f9aff17a55..9178ae264f 100644 --- a/modules/logic_app/trigger_recurrence/module.tf +++ b/modules/logic_app/trigger_recurrence/module.tf @@ -4,5 +4,5 @@ resource "azurerm_logic_app_trigger_recurrence" "freq" { frequency = var.frequency interval = var.interval start_time = try(var.start_time, null) - # time_zone = var.time_zone + # time_zone = var.time_zone } diff --git a/modules/logic_app/trigger_recurrence/output.tf b/modules/logic_app/trigger_recurrence/output.tf index 22446a99eb..6496583a80 100644 --- a/modules/logic_app/trigger_recurrence/output.tf +++ b/modules/logic_app/trigger_recurrence/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_logic_app_trigger_recurrence.freq.id description = "The ID of the Recurrence Trigger within the Logic App Workflow" } diff --git a/modules/logic_app/trigger_recurrence/variables.tf b/modules/logic_app/trigger_recurrence/variables.tf index 77676a6ee5..fbce1d78f5 100644 --- a/modules/logic_app/trigger_recurrence/variables.tf +++ b/modules/logic_app/trigger_recurrence/variables.tf @@ -1,20 +1,20 @@ -variable name { +variable "name" { description = "(Required) Specifies the name of the Recurrence Triggers to be created within the Logic App Workflow" } -variable logic_app_id { +variable "logic_app_id" { description = "(Required) Specifies the ID of the Logic App Workflow" } -variable frequency { +variable "frequency" { description = "(Required) Specifies the Frequency at which this Trigger should be run" } -variable interval { +variable "interval" { description = "(Required) Specifies interval used for the Frequency" } -variable start_time { +variable "start_time" { description = "(Optional) Specifies the start date and time for this trigger in RFC3339 format: 2000-01-02T03:04:05Z" } diff --git a/modules/logic_app/workflow/output.tf b/modules/logic_app/workflow/output.tf index 2f2a727ab8..e960dc3468 100644 --- a/modules/logic_app/workflow/output.tf +++ b/modules/logic_app/workflow/output.tf @@ -1,32 +1,32 @@ -output id { +output "id" { value = azurerm_logic_app_workflow.la.id description = "The Logic App Workflow ID." } -output access_endpoint { +output "access_endpoint" { value = azurerm_logic_app_workflow.la.access_endpoint description = "The Access Endpoint for the Logic App Workflow." } -output connector_endpoint_ip_addresses { +output "connector_endpoint_ip_addresses" { value = azurerm_logic_app_workflow.la.connector_endpoint_ip_addresses description = "The list of access endpoint ip addresses of connector." } -output connector_outbound_ip_addresses { +output "connector_outbound_ip_addresses" { value = azurerm_logic_app_workflow.la.connector_outbound_ip_addresses description = "The list of outgoing ip addresses of connector." } -output workflow_endpoint_ip_addresses { +output "workflow_endpoint_ip_addresses" { value = azurerm_logic_app_workflow.la.workflow_endpoint_ip_addresses description = "The list of access endpoint ip addresses of workflow." } -output workflow_outbound_ip_addresses { +output "workflow_outbound_ip_addresses" { value = azurerm_logic_app_workflow.la.workflow_outbound_ip_addresses description = "The list of outgoing ip addresses of workflow." } diff --git a/modules/logic_app/workflow/variables.tf b/modules/logic_app/workflow/variables.tf index 13c0f1d5c2..584f6d5df5 100644 --- a/modules/logic_app/workflow/variables.tf +++ b/modules/logic_app/workflow/variables.tf @@ -1,39 +1,39 @@ -variable tags { +variable "tags" { description = "(Required) map of tags for the deployment" } -variable name { +variable "name" { description = "(Required) Name of the Logic App" } -variable location { +variable "location" { description = "(Required) Resource Location" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) Resource group of the Logic App" } -variable integration_service_environment_id { +variable "integration_service_environment_id" { } -variable logic_app_integration_account_id { +variable "logic_app_integration_account_id" { } -variable workflow_schema { +variable "workflow_schema" { } -variable workflow_version { +variable "workflow_version" { } -variable parameters { +variable "parameters" { default = {} } -variable application_insight { +variable "application_insight" { default = null } -variable global_settings {} +variable "global_settings" {} -variable base_tags {} \ No newline at end of file +variable "base_tags" {} \ No newline at end of file diff --git a/modules/netapp/output.tf b/modules/netapp/output.tf index e6934c457c..ccad3d9703 100644 --- a/modules/netapp/output.tf +++ b/modules/netapp/output.tf @@ -1,3 +1,3 @@ -output pools { +output "pools" { value = module.pools } diff --git a/modules/netapp/pool/output.tf b/modules/netapp/pool/output.tf index cd54bd6b19..3a26b256b6 100644 --- a/modules/netapp/pool/output.tf +++ b/modules/netapp/pool/output.tf @@ -1,7 +1,7 @@ -output pool { +output "pool" { value = azurerm_netapp_pool.pool } -output volumes { +output "volumes" { value = module.volumes } diff --git a/modules/netapp/pool/pool.tf b/modules/netapp/pool/pool.tf index 4386043b31..104058b6be 100644 --- a/modules/netapp/pool/pool.tf +++ b/modules/netapp/pool/pool.tf @@ -9,7 +9,7 @@ resource "azurerm_netapp_pool" "pool" { tags = merge(var.base_tags, try(var.settings.tags, {})) } -module volumes { +module "volumes" { source = "../volume" for_each = try(var.settings.volumes, {}) settings = each.value diff --git a/modules/netapp/pool/variables.tf b/modules/netapp/pool/variables.tf index 17552832eb..b5e2e56d31 100644 --- a/modules/netapp/pool/variables.tf +++ b/modules/netapp/pool/variables.tf @@ -1,11 +1,11 @@ -variable global_settings {} -variable client_config {} -variable settings {} -variable resource_group_name {} -variable location {} -variable account_name {} -variable vnets {} +variable "global_settings" {} +variable "client_config" {} +variable "settings" {} +variable "resource_group_name" {} +variable "location" {} +variable "account_name" {} +variable "vnets" {} -variable base_tags { +variable "base_tags" { default = {} } diff --git a/modules/netapp/pools.tf b/modules/netapp/pools.tf index 82c884c49b..c270b63558 100644 --- a/modules/netapp/pools.tf +++ b/modules/netapp/pools.tf @@ -1,4 +1,4 @@ -module pools { +module "pools" { source = "./pool" for_each = try(var.settings.pools, {}) diff --git a/modules/netapp/variables.tf b/modules/netapp/variables.tf index 0a262cea96..23e036e1ab 100644 --- a/modules/netapp/variables.tf +++ b/modules/netapp/variables.tf @@ -1,9 +1,9 @@ -variable global_settings {} -variable client_config {} -variable settings {} -variable resource_group_name {} -variable location {} -variable base_tags { +variable "global_settings" {} +variable "client_config" {} +variable "settings" {} +variable "resource_group_name" {} +variable "location" {} +variable "base_tags" { default = {} } -variable vnets {} +variable "vnets" {} diff --git a/modules/netapp/volume/output.tf b/modules/netapp/volume/output.tf index d8518712bd..3702d06c5d 100644 --- a/modules/netapp/volume/output.tf +++ b/modules/netapp/volume/output.tf @@ -1,3 +1,3 @@ -output volume { +output "volume" { value = azurerm_netapp_volume.volume } diff --git a/modules/netapp/volume/variables.tf b/modules/netapp/volume/variables.tf index e82e68ab19..8616c7882a 100644 --- a/modules/netapp/volume/variables.tf +++ b/modules/netapp/volume/variables.tf @@ -1,10 +1,10 @@ -variable settings {} -variable resource_group_name {} -variable location {} -variable account_name {} -variable pool_name {} -variable service_level {} -variable subnet_id {} -variable tags { +variable "settings" {} +variable "resource_group_name" {} +variable "location" {} +variable "account_name" {} +variable "pool_name" {} +variable "service_level" {} +variable "subnet_id" {} +variable "tags" { default = {} } diff --git a/modules/networking/application_gateway/diagnostics.tf b/modules/networking/application_gateway/diagnostics.tf index 7877e24610..e0f56282ef 100755 --- a/modules/networking/application_gateway/diagnostics.tf +++ b/modules/networking/application_gateway/diagnostics.tf @@ -1,4 +1,4 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" resource_id = azurerm_application_gateway.agw.id diff --git a/modules/networking/application_gateway/output.tf b/modules/networking/application_gateway/output.tf index 3402ed0b85..362fe7d64a 100644 --- a/modules/networking/application_gateway/output.tf +++ b/modules/networking/application_gateway/output.tf @@ -1,8 +1,8 @@ -output id { +output "id" { value = azurerm_application_gateway.agw.id } -output private_ip_address { +output "private_ip_address" { value = local.private_ip_address } diff --git a/modules/networking/application_security_group/variables.tf b/modules/networking/application_security_group/variables.tf index 121ee44b73..2da7574ad5 100644 --- a/modules/networking/application_security_group/variables.tf +++ b/modules/networking/application_security_group/variables.tf @@ -1,18 +1,18 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable base_tags { +variable "base_tags" { description = "tags of the resource" } -variable location { +variable "location" { description = "location of the resource" } -variable settings {} +variable "settings" {} -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } diff --git a/modules/networking/dns_zone/output.tf b/modules/networking/dns_zone/output.tf index 7baaa47aa7..4d65f6c862 100644 --- a/modules/networking/dns_zone/output.tf +++ b/modules/networking/dns_zone/output.tf @@ -10,7 +10,7 @@ output "name" { value = regex("(.+).", azurerm_dns_zone.dns_zone.soa_record[0].fqdn)[0] } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name description = "Resource group name of the dns_zone" } diff --git a/modules/networking/dns_zone/records.tf b/modules/networking/dns_zone/records.tf index 3f890b13fb..c6d57297a4 100644 --- a/modules/networking/dns_zone/records.tf +++ b/modules/networking/dns_zone/records.tf @@ -1,4 +1,4 @@ -module records { +module "records" { source = "./records" count = try(var.settings.records, null) == null ? 0 : 1 depends_on = [azurerm_dns_zone.dns_zone] diff --git a/modules/networking/dns_zone/records/output.tf b/modules/networking/dns_zone/records/output.tf index 4c2ecb9b08..e256bcc9c5 100644 --- a/modules/networking/dns_zone/records/output.tf +++ b/modules/networking/dns_zone/records/output.tf @@ -1,4 +1,4 @@ -output a { +output "a" { value = merge( azurerm_dns_a_record.a, azurerm_dns_a_record.a_dns_zone_record, @@ -6,40 +6,40 @@ output a { ) } -output aaaa { +output "aaaa" { value = merge( azurerm_dns_aaaa_record.aaaa, azurerm_dns_aaaa_record.aaaa_dns_zone_record ) } -output caa { +output "caa" { value = azurerm_dns_caa_record.caa } -output cname { +output "cname" { value = merge( azurerm_dns_cname_record.cname, azurerm_dns_cname_record.cname_dns_zone_record ) } -output mx { +output "mx" { value = azurerm_dns_mx_record.mx } -output ns { +output "ns" { value = azurerm_dns_ns_record.ns } -output ptr { +output "ptr" { value = azurerm_dns_ptr_record.ptr } -output srv { +output "srv" { value = azurerm_dns_srv_record.srv } -output txt { +output "txt" { value = azurerm_dns_txt_record.txt } \ No newline at end of file diff --git a/modules/networking/dns_zone/records/variables.tf b/modules/networking/dns_zone/records/variables.tf index c6010fef29..19abb506fb 100644 --- a/modules/networking/dns_zone/records/variables.tf +++ b/modules/networking/dns_zone/records/variables.tf @@ -1,13 +1,13 @@ -variable base_tags { +variable "base_tags" { default = {} } -variable client_config {} -variable resource_group_name {} -variable records {} -variable target_resources { +variable "client_config" {} +variable "resource_group_name" {} +variable "records" {} +variable "target_resources" { default = {} } -variable zone_name {} -variable resource_ids { +variable "zone_name" {} +variable "resource_ids" { default = {} } \ No newline at end of file diff --git a/modules/networking/dns_zone/variables.tf b/modules/networking/dns_zone/variables.tf index fbba8a596e..256ff16fb9 100644 --- a/modules/networking/dns_zone/variables.tf +++ b/modules/networking/dns_zone/variables.tf @@ -1,16 +1,16 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable client_config {} -variable settings {} -variable global_settings { +variable "client_config" {} +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable resource_ids { +variable "resource_ids" { default = {} } \ No newline at end of file diff --git a/modules/networking/domain_name_registrations/variables.tf b/modules/networking/domain_name_registrations/variables.tf index 32b99188b3..52baef91a0 100644 --- a/modules/networking/domain_name_registrations/variables.tf +++ b/modules/networking/domain_name_registrations/variables.tf @@ -1,19 +1,19 @@ -variable resource_group_name {} -variable settings {} -variable base_tags {} -variable dns_zone_id { +variable "resource_group_name" {} +variable "settings" {} +variable "base_tags" {} +variable "dns_zone_id" { description = "Resource ID of the Azure DNS global zone." default = "" } -variable targetDnsType { +variable "targetDnsType" { description = "Target DNS type (would be used for migration). - AzureDns or DefaultDomainRegistrarDns. Set a value if this is a new domain." default = "DefaultDomainRegistrarDns" } -variable existingDnsType { +variable "existingDnsType" { description = "Target DNS type (would be used to migrate from). - AzureDns or DefaultDomainRegistrarDns. Set to '' if this is a new domain." default = "" } -variable name { +variable "name" { description = "Name of the domain to purchase. When set to '' a random name is generated (recommended for CI)." default = "" } \ No newline at end of file diff --git a/modules/networking/express_route_circuit/diagnostics.tf b/modules/networking/express_route_circuit/diagnostics.tf index 8b7fc2031d..f1afe1573b 100755 --- a/modules/networking/express_route_circuit/diagnostics.tf +++ b/modules/networking/express_route_circuit/diagnostics.tf @@ -1,5 +1,5 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" count = lookup(var.settings, "diagnostic_profiles", null) == null ? 0 : 1 diff --git a/modules/networking/express_route_circuit/output.tf b/modules/networking/express_route_circuit/output.tf index a2bc21c1c6..c359df6e87 100644 --- a/modules/networking/express_route_circuit/output.tf +++ b/modules/networking/express_route_circuit/output.tf @@ -1,24 +1,24 @@ -output id { +output "id" { value = azurerm_express_route_circuit.circuit.id description = "Express Route Circuit ID" } -output service_key { +output "service_key" { value = azurerm_express_route_circuit.circuit.service_key description = "The string needed by the service provider to provision the ExpressRoute circuit." } -output service_provider_provisioning_state { +output "service_provider_provisioning_state" { value = azurerm_express_route_circuit.circuit.service_provider_provisioning_state description = "The ExpressRoute circuit provisioning state from your chosen service provider." } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name description = "The Express Route circuit resource group name." } -output name { +output "name" { value = azurerm_express_route_circuit.circuit.name description = "Name of the Express Route Circuit." diff --git a/modules/networking/express_route_circuit/variables.tf b/modules/networking/express_route_circuit/variables.tf index 606a59b69e..9832413b65 100644 --- a/modules/networking/express_route_circuit/variables.tf +++ b/modules/networking/express_route_circuit/variables.tf @@ -1,15 +1,15 @@ -variable settings {} -variable resource_groups {} -variable resource_group_name { +variable "settings" {} +variable "resource_groups" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable diagnostics {} -variable global_settings { +variable "diagnostics" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } # variable express_route_circuits {} diff --git a/modules/networking/express_route_circuit_authorization/output.tf b/modules/networking/express_route_circuit_authorization/output.tf index 727e8486f9..cd515a67b5 100644 --- a/modules/networking/express_route_circuit_authorization/output.tf +++ b/modules/networking/express_route_circuit_authorization/output.tf @@ -1,14 +1,14 @@ -output id { +output "id" { value = azurerm_express_route_circuit_authorization.circuitauth.id description = "Express Route Circuit Authorization ID" } -output authorization_key { +output "authorization_key" { value = azurerm_express_route_circuit_authorization.circuitauth.authorization_key description = "The authorization key" } -output authorization_use_status { +output "authorization_use_status" { value = azurerm_express_route_circuit_authorization.circuitauth.authorization_use_status description = "The authorization use status." diff --git a/modules/networking/express_route_circuit_authorization/variables.tf b/modules/networking/express_route_circuit_authorization/variables.tf index 3023f05b81..206a6497e2 100644 --- a/modules/networking/express_route_circuit_authorization/variables.tf +++ b/modules/networking/express_route_circuit_authorization/variables.tf @@ -1,6 +1,6 @@ -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable express_route_circuit_name {} +variable "express_route_circuit_name" {} diff --git a/modules/networking/firewall/diagnostics.tf b/modules/networking/firewall/diagnostics.tf index 13b767df09..8a78b0b339 100755 --- a/modules/networking/firewall/diagnostics.tf +++ b/modules/networking/firewall/diagnostics.tf @@ -1,4 +1,4 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" count = var.diagnostic_profiles == null ? 0 : 1 diff --git a/modules/networking/firewall/output.tf b/modules/networking/firewall/output.tf index f3b0a53d67..c3a1e881c2 100755 --- a/modules/networking/firewall/output.tf +++ b/modules/networking/firewall/output.tf @@ -1,19 +1,19 @@ -output id { +output "id" { description = "The ID of the Azure Firewall." value = azurerm_firewall.fw.id } -output name { +output "name" { description = "Name of the firewall" value = azurerm_firewall.fw.name } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name } -output ip_configuration { +output "ip_configuration" { description = "The Private IP address of the Azure Firewall." value = azurerm_firewall.fw.ip_configuration } \ No newline at end of file diff --git a/modules/networking/front_door/diagnostics.tf b/modules/networking/front_door/diagnostics.tf index 586d96f088..47b4d9332d 100644 --- a/modules/networking/front_door/diagnostics.tf +++ b/modules/networking/front_door/diagnostics.tf @@ -1,5 +1,5 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" count = lookup(var.settings, "diagnostic_profiles", null) == null ? 0 : 1 diff --git a/modules/networking/front_door/variables.tf b/modules/networking/front_door/variables.tf index ed2a96a139..ad2cb8a0c8 100644 --- a/modules/networking/front_door/variables.tf +++ b/modules/networking/front_door/variables.tf @@ -1,26 +1,26 @@ -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable diagnostics {} -variable front_door_waf_policies { +variable "diagnostics" {} +variable "front_door_waf_policies" { default = {} } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable keyvault_id { +variable "keyvault_id" { default = null } -variable keyvault_certificate_requests { +variable "keyvault_certificate_requests" { default = {} } -variable resource_group_name {} -variable settings {} -variable tags { +variable "resource_group_name" {} +variable "settings" {} +variable "tags" { default = {} } diff --git a/modules/networking/front_door_waf_policy/variables.tf b/modules/networking/front_door_waf_policy/variables.tf index 5a33af647e..aebe07ae3a 100644 --- a/modules/networking/front_door_waf_policy/variables.tf +++ b/modules/networking/front_door_waf_policy/variables.tf @@ -1,19 +1,19 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable settings {} -variable base_tags { +variable "settings" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable tags { +variable "tags" { default = {} } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable front_door_waf_policies { +variable "front_door_waf_policies" { default = {} } diff --git a/modules/networking/load_balancers/output.tf b/modules/networking/load_balancers/output.tf index 15b3d51483..d53af0afae 100644 --- a/modules/networking/load_balancers/output.tf +++ b/modules/networking/load_balancers/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_lb.lb.id } diff --git a/modules/networking/load_balancers/variables.tf b/modules/networking/load_balancers/variables.tf index 2789193714..af682d4424 100644 --- a/modules/networking/load_balancers/variables.tf +++ b/modules/networking/load_balancers/variables.tf @@ -1,25 +1,25 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable settings {} -variable global_settings { +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable diagnostics {} -variable vnets {} -variable client_config { +variable "diagnostics" {} +variable "vnets" {} +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable public_ip_addresses {} +variable "public_ip_addresses" {} variable "existing_resources" { default = {} diff --git a/modules/networking/local_network_gateways/output.tf b/modules/networking/local_network_gateways/output.tf index d78a04d5e0..37c9fd2de8 100644 --- a/modules/networking/local_network_gateways/output.tf +++ b/modules/networking/local_network_gateways/output.tf @@ -1,3 +1,3 @@ -output id { +output "id" { value = azurerm_local_network_gateway.lngw.id } \ No newline at end of file diff --git a/modules/networking/local_network_gateways/variables.tf b/modules/networking/local_network_gateways/variables.tf index edb1e1af47..644ff174c5 100644 --- a/modules/networking/local_network_gateways/variables.tf +++ b/modules/networking/local_network_gateways/variables.tf @@ -1,17 +1,17 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable settings {} -variable global_settings { +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } diff --git a/modules/networking/network_security_group/diagnostics.tf b/modules/networking/network_security_group/diagnostics.tf index f78c8be86b..5df9069335 100644 --- a/modules/networking/network_security_group/diagnostics.tf +++ b/modules/networking/network_security_group/diagnostics.tf @@ -1,5 +1,5 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" count = try(var.settings.diagnostic_profiles, null) == null ? 0 : 1 diff --git a/modules/networking/network_security_group/module.tf b/modules/networking/network_security_group/module.tf index 59466a2ea9..b04444eb1c 100644 --- a/modules/networking/network_security_group/module.tf +++ b/modules/networking/network_security_group/module.tf @@ -36,6 +36,6 @@ resource "azurerm_network_security_group" "nsg" { } } -output id { +output "id" { value = azurerm_network_security_group.nsg.id } \ No newline at end of file diff --git a/modules/networking/network_security_group/variables.tf b/modules/networking/network_security_group/variables.tf index 306afcb652..543719672d 100644 --- a/modules/networking/network_security_group/variables.tf +++ b/modules/networking/network_security_group/variables.tf @@ -1,26 +1,26 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) Name of the resource group where to create the resource. Changing this forces a new resource to be created. " type = string } -variable location { +variable "location" { description = "(Required) Specifies the Azure location to deploy the resource. Changing this forces a new resource to be created." type = string } -variable diagnostics { +variable "diagnostics" { description = "(Required) Diagnostics object with the definitions and destination services" } -variable settings { +variable "settings" { description = "(Required) configuration object describing the networking configuration, as described in README" } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } diff --git a/modules/networking/network_watcher/variables.tf b/modules/networking/network_watcher/variables.tf index 9c90af9d0c..6b3a81e606 100644 --- a/modules/networking/network_watcher/variables.tf +++ b/modules/networking/network_watcher/variables.tf @@ -1,22 +1,22 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable settings { +variable "settings" { default = {} } -variable tags { +variable "tags" { description = "(Required) Map of tags to be applied to the resource" - type = map + type = map(any) } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } \ No newline at end of file diff --git a/modules/networking/networking_interface_asg_association/asg_associations.tf b/modules/networking/networking_interface_asg_association/asg_associations.tf index bd34299b4b..18d5131153 100644 --- a/modules/networking/networking_interface_asg_association/asg_associations.tf +++ b/modules/networking/networking_interface_asg_association/asg_associations.tf @@ -1,4 +1,4 @@ resource "azurerm_network_interface_application_security_group_association" "asg" { application_security_group_id = var.application_security_group_id - network_interface_id = var.network_interface_id + network_interface_id = var.network_interface_id } diff --git a/modules/networking/networking_interface_asg_association/main.tf b/modules/networking/networking_interface_asg_association/main.tf index b4dccd03cf..48e8319899 100644 --- a/modules/networking/networking_interface_asg_association/main.tf +++ b/modules/networking/networking_interface_asg_association/main.tf @@ -12,5 +12,5 @@ locals { "module" = basename(abspath(path.module)) } tags = merge(var.base_tags, local.module_tag, try(var.settings.tags, null)) - + } \ No newline at end of file diff --git a/modules/networking/networking_interface_asg_association/variables.tf b/modules/networking/networking_interface_asg_association/variables.tf index fa46cfdc0b..ab497ac9dc 100644 --- a/modules/networking/networking_interface_asg_association/variables.tf +++ b/modules/networking/networking_interface_asg_association/variables.tf @@ -1,39 +1,39 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable resource_group_name { +variable "resource_group_name" { description = "Name of the existing resource group to deploy the virtual machine" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable application_security_groups { +variable "application_security_groups" { default = {} } -variable settings { +variable "settings" { default = {} } -variable network_interface_id { +variable "network_interface_id" { default = {} } -variable application_security_group_id { +variable "application_security_group_id" { default = {} } -variable existing_resources { +variable "existing_resources" { default = {} } diff --git a/modules/networking/private-dns/output.tf b/modules/networking/private-dns/output.tf index ca0ad6fd01..ee5bf401b1 100644 --- a/modules/networking/private-dns/output.tf +++ b/modules/networking/private-dns/output.tf @@ -1,14 +1,14 @@ -output id { +output "id" { value = azurerm_private_dns_zone.private_dns.id } -output name { +output "name" { value = azurerm_private_dns_zone.private_dns.name } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name } \ No newline at end of file diff --git a/modules/networking/private-dns/variables.tf b/modules/networking/private-dns/variables.tf index 0fa9c8fc52..82e7b19417 100644 --- a/modules/networking/private-dns/variables.tf +++ b/modules/networking/private-dns/variables.tf @@ -1,29 +1,29 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable name { +variable "name" { } -variable resource_group_name { +variable "resource_group_name" { } -variable records { +variable "records" { } -variable vnet_links { +variable "vnet_links" { default = {} } -variable vnets { +variable "vnets" { default = {} } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable tags { +variable "tags" { default = {} } \ No newline at end of file diff --git a/modules/networking/private_endpoint/output.tf b/modules/networking/private_endpoint/output.tf index 527cf30f04..a6f86b8ac9 100755 --- a/modules/networking/private_endpoint/output.tf +++ b/modules/networking/private_endpoint/output.tf @@ -1,14 +1,14 @@ -output id { +output "id" { value = azurerm_private_endpoint.pep.id } -output private_dns_zone_group { +output "private_dns_zone_group" { value = azurerm_private_endpoint.pep.private_dns_zone_group } -output private_dns_zone_configs { +output "private_dns_zone_configs" { value = azurerm_private_endpoint.pep.private_dns_zone_configs } \ No newline at end of file diff --git a/modules/networking/private_endpoint/private_endpoint.tf b/modules/networking/private_endpoint/private_endpoint.tf index 1e0d02b1d7..9b34a433c8 100755 --- a/modules/networking/private_endpoint/private_endpoint.tf +++ b/modules/networking/private_endpoint/private_endpoint.tf @@ -24,7 +24,7 @@ resource "azurerm_private_endpoint" "pep" { request_message = try(var.settings.private_service_connection.request_message, null) } - dynamic private_dns_zone_group { + dynamic "private_dns_zone_group" { for_each = try(var.settings.private_dns, {}) == {} ? [] : [1] content { diff --git a/modules/networking/private_endpoint/variables.tf b/modules/networking/private_endpoint/variables.tf index aa0a64fc8e..fb43b1ca1d 100755 --- a/modules/networking/private_endpoint/variables.tf +++ b/modules/networking/private_endpoint/variables.tf @@ -1,33 +1,33 @@ -variable resource_id {} +variable "resource_id" {} -variable name { +variable "name" { type = string description = "(Required) Specifies the name. Changing this forces a new resource to be created." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group. Changing this forces a new resource to be created." } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created." } -variable subnet_id {} -variable settings {} -variable global_settings { +variable "subnet_id" {} +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable subresource_names { +variable "subresource_names" { default = [] } -variable client_config { +variable "client_config" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } \ No newline at end of file diff --git a/modules/networking/private_links/endpoints/private_endpoint/output.tf b/modules/networking/private_links/endpoints/private_endpoint/output.tf index c3faf6f738..082cd1b825 100644 --- a/modules/networking/private_links/endpoints/private_endpoint/output.tf +++ b/modules/networking/private_links/endpoints/private_endpoint/output.tf @@ -2,19 +2,19 @@ # for_each = toset(try(var.settings.private_service_connection.subresource_names, [])) # value = azurerm_private_endpoint.pep[each.key].id -# +# # } # output private_dns_zone_group { # for_each = toset(try(var.settings.private_service_connection.subresource_names, [])) # value = azurerm_private_endpoint.pep[each.key].private_dns_zone_group -# +# # } # output private_dns_zone_configs { # for_each = toset(try(var.settings.private_service_connection.subresource_names, [])) # value = azurerm_private_endpoint.pep[each.key].private_dns_zone_configs -# +# # } \ No newline at end of file diff --git a/modules/networking/private_links/endpoints/private_endpoint/private_endpoint.tf b/modules/networking/private_links/endpoints/private_endpoint/private_endpoint.tf index cb558e1fbf..6be05e7bf3 100644 --- a/modules/networking/private_links/endpoints/private_endpoint/private_endpoint.tf +++ b/modules/networking/private_links/endpoints/private_endpoint/private_endpoint.tf @@ -26,7 +26,7 @@ resource "azurerm_private_endpoint" "pep" { request_message = try(var.settings.private_service_connection.request_message, null) } - dynamic private_dns_zone_group { + dynamic "private_dns_zone_group" { for_each = try(var.settings.private_dns, {}) == {} ? [] : [1] content { diff --git a/modules/networking/private_links/endpoints/private_endpoint/variables.tf b/modules/networking/private_links/endpoints/private_endpoint/variables.tf index b23bfe106f..05be9af0c2 100644 --- a/modules/networking/private_links/endpoints/private_endpoint/variables.tf +++ b/modules/networking/private_links/endpoints/private_endpoint/variables.tf @@ -1,31 +1,31 @@ -variable resource_id {} +variable "resource_id" {} -variable name { +variable "name" { type = string description = "(Required) Specifies the name. Changing this forces a new resource to be created." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group. Changing this forces a new resource to be created." } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created." } -variable subnet_id {} -variable settings {} -variable global_settings { +variable "subnet_id" {} +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable subresource_names {} -variable private_dns { +variable "subresource_names" {} +variable "private_dns" { default = {} } \ No newline at end of file diff --git a/modules/networking/private_links/endpoints/subnet/variables.tf b/modules/networking/private_links/endpoints/subnet/variables.tf index 5992fbf415..5a7e381f03 100644 --- a/modules/networking/private_links/endpoints/subnet/variables.tf +++ b/modules/networking/private_links/endpoints/subnet/variables.tf @@ -1,17 +1,17 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable resource_groups {} -variable private_endpoints {} -variable private_dns {} -variable remote_objects {} -variable subnet_id {} -variable vnet_resource_group_name {} -variable vnet_location {} -variable base_tags { +variable "resource_groups" {} +variable "private_endpoints" {} +variable "private_dns" {} +variable "remote_objects" {} +variable "subnet_id" {} +variable "vnet_resource_group_name" {} +variable "vnet_location" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/networking/private_links/endpoints/subnets.tf b/modules/networking/private_links/endpoints/subnets.tf index def189898e..3d57ed2d3c 100644 --- a/modules/networking/private_links/endpoints/subnets.tf +++ b/modules/networking/private_links/endpoints/subnets.tf @@ -1,4 +1,4 @@ -module subnet { +module "subnet" { source = "./subnet" for_each = toset(try(var.settings.subnet_keys, [])) diff --git a/modules/networking/private_links/endpoints/variables.tf b/modules/networking/private_links/endpoints/variables.tf index 15d6d9adfd..96e68264c4 100644 --- a/modules/networking/private_links/endpoints/variables.tf +++ b/modules/networking/private_links/endpoints/variables.tf @@ -1,16 +1,16 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable settings {} -variable resource_groups {} -variable private_endpoints {} -variable private_dns {} -variable remote_objects {} -variable vnet {} -variable base_tags { +variable "settings" {} +variable "resource_groups" {} +variable "private_endpoints" {} +variable "private_dns" {} +variable "remote_objects" {} +variable "vnet" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/networking/public_ip_addresses/diagnostics.tf b/modules/networking/public_ip_addresses/diagnostics.tf index f45495bdc1..7cbba8f51b 100755 --- a/modules/networking/public_ip_addresses/diagnostics.tf +++ b/modules/networking/public_ip_addresses/diagnostics.tf @@ -1,4 +1,4 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" resource_id = azurerm_public_ip.pip.id diff --git a/modules/networking/public_ip_addresses/output.tf b/modules/networking/public_ip_addresses/output.tf index 7bb1d9857b..540fde6702 100755 --- a/modules/networking/public_ip_addresses/output.tf +++ b/modules/networking/public_ip_addresses/output.tf @@ -1,14 +1,14 @@ -output id { +output "id" { value = azurerm_public_ip.pip.id } -output ip_address { +output "ip_address" { value = azurerm_public_ip.pip.ip_address } -output fqdn { +output "fqdn" { value = azurerm_public_ip.pip.fqdn } diff --git a/modules/networking/public_ip_addresses/variables.tf b/modules/networking/public_ip_addresses/variables.tf index ef9ac6745f..f35702ca80 100755 --- a/modules/networking/public_ip_addresses/variables.tf +++ b/modules/networking/public_ip_addresses/variables.tf @@ -1,47 +1,47 @@ -variable name {} -variable resource_group_name { +variable "name" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable sku { +variable "sku" { default = "Basic" } -variable allocation_method { +variable "allocation_method" { default = "Dynamic" } -variable ip_version { +variable "ip_version" { default = "IPv4" } -variable idle_timeout_in_minutes { +variable "idle_timeout_in_minutes" { default = null } -variable domain_name_label { +variable "domain_name_label" { default = null } # if set to true, automatically generate a domain name label with the name -variable generate_domain_name_label { +variable "generate_domain_name_label" { default = false } -variable reverse_fqdn { +variable "reverse_fqdn" { default = null } -variable tags { +variable "tags" { default = null } -variable zones { +variable "zones" { default = null } -variable diagnostics { +variable "diagnostics" { default = {} } -variable diagnostic_profiles { +variable "diagnostic_profiles" { default = {} } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/networking/route_tables/output.tf b/modules/networking/route_tables/output.tf index 6953093549..c420beca98 100755 --- a/modules/networking/route_tables/output.tf +++ b/modules/networking/route_tables/output.tf @@ -1,9 +1,9 @@ -output id { +output "id" { value = azurerm_route_table.rt.id } -output name { +output "name" { value = azurerm_route_table.rt.name } diff --git a/modules/networking/route_tables/variables.tf b/modules/networking/route_tables/variables.tf index b4696f8c8e..19d527a38f 100755 --- a/modules/networking/route_tables/variables.tf +++ b/modules/networking/route_tables/variables.tf @@ -1,18 +1,18 @@ -variable name {} -variable resource_group_name { +variable "name" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable disable_bgp_route_propagation {} -variable tags { +variable "disable_bgp_route_propagation" {} +variable "tags" { description = "(Required) Map of tags to be applied to the resource" - type = map + type = map(any) } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/networking/routes/output.tf b/modules/networking/routes/output.tf index d645825e78..a6b4a1e0e3 100755 --- a/modules/networking/routes/output.tf +++ b/modules/networking/routes/output.tf @@ -1,3 +1,3 @@ -output id { +output "id" { value = azurerm_route.route.id } diff --git a/modules/networking/routes/variables.tf b/modules/networking/routes/variables.tf index 781b3711ba..e8adcaa195 100755 --- a/modules/networking/routes/variables.tf +++ b/modules/networking/routes/variables.tf @@ -1,17 +1,17 @@ -variable name {} -variable resource_group_name { +variable "name" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable route_table_name {} -variable address_prefix {} -variable next_hop_type {} -variable next_hop_in_ip_address_fw { +variable "route_table_name" {} +variable "address_prefix" {} +variable "next_hop_type" {} +variable "next_hop_in_ip_address_fw" { default = null } -variable next_hop_in_ip_address_vm { +variable "next_hop_in_ip_address_vm" { default = null } -variable next_hop_in_ip_address { +variable "next_hop_in_ip_address" { default = null } \ No newline at end of file diff --git a/modules/networking/virtual_network/diagnostics.tf b/modules/networking/virtual_network/diagnostics.tf index bcc4d697f9..a884080faf 100644 --- a/modules/networking/virtual_network/diagnostics.tf +++ b/modules/networking/virtual_network/diagnostics.tf @@ -1,5 +1,5 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" count = lookup(var.settings, "diagnostic_profiles", null) == null ? 0 : 1 diff --git a/modules/networking/virtual_network/nsg/diagnostics.tf b/modules/networking/virtual_network/nsg/diagnostics.tf index 5db75ab4fb..426aff53b9 100644 --- a/modules/networking/virtual_network/nsg/diagnostics.tf +++ b/modules/networking/virtual_network/nsg/diagnostics.tf @@ -1,5 +1,5 @@ -module diagnostics { +module "diagnostics" { source = "../../../diagnostics" for_each = { for key, subnet in var.subnets : key => subnet diff --git a/modules/networking/virtual_network/nsg/flow_logs/variables.tf b/modules/networking/virtual_network/nsg/flow_logs/variables.tf index 068cf23da7..ce99a97167 100644 --- a/modules/networking/virtual_network/nsg/flow_logs/variables.tf +++ b/modules/networking/virtual_network/nsg/flow_logs/variables.tf @@ -1,24 +1,24 @@ -variable resource_id { +variable "resource_id" { description = "(Required) Fully qualified Azure resource identifier for which you enable diagnostics." } -variable resource_location { +variable "resource_location" { description = "(Required) location of the resource" } -variable diagnostics { +variable "diagnostics" { description = "(Required) Contains the diagnostics setting object." } -variable settings { +variable "settings" { default = {} } -variable global_settings { +variable "global_settings" { default = {} } -variable network_watchers { +variable "network_watchers" { default = {} } \ No newline at end of file diff --git a/modules/networking/virtual_network/nsg/module.tf b/modules/networking/virtual_network/nsg/module.tf index f82cc30c56..e391804aa7 100644 --- a/modules/networking/virtual_network/nsg/module.tf +++ b/modules/networking/virtual_network/nsg/module.tf @@ -20,19 +20,19 @@ resource "azurerm_network_security_group" "nsg_obj" { dynamic "security_rule" { for_each = try(var.network_security_group_definition[each.value.nsg_key].nsg, []) content { - name = lookup(security_rule.value, "name", null) - priority = lookup(security_rule.value, "priority", null) - direction = lookup(security_rule.value, "direction", null) - access = lookup(security_rule.value, "access", null) - protocol = lookup(security_rule.value, "protocol", null) - source_port_range = lookup(security_rule.value, "source_port_range", null) - source_port_ranges = lookup(security_rule.value, "source_port_ranges", null) - destination_port_range = lookup(security_rule.value, "destination_port_range", null) - destination_port_ranges = lookup(security_rule.value, "destination_port_ranges", null) - source_address_prefix = lookup(security_rule.value, "source_address_prefix", null) - source_address_prefixes = lookup(security_rule.value, "source_address_prefixes", null) - destination_address_prefix = lookup(security_rule.value, "destination_address_prefix", null) - destination_address_prefixes = lookup(security_rule.value, "destination_address_prefixes", null) + name = lookup(security_rule.value, "name", null) + priority = lookup(security_rule.value, "priority", null) + direction = lookup(security_rule.value, "direction", null) + access = lookup(security_rule.value, "access", null) + protocol = lookup(security_rule.value, "protocol", null) + source_port_range = lookup(security_rule.value, "source_port_range", null) + source_port_ranges = lookup(security_rule.value, "source_port_ranges", null) + destination_port_range = lookup(security_rule.value, "destination_port_range", null) + destination_port_ranges = lookup(security_rule.value, "destination_port_ranges", null) + source_address_prefix = lookup(security_rule.value, "source_address_prefix", null) + source_address_prefixes = lookup(security_rule.value, "source_address_prefixes", null) + destination_address_prefix = lookup(security_rule.value, "destination_address_prefix", null) + destination_address_prefixes = lookup(security_rule.value, "destination_address_prefixes", null) # source_application_security_groups = { # keys = ["app_server"] @@ -41,7 +41,7 @@ resource "azurerm_network_security_group" "nsg_obj" { # source_application_security_groups = { # ids = ["resource_id"] # } - + source_application_security_group_ids = coalescelist( flatten( [ @@ -60,7 +60,7 @@ resource "azurerm_network_security_group" "nsg_obj" { [""] ) //coalescelist - + # destination_application_security_groups = { # keys = ["app_server"] # } @@ -68,7 +68,7 @@ resource "azurerm_network_security_group" "nsg_obj" { # destination_application_security_groups = { # ids = ["resource_id"] # } - + destination_application_security_group_ids = coalescelist( flatten( [ diff --git a/modules/networking/virtual_network/nsg/nsg_flow_logs.tf b/modules/networking/virtual_network/nsg/nsg_flow_logs.tf index c9514bc14f..a06e879a16 100644 --- a/modules/networking/virtual_network/nsg/nsg_flow_logs.tf +++ b/modules/networking/virtual_network/nsg/nsg_flow_logs.tf @@ -1,5 +1,5 @@ -module nsg_flows { +module "nsg_flows" { source = "./flow_logs" for_each = { for key, subnet in var.subnets : key => subnet diff --git a/modules/networking/virtual_network/nsg/variables.tf b/modules/networking/virtual_network/nsg/variables.tf index 303e2dcf5c..2c61dde8dc 100644 --- a/modules/networking/virtual_network/nsg/variables.tf +++ b/modules/networking/virtual_network/nsg/variables.tf @@ -1,44 +1,44 @@ -variable client_config {} -variable resource_group { +variable "client_config" {} +variable "resource_group" { description = "(Required) Map of the resource groups to create" type = string } -variable virtual_network_name { +variable "virtual_network_name" { description = "name of the parent virtual network" } -variable subnets { +variable "subnets" { description = "map structure for the subnets to be created" } -variable tags { +variable "tags" { description = "tags of the resource" } -variable location { +variable "location" { description = "location of the resource" } -variable diagnostics { +variable "diagnostics" { } -variable application_security_groups { +variable "application_security_groups" { default = {} } -variable network_security_group_definition { +variable "network_security_group_definition" { default = {} } -variable link_nsg_to_subnet { +variable "link_nsg_to_subnet" { default = true } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable network_watchers { +variable "network_watchers" { default = {} } diff --git a/modules/networking/virtual_network/output.tf b/modules/networking/virtual_network/output.tf index f395dcd0e0..6ed847a019 100644 --- a/modules/networking/virtual_network/output.tf +++ b/modules/networking/virtual_network/output.tf @@ -1,31 +1,31 @@ -output id { +output "id" { value = azurerm_virtual_network.vnet.id description = "Virutal Network id" } -output name { +output "name" { value = azurerm_virtual_network.vnet.name description = "Virutal Network name" } -output address_space { +output "address_space" { value = azurerm_virtual_network.vnet.address_space description = "Virutal Network address_space" } -output dns_servers { +output "dns_servers" { value = azurerm_virtual_network.vnet.dns_servers description = "Virutal Network dns_servers" } -output resource_group_name { +output "resource_group_name" { value = azurerm_virtual_network.vnet.resource_group_name description = "Virutal Network resource_group_name" } -output location { +output "location" { value = var.location description = "Azure region of the virtual network" } diff --git a/modules/networking/virtual_network/subnet/output.tf b/modules/networking/virtual_network/subnet/output.tf index 38538de8c4..e856717303 100644 --- a/modules/networking/virtual_network/subnet/output.tf +++ b/modules/networking/virtual_network/subnet/output.tf @@ -1,15 +1,15 @@ -output id { +output "id" { value = azurerm_subnet.subnet.id } -output name { +output "name" { value = azurerm_subnet.subnet.name } -output cidr { +output "cidr" { value = var.address_prefixes } \ No newline at end of file diff --git a/modules/networking/virtual_network/subnet/variables.tf b/modules/networking/virtual_network/subnet/variables.tf index ee4296cb29..d15dbbd2f8 100644 --- a/modules/networking/virtual_network/subnet/variables.tf +++ b/modules/networking/virtual_network/subnet/variables.tf @@ -1,26 +1,26 @@ -variable name { +variable "name" { description = "(Required) The name of the subnet. Changing this forces a new resource to be created." } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group in which to create the subnet." type = string } -variable virtual_network_name { +variable "virtual_network_name" { description = "(Required) The name of the virtual network to which to attach the subnet." } -variable address_prefixes { +variable "address_prefixes" { description = "(Optional) The address prefixes to use for the subnet." default = [] } -variable enforce_private_link_endpoint_network_policies { +variable "enforce_private_link_endpoint_network_policies" { description = "(Optional) Enable or Disable network policies for the private link endpoint on the subnet. Default value is false. Conflicts with enforce_private_link_service_network_policies." default = null } -variable enforce_private_link_service_network_policies { +variable "enforce_private_link_service_network_policies" { description = "(Optional) Enable or Disable network policies for the private link service on the subnet. Default valule is false. Conflicts with enforce_private_link_endpoint_network_policies." default = null } -variable service_endpoints { +variable "service_endpoints" { description = "(Optional) The list of Service endpoints to associate with the subnet. Possible values include: Microsoft.AzureActiveDirectory, Microsoft.AzureCosmosDB, Microsoft.ContainerRegistry, Microsoft.EventHub, Microsoft.KeyVault, Microsoft.ServiceBus, Microsoft.Sql, Microsoft.Storage and Microsoft.Web." default = [] # validation { @@ -29,7 +29,7 @@ variable service_endpoints { # } } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} \ No newline at end of file +variable "settings" {} \ No newline at end of file diff --git a/modules/networking/virtual_network/variables.tf b/modules/networking/virtual_network/variables.tf index ea74888146..f933fe27f1 100644 --- a/modules/networking/virtual_network/variables.tf +++ b/modules/networking/virtual_network/variables.tf @@ -1,53 +1,53 @@ -variable client_config {} -variable resource_group_name { +variable "client_config" {} +variable "resource_group_name" { description = "(Required) Name of the resource group where to create the resource. Changing this forces a new resource to be created. " type = string } -variable location { +variable "location" { description = "(Required) Specifies the Azure location to deploy the resource. Changing this forces a new resource to be created." type = string } -variable tags { +variable "tags" { description = "(Required) map of tags for the deployment" } -variable diagnostics { +variable "diagnostics" { description = "(Required) Diagnostics object with the definitions and destination services" } -variable settings { +variable "settings" { description = "(Required) configuration object describing the networking configuration, as described in README" } -variable application_security_groups { +variable "application_security_groups" { default = {} } -variable network_security_group_definition {} +variable "network_security_group_definition" {} -variable netwatcher { +variable "netwatcher" { description = "(Optional) is a map with two attributes: name, rg who describes the name and rg where the netwatcher was already deployed" default = {} } -variable ddos_id { +variable "ddos_id" { description = "(Optional) ID of the DDoS protection plan if exists" default = "" } -variable route_tables { +variable "route_tables" { default = {} } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable network_watchers { +variable "network_watchers" { default = {} } \ No newline at end of file diff --git a/modules/networking/virtual_network_gateway_connections/output.tf b/modules/networking/virtual_network_gateway_connections/output.tf index 91c707be26..d7b3dbb593 100644 --- a/modules/networking/virtual_network_gateway_connections/output.tf +++ b/modules/networking/virtual_network_gateway_connections/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_virtual_network_gateway_connection.vngw_connection.id } diff --git a/modules/networking/virtual_network_gateway_connections/variables.tf b/modules/networking/virtual_network_gateway_connections/variables.tf index 943b696183..ece9ae6d4c 100644 --- a/modules/networking/virtual_network_gateway_connections/variables.tf +++ b/modules/networking/virtual_network_gateway_connections/variables.tf @@ -1,27 +1,27 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable settings {} -variable global_settings { +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable diagnostics {} -variable client_config { +variable "diagnostics" {} +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable express_route_circuit_id {} -variable authorization_key {} -variable virtual_network_gateway_id {} -variable local_network_gateway_id {} +variable "express_route_circuit_id" {} +variable "authorization_key" {} +variable "virtual_network_gateway_id" {} +variable "local_network_gateway_id" {} diff --git a/modules/networking/virtual_network_gateways/output.tf b/modules/networking/virtual_network_gateways/output.tf index e24139a63f..940947d137 100644 --- a/modules/networking/virtual_network_gateways/output.tf +++ b/modules/networking/virtual_network_gateways/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_virtual_network_gateway.vngw.id } diff --git a/modules/networking/virtual_network_gateways/variables.tf b/modules/networking/virtual_network_gateways/variables.tf index 9c74b280c7..080a28bc7a 100644 --- a/modules/networking/virtual_network_gateways/variables.tf +++ b/modules/networking/virtual_network_gateways/variables.tf @@ -1,25 +1,25 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable settings {} -variable global_settings { +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable diagnostics {} -variable vnets {} -variable client_config { +variable "diagnostics" {} +variable "vnets" {} +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable public_ip_addresses {} +variable "public_ip_addresses" {} diff --git a/modules/networking/virtual_wan/variables.tf b/modules/networking/virtual_wan/variables.tf index 13ed26ee15..8128cef85f 100644 --- a/modules/networking/virtual_wan/variables.tf +++ b/modules/networking/virtual_wan/variables.tf @@ -1,18 +1,18 @@ -variable settings {} -variable resource_groups {} -variable resource_group_name { +variable "settings" {} +variable "resource_groups" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable diagnostics {} -variable global_settings { +variable "diagnostics" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/networking/virtual_wan/virtual_hub/variables.tf b/modules/networking/virtual_wan/virtual_hub/variables.tf index 75b654fa23..bc353db6d4 100644 --- a/modules/networking/virtual_wan/virtual_hub/variables.tf +++ b/modules/networking/virtual_wan/virtual_hub/variables.tf @@ -35,6 +35,6 @@ variable "vwan_id" { } variable "tags" { - type = map + type = map(any) default = {} } diff --git a/modules/networking/virtual_wan/virtual_wan.tf b/modules/networking/virtual_wan/virtual_wan.tf index f9973524a3..f913538173 100644 --- a/modules/networking/virtual_wan/virtual_wan.tf +++ b/modules/networking/virtual_wan/virtual_wan.tf @@ -21,7 +21,7 @@ resource "azurerm_virtual_wan" "vwan" { office365_local_breakout_category = try(var.settings.office365_local_breakout_category, "None") } -module hubs { +module "hubs" { source = "./virtual_hub" for_each = try(var.settings.hubs, {}) @@ -34,13 +34,13 @@ module hubs { tags = merge(try(each.value.tags, null), local.tags) } -output virtual_hubs { +output "virtual_hubs" { value = module.hubs description = "Virtual Hubs object" } -output virtual_wan { +output "virtual_wan" { value = azurerm_virtual_wan.vwan description = "Virtual WAN object" diff --git a/modules/recovery_vault/diagnostics.tf b/modules/recovery_vault/diagnostics.tf index 241d3c0095..ed81300e31 100644 --- a/modules/recovery_vault/diagnostics.tf +++ b/modules/recovery_vault/diagnostics.tf @@ -1,5 +1,5 @@ -module diagnostics { +module "diagnostics" { source = "../diagnostics" resource_id = azurerm_recovery_services_vault.asr.id diff --git a/modules/recovery_vault/outputs.tf b/modules/recovery_vault/outputs.tf index 5859812325..b996d9292f 100644 --- a/modules/recovery_vault/outputs.tf +++ b/modules/recovery_vault/outputs.tf @@ -29,7 +29,7 @@ output "resource_group_name" { value = var.resource_group_name } -output soft_delete_enabled { +output "soft_delete_enabled" { description = "Boolean indicating if soft deleted is enabled on the vault." value = try(var.settings.soft_delete_enabled, true) } diff --git a/modules/recovery_vault/private_endpoints.tf b/modules/recovery_vault/private_endpoints.tf index cb60c6eb37..3ba7abf2a4 100755 --- a/modules/recovery_vault/private_endpoints.tf +++ b/modules/recovery_vault/private_endpoints.tf @@ -4,7 +4,7 @@ # Private endpoint # -module private_endpoint { +module "private_endpoint" { source = "../networking/private_endpoint" for_each = var.private_endpoints diff --git a/modules/recovery_vault/variables.tf b/modules/recovery_vault/variables.tf index 4b6a74544a..b75aa4e569 100644 --- a/modules/recovery_vault/variables.tf +++ b/modules/recovery_vault/variables.tf @@ -1,29 +1,29 @@ -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable settings {} -variable global_settings { +variable "settings" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable diagnostics {} -variable base_tags { +variable "diagnostics" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable private_endpoints {} -variable vnets {} -variable client_config { +variable "private_endpoints" {} +variable "vnets" {} +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable resource_groups {} -variable identity { +variable "resource_groups" {} +variable "identity" { default = null } -variable private_dns { +variable "private_dns" { default = {} } \ No newline at end of file diff --git a/modules/redis_cache/variables.tf b/modules/redis_cache/variables.tf index 061febd156..fdd89c60ee 100644 --- a/modules/redis_cache/variables.tf +++ b/modules/redis_cache/variables.tf @@ -1,25 +1,25 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable tags { +variable "tags" { description = "(Required) Map of tags to be applied to the resource" - type = map + type = map(any) } -variable redis {} +variable "redis" {} -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/resource_group/output.tf b/modules/resource_group/output.tf index 6457b8e0f4..19a5064743 100644 --- a/modules/resource_group/output.tf +++ b/modules/resource_group/output.tf @@ -1,22 +1,22 @@ -output name { +output "name" { value = azurerm_resource_group.rg.name } -output location { +output "location" { value = azurerm_resource_group.rg.location } -output tags { +output "tags" { value = azurerm_resource_group.rg.tags } -output rbac_id { +output "rbac_id" { value = azurerm_resource_group.rg.id } -output id { +output "id" { value = azurerm_resource_group.rg.id } \ No newline at end of file diff --git a/modules/resource_group/variables.tf b/modules/resource_group/variables.tf index c1b9d9f8b9..717b567714 100644 --- a/modules/resource_group/variables.tf +++ b/modules/resource_group/variables.tf @@ -1,12 +1,12 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable tags { +variable "tags" { description = "(Required) Map of tags to be applied to the resource" - type = map + type = map(any) } -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } diff --git a/modules/roles/custom_roles/output.tf b/modules/roles/custom_roles/output.tf index 20510f0a80..13e0094564 100755 --- a/modules/roles/custom_roles/output.tf +++ b/modules/roles/custom_roles/output.tf @@ -1,9 +1,9 @@ -output id { +output "id" { value = azurerm_role_definition.custom_role.id } -output role_definition_resource_id { +output "role_definition_resource_id" { value = azurerm_role_definition.custom_role.role_definition_resource_id } \ No newline at end of file diff --git a/modules/roles/custom_roles/variables.tf b/modules/roles/custom_roles/variables.tf index 281ecdfe79..2d44cc8cbb 100755 --- a/modules/roles/custom_roles/variables.tf +++ b/modules/roles/custom_roles/variables.tf @@ -1,5 +1,5 @@ -variable custom_role {} -variable subscription_primary {} -variable global_settings { +variable "custom_role" {} +variable "subscription_primary" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } diff --git a/modules/roles/role_assignment/assignment/variables.tf b/modules/roles/role_assignment/assignment/variables.tf index 61a5827a5e..11741fbb7b 100755 --- a/modules/roles/role_assignment/assignment/variables.tf +++ b/modules/roles/role_assignment/assignment/variables.tf @@ -1,14 +1,14 @@ -variable scope {} -variable role_definition_name { +variable "scope" {} +variable "role_definition_name" { default = null } -variable role_definition_id { +variable "role_definition_id" { default = null } -variable keys {} -variable azuread_apps {} -variable azuread_groups {} -variable managed_identities {} -variable client_config { +variable "keys" {} +variable "azuread_apps" {} +variable "azuread_groups" {} +variable "managed_identities" {} +variable "client_config" { description = "Client configuration object (see module README.md)." } \ No newline at end of file diff --git a/modules/roles/role_assignment/module.tf b/modules/roles/role_assignment/module.tf index 00169b753f..abb9e97e4e 100755 --- a/modules/roles/role_assignment/module.tf +++ b/modules/roles/role_assignment/module.tf @@ -1,6 +1,6 @@ -module assignment { +module "assignment" { source = "./assignment" for_each = var.role_mappings diff --git a/modules/roles/role_assignment/variables.tf b/modules/roles/role_assignment/variables.tf index 2d83db43a1..9c4730a197 100755 --- a/modules/roles/role_assignment/variables.tf +++ b/modules/roles/role_assignment/variables.tf @@ -1,21 +1,21 @@ -variable scope {} -variable mode {} -variable role_mappings {} -variable custom_roles { +variable "scope" {} +variable "mode" {} +variable "role_mappings" {} +variable "custom_roles" { default = {} } -variable azuread_apps { +variable "azuread_apps" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } -variable object_id { +variable "object_id" { default = {} } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } \ No newline at end of file diff --git a/modules/security/disk_encryption_set/output.tf b/modules/security/disk_encryption_set/output.tf index 9ddc5b7d70..9457ce92a9 100644 --- a/modules/security/disk_encryption_set/output.tf +++ b/modules/security/disk_encryption_set/output.tf @@ -1,14 +1,14 @@ -output principal_id { +output "principal_id" { value = azurerm_disk_encryption_set.encryption_set.identity.0.principal_id } -output tenant_id { +output "tenant_id" { value = azurerm_disk_encryption_set.encryption_set.identity.0.tenant_id } -output id { +output "id" { value = azurerm_disk_encryption_set.encryption_set.id } -output rbac_id { +output "rbac_id" { value = azurerm_disk_encryption_set.encryption_set.identity.0.principal_id } diff --git a/modules/security/disk_encryption_set/variables.tf b/modules/security/disk_encryption_set/variables.tf index 18f554736d..021395e1d9 100644 --- a/modules/security/disk_encryption_set/variables.tf +++ b/modules/security/disk_encryption_set/variables.tf @@ -1,9 +1,9 @@ -variable global_settings {} -variable client_config {} -variable base_tags { +variable "global_settings" {} +variable "client_config" {} +variable "base_tags" { default = {} } -variable settings {} -variable keyvault_id {} -variable key_vault_key_ids {} -variable resource_groups {} \ No newline at end of file +variable "settings" {} +variable "keyvault_id" {} +variable "key_vault_key_ids" {} +variable "resource_groups" {} \ No newline at end of file diff --git a/modules/security/dynamic_keyvault_secrets/keyvault.tf b/modules/security/dynamic_keyvault_secrets/keyvault.tf index 1ea785a08a..1dbbcd3f16 100644 --- a/modules/security/dynamic_keyvault_secrets/keyvault.tf +++ b/modules/security/dynamic_keyvault_secrets/keyvault.tf @@ -1,4 +1,4 @@ -module secret { +module "secret" { source = "./secret" for_each = { for key, value in var.settings : key => value @@ -10,7 +10,7 @@ module secret { keyvault_id = var.keyvault.id } -module secret_value { +module "secret_value" { source = "./secret" for_each = { for key, value in var.settings : key => value @@ -22,7 +22,7 @@ module secret_value { keyvault_id = var.keyvault.id } -module secret_immutable { +module "secret_immutable" { source = "./secret_immutable" for_each = { for key, value in var.settings : key => value diff --git a/modules/security/dynamic_keyvault_secrets/secret/variables.tf b/modules/security/dynamic_keyvault_secrets/secret/variables.tf index 8b97a9f977..2de0e52eb2 100644 --- a/modules/security/dynamic_keyvault_secrets/secret/variables.tf +++ b/modules/security/dynamic_keyvault_secrets/secret/variables.tf @@ -1,3 +1,3 @@ -variable name {} -variable value {} -variable keyvault_id {} \ No newline at end of file +variable "name" {} +variable "value" {} +variable "keyvault_id" {} \ No newline at end of file diff --git a/modules/security/dynamic_keyvault_secrets/secret_immutable/variables.tf b/modules/security/dynamic_keyvault_secrets/secret_immutable/variables.tf index 8b97a9f977..2de0e52eb2 100644 --- a/modules/security/dynamic_keyvault_secrets/secret_immutable/variables.tf +++ b/modules/security/dynamic_keyvault_secrets/secret_immutable/variables.tf @@ -1,3 +1,3 @@ -variable name {} -variable value {} -variable keyvault_id {} \ No newline at end of file +variable "name" {} +variable "value" {} +variable "keyvault_id" {} \ No newline at end of file diff --git a/modules/security/dynamic_keyvault_secrets/variables.tf b/modules/security/dynamic_keyvault_secrets/variables.tf index 25c141854c..8e01f81793 100644 --- a/modules/security/dynamic_keyvault_secrets/variables.tf +++ b/modules/security/dynamic_keyvault_secrets/variables.tf @@ -1,5 +1,5 @@ -variable settings {} -variable keyvault {} -variable objects { +variable "settings" {} +variable "keyvault" {} +variable "objects" { default = {} } \ No newline at end of file diff --git a/modules/security/keyvault/diagnostics.tf b/modules/security/keyvault/diagnostics.tf index 36cf5eac6b..364e1f5bef 100755 --- a/modules/security/keyvault/diagnostics.tf +++ b/modules/security/keyvault/diagnostics.tf @@ -1,4 +1,4 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" resource_id = azurerm_key_vault.keyvault.id diff --git a/modules/security/keyvault/examples/101-simple/variables.tf b/modules/security/keyvault/examples/101-simple/variables.tf index c9a568320c..47213a4165 100755 --- a/modules/security/keyvault/examples/101-simple/variables.tf +++ b/modules/security/keyvault/examples/101-simple/variables.tf @@ -1,5 +1,5 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable resource_groups {} -variable keyvaults {} \ No newline at end of file +variable "resource_groups" {} +variable "keyvaults" {} \ No newline at end of file diff --git a/modules/security/keyvault/examples/102-with-networking/variables.tf b/modules/security/keyvault/examples/102-with-networking/variables.tf index 69cb7dc999..df07937fa5 100755 --- a/modules/security/keyvault/examples/102-with-networking/variables.tf +++ b/modules/security/keyvault/examples/102-with-networking/variables.tf @@ -1,7 +1,7 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable resource_groups {} -variable keyvaults {} -variable keyvault_id {} -variable org_id {} \ No newline at end of file +variable "resource_groups" {} +variable "keyvaults" {} +variable "keyvault_id" {} +variable "org_id" {} \ No newline at end of file diff --git a/modules/security/keyvault/output.tf b/modules/security/keyvault/output.tf index d777be8d0c..24b2effb1b 100755 --- a/modules/security/keyvault/output.tf +++ b/modules/security/keyvault/output.tf @@ -1,21 +1,21 @@ -output id { +output "id" { value = azurerm_key_vault.keyvault.id } -output vault_uri { +output "vault_uri" { value = azurerm_key_vault.keyvault.vault_uri } -output name { +output "name" { value = azurerm_key_vault.keyvault.name } -output rbac_id { +output "rbac_id" { value = azurerm_key_vault.keyvault.id } -output base_tags { +output "base_tags" { value = var.base_tags } diff --git a/modules/security/keyvault/private_endpoints.tf b/modules/security/keyvault/private_endpoints.tf index 60bc86dd38..bdead77d62 100755 --- a/modules/security/keyvault/private_endpoints.tf +++ b/modules/security/keyvault/private_endpoints.tf @@ -4,7 +4,7 @@ # Private endpoint # -module private_endpoint { +module "private_endpoint" { source = "../../networking/private_endpoint" for_each = try(var.settings.private_endpoints, {}) diff --git a/modules/security/keyvault/variables.tf b/modules/security/keyvault/variables.tf index 3ac56a1e81..bcce7d6c78 100755 --- a/modules/security/keyvault/variables.tf +++ b/modules/security/keyvault/variables.tf @@ -1,28 +1,28 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable resource_groups {} -variable settings {} -variable vnets { +variable "resource_groups" {} +variable "settings" {} +variable "vnets" { default = {} } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable managed_identities { +variable "managed_identities" { default = {} } # For diagnostics settings -variable diagnostics { +variable "diagnostics" { default = {} } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable private_dns { +variable "private_dns" { default = {} } \ No newline at end of file diff --git a/modules/security/keyvault_access_policies/access_policy/variables.tf b/modules/security/keyvault_access_policies/access_policy/variables.tf index 52ff9768e8..d7d9631b71 100755 --- a/modules/security/keyvault_access_policies/access_policy/variables.tf +++ b/modules/security/keyvault_access_policies/access_policy/variables.tf @@ -1,4 +1,4 @@ -variable keyvault_id {} -variable tenant_id {} -variable object_id {} -variable access_policy {} +variable "keyvault_id" {} +variable "tenant_id" {} +variable "object_id" {} +variable "access_policy" {} diff --git a/modules/security/keyvault_access_policies/policies.tf b/modules/security/keyvault_access_policies/policies.tf index efedb8fa43..916fffd58b 100755 --- a/modules/security/keyvault_access_policies/policies.tf +++ b/modules/security/keyvault_access_policies/policies.tf @@ -1,5 +1,5 @@ -module azuread_apps { +module "azuread_apps" { source = "./access_policy" for_each = { for key, access_policy in var.access_policies : key => access_policy @@ -12,7 +12,7 @@ module azuread_apps { object_id = try(var.azuread_apps[var.client_config.landingzone_key][each.value.azuread_app_key].azuread_service_principal.object_id, var.azuread_apps[each.value.lz_key][each.value.azuread_app_key].azuread_service_principal.object_id) } -module azuread_group { +module "azuread_group" { source = "./access_policy" for_each = { for key, access_policy in var.access_policies : key => access_policy @@ -25,7 +25,7 @@ module azuread_group { object_id = try(each.value.lz_key, null) == null ? var.azuread_groups[var.client_config.landingzone_key][each.value.azuread_group_key].id : var.azuread_groups[each.value.lz_key][each.value.azuread_group_key].id } -module logged_in_user { +module "logged_in_user" { source = "./access_policy" for_each = { for key, access_policy in var.access_policies : key => access_policy @@ -38,7 +38,7 @@ module logged_in_user { object_id = var.client_config.object_id } -module logged_in_aad_app { +module "logged_in_aad_app" { source = "./access_policy" for_each = { for key, access_policy in var.access_policies : key => access_policy @@ -51,7 +51,7 @@ module logged_in_aad_app { object_id = var.client_config.object_id } -module object_id { +module "object_id" { source = "./access_policy" for_each = { for key, access_policy in var.access_policies : key => access_policy @@ -64,7 +64,7 @@ module object_id { object_id = each.value.object_id } -module managed_identity { +module "managed_identity" { source = "./access_policy" for_each = { for key, access_policy in var.access_policies : key => access_policy @@ -77,7 +77,7 @@ module managed_identity { object_id = try(each.value.lz_key, null) == null ? var.resources.managed_identities[var.client_config.landingzone_key][each.value.managed_identity_key].principal_id : var.resources.managed_identities[each.value.lz_key][each.value.managed_identity_key].principal_id } -module mssql_managed_instance { +module "mssql_managed_instance" { source = "./access_policy" for_each = { for key, access_policy in var.access_policies : key => access_policy @@ -90,7 +90,7 @@ module mssql_managed_instance { object_id = try(each.value.lz_key, null) == null ? var.resources.mssql_managed_instances[var.client_config.landingzone_key][each.value.mssql_managed_instance_key].principal_id : var.resources.mssql_managed_instances[each.value.lz_key][each.value.mssql_managed_instance_key].principal_id } -module mssql_managed_instances_secondary { +module "mssql_managed_instances_secondary" { source = "./access_policy" for_each = { for key, access_policy in var.access_policies : key => access_policy @@ -105,7 +105,7 @@ module mssql_managed_instances_secondary { -module storage_accounts { +module "storage_accounts" { source = "./access_policy" for_each = { for key, access_policy in var.access_policies : key => access_policy diff --git a/modules/security/keyvault_access_policies/variables.tf b/modules/security/keyvault_access_policies/variables.tf index 9cfb0289ef..fe82bde60a 100755 --- a/modules/security/keyvault_access_policies/variables.tf +++ b/modules/security/keyvault_access_policies/variables.tf @@ -1,29 +1,29 @@ -variable keyvaults { +variable "keyvaults" { default = {} } -variable keyvault_key { +variable "keyvault_key" { default = null } -variable keyvault_id { +variable "keyvault_id" { default = null } -variable access_policies { +variable "access_policies" { validation { condition = length(var.access_policies) <= 16 error_message = "A maximun of 16 access policies can be set." } } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable azuread_groups { +variable "azuread_groups" { default = {} } -variable azuread_apps { +variable "azuread_apps" { default = {} } -variable resources { +variable "resources" { default = {} } \ No newline at end of file diff --git a/modules/security/keyvault_certificate/output.tf b/modules/security/keyvault_certificate/output.tf index 3e3061ee33..8038915ebc 100644 --- a/modules/security/keyvault_certificate/output.tf +++ b/modules/security/keyvault_certificate/output.tf @@ -1,23 +1,23 @@ -output secret_id { +output "secret_id" { value = azurerm_key_vault_certificate.cert.secret_id } -output id { +output "id" { value = azurerm_key_vault_certificate.cert.id } -output version { +output "version" { value = azurerm_key_vault_certificate.cert.version } -output name { +output "name" { value = azurerm_key_vault_certificate.cert.name } -output thumbprint { +output "thumbprint" { value = azurerm_key_vault_certificate.cert.thumbprint } -output certificate_attribute { +output "certificate_attribute" { value = azurerm_key_vault_certificate.cert.certificate_attribute } \ No newline at end of file diff --git a/modules/security/keyvault_certificate/variables.tf b/modules/security/keyvault_certificate/variables.tf index 23a4f41deb..4f76840d16 100644 --- a/modules/security/keyvault_certificate/variables.tf +++ b/modules/security/keyvault_certificate/variables.tf @@ -1,2 +1,2 @@ -variable settings {} -variable keyvault {} \ No newline at end of file +variable "settings" {} +variable "keyvault" {} \ No newline at end of file diff --git a/modules/security/keyvault_certificate_issuer/output.tf b/modules/security/keyvault_certificate_issuer/output.tf index 4351672365..d0ebba6315 100644 --- a/modules/security/keyvault_certificate_issuer/output.tf +++ b/modules/security/keyvault_certificate_issuer/output.tf @@ -1,7 +1,7 @@ -output id { +output "id" { value = azurerm_key_vault_certificate_issuer.keycertisr.id } -output name { +output "name" { value = azurerm_key_vault_certificate_issuer.keycertisr.name } diff --git a/modules/security/keyvault_certificate_issuer/variables.tf b/modules/security/keyvault_certificate_issuer/variables.tf index 578046a23a..e7bc9b905f 100644 --- a/modules/security/keyvault_certificate_issuer/variables.tf +++ b/modules/security/keyvault_certificate_issuer/variables.tf @@ -1,32 +1,32 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable settings {} -variable resource_group_name { +variable "settings" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable password {} -variable keyvault_id { +variable "password" {} +variable "keyvault_id" { default = null } -variable organization_id { +variable "organization_id" { default = null } -variable provider_name { +variable "provider_name" { default = null } -variable account_id { +variable "account_id" { default = null } -variable issuer_name { +variable "issuer_name" { default = null } \ No newline at end of file diff --git a/modules/security/keyvault_certificate_request/module.tf b/modules/security/keyvault_certificate_request/module.tf index 766795c806..3cb2cc0f10 100644 --- a/modules/security/keyvault_certificate_request/module.tf +++ b/modules/security/keyvault_certificate_request/module.tf @@ -25,7 +25,7 @@ resource "azurerm_key_vault_certificate" "csr" { content_type = var.settings.certificate_policy.content_type } - dynamic x509_certificate_properties { + dynamic "x509_certificate_properties" { for_each = try(var.settings.certificate_policy.x509_certificate_properties[*], {}) content { @@ -35,7 +35,7 @@ resource "azurerm_key_vault_certificate" "csr" { subject = try(x509_certificate_properties.value.subject, "CN=${try("${x509_certificate_properties.value.domain_name_registration.subdomain}.", "")}${var.domain_name_registrations[x509_certificate_properties.value.domain_name_registration.key].dns_domain_registration_name}") validity_in_months = x509_certificate_properties.value.validity_in_months - dynamic subject_alternative_names { + dynamic "subject_alternative_names" { for_each = try(x509_certificate_properties.value.subject_alternative_names, null) == null ? [] : [1] content { diff --git a/modules/security/keyvault_certificate_request/output.tf b/modules/security/keyvault_certificate_request/output.tf index 6318c9a208..be939cec82 100644 --- a/modules/security/keyvault_certificate_request/output.tf +++ b/modules/security/keyvault_certificate_request/output.tf @@ -1,21 +1,21 @@ -output id { +output "id" { value = azurerm_key_vault_certificate.csr.id } -output keyvault_id { +output "keyvault_id" { value = var.keyvault_id } -output secret_id { +output "secret_id" { value = azurerm_key_vault_certificate.csr.secret_id } -output version { +output "version" { value = azurerm_key_vault_certificate.csr.version } -output thumbprint { +output "thumbprint" { value = azurerm_key_vault_certificate.csr.thumbprint } -output certificate_attribute { +output "certificate_attribute" { value = azurerm_key_vault_certificate.csr.certificate_attribute } -output name { +output "name" { value = azurerm_key_vault_certificate.csr.name } \ No newline at end of file diff --git a/modules/security/keyvault_certificate_request/scripts/GlobalSign_cancel_orders.sh b/modules/security/keyvault_certificate_request/scripts/GlobalSign_cancel_orders.sh index 594f32da80..68f4124173 100755 --- a/modules/security/keyvault_certificate_request/scripts/GlobalSign_cancel_orders.sh +++ b/modules/security/keyvault_certificate_request/scripts/GlobalSign_cancel_orders.sh @@ -12,7 +12,7 @@ function cancel_order { orderIDs=$(echo ${orders} | xq -r '."soap:Envelope"."soap:Body"."ns2:GetCertificateOrdersResponse".Response.SearchOrderDetails.SearchOrderDetail | if type == "array" then .[] else . end | select( .OrderStatus != "3" and .OrderStatus != "5") | .OrderID' 2>/dev/null) if [[ ! -z "${orderIDs}" ]]; then - + # Process the order cancellation for orderID in ${orderIDs}; do echo "Cancelling orderID: ${orderID}" diff --git a/modules/security/keyvault_certificate_request/variables.tf b/modules/security/keyvault_certificate_request/variables.tf index ff52f56587..4a5a6e5eb9 100644 --- a/modules/security/keyvault_certificate_request/variables.tf +++ b/modules/security/keyvault_certificate_request/variables.tf @@ -1,8 +1,8 @@ -variable certificate_issuers { +variable "certificate_issuers" { default = {} } -variable keyvault_id {} -variable settings {} -variable domain_name_registrations { +variable "keyvault_id" {} +variable "settings" {} +variable "domain_name_registrations" { default = {} } \ No newline at end of file diff --git a/modules/security/keyvault_key/output.tf b/modules/security/keyvault_key/output.tf index 87d774f4c3..22d1be0bfa 100644 --- a/modules/security/keyvault_key/output.tf +++ b/modules/security/keyvault_key/output.tf @@ -1,7 +1,7 @@ -output id { +output "id" { value = azurerm_key_vault_key.key.id } -output name { +output "name" { value = var.settings.name } diff --git a/modules/security/keyvault_key/variables.tf b/modules/security/keyvault_key/variables.tf index ba8be39a9e..f76611ea45 100644 --- a/modules/security/keyvault_key/variables.tf +++ b/modules/security/keyvault_key/variables.tf @@ -1,9 +1,9 @@ -variable settings {} -variable keyvault {} -variable base_tags { +variable "settings" {} +variable "keyvault" {} +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable tags { +variable "tags" { default = null } \ No newline at end of file diff --git a/modules/security/managed_identity/output.tf b/modules/security/managed_identity/output.tf index fe9af325f9..ce02755159 100644 --- a/modules/security/managed_identity/output.tf +++ b/modules/security/managed_identity/output.tf @@ -1,20 +1,20 @@ -output id { +output "id" { value = azurerm_user_assigned_identity.msi.id } -output principal_id { +output "principal_id" { value = azurerm_user_assigned_identity.msi.principal_id } -output client_id { +output "client_id" { value = azurerm_user_assigned_identity.msi.client_id } -output rbac_id { +output "rbac_id" { value = azurerm_user_assigned_identity.msi.principal_id description = "This attribute is used to set the role assignment" } -output name { +output "name" { value = azurerm_user_assigned_identity.msi.name } diff --git a/modules/security/managed_identity/variables.tf b/modules/security/managed_identity/variables.tf index 06d308df18..fc3dc066c4 100644 --- a/modules/security/managed_identity/variables.tf +++ b/modules/security/managed_identity/variables.tf @@ -1,19 +1,19 @@ -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable name {} -variable global_settings { +variable "name" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable tags { +variable "tags" { default = null } \ No newline at end of file diff --git a/modules/shared_image_gallery/image_definitions/output.tf b/modules/shared_image_gallery/image_definitions/output.tf index 870d515a28..9326ce96dc 100644 --- a/modules/shared_image_gallery/image_definitions/output.tf +++ b/modules/shared_image_gallery/image_definitions/output.tf @@ -1,3 +1,3 @@ -output name { +output "name" { value = azurerm_shared_image.image.name } \ No newline at end of file diff --git a/modules/shared_image_gallery/image_definitions/variables.tf b/modules/shared_image_gallery/image_definitions/variables.tf index 72c2761514..751b20c38f 100644 --- a/modules/shared_image_gallery/image_definitions/variables.tf +++ b/modules/shared_image_gallery/image_definitions/variables.tf @@ -1,9 +1,9 @@ -variable resource_group_name {} -variable location {} -variable diagnostics {} -variable client_config {} -variable global_settings {} -variable settings {} -variable base_tags {} -variable gallery_name {} \ No newline at end of file +variable "resource_group_name" {} +variable "location" {} +variable "diagnostics" {} +variable "client_config" {} +variable "global_settings" {} +variable "settings" {} +variable "base_tags" {} +variable "gallery_name" {} \ No newline at end of file diff --git a/modules/shared_image_gallery/image_galleries/output.tf b/modules/shared_image_gallery/image_galleries/output.tf index 93549a41d9..0f37985c92 100644 --- a/modules/shared_image_gallery/image_galleries/output.tf +++ b/modules/shared_image_gallery/image_galleries/output.tf @@ -1,3 +1,3 @@ -output name { +output "name" { value = azurerm_shared_image_gallery.gallery.name } \ No newline at end of file diff --git a/modules/shared_image_gallery/image_galleries/variables.tf b/modules/shared_image_gallery/image_galleries/variables.tf index d206ebb89b..ed5b068819 100644 --- a/modules/shared_image_gallery/image_galleries/variables.tf +++ b/modules/shared_image_gallery/image_galleries/variables.tf @@ -1,8 +1,8 @@ -variable resource_group_name {} -variable location {} -variable diagnostics {} -variable client_config {} -variable global_settings {} -variable settings {} -variable base_tags {} \ No newline at end of file +variable "resource_group_name" {} +variable "location" {} +variable "diagnostics" {} +variable "client_config" {} +variable "global_settings" {} +variable "settings" {} +variable "base_tags" {} \ No newline at end of file diff --git a/modules/shared_image_gallery/packer_service_principal/variables.tf b/modules/shared_image_gallery/packer_service_principal/variables.tf index 6254969237..3cc7e37e9a 100644 --- a/modules/shared_image_gallery/packer_service_principal/variables.tf +++ b/modules/shared_image_gallery/packer_service_principal/variables.tf @@ -1,13 +1,13 @@ -variable resource_group_name {} -variable location {} -variable client_config {} -variable global_settings {} -variable settings {} -variable base_tags {} -variable gallery_name {} -variable image_name {} -variable key_vault_id {} -variable tenant_id {} -variable subscription {} +variable "resource_group_name" {} +variable "location" {} +variable "client_config" {} +variable "global_settings" {} +variable "settings" {} +variable "base_tags" {} +variable "gallery_name" {} +variable "image_name" {} +variable "key_vault_id" {} +variable "tenant_id" {} +variable "subscription" {} diff --git a/modules/storage_account/blob/output.tf b/modules/storage_account/blob/output.tf index fb691927bb..3c5e82a92f 100644 --- a/modules/storage_account/blob/output.tf +++ b/modules/storage_account/blob/output.tf @@ -1,7 +1,7 @@ -output id { +output "id" { value = azurerm_storage_blob.blob.id } -output url { +output "url" { value = azurerm_storage_blob.blob.url } diff --git a/modules/storage_account/blob/variables.tf b/modules/storage_account/blob/variables.tf index 0357d546dc..7225605832 100644 --- a/modules/storage_account/blob/variables.tf +++ b/modules/storage_account/blob/variables.tf @@ -1,3 +1,3 @@ -variable storage_account_name {} -variable storage_container_name {} -variable settings {} \ No newline at end of file +variable "storage_account_name" {} +variable "storage_container_name" {} +variable "settings" {} \ No newline at end of file diff --git a/modules/storage_account/container/output.tf b/modules/storage_account/container/output.tf index 916534b4d2..2b39e9388e 100644 --- a/modules/storage_account/container/output.tf +++ b/modules/storage_account/container/output.tf @@ -1,8 +1,8 @@ -output blobs { +output "blobs" { value = module.blob } -output name { +output "name" { value = azurerm_storage_container.stg.name } \ No newline at end of file diff --git a/modules/storage_account/container/storage_blob.tf b/modules/storage_account/container/storage_blob.tf index d9c10e63ca..d694435f1f 100644 --- a/modules/storage_account/container/storage_blob.tf +++ b/modules/storage_account/container/storage_blob.tf @@ -1,4 +1,4 @@ -module blob { +module "blob" { source = "../blob" depends_on = [azurerm_storage_container.stg] for_each = try(var.settings.storage_blobs, {}) diff --git a/modules/storage_account/container/variables.tf b/modules/storage_account/container/variables.tf index 0d8f1d54a8..d36597c16c 100644 --- a/modules/storage_account/container/variables.tf +++ b/modules/storage_account/container/variables.tf @@ -1,2 +1,2 @@ -variable settings {} -variable storage_account_name {} +variable "settings" {} +variable "storage_account_name" {} diff --git a/modules/storage_account/data_lake_filesystem/output.tf b/modules/storage_account/data_lake_filesystem/output.tf index 4b5e1bf17d..fee227bfb3 100644 --- a/modules/storage_account/data_lake_filesystem/output.tf +++ b/modules/storage_account/data_lake_filesystem/output.tf @@ -1,3 +1,3 @@ -output id { +output "id" { value = azurerm_storage_data_lake_gen2_filesystem.gen2.id } diff --git a/modules/storage_account/data_lake_filesystem/variables.tf b/modules/storage_account/data_lake_filesystem/variables.tf index a4cfab9dea..03ade4fa1a 100644 --- a/modules/storage_account/data_lake_filesystem/variables.tf +++ b/modules/storage_account/data_lake_filesystem/variables.tf @@ -1,2 +1,2 @@ -variable settings {} -variable storage_account_id {} +variable "settings" {} +variable "storage_account_id" {} diff --git a/modules/storage_account/output.tf b/modules/storage_account/output.tf index ae5409baf0..1615995e3b 100755 --- a/modules/storage_account/output.tf +++ b/modules/storage_account/output.tf @@ -1,44 +1,44 @@ -output id { +output "id" { value = azurerm_storage_account.stg.id } -output name { +output "name" { value = azurerm_storage_account.stg.name } -output location { +output "location" { value = var.location } -output resource_group_name { +output "resource_group_name" { value = var.resource_group_name } -output primary_blob_endpoint { +output "primary_blob_endpoint" { value = azurerm_storage_account.stg.primary_blob_endpoint } -output containers { +output "containers" { value = module.container } -output data_lake_filesystems { +output "data_lake_filesystems" { value = module.data_lake_filesystem } -output primary_access_key { +output "primary_access_key" { value = azurerm_storage_account.stg.primary_access_key } -output primary_connection_string { +output "primary_connection_string" { value = azurerm_storage_account.stg.primary_connection_string } -output identity { +output "identity" { value = try(azurerm_storage_account.stg.identity, null) } -output rbac_id { +output "rbac_id" { value = try(azurerm_storage_account.stg.identity.0, null) } \ No newline at end of file diff --git a/modules/storage_account/private_endpoint.tf b/modules/storage_account/private_endpoint.tf index d2f0e41c06..93005dcafe 100755 --- a/modules/storage_account/private_endpoint.tf +++ b/modules/storage_account/private_endpoint.tf @@ -1,4 +1,4 @@ -module private_endpoint { +module "private_endpoint" { source = "../networking/private_endpoint" for_each = var.private_endpoints diff --git a/modules/storage_account/storage_account.tf b/modules/storage_account/storage_account.tf index ff1fecc68d..ce4f70dde4 100755 --- a/modules/storage_account/storage_account.tf +++ b/modules/storage_account/storage_account.tf @@ -149,7 +149,7 @@ resource "azurerm_storage_account" "stg" { } -module container { +module "container" { source = "./container" for_each = try(var.storage_account.containers, {}) @@ -157,7 +157,7 @@ module container { settings = each.value } -module data_lake_filesystem { +module "data_lake_filesystem" { source = "./data_lake_filesystem" for_each = try(var.storage_account.data_lake_filesystems, {}) diff --git a/modules/storage_account/variables.tf b/modules/storage_account/variables.tf index d78c63fc45..2292b379ae 100755 --- a/modules/storage_account/variables.tf +++ b/modules/storage_account/variables.tf @@ -1,33 +1,33 @@ -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable storage_account {} -variable resource_group_name { +variable "storage_account" {} +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable vnets { +variable "vnets" { default = {} } -variable private_endpoints { +variable "private_endpoints" { default = {} } -variable resource_groups { +variable "resource_groups" { default = {} } -variable base_tags { +variable "base_tags" { default = {} } -variable recovery_vaults { +variable "recovery_vaults" { default = {} } -variable private_dns { +variable "private_dns" { default = {} } \ No newline at end of file diff --git a/modules/subscription_billing_role_assignment/billing_role_assignment.tf b/modules/subscription_billing_role_assignment/billing_role_assignment.tf index 0fac8ab2b8..2bcd7a341f 100644 --- a/modules/subscription_billing_role_assignment/billing_role_assignment.tf +++ b/modules/subscription_billing_role_assignment/billing_role_assignment.tf @@ -5,7 +5,7 @@ data "azurerm_billing_enrollment_account_scope" "sub" { data "external" "role_definition" { program = [ - "bash", "-c", + "bash", "-c", "az rest --method GET --url https://management.azure.com${local.billing_scope_id}/billingRoleDefinitions?api-version=2019-10-01-preview --query \"value[?properties.roleName=='${var.billing_role_definition_name}'].{id:id}[0]\" -o json" ] @@ -20,7 +20,7 @@ locals { billing_scope_id = data.azurerm_billing_enrollment_account_scope.sub.id } -module role_assignment_azuread_users { +module "role_assignment_azuread_users" { source = "./role_assignment" for_each = try(var.settings.principals.azuread_users, {}) @@ -32,7 +32,7 @@ module role_assignment_azuread_users { } -module role_assignment_msi { +module "role_assignment_msi" { source = "./role_assignment" for_each = try(var.settings.principals.managed_identities, {}) depends_on = [module.role_assignment_azuread_users] diff --git a/modules/subscription_billing_role_assignment/role_assignment/billing_role_assignment.tf b/modules/subscription_billing_role_assignment/role_assignment/billing_role_assignment.tf index e981abd690..7a5db83e14 100644 --- a/modules/subscription_billing_role_assignment/role_assignment/billing_role_assignment.tf +++ b/modules/subscription_billing_role_assignment/role_assignment/billing_role_assignment.tf @@ -4,7 +4,7 @@ locals { resource "null_resource" "subscription_creation_role" { triggers = { - url = format("https://management.azure.com%s/billingRoleAssignments/%s?api-version=%s", var.billing_scope_id, var.principal_id, local.api_version) + url = format("https://management.azure.com%s/billingRoleAssignments/%s?api-version=%s", var.billing_scope_id, var.principal_id, local.api_version) properties = jsonencode( { properties = { @@ -22,7 +22,7 @@ resource "null_resource" "subscription_creation_role" { on_failure = fail environment = { - METHOD = "PUT" + METHOD = "PUT" URL = self.triggers.url PROPERTIES = self.triggers.properties } diff --git a/modules/subscription_billing_role_assignment/role_assignment/variables.tf b/modules/subscription_billing_role_assignment/role_assignment/variables.tf index b7dd927bed..78f393bf2d 100644 --- a/modules/subscription_billing_role_assignment/role_assignment/variables.tf +++ b/modules/subscription_billing_role_assignment/role_assignment/variables.tf @@ -1,8 +1,8 @@ -variable billing_scope_id {} -variable principal_id {} -variable role_definition_id {} -variable tenant_id {} -variable settings {} -variable aad_user_impersonate { +variable "billing_scope_id" {} +variable "principal_id" {} +variable "role_definition_id" {} +variable "tenant_id" {} +variable "settings" {} +variable "aad_user_impersonate" { default = null } \ No newline at end of file diff --git a/modules/subscription_billing_role_assignment/variables.tf b/modules/subscription_billing_role_assignment/variables.tf index 0f9a81e4c9..35148cc3d8 100644 --- a/modules/subscription_billing_role_assignment/variables.tf +++ b/modules/subscription_billing_role_assignment/variables.tf @@ -1,8 +1,8 @@ -variable client_config {} -variable principals {} -variable settings {} -variable keyvaults {} -variable billing_role_definition_name { +variable "client_config" {} +variable "principals" {} +variable "settings" {} +variable "keyvaults" {} +variable "billing_role_definition_name" { default = "Enrollment account subscription creator" validation { diff --git a/modules/subscriptions/README.md b/modules/subscriptions/README.md index 211e1b4d45..c657cf2e09 100644 --- a/modules/subscriptions/README.md +++ b/modules/subscriptions/README.md @@ -8,7 +8,7 @@ The following pre-requisites must be performed before using that module. ## Pre-requisites -This module must be executed with +This module must be executed with - An Azure Active Directory user being and EA Account Owner - An Azure Active directory User that has been delegated the subscription creation role - An Azure Active directory App SPN that has been delegated the subscription creation role diff --git a/modules/subscriptions/diagnostics.tf b/modules/subscriptions/diagnostics.tf index d20b690525..2caca6d188 100755 --- a/modules/subscriptions/diagnostics.tf +++ b/modules/subscriptions/diagnostics.tf @@ -1,4 +1,4 @@ -module diagnostics { +module "diagnostics" { source = "../diagnostics" count = try(var.settings.diagnostic_profiles, null) == null ? 0 : 1 diff --git a/modules/subscriptions/output.tf b/modules/subscriptions/output.tf index 088e585fc5..fbfe3df997 100755 --- a/modules/subscriptions/output.tf +++ b/modules/subscriptions/output.tf @@ -1,11 +1,11 @@ -output subscription_id { +output "subscription_id" { value = try(azurerm_subscription.sub.0.subscription_id, var.client_config.subscription_id) } -output tenant_id { +output "tenant_id" { value = try(azurerm_subscription.sub.0.tenant_id, var.client_config.tenant_id) } -output tags { +output "tags" { value = try(var.settings.tags, null) } diff --git a/modules/subscriptions/scripts/refresh_access_token.sh b/modules/subscriptions/scripts/refresh_access_token.sh index 7975fcbd0d..4ffe4dcf86 100755 --- a/modules/subscriptions/scripts/refresh_access_token.sh +++ b/modules/subscriptions/scripts/refresh_access_token.sh @@ -11,7 +11,7 @@ subscription_id=$(az account show --query id -o tsv) if [ ${user_type} == "user" ]; then az login --tenant ${tenant_id} --use-device-code --allow-no-subscriptions > /dev/null - + else user_name=$(az account show --query user.name -o tsv) @@ -19,7 +19,7 @@ else case "${user_name}" in "systemAssignedIdentity") - az login --identity --allow-no-subscription + az login --identity --allow-no-subscription ;; "userAssignedIdentity") msi=$(az account show --query user.assignedIdentityInfo -o tsv) diff --git a/modules/subscriptions/variables.tf b/modules/subscriptions/variables.tf index 0409f80420..9e947376c7 100755 --- a/modules/subscriptions/variables.tf +++ b/modules/subscriptions/variables.tf @@ -1,11 +1,11 @@ -variable settings {} -variable subscription_key {} -variable client_config {} -variable global_settings { +variable "settings" {} +variable "subscription_key" {} +variable "client_config" {} +variable "global_settings" { description = "Global settings object (see module README.md)" } # For diagnostics settings -variable diagnostics { +variable "diagnostics" { default = {} } diff --git a/modules/webapps/appservice/locals.dynamic_app_settings.tf b/modules/webapps/appservice/locals.dynamic_app_settings.tf index 36613ab351..3ab7498e3d 100644 --- a/modules/webapps/appservice/locals.dynamic_app_settings.tf +++ b/modules/webapps/appservice/locals.dynamic_app_settings.tf @@ -12,12 +12,12 @@ locals { dynamic_settings_to_process = { for setting in flatten( - [ + [ for setting_name, resources in var.dynamic_app_settings : [ - for resource_type_key, resource in resources : [ + for resource_type_key, resource in resources : [ for object_id_key, object_attributes in resource : { - key = setting_name - value = try(var.combined_objects[resource_type_key][object_attributes.lz_key][object_id_key][object_attributes.attribute_key], var.combined_objects[resource_type_key][var.client_config.landingzone_key][object_id_key][object_attributes.attribute_key]) + key = setting_name + value = try(var.combined_objects[resource_type_key][object_attributes.lz_key][object_id_key][object_attributes.attribute_key], var.combined_objects[resource_type_key][var.client_config.landingzone_key][object_id_key][object_attributes.attribute_key]) } ] ] diff --git a/modules/webapps/appservice/module.tf b/modules/webapps/appservice/module.tf index 68f8d493d0..fbf727a093 100755 --- a/modules/webapps/appservice/module.tf +++ b/modules/webapps/appservice/module.tf @@ -24,7 +24,7 @@ resource "azurerm_app_service" "app_service" { enabled = lookup(var.settings, "enabled", null) https_only = lookup(var.settings, "https_only", null) - dynamic identity { + dynamic "identity" { for_each = try(var.identity, null) == null ? [] : [1] content { diff --git a/modules/webapps/appservice/output.tf b/modules/webapps/appservice/output.tf index 7b792da127..b3b9a8b4df 100755 --- a/modules/webapps/appservice/output.tf +++ b/modules/webapps/appservice/output.tf @@ -1,16 +1,16 @@ -output id { +output "id" { value = azurerm_app_service.app_service.id description = "The ID of the App Service." } -output default_site_hostname { +output "default_site_hostname" { value = azurerm_app_service.app_service.default_site_hostname description = "The Default Hostname associated with the App Service" } -output outbound_ip_addresses { +output "outbound_ip_addresses" { value = azurerm_app_service.app_service.outbound_ip_addresses description = "A comma separated list of outbound IP addresses" } -output possible_outbound_ip_addresses { +output "possible_outbound_ip_addresses" { value = azurerm_app_service.app_service.possible_outbound_ip_addresses description = "A comma separated list of outbound IP addresses. not all of which are necessarily in use" } diff --git a/modules/webapps/appservice/variables.tf b/modules/webapps/appservice/variables.tf index 98ed5f1807..8cc8f2116f 100755 --- a/modules/webapps/appservice/variables.tf +++ b/modules/webapps/appservice/variables.tf @@ -1,64 +1,64 @@ -variable client_config { +variable "client_config" { description = "Client configuration object (see module README.md)." } -variable tags { +variable "tags" { description = "(Required) map of tags for the deployment" } -variable name { +variable "name" { description = "(Required) Name of the App Service" } -variable location { +variable "location" { description = "(Required) Resource Location" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) Resource group of the App Service" } -variable app_service_plan_id { +variable "app_service_plan_id" { } -variable identity { +variable "identity" { default = null } -variable connection_strings { +variable "connection_strings" { default = {} } -variable app_settings { +variable "app_settings" { default = null } -variable dynamic_app_settings { +variable "dynamic_app_settings" { default = {} } -variable slots { +variable "slots" { default = {} } -variable application_insight { +variable "application_insight" { default = null } -variable settings {} +variable "settings" {} -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } -variable combined_objects { +variable "combined_objects" { default = {} } -variable storage_accounts { +variable "storage_accounts" { default = {} } diff --git a/modules/webapps/ase/diagnostic.tf b/modules/webapps/ase/diagnostic.tf index a6cd748226..110a4393a1 100644 --- a/modules/webapps/ase/diagnostic.tf +++ b/modules/webapps/ase/diagnostic.tf @@ -1,5 +1,5 @@ -module diagnostics { +module "diagnostics" { source = "../../diagnostics" count = var.diagnostic_profiles == null ? 0 : 1 diff --git a/modules/webapps/ase/output.tf b/modules/webapps/ase/output.tf index 17acfc104a..a956891bf2 100644 --- a/modules/webapps/ase/output.tf +++ b/modules/webapps/ase/output.tf @@ -1,25 +1,25 @@ -output id { +output "id" { value = data.azurerm_app_service_environment.ase.id description = "App Service Environment Resource Id" } -output name { +output "name" { value = azurecaf_name.ase.result description = "App Service Environment Name" } -output ilb_ip { +output "ilb_ip" { value = data.azurerm_app_service_environment.ase.internal_ip_address } -output subnet_id { +output "subnet_id" { value = var.subnet_id } -output zone { +output "zone" { value = var.zone } -output a_records { +output "a_records" { value = azurerm_private_dns_a_record.a_records } \ No newline at end of file diff --git a/modules/webapps/ase/variables.tf b/modules/webapps/ase/variables.tf index b499955e13..748a1e15bf 100644 --- a/modules/webapps/ase/variables.tf +++ b/modules/webapps/ase/variables.tf @@ -1,44 +1,44 @@ -variable tags { +variable "tags" { description = "(Required) map of tags for the deployment" } -variable name { +variable "name" { description = "(Required) Name of the App Service Environment" } -variable kind { +variable "kind" { description = "(Required) Kind of resource. Possible value are ASEV2" } -variable zone { +variable "zone" { description = "(Required) Availability Zone of resource. Possible value are 1, 2 or 3" } -variable location { +variable "location" { description = "(Required) Resource Location" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) Resource group of the ASE" } -variable subnet_id { +variable "subnet_id" { description = "(Required) Name of the Virtual Network for the ASE" } -variable subnet_name {} +variable "subnet_name" {} -variable internalLoadBalancingMode {} +variable "internalLoadBalancingMode" {} -variable diagnostics { +variable "diagnostics" { default = null } -variable diagnostic_profiles { +variable "diagnostic_profiles" { default = null } -variable front_end_size { +variable "front_end_size" { description = "Instance size for the front-end pool." default = "Standard_D1_V2" @@ -48,22 +48,22 @@ variable front_end_size { } } -variable front_end_count { +variable "front_end_count" { description = "Number of instances in the front-end pool. Minimum of two." default = "2" } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable private_dns { +variable "private_dns" { default = {} } -variable settings {} +variable "settings" {} -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/webapps/asp/output.tf b/modules/webapps/asp/output.tf index 244b35d290..0032d2635e 100644 --- a/modules/webapps/asp/output.tf +++ b/modules/webapps/asp/output.tf @@ -1,11 +1,11 @@ -output id { +output "id" { value = azurerm_app_service_plan.asp.id } -output maximum_number_of_workers { +output "maximum_number_of_workers" { value = azurerm_app_service_plan.asp.maximum_number_of_workers } -output ase_id { +output "ase_id" { value = var.app_service_environment_id } \ No newline at end of file diff --git a/modules/webapps/asp/variables.tf b/modules/webapps/asp/variables.tf index e71629e00d..4096fd91e5 100644 --- a/modules/webapps/asp/variables.tf +++ b/modules/webapps/asp/variables.tf @@ -1,36 +1,36 @@ -variable tags { +variable "tags" { description = "(Required) map of tags for the deployment" } -variable app_service_environment_id { +variable "app_service_environment_id" { description = "(Required) ASE Id for App Service Plan Hosting Environment" default = null } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) The name of the resource group where to create the resource." type = string } -variable location { +variable "location" { description = "(Required) Specifies the supported Azure location where to create the resource. Changing this forces a new resource to be created." type = string } -variable settings {} +variable "settings" {} -variable kind { +variable "kind" { description = "(Optional) The kind of the App Service Plan to create. Possible values are Windows (also available as App), Linux, elastic (for Premium Consumption) and FunctionApp (for a Consumption Plan). Defaults to Windows. Changing this forces a new resource to be created." default = "Windows" } -variable global_settings { +variable "global_settings" { description = "Global settings object (see module README.md)" } -variable base_tags { +variable "base_tags" { description = "Base tags for the resource to be inherited from the resource group." - type = map + type = map(any) } \ No newline at end of file diff --git a/modules/webapps/function_app/locals.dynamic_app_settings.tf b/modules/webapps/function_app/locals.dynamic_app_settings.tf index 36613ab351..3ab7498e3d 100644 --- a/modules/webapps/function_app/locals.dynamic_app_settings.tf +++ b/modules/webapps/function_app/locals.dynamic_app_settings.tf @@ -12,12 +12,12 @@ locals { dynamic_settings_to_process = { for setting in flatten( - [ + [ for setting_name, resources in var.dynamic_app_settings : [ - for resource_type_key, resource in resources : [ + for resource_type_key, resource in resources : [ for object_id_key, object_attributes in resource : { - key = setting_name - value = try(var.combined_objects[resource_type_key][object_attributes.lz_key][object_id_key][object_attributes.attribute_key], var.combined_objects[resource_type_key][var.client_config.landingzone_key][object_id_key][object_attributes.attribute_key]) + key = setting_name + value = try(var.combined_objects[resource_type_key][object_attributes.lz_key][object_id_key][object_attributes.attribute_key], var.combined_objects[resource_type_key][var.client_config.landingzone_key][object_id_key][object_attributes.attribute_key]) } ] ] diff --git a/modules/webapps/function_app/module.tf b/modules/webapps/function_app/module.tf index 562f752cfb..e99b522077 100644 --- a/modules/webapps/function_app/module.tf +++ b/modules/webapps/function_app/module.tf @@ -10,18 +10,18 @@ # } resource "azurerm_function_app" "function_app" { - name = var.name - location = var.location - resource_group_name = var.resource_group_name - app_service_plan_id = var.app_service_plan_id - client_affinity_enabled = lookup(var.settings, "client_affinity_enabled", null) - enabled = lookup(var.settings, "enabled", null) - https_only = lookup(var.settings, "https_only", null) - os_type = lookup(var.settings, "os_type", "linux") - storage_account_name = var.storage_account_name - storage_account_access_key = var.storage_account_access_key - tags = local.tags - + name = var.name + location = var.location + resource_group_name = var.resource_group_name + app_service_plan_id = var.app_service_plan_id + client_affinity_enabled = lookup(var.settings, "client_affinity_enabled", null) + enabled = lookup(var.settings, "enabled", null) + https_only = lookup(var.settings, "https_only", null) + os_type = lookup(var.settings, "os_type", "linux") + storage_account_name = var.storage_account_name + storage_account_access_key = var.storage_account_access_key + tags = local.tags + app_settings = local.app_settings dynamic "auth_settings" { @@ -98,8 +98,8 @@ resource "azurerm_function_app" "function_app" { value = connection_string.value.value } } - - dynamic identity { + + dynamic "identity" { for_each = try(var.identity, null) == null ? [] : [1] content { diff --git a/modules/webapps/function_app/output.tf b/modules/webapps/function_app/output.tf index 36728338aa..18e5c00188 100755 --- a/modules/webapps/function_app/output.tf +++ b/modules/webapps/function_app/output.tf @@ -1,4 +1,4 @@ -output id { +output "id" { value = azurerm_function_app.function_app.id description = "The ID of the App Service." } @@ -6,11 +6,11 @@ output id { # value = azurerm_function_app.function_app.default_site_hostname # description = "The Default Hostname associated with the App Service" #} -output outbound_ip_addresses { +output "outbound_ip_addresses" { value = azurerm_function_app.function_app.outbound_ip_addresses description = "A comma separated list of outbound IP addresses" } -output possible_outbound_ip_addresses { +output "possible_outbound_ip_addresses" { value = azurerm_function_app.function_app.possible_outbound_ip_addresses description = "A comma separated list of outbound IP addresses. not all of which are necessarily in use" } diff --git a/modules/webapps/function_app/variables.tf b/modules/webapps/function_app/variables.tf index a490fb3fd5..d43ca5c933 100755 --- a/modules/webapps/function_app/variables.tf +++ b/modules/webapps/function_app/variables.tf @@ -1,63 +1,63 @@ -variable settings {} +variable "settings" {} -variable global_settings {} +variable "global_settings" {} -variable location { +variable "location" { description = "(Required) Resource Location" } -variable resource_group_name { +variable "resource_group_name" { description = "(Required) Resource group of the App Service" } -variable app_service_plan_id { +variable "app_service_plan_id" { } -variable tags { +variable "tags" { description = "(Required) map of tags for the deployment" } -variable name { +variable "name" { description = "(Required) Name of the App Service" } -variable storage_account_access_key { +variable "storage_account_access_key" { default = null } -variable storage_account_name { +variable "storage_account_name" { default = null } -variable identity { +variable "identity" { default = null } -variable connection_strings { +variable "connection_strings" { default = {} } -variable app_settings { +variable "app_settings" { default = null } -variable slots { +variable "slots" { default = {} } -variable application_insight { +variable "application_insight" { default = null } -variable base_tags {} +variable "base_tags" {} -variable combined_objects { +variable "combined_objects" { default = {} } -variable client_config {} +variable "client_config" {} -variable dynamic_app_settings { +variable "dynamic_app_settings" { default = {} } \ No newline at end of file diff --git a/monitoring.tf b/monitoring.tf index f486037f6c..424730933e 100644 --- a/monitoring.tf +++ b/monitoring.tf @@ -1,4 +1,4 @@ -module service_health_alerts { +module "service_health_alerts" { source = "./modules/monitoring/service_health_alerts" for_each = local.shared_services.monitoring global_settings = local.global_settings diff --git a/mssql_databases.tf b/mssql_databases.tf index 1ebc650363..45f85981e4 100755 --- a/mssql_databases.tf +++ b/mssql_databases.tf @@ -1,4 +1,4 @@ -output mssql_databases { +output "mssql_databases" { value = module.mssql_databases } @@ -7,12 +7,12 @@ module "mssql_databases" { source = "./modules/databases/mssql_database" for_each = local.database.mssql_databases - global_settings = local.global_settings - managed_identities = local.combined_objects_managed_identities - settings = each.value - server_id = try(local.combined_objects_mssql_servers[local.client_config.landingzone_key][each.value.mssql_server_key].id, local.combined_objects_mssql_servers[each.value.lz_key][each.value.mssql_server_key].id) - server_name = try(local.combined_objects_mssql_servers[local.client_config.landingzone_key][each.value.mssql_server_key].name, local.combined_objects_mssql_servers[each.value.lz_key][each.value.mssql_server_key].name) - elastic_pool_id = try(each.value.elastic_pool_key, null) == null ? null : try(local.combined_objects_mssql_elastic_pools[local.client_config.landingzone_key][each.value.elastic_pool_key].id, local.combined_objects_mssql_elastic_pools[each.value.lz_key][each.value.elastic_pool_key].id) - storage_accounts = module.storage_accounts - base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} + global_settings = local.global_settings + managed_identities = local.combined_objects_managed_identities + settings = each.value + server_id = try(local.combined_objects_mssql_servers[local.client_config.landingzone_key][each.value.mssql_server_key].id, local.combined_objects_mssql_servers[each.value.lz_key][each.value.mssql_server_key].id) + server_name = try(local.combined_objects_mssql_servers[local.client_config.landingzone_key][each.value.mssql_server_key].name, local.combined_objects_mssql_servers[each.value.lz_key][each.value.mssql_server_key].name) + elastic_pool_id = try(each.value.elastic_pool_key, null) == null ? null : try(local.combined_objects_mssql_elastic_pools[local.client_config.landingzone_key][each.value.elastic_pool_key].id, local.combined_objects_mssql_elastic_pools[each.value.lz_key][each.value.elastic_pool_key].id) + storage_accounts = module.storage_accounts + base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } diff --git a/mssql_elastic_pools.tf b/mssql_elastic_pools.tf index 4540ae43a2..4a9ab9cfc0 100755 --- a/mssql_elastic_pools.tf +++ b/mssql_elastic_pools.tf @@ -1,5 +1,5 @@ -output mssql_elastic_pools { +output "mssql_elastic_pools" { value = module.mssql_elastic_pools } diff --git a/mssql_servers.tf b/mssql_servers.tf index 410ad523a0..abccfcb482 100755 --- a/mssql_servers.tf +++ b/mssql_servers.tf @@ -1,5 +1,5 @@ -output mssql_servers { +output "mssql_servers" { value = module.mssql_servers } diff --git a/msssql_managed_databases.tf b/msssql_managed_databases.tf index 3ec707495d..70b3f7cb1c 100644 --- a/msssql_managed_databases.tf +++ b/msssql_managed_databases.tf @@ -1,5 +1,5 @@ -output mssql_managed_databases { +output "mssql_managed_databases" { value = module.mssql_managed_databases } diff --git a/msssql_managed_instances.tf b/msssql_managed_instances.tf index ade070a548..b694e5bc4e 100644 --- a/msssql_managed_instances.tf +++ b/msssql_managed_instances.tf @@ -1,9 +1,9 @@ -output mssql_managed_instances { +output "mssql_managed_instances" { value = module.mssql_managed_instances } -output mssql_managed_instances_secondary { +output "mssql_managed_instances_secondary" { value = module.mssql_managed_instances_secondary } diff --git a/mysql_servers.tf b/mysql_servers.tf index 5d648f0eb3..198f03bebf 100644 --- a/mysql_servers.tf +++ b/mysql_servers.tf @@ -1,5 +1,5 @@ -output mysql_servers { +output "mysql_servers" { value = module.mysql_servers } diff --git a/network_security_groups.tf b/network_security_groups.tf index 17635e6af2..5e8feb741d 100644 --- a/network_security_groups.tf +++ b/network_security_groups.tf @@ -1,4 +1,4 @@ -module network_security_groups { +module "network_security_groups" { source = "./modules/networking/network_security_group" for_each = { diff --git a/networking.tf b/networking.tf index 445591cc4c..4e89226c1d 100755 --- a/networking.tf +++ b/networking.tf @@ -1,10 +1,10 @@ -output vnets { +output "vnets" { depends_on = [azurerm_virtual_network_peering.peering] value = module.networking } -output public_ip_addresses { +output "public_ip_addresses" { value = module.public_ip_addresses } @@ -54,7 +54,7 @@ resource "azurecaf_name" "public_ip_addresses" { use_slug = local.global_settings.use_slug } -module public_ip_addresses { +module "public_ip_addresses" { source = "./modules/networking/public_ip_addresses" for_each = local.networking.public_ip_addresses diff --git a/networking_dns_zones.tf b/networking_dns_zones.tf index e534af8e11..90ffbdab81 100644 --- a/networking_dns_zones.tf +++ b/networking_dns_zones.tf @@ -1,4 +1,4 @@ -module dns_zones { +module "dns_zones" { source = "./modules/networking/dns_zone" for_each = try(local.networking.dns_zones, {}) @@ -13,14 +13,14 @@ module dns_zones { } } -output dns_zones { +output "dns_zones" { value = module.dns_zones } # # Create records on remote DNS zones # -module dns_zone_records { +module "dns_zone_records" { source = "./modules/networking/dns_zone/records" for_each = try(local.networking.dns_zone_records, {}) depends_on = [module.dns_zones] @@ -37,6 +37,6 @@ module dns_zone_records { } -output dns_zone_records { +output "dns_zone_records" { value = module.dns_zone_records } \ No newline at end of file diff --git a/networking_domain_name_registrations.tf b/networking_domain_name_registrations.tf index 7c0beaef3d..340d643bcc 100644 --- a/networking_domain_name_registrations.tf +++ b/networking_domain_name_registrations.tf @@ -1,4 +1,4 @@ -module domain_name_registrations { +module "domain_name_registrations" { source = "./modules/networking/domain_name_registrations" for_each = try(local.networking.domain_name_registrations, {}) @@ -9,7 +9,7 @@ module domain_name_registrations { settings = each.value } -output domain_name_registrations { +output "domain_name_registrations" { value = module.domain_name_registrations } diff --git a/networking_express_route.tf b/networking_express_route.tf index f9319d3cdc..15f7a3b663 100644 --- a/networking_express_route.tf +++ b/networking_express_route.tf @@ -4,7 +4,7 @@ # # -module express_route_circuits { +module "express_route_circuits" { source = "./modules/networking/express_route_circuit" for_each = local.networking.express_route_circuits @@ -22,7 +22,7 @@ module express_route_circuits { # # -module express_route_circuit_authorizations { +module "express_route_circuit_authorizations" { source = "./modules/networking/express_route_circuit_authorization" for_each = local.networking.express_route_circuit_authorizations @@ -33,13 +33,13 @@ module express_route_circuit_authorizations { # Outputs -output express_route_circuits { +output "express_route_circuits" { value = module.express_route_circuits description = "Express Route Circuit output" } -output express_route_circuit_authorizations { +output "express_route_circuit_authorizations" { value = module.express_route_circuit_authorizations description = "Express Route Circuit Authorizations Keys output" diff --git a/networking_private_links.tf b/networking_private_links.tf index 5dd4ac2bd9..5038fcf381 100644 --- a/networking_private_links.tf +++ b/networking_private_links.tf @@ -1,4 +1,4 @@ -module private_endpoints { +module "private_endpoints" { source = "./modules/networking/private_links/endpoints" for_each = try(var.networking.private_endpoints, {}) diff --git a/networking_virtual_wan.tf b/networking_virtual_wan.tf index 1ff80370eb..fe8165dc02 100644 --- a/networking_virtual_wan.tf +++ b/networking_virtual_wan.tf @@ -4,7 +4,7 @@ # # -module virtual_wans { +module "virtual_wans" { source = "./modules/networking/virtual_wan" for_each = local.networking.virtual_wans @@ -36,7 +36,7 @@ resource "azurerm_virtual_hub_connection" "vhub_connection" { } # Outputs -output virtual_wans { +output "virtual_wans" { value = module.virtual_wans description = "Virtual WAN output" diff --git a/networking_vngw.tf b/networking_vngw.tf index 07ce80d017..d6b35e9c74 100644 --- a/networking_vngw.tf +++ b/networking_vngw.tf @@ -1,4 +1,4 @@ -module virtual_network_gateways { +module "virtual_network_gateways" { source = "./modules/networking/virtual_network_gateways" for_each = try(local.networking.virtual_network_gateways, {}) @@ -16,7 +16,7 @@ module virtual_network_gateways { ] } -module virtual_network_gateway_connections { +module "virtual_network_gateway_connections" { source = "./modules/networking/virtual_network_gateway_connections" for_each = try(local.networking.virtual_network_gateway_connections, {}) @@ -33,7 +33,7 @@ module virtual_network_gateway_connections { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -module local_network_gateways { +module "local_network_gateways" { source = "./modules/networking/local_network_gateways" for_each = try(local.networking.local_network_gateways, {}) resource_group_name = module.resource_groups[each.value.resource_group_key].name diff --git a/output.tf b/output.tf index 98a3983091..a1ba7138b3 100755 --- a/output.tf +++ b/output.tf @@ -1,5 +1,5 @@ -output client_config { +output "client_config" { value = { tenant_id = local.client_config.tenant_id subscription_id = local.client_config.subscription_id @@ -8,6 +8,6 @@ output client_config { } -output global_settings { +output "global_settings" { value = local.global_settings } \ No newline at end of file diff --git a/postgresql_servers.tf b/postgresql_servers.tf index 8419f806a7..432864b3cb 100644 --- a/postgresql_servers.tf +++ b/postgresql_servers.tf @@ -1,5 +1,5 @@ -output postgresql_servers { +output "postgresql_servers" { value = module.postgresql_servers } diff --git a/proximity_placement_groups.tf b/proximity_placement_groups.tf index 143f545400..23b81d6fb9 100644 --- a/proximity_placement_groups.tf +++ b/proximity_placement_groups.tf @@ -1,6 +1,6 @@ -module proximity_placement_groups { +module "proximity_placement_groups" { source = "./modules/compute/proximity_placement_group" for_each = local.compute.proximity_placement_groups @@ -13,7 +13,7 @@ module proximity_placement_groups { } -output proximity_placement_groups { +output "proximity_placement_groups" { value = module.proximity_placement_groups } diff --git a/recovery_vaults.tf b/recovery_vaults.tf index a7de39b988..d709f0588f 100644 --- a/recovery_vaults.tf +++ b/recovery_vaults.tf @@ -1,5 +1,5 @@ -module recovery_vaults { +module "recovery_vaults" { source = "./modules/recovery_vault" for_each = local.shared_services.recovery_vaults @@ -17,7 +17,7 @@ module recovery_vaults { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -output recovery_vaults { +output "recovery_vaults" { value = module.recovery_vaults } diff --git a/resource_groups.tf b/resource_groups.tf index c025b5cd54..b88c2da272 100755 --- a/resource_groups.tf +++ b/resource_groups.tf @@ -1,5 +1,5 @@ -module resource_groups { +module "resource_groups" { source = "./modules/resource_group" for_each = try(var.resource_groups, {}) @@ -9,7 +9,7 @@ module resource_groups { tags = var.tags } -output resource_groups { +output "resource_groups" { value = module.resource_groups } \ No newline at end of file diff --git a/roles.tf b/roles.tf index 40204fdee1..3336ae4392 100755 --- a/roles.tf +++ b/roles.tf @@ -1,4 +1,4 @@ -module custom_roles { +module "custom_roles" { source = "./modules/roles/custom_roles" for_each = var.custom_role_definitions diff --git a/shared_image_gallery.tf b/shared_image_gallery.tf index b62254bee3..9bec04c56a 100644 --- a/shared_image_gallery.tf +++ b/shared_image_gallery.tf @@ -1,4 +1,4 @@ -module shared_image_galleries { +module "shared_image_galleries" { source = "./modules/shared_image_gallery/image_galleries" for_each = try(local.shared_services.shared_image_galleries, {}) @@ -14,7 +14,7 @@ module shared_image_galleries { ] } -module image_definitions { +module "image_definitions" { source = "./modules/shared_image_gallery/image_definitions" for_each = try(local.shared_services.image_definitions, {}) @@ -29,7 +29,7 @@ module image_definitions { } -module packer_service_principal { +module "packer_service_principal" { source = "./modules/shared_image_gallery/packer_service_principal" for_each = try(local.shared_services.packer_service_principal, {}) diff --git a/storage_account_blobs.tf b/storage_account_blobs.tf index 48064a6ed6..15e577daef 100644 --- a/storage_account_blobs.tf +++ b/storage_account_blobs.tf @@ -21,7 +21,7 @@ module "storage_account_blobs" { settings = each.value } -output storage_account_blobs { +output "storage_account_blobs" { value = module.storage_account_blobs } diff --git a/storage_accounts.tf b/storage_accounts.tf index 07b01bb549..a528bd5f1d 100755 --- a/storage_accounts.tf +++ b/storage_accounts.tf @@ -16,7 +16,7 @@ module "storage_accounts" { private_dns = local.combined_objects_private_dns } -output storage_accounts { +output "storage_accounts" { value = module.storage_accounts } diff --git a/subscriptions.tf b/subscriptions.tf index f4b83ad2e0..c0ccccb617 100755 --- a/subscriptions.tf +++ b/subscriptions.tf @@ -5,22 +5,22 @@ module "subscriptions" { for_each = var.subscriptions - global_settings = local.global_settings - subscription_key = each.key - settings = each.value - client_config = local.client_config - diagnostics = local.combined_diagnostics + global_settings = local.global_settings + subscription_key = each.key + settings = each.value + client_config = local.client_config + diagnostics = local.combined_diagnostics } module "subscription_billing_role_assignments" { - source = "./modules/subscription_billing_role_assignment" - for_each = var.subscription_billing_role_assignments + source = "./modules/subscription_billing_role_assignment" + for_each = var.subscription_billing_role_assignments billing_role_definition_name = each.value.billing_role_definition_name client_config = local.client_config keyvaults = local.combined_objects_keyvaults settings = each.value - principals = { + principals = { azuread_users = local.combined_objects_azuread_users managed_identities = local.combined_objects_managed_identities } diff --git a/synapses.tf b/synapses.tf index 152613d281..0f0538dca6 100644 --- a/synapses.tf +++ b/synapses.tf @@ -1,4 +1,4 @@ -module synapse_workspaces { +module "synapse_workspaces" { source = "./modules/analytics/synapse" depends_on = [module.keyvault_access_policies, module.keyvault_access_policies_azuread_apps] for_each = local.database.synapse_workspaces @@ -12,7 +12,7 @@ module synapse_workspaces { base_tags = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {} } -output synapse_workspaces { +output "synapse_workspaces" { value = module.synapse_workspaces } diff --git a/variables.tf b/variables.tf index 19b064b8bb..aca3d0cfad 100755 --- a/variables.tf +++ b/variables.tf @@ -160,11 +160,11 @@ variable "webapp" { } } -variable data_factory { +variable "data_factory" { default = {} } -variable logic_app { +variable "logic_app" { default = {} } @@ -240,27 +240,27 @@ variable "shared_services" { } } -variable virtual_network_gateways { +variable "virtual_network_gateways" { default = {} } -variable virtual_network_gateway_connections { +variable "virtual_network_gateway_connections" { default = {} } -variable shared_image_galleries { +variable "shared_image_galleries" { default = {} } -variable image_definitions { +variable "image_definitions" { default = {} } -variable packer_service_principal { +variable "packer_service_principal" { default = {} } -variable packer_managed_identity { +variable "packer_managed_identity" { default = {} } @@ -271,29 +271,29 @@ variable "cosmos_dbs" { default = {} } -variable app_config { +variable "app_config" { default = {} } -variable local_network_gateways { +variable "local_network_gateways" { default = {} } -variable application_security_groups { +variable "application_security_groups" { default = {} } -variable event_hubs { +variable "event_hubs" { default = {} } -variable event_hub_auth_rules { +variable "event_hub_auth_rules" { default = {} } -variable event_hub_namespace_auth_rules { +variable "event_hub_namespace_auth_rules" { default = {} } -variable event_hub_consumer_groups { +variable "event_hub_consumer_groups" { default = {} } diff --git a/virtual_machines.tf b/virtual_machines.tf index d8e1ec3303..77f9d877b1 100644 --- a/virtual_machines.tf +++ b/virtual_machines.tf @@ -1,6 +1,6 @@ -module virtual_machines { +module "virtual_machines" { source = "./modules/compute/virtual_machine" depends_on = [ module.availability_sets, @@ -32,7 +32,7 @@ module virtual_machines { } -output virtual_machines { +output "virtual_machines" { value = module.virtual_machines }