Skip to content

Commit e92ebcf

Browse files
authored
Merge pull request #3 from data-platform-hq/fix-param
fix: configure application_stack
2 parents 50259f6 + 0adb309 commit e92ebcf

File tree

3 files changed

+34
-7
lines changed

3 files changed

+34
-7
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ No modules.
3434
| Name | Description | Type | Default | Required |
3535
|------|-------------|------|---------|:--------:|
3636
| <a name="input_app_settings"></a> [app\_settings](#input\_app\_settings) | Application setting | `map(string)` | `{}` | no |
37+
| <a name="input_application_stack"></a> [application\_stack](#input\_application\_stack) | Application stack configuration, run `az webapp list-runtimes --os-type linux` to get the list of supported stacks | `map(string)` | <pre>{<br> "java_server": "JAVA",<br> "java_server_version": 11,<br> "java_version": "java11"<br>}</pre> | no |
3738
| <a name="input_application_type"></a> [application\_type](#input\_application\_type) | Application type (java, python, etc) | `string` | `"java"` | no |
3839
| <a name="input_env"></a> [env](#input\_env) | Environment | `string` | n/a | yes |
3940
| <a name="input_ip_restriction"></a> [ip\_restriction](#input\_ip\_restriction) | Firewall settings for the function app | <pre>list(object({<br> name = string<br> ip_address = string<br> service_tag = string<br> virtual_network_subnet_id = string<br> priority = string<br> action = string<br> headers = list(object({<br> x_azure_fdid = list(string)<br> x_fd_health_probe = list(string)<br> x_forwarded_for = list(string)<br> x_forwarded_host = list(string)<br> }))<br> }))</pre> | <pre>[<br> {<br> "action": "Allow",<br> "headers": null,<br> "ip_address": null,<br> "name": "allow_azure",<br> "priority": "100",<br> "service_tag": "AzureCloud",<br> "virtual_network_subnet_id": null<br> }<br>]</pre> | no |

main.tf

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,19 @@ locals {
1616
AZURE_LOG_LEVEL = "info"
1717
APPINSIGHTS_INSTRUMENTATIONKEY = azurerm_application_insights.this.instrumentation_key
1818
}
19+
application_stack_struct = {
20+
docker_image = null
21+
docker_image_tag = null
22+
dotnet_version = null
23+
java_server = null
24+
java_server_version = null
25+
java_version = null
26+
php_version = null
27+
python_version = null
28+
node_version = null
29+
ruby_version = null
30+
}
31+
application_stack = merge(local.application_stack_struct, var.application_stack)
1932
}
2033

2134
resource "azurerm_linux_web_app" "this" {
@@ -41,7 +54,16 @@ resource "azurerm_linux_web_app" "this" {
4154
ip_restriction = var.ip_restriction
4255
scm_ip_restriction = var.ip_restriction
4356
application_stack {
44-
java_version = var.java_version
57+
docker_image = local.application_stack["docker_image"]
58+
docker_image_tag = local.application_stack["docker_image_tag"]
59+
dotnet_version = local.application_stack["dotnet_version"]
60+
java_server = local.application_stack["java_server"]
61+
java_server_version = local.application_stack["java_server_version"]
62+
java_version = local.application_stack["java_version"]
63+
php_version = local.application_stack["php_version"]
64+
python_version = local.application_stack["python_version"]
65+
node_version = local.application_stack["node_version"]
66+
ruby_version = local.application_stack["ruby_version"]
4567
}
4668
}
4769
}

variables.tf

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ variable "application_type" {
4040
default = "java"
4141
}
4242

43-
variable "java_version" {
44-
type = string
45-
description = "Java version"
46-
default = "8"
47-
}
48-
4943
variable "ip_restriction" {
5044
description = "Firewall settings for the function app"
5145
type = list(object({
@@ -92,3 +86,13 @@ variable "use_private_net" {
9286
description = "Use private network injection"
9387
default = false
9488
}
89+
90+
variable "application_stack" {
91+
type = map(string)
92+
default = {
93+
java_server = "JAVA"
94+
java_server_version = 11
95+
java_version = "java11"
96+
}
97+
description = "Application stack configuration, run `az webapp list-runtimes --os-type linux` to get the list of supported stacks"
98+
}

0 commit comments

Comments
 (0)