Skip to content

Commit 8cfa1a6

Browse files
authored
feat: Switch app service (#2659)
* cleanup shared pdf engine * cleanup app service pdf
1 parent 5d47ab5 commit 8cfa1a6

File tree

13 files changed

+25
-1019
lines changed

13 files changed

+25
-1019
lines changed

src/domains/printit-app/01_app_service_pdf_engine_clone.tf

Lines changed: 0 additions & 480 deletions
This file was deleted.

src/domains/printit-app/04_apim_pdf_engine.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ locals {
3131
description = "PDF Engine Service for Stampa Avvisi - API"
3232
path = "printit/pdf-engine"
3333
subscription_required = true
34-
service_url = var.is_feature_enabled.apim_use_pdf_engine_clone ? (can(module.printit_pdf_engine_app_service_java_clone[0].default_site_hostname) ? module.printit_pdf_engine_app_service_java_clone[0].default_site_hostname : "") : (can(module.printit_pdf_engine_app_service_java[0].default_site_hostname) ? module.printit_pdf_engine_app_service_java[0].default_site_hostname : "")
34+
service_url = can(module.printit_pdf_engine_app_service_java[0].default_site_hostname) ? module.printit_pdf_engine_app_service_java[0].default_site_hostname : ""
3535
}
3636
apim_pdf_engine_node_service_api = {
3737
# node
3838
display_name = "PDF Engine Node Service for Stampa Avvisi - API"
3939
description = "PDF Engine Node Service for Stampa Avvisi - API"
4040
path = "printit/pdf-engine-node"
4141
subscription_required = true
42-
service_url = var.is_feature_enabled.apim_use_pdf_engine_clone ? (can(module.printit_pdf_engine_app_service_clone[0].default_site_hostname) ? module.printit_pdf_engine_app_service_clone[0].default_site_hostname : "") : (can(module.printit_pdf_engine_app_service[0].default_site_hostname) ? module.printit_pdf_engine_app_service[0].default_site_hostname : "")
42+
service_url = can(module.printit_pdf_engine_app_service[0].default_site_hostname) ? module.printit_pdf_engine_app_service[0].default_site_hostname : ""
4343
}
4444
}
4545

src/domains/printit-app/99_variables.tf

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,12 @@ variable "tags" {
7171

7272
variable "is_feature_enabled" {
7373
type = object({
74-
pdf_engine = bool
75-
printit = bool
76-
apim_use_pdf_engine_clone = optional(bool, false)
77-
pdf_engine_clone = optional(bool, false)
74+
pdf_engine = bool
75+
printit = bool
7876
})
7977
default = {
80-
pdf_engine = false
81-
printit = false
82-
apim_use_pdf_engine_clone = false
83-
pdf_engine_clone = false
78+
pdf_engine = false
79+
printit = false
8480
}
8581
}
8682
### External resources

src/domains/printit-app/README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,9 @@ No outputs.
145145
| <a name="module_kubernetes_service_account"></a> [kubernetes\_service\_account](#module\_kubernetes\_service\_account) | ./.terraform/modules/__v3__/kubernetes_service_account | n/a |
146146
| <a name="module_pod_identity"></a> [pod\_identity](#module\_pod\_identity) | ./.terraform/modules/__v3__/kubernetes_pod_identity | n/a |
147147
| <a name="module_printit_pdf_engine_app_service"></a> [printit\_pdf\_engine\_app\_service](#module\_printit\_pdf\_engine\_app\_service) | ./.terraform/modules/__v3__/app_service | n/a |
148-
| <a name="module_printit_pdf_engine_app_service_clone"></a> [printit\_pdf\_engine\_app\_service\_clone](#module\_printit\_pdf\_engine\_app\_service\_clone) | ./.terraform/modules/__v3__/app_service | n/a |
149148
| <a name="module_printit_pdf_engine_app_service_java"></a> [printit\_pdf\_engine\_app\_service\_java](#module\_printit\_pdf\_engine\_app\_service\_java) | ./.terraform/modules/__v3__/app_service | n/a |
150-
| <a name="module_printit_pdf_engine_app_service_java_clone"></a> [printit\_pdf\_engine\_app\_service\_java\_clone](#module\_printit\_pdf\_engine\_app\_service\_java\_clone) | ./.terraform/modules/__v3__/app_service | n/a |
151149
| <a name="module_printit_pdf_engine_java_slot_staging"></a> [printit\_pdf\_engine\_java\_slot\_staging](#module\_printit\_pdf\_engine\_java\_slot\_staging) | ./.terraform/modules/__v3__/app_service_slot | n/a |
152-
| <a name="module_printit_pdf_engine_java_slot_staging_clone"></a> [printit\_pdf\_engine\_java\_slot\_staging\_clone](#module\_printit\_pdf\_engine\_java\_slot\_staging\_clone) | ./.terraform/modules/__v3__/app_service_slot | n/a |
153150
| <a name="module_printit_pdf_engine_slot_staging"></a> [printit\_pdf\_engine\_slot\_staging](#module\_printit\_pdf\_engine\_slot\_staging) | ./.terraform/modules/__v3__/app_service_slot | n/a |
154-
| <a name="module_printit_pdf_engine_slot_staging_clone"></a> [printit\_pdf\_engine\_slot\_staging\_clone](#module\_printit\_pdf\_engine\_slot\_staging\_clone) | ./.terraform/modules/__v3__/app_service_slot | n/a |
155151
| <a name="module_tls_checker"></a> [tls\_checker](#module\_tls\_checker) | ./.terraform/modules/__v3__/tls_checker | n/a |
156152

157153
## Resources
@@ -190,9 +186,7 @@ No outputs.
190186
| [azurerm_key_vault_secret.templates_storage_account_pkey](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
191187
| [azurerm_key_vault_secret.tenant_id](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource |
192188
| [azurerm_monitor_autoscale_setting.autoscale_app_service_printit_pdf_engine_autoscale](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_autoscale_setting) | resource |
193-
| [azurerm_monitor_autoscale_setting.autoscale_app_service_printit_pdf_engine_autoscale_clone](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_autoscale_setting) | resource |
194189
| [azurerm_monitor_autoscale_setting.autoscale_app_service_printit_pdf_engine_java_autoscale](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_autoscale_setting) | resource |
195-
| [azurerm_monitor_autoscale_setting.autoscale_app_service_printit_pdf_engine_java_autoscale_clone](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_autoscale_setting) | resource |
196190
| [azurerm_monitor_scheduled_query_rules_alert.generate-pdf-engine-generate-responsetime](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource |
197191
| [azurerm_monitor_scheduled_query_rules_alert.pagopa-pdf-engine-pdf-availability](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource |
198192
| [azurerm_monitor_scheduled_query_rules_alert.pagopa-print-payment-notice-generator-responsetime-upd](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource |
@@ -206,7 +200,6 @@ No outputs.
206200
| [azurerm_monitor_scheduled_query_rules_alert.print-notice-retry-fn-error-alert](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource |
207201
| [azurerm_private_dns_a_record.ingress](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/private_dns_a_record) | resource |
208202
| [azurerm_resource_group.printit_pdf_engine_app_service_rg](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group) | resource |
209-
| [azurerm_resource_group.printit_pdf_engine_app_service_rg_clone](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group) | resource |
210203
| [helm_release.cert_mounter](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
211204
| [helm_release.reloader](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
212205
| [kubernetes_namespace.namespace](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
@@ -262,7 +255,7 @@ No outputs.
262255
| <a name="input_ingress_load_balancer_ip"></a> [ingress\_load\_balancer\_ip](#input\_ingress\_load\_balancer\_ip) | ## Aks | `string` | n/a | yes |
263256
| <a name="input_instance"></a> [instance](#input\_instance) | One of beta, prod01, prod02 | `string` | n/a | yes |
264257
| <a name="input_io_backend_base_path"></a> [io\_backend\_base\_path](#input\_io\_backend\_base\_path) | io backend api base path | `string` | `null` | no |
265-
| <a name="input_is_feature_enabled"></a> [is\_feature\_enabled](#input\_is\_feature\_enabled) | n/a | <pre>object({<br/> pdf_engine = bool<br/> printit = bool<br/> apim_use_pdf_engine_clone = optional(bool, false)<br/> pdf_engine_clone = optional(bool, false)<br/> })</pre> | <pre>{<br/> "apim_use_pdf_engine_clone": false,<br/> "pdf_engine": false,<br/> "pdf_engine_clone": false,<br/> "printit": false<br/>}</pre> | no |
258+
| <a name="input_is_feature_enabled"></a> [is\_feature\_enabled](#input\_is\_feature\_enabled) | n/a | <pre>object({<br/> pdf_engine = bool<br/> printit = bool<br/> })</pre> | <pre>{<br/> "pdf_engine": false,<br/> "printit": false<br/>}</pre> | no |
266259
| <a name="input_k8s_kube_config_path_prefix"></a> [k8s\_kube\_config\_path\_prefix](#input\_k8s\_kube\_config\_path\_prefix) | n/a | `string` | `"~/.kube"` | no |
267260
| <a name="input_location"></a> [location](#input\_location) | One of westeurope, northeurope | `string` | n/a | yes |
268261
| <a name="input_location_short"></a> [location\_short](#input\_location\_short) | One of wue, neu | `string` | n/a | yes |

src/domains/printit-app/env/itn-prod/terraform.tfvars

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,17 @@ ingress_load_balancer_ip = "10.3.2.250"
3737

3838
# pdf-engine
3939
is_feature_enabled = {
40-
pdf_engine = true
41-
pdf_engine_clone = true
42-
printit = true
43-
apim_use_pdf_engine_clone = false
40+
pdf_engine = true
41+
printit = true
4442
}
4543

4644
app_service_pdf_engine_sku_name = "P2v3"
4745
app_service_pdf_engine_autoscale_enabled = true
4846
app_service_pdf_engine_always_on = true
49-
app_service_pdf_engine_zone_balancing_enabled = true
47+
app_service_pdf_engine_zone_balancing_enabled = false
5048
app_service_pdf_engine_sku_name_java = "P1v3"
51-
app_service_pdf_engine_sku_name_java_zone_balancing_enabled = true
52-
49+
app_service_pdf_engine_sku_name_java_zone_balancing_enabled = false
50+
app_service_ip_restriction_default_action = "Deny"
5351
pod_disruption_budgets = {
5452
"print-payment-notice-functions" = {
5553
minAvailable = 2

0 commit comments

Comments
 (0)