Skip to content

Commit

Permalink
FMT
Browse files Browse the repository at this point in the history
  • Loading branch information
@arnaudlh
arnaudlh committed Jun 3, 2024
1 parent 1083b00 commit 26d0554
Show file tree
Hide file tree
Showing 16 changed files with 92 additions and 92 deletions.
40 changes: 20 additions & 20 deletions examples/apim/118-api_management_platform_stv2/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ vnets = {
region = "region1"
vnet = {
name = "example-uks" # prefix-vnet-example-uks
address_space = ["10.0.0.0/16"]
address_space = ["10.0.0.0/16"]
}
subnets = {

# Example subnet for APIM private endpoint

snet_example_apim_uks = {
name = "example-apim-uks" #prefix-snet-example-apim-uks
cidr = ["10.0.1.0/24"]
nsg_key = "nsg_example_apim_uks"
# route_table_key = ""
name = "example-apim-uks" #prefix-snet-example-apim-uks
cidr = ["10.0.1.0/24"]
nsg_key = "nsg_example_apim_uks"
# route_table_key = ""
service_endpoints = ["Microsoft.KeyVault", "Microsoft.Storage", "Microsoft.Sql", "Microsoft.EventHub", "Microsoft.ServiceBus"] # service endpoints required for APIM
}
}
}
}
}

Expand Down Expand Up @@ -142,31 +142,31 @@ public_ip_addresses = {

api_management = {
apim_uks = {
name = "example-uks" # prefix-apim-example-uks
resource_group_key = "rg_example_apim_uks"
publisher_name = "apim.example.sre.com"
publisher_email = "[email protected]"
sku_name = "Developer_1" # https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management#sku_name
region = "region1"
name = "example-uks" # prefix-apim-example-uks
resource_group_key = "rg_example_apim_uks"
publisher_name = "apim.example.sre.com"
publisher_email = "[email protected]"
sku_name = "Developer_1" # https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management#sku_name
region = "region1"

# Required to deploy APIM on platform verions stv2.*
public_ip_address = {
key = "pip_apim_uks"
# lz_key = ""
}
public_ip_address = {
key = "pip_apim_uks"
# lz_key = ""
}

virtual_network_type = "Internal" # The type of virtual network you want to use, valid values include: None, External, Internal. Defaults to None.
virtual_network_configuration = {
vnet_key = "vnet_example_uks"
subnet_key = "snet_example_apim_uks"
# lz_key = ""
# lz_key = ""
}

identity = {
type = "UserAssigned"
managed_identity_keys = ["msi_apim_uks"]
}

portal = {
host_name = "example.apim.com"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/compute/kubernetes_services/108-single-cluster-remote-adgroup-admin/aks.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ aks_clusters = {

addon_profile = {
oms_agent = {
log_analytics_key = "central_logs_region1"
log_analytics_key = "central_logs_region1"
msi_auth_for_monitoring_enabled = true
}
}
Expand Down
12 changes: 6 additions & 6 deletions examples/compute/virtual_machine/113-single-linux-custom-data-template/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,23 @@ virtual_machines = {
disable_password_authentication = true

custom_data = {
templatefile = "compute/virtual_machine/113-single-linux-custom-data-template/custom_data.tpl"
my_value = "my_value"
templatefile = "compute/virtual_machine/113-single-linux-custom-data-template/custom_data.tpl"
my_value = "my_value"
}
dynamic_custom_data = {
vnets = {
vnet_region1 ={}
vnet_region1 = {}
}
storage_accounts = {
sa1 = {
file_share = "share1"
file_share_directory = "dir1"
file_share = "share1"
file_share_directory = "dir1"
}
}
keyvault_keys = {
key1 = {
keyvault_key = "example_vm_rg1"
name = "disk-key"
name = "disk-key"
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions examples/databricks_access_connectors/100-databricks_access_connectors/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ resource_groups = {

databricks_access_connectors = {
dac_1 = {
name = "example-name"
resource_group_key = "dac_test"
identity = {
type = "UserAssigned" #SystemAssigned
managed_identity_keys = ["dac_test"]
name = "example-name"
resource_group_key = "dac_test"
identity = {
type = "UserAssigned" #SystemAssigned
managed_identity_keys = ["dac_test"]
}
tags = {
test = "test"
test1 = "test1"
}
tags = {
test = "test"
test1 = "test1"
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...ce_configuration/200-maintenance-configuration-assignment-vm-windows/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ virtual_machines = {
priority = "Spot"
eviction_policy = "Deallocate"

patch_mode = "AutomaticByPlatform"
patch_mode = "AutomaticByPlatform"
bypass_platform_safety_checks_on_user_schedule_enabled = true
# When you want to load the file from the folder in the custom_data always use the relative path from the caf_solution in landing zones
custom_data = "../../examples/compute/virtual_machine/101-single-windows-vm/scripts/custom.ps1"
Expand Down
20 changes: 10 additions & 10 deletions ...ance_configuration/201-maintenance-configuration-assignment-vm-linux/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ global_settings = {
}

inherit_tags = true

resource_defaults = {
virtual_machines = {
# set the below to enable az managed boot diagostics for vms
Expand Down Expand Up @@ -70,17 +70,17 @@ virtual_machines = {
# Spot VM to save money
priority = "Spot"
eviction_policy = "Deallocate"
patch_mode = "AutomaticByPlatform"

patch_mode = "AutomaticByPlatform"
bypass_platform_safety_checks_on_user_schedule_enabled = true

# Value of the nic keys to attach the VM. The first one in the list is the default nic
network_interface_keys = ["nic0"]

os_disk = {
name = "example_vm1-os"
caching = "ReadWrite"
storage_account_type = "Standard_LRS"
name = "example_vm1-os"
caching = "ReadWrite"
storage_account_type = "Standard_LRS"
}
identity = {
type = "SystemAssigned" #SystemAssigned OR UserAssigned OR SystemAssigned, UserAssigned
Expand All @@ -105,10 +105,10 @@ virtual_machines = {
name = "server1-data1"
storage_account_type = "Standard_LRS"
# Only Empty is supported. More community contributions required to cover other scenarios
create_option = "Empty"
disk_size_gb = "10"
lun = 1
zones = ["1"]
create_option = "Empty"
disk_size_gb = "10"
lun = 1
zones = ["1"]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/mssql_mi/200-mi/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ vnets = {
resource_group_key = "networking_region1"
vnet = {
name = "sqlmi-rg1"
address_space = ["172.25.88.0/21","10.2.0.0/24"]
address_space = ["172.25.88.0/21", "10.2.0.0/24"]
}
subnets = {
sqlmi1 = {
Expand Down
2 changes: 1 addition & 1 deletion examples/mssql_mi/200-mi/nsg.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ network_security_group_definition = {
]
}
subnet02 = {
nsg= []
nsg = []
}
}
22 changes: 11 additions & 11 deletions ...etworking/private_links/endpoints/100-azure-open-ai-private-endpoint/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ cognitive_services_account = {
resource_group = {
key = "rg1"
}
name = "pineconellmdemoopenai1"
kind = "OpenAI"
sku_name = "S0"
name = "pineconellmdemoopenai1"
kind = "OpenAI"
sku_name = "S0"
custom_subdomain_name = "cs-alz-caf-test-b"
#log_analytics_key = "la1"
}
Expand All @@ -34,9 +34,9 @@ vnets = {
specialsubnets = {}
subnets = {
private_endpoints_subnet = {
name = "PrivateEndpoints"
cidr = ["10.0.16.0/24"]
enforce_private_endpoint_network_policies = true
name = "PrivateEndpoints"
cidr = ["10.0.16.0/24"]
enforce_private_endpoint_network_policies = true
enforce_private_link_endpoint_network_policies = false
}
}
Expand All @@ -58,12 +58,12 @@ private_dns = {

private_endpoints = {
vnet1 = {
vnet_key = "vnet1"
subnet_keys = ["private_endpoints_subnet"]
vnet_key = "vnet1"
subnet_keys = ["private_endpoints_subnet"]
resource_group_key = "rg1"
cognitive_services_account = {
my_account = {
private_service_connection = {
cognitive_services_account = {
my_account = {
private_service_connection = {
name = "CognitiveServicesPrivateEndpoint"
}
private_dns = {
Expand Down
30 changes: 15 additions & 15 deletions examples/recovery_vault/106-backupvault-with-sqldatabase-saphana/recovery_vaults.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ recovery_vaults = {
backup_policies = {
vm_workloads = {
sql = {
name = "SQLTest"
workload_type = "SQLDataBase"
vault_key = "asr1"
rg_key = "primary"
timezone = "UTC"
name = "SQLTest"
workload_type = "SQLDataBase"
vault_key = "asr1"
rg_key = "primary"
timezone = "UTC"
compression_enabled = false
protection_policies = {
sqlfull = {
Expand All @@ -23,8 +23,8 @@ recovery_vaults = {
frequency = "Daily"
time = "15:00"
}
retention_daily = {
count = 8
retention_daily = {
count = 8
}
}
sqllog = {
Expand All @@ -39,11 +39,11 @@ recovery_vaults = {
}
}
saphana = {
name = "SAPHANATest"
workload_type = "SAPHanaDatabase"
vault_key = "asr1"
rg_key = "primary"
timezone = "UTC"
name = "SAPHANATest"
workload_type = "SAPHanaDatabase"
vault_key = "asr1"
rg_key = "primary"
timezone = "UTC"
compression_enabled = false
protection_policies = {
saphanafull = {
Expand All @@ -52,8 +52,8 @@ recovery_vaults = {
frequency = "Daily"
time = "15:00"
}
retention_daily = {
count = 8
retention_daily = {
count = 8
}
}
saphanalog = {
Expand All @@ -65,7 +65,7 @@ recovery_vaults = {
count = 8
}
}
}
}
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions examples/role_mapping/102-azure-openai-managed-identity/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ cognitive_services_account = {
resource_group = {
key = "rg1"
}
name = "pinecone-llm-demoopenai"
kind = "OpenAI"
sku_name = "S0"
name = "pinecone-llm-demoopenai"
kind = "OpenAI"
sku_name = "S0"
custom_subdomain_name = "cs-alz-caf-llm-demoopenai"
}
}

managed_identities = {
workload-msi = {
name = "example-msi-openai-rolemap-msi"
name = "example-msi-openai-rolemap-msi"
resource_group_key = "rg1"
}
}
Expand Down
4 changes: 2 additions & 2 deletions examples/search_service/100-search-service-both-apikeys-and-azuread/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ vnets = {
}
subnets = {
default = {
name = "default"
cidr = ["10.5.1.0/24"]
name = "default"
cidr = ["10.5.1.0/24"]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/search_service/102-search-service-only-azuread/configuration.tfvars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ search_services = {
identity = {
type = "SystemAssigned"
}
local_authentication_enabled = false
local_authentication_enabled = false
# public_network_access_enabled = true
# allowed_ips = ["13.478.57.73"]
}
Expand Down
2 changes: 1 addition & 1 deletion examples/tests/mock/e2e_plan.tftest.hcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mock_provider "azurerm" {
}

mock_provider "azurerm" {
alias = "vhub"
alias = "vhub"
source = "./tests/mock_data"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@ variable "maintenance_assignment_virtual_machine" {
default = {}
}
variable "search_services" {
default = {}
default = {}
}
variable "load_test" {
default = {}
Expand Down
Loading

0 comments on commit 26d0554

Please sign in to comment.