Skip to content

Commit fc55b92

Browse files
committed
fix(m365): update example directory to have all defined variables
update order in main.tf to match variables.tf file
1 parent aec7ad1 commit fc55b92

2 files changed

Lines changed: 23 additions & 10 deletions

File tree

m365/terraform/env/example/main.tf

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
module "scuba_connect" {
22
source = "../.."
3-
app_name = var.app_name
4-
app_multi_tenant = var.app_multi_tenant
5-
image_path = var.image_path
63
contact_emails = var.contact_emails
74
resource_group_name = var.resource_group_name
8-
serial_number = var.serial_number
95
location = var.location
106
schedule_interval = var.schedule_interval
11-
tenants_dir_path = var.tenants_dir_path
7+
app_name = var.app_name
8+
app_multi_tenant = var.app_multi_tenant
129
vnet = var.vnet
13-
container_image = var.container_image
14-
container_registry = var.container_registry
10+
firewall = var.firewall
11+
tags = var.tags
12+
serial_number = var.serial_number
13+
image_path = var.image_path
14+
output_all_files = var.output_all_files
15+
create_app = var.create_app
16+
prefix_override = var.prefix_override
1517
input_storage_container_url = var.input_storage_container_url
1618
output_storage_container_url = var.output_storage_container_url
17-
output_all_files = var.output_all_files
18-
tags = var.tags
19+
output_storage_container_sas = var.output_storage_container_sas
20+
tenants_dir_path = var.tenants_dir_path
21+
container_registry = var.container_registry
22+
container_image = var.container_image
23+
container_memory_gb = var.container_memory_gb
1924
secondary_app_info = var.secondary_app_info
2025
}

m365/terraform/env/example/variables.tf

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@ variable "input_storage_container_url" {
108108
variable "output_storage_container_url" {
109109
default = null
110110
type = string
111-
description = "If not null, output container to put results in (must give permissions to service account). Otherwise by default will create storage container. Expect an https url pointing to a container"
111+
description = "If not null, output container to put results in (must give permissions to service account or use SAS). Otherwise by default will create storage container. Expect an https url pointing to a container"
112+
}
113+
114+
variable "output_storage_container_sas" {
115+
default = null
116+
type = string
117+
description = "If not null, shared access signature token (query string) to use when writing results to the output storage container. Set this when the container is in an external tenant (the owner of that container will provide the value)."
118+
sensitive = true
112119
}
113120

114121
variable "tenants_dir_path" {
@@ -142,6 +149,7 @@ variable "container_memory_gb" {
142149
error_message = "Container memory must be between 2GB and 16GB"
143150
}
144151
}
152+
145153
variable "secondary_app_info" {
146154
description = <<EOF
147155
Information for a secondary app. This can be used for one ScubaConnect instance to handle multiple environments (e.g., GCC and GCC High).

0 commit comments

Comments
 (0)