File tree Expand file tree Collapse file tree 8 files changed +75
-91
lines changed
Expand file tree Collapse file tree 8 files changed +75
-91
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,6 @@ module "forms_admin" {
2525 analytics_enabled = var. forms_admin_settings . analytics_enabled
2626 act_as_user_enabled = var. forms_admin_settings . act_as_user_enabled
2727 welsh_enabled = var. forms_admin_settings . welsh_enabled
28- daily_submission_emails_enabled = var. forms_admin_settings . daily_submission_emails_enabled
2928 org_admin_alerts_enabled = var. forms_admin_settings . org_admin_alerts_enabled
3029 enable_mailchimp_sync = var. forms_admin_settings . synchronize_to_mailchimp
3130 enable_organisations_sync = var. forms_admin_settings . synchronize_orgs_from_govuk
Original file line number Diff line number Diff line change @@ -129,22 +129,21 @@ EOF
129129variable "forms_admin_settings" {
130130 description = " Forms Admin configuration values"
131131 type = object ({
132- cpu = number
133- memory = number
134- min_capacity = number
135- max_capacity = number
136- enable_maintenance_mode = bool
137- auth_provider = string
138- previous_auth_provider = string
139- cloudwatch_metrics_enabled = bool
140- analytics_enabled = bool
141- act_as_user_enabled = bool
142- welsh_enabled = bool
143- daily_submission_emails_enabled = bool
144- org_admin_alerts_enabled = bool
145- govuk_app_domain = string
146- synchronize_to_mailchimp = bool
147- synchronize_orgs_from_govuk = bool
132+ cpu = number
133+ memory = number
134+ min_capacity = number
135+ max_capacity = number
136+ enable_maintenance_mode = bool
137+ auth_provider = string
138+ previous_auth_provider = string
139+ cloudwatch_metrics_enabled = bool
140+ analytics_enabled = bool
141+ act_as_user_enabled = bool
142+ welsh_enabled = bool
143+ org_admin_alerts_enabled = bool
144+ govuk_app_domain = string
145+ synchronize_to_mailchimp = bool
146+ synchronize_orgs_from_govuk = bool
148147 })
149148 nullable = false
150149}
Original file line number Diff line number Diff line change @@ -68,22 +68,21 @@ container_registry = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
6868dlq_arn = " arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
6969send_logs_to_cyber = true
7070forms_admin_settings = {
71- cpu = 256
72- memory = 512
73- min_capacity = 3
74- max_capacity = 3
75- enable_maintenance_mode = false
76- auth_provider = " auth0"
77- previous_auth_provider = null
78- cloudwatch_metrics_enabled = true
79- analytics_enabled = true
80- act_as_user_enabled = true
81- welsh_enabled = true
82- daily_submission_emails_enabled = true
83- org_admin_alerts_enabled = true
84- govuk_app_domain = " integration.publishing.service.gov.uk"
85- synchronize_to_mailchimp = false
86- synchronize_orgs_from_govuk = false
71+ cpu = 256
72+ memory = 512
73+ min_capacity = 3
74+ max_capacity = 3
75+ enable_maintenance_mode = false
76+ auth_provider = " auth0"
77+ previous_auth_provider = null
78+ cloudwatch_metrics_enabled = true
79+ analytics_enabled = true
80+ act_as_user_enabled = true
81+ welsh_enabled = true
82+ org_admin_alerts_enabled = true
83+ govuk_app_domain = " integration.publishing.service.gov.uk"
84+ synchronize_to_mailchimp = false
85+ synchronize_orgs_from_govuk = false
8786}
8887forms_product_page_settings = {
8988 cpu = 256
Original file line number Diff line number Diff line change @@ -124,22 +124,21 @@ container_registry = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
124124dlq_arn = " arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
125125send_logs_to_cyber = true
126126forms_admin_settings = {
127- cpu = 512
128- memory = 1024
129- min_capacity = 6
130- max_capacity = 36
131- enable_maintenance_mode = false
132- auth_provider = " auth0"
133- previous_auth_provider = null
134- cloudwatch_metrics_enabled = true
135- analytics_enabled = true
136- act_as_user_enabled = false
137- welsh_enabled = true
138- daily_submission_emails_enabled = true
139- org_admin_alerts_enabled = false
140- govuk_app_domain = " publishing.service.gov.uk"
141- synchronize_to_mailchimp = true
142- synchronize_orgs_from_govuk = true
127+ cpu = 512
128+ memory = 1024
129+ min_capacity = 6
130+ max_capacity = 36
131+ enable_maintenance_mode = false
132+ auth_provider = " auth0"
133+ previous_auth_provider = null
134+ cloudwatch_metrics_enabled = true
135+ analytics_enabled = true
136+ act_as_user_enabled = false
137+ welsh_enabled = true
138+ org_admin_alerts_enabled = false
139+ govuk_app_domain = " publishing.service.gov.uk"
140+ synchronize_to_mailchimp = true
141+ synchronize_orgs_from_govuk = true
143142}
144143forms_product_page_settings = {
145144 cpu = 256
Original file line number Diff line number Diff line change @@ -33,22 +33,21 @@ container_registry = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
3333dlq_arn = " arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
3434send_logs_to_cyber = true
3535forms_admin_settings = {
36- cpu = 256
37- memory = 512
38- min_capacity = 3
39- max_capacity = 3
40- enable_maintenance_mode = false
41- auth_provider = " auth0"
42- previous_auth_provider = null
43- cloudwatch_metrics_enabled = true
44- analytics_enabled = true
45- act_as_user_enabled = true
46- welsh_enabled = true
47- daily_submission_emails_enabled = true
48- org_admin_alerts_enabled = false
49- govuk_app_domain = " staging.publishing.service.gov.uk"
50- synchronize_to_mailchimp = false
51- synchronize_orgs_from_govuk = false
36+ cpu = 256
37+ memory = 512
38+ min_capacity = 3
39+ max_capacity = 3
40+ enable_maintenance_mode = false
41+ auth_provider = " auth0"
42+ previous_auth_provider = null
43+ cloudwatch_metrics_enabled = true
44+ analytics_enabled = true
45+ act_as_user_enabled = true
46+ welsh_enabled = true
47+ org_admin_alerts_enabled = false
48+ govuk_app_domain = " staging.publishing.service.gov.uk"
49+ synchronize_to_mailchimp = false
50+ synchronize_orgs_from_govuk = false
5251}
5352forms_product_page_settings = {
5453 cpu = 256
Original file line number Diff line number Diff line change @@ -31,22 +31,21 @@ container_registry = "711966560482.dkr.ecr.eu-west-2.amazonaws.com"
3131dlq_arn = " arn:aws:sqs:eu-west-2:711966560482:eventbridge-dead-letter-queue"
3232send_logs_to_cyber = true
3333forms_admin_settings = {
34- cpu = 256
35- memory = 512
36- min_capacity = 0
37- max_capacity = 0
38- enable_maintenance_mode = false
39- auth_provider = " user_research"
40- previous_auth_provider = null
41- cloudwatch_metrics_enabled = false
42- analytics_enabled = false
43- act_as_user_enabled = false
44- welsh_enabled = true
45- daily_submission_emails_enabled = true
46- org_admin_alerts_enabled = false
47- govuk_app_domain = " "
48- synchronize_to_mailchimp = false
49- synchronize_orgs_from_govuk = false
34+ cpu = 256
35+ memory = 512
36+ min_capacity = 0
37+ max_capacity = 0
38+ enable_maintenance_mode = false
39+ auth_provider = " user_research"
40+ previous_auth_provider = null
41+ cloudwatch_metrics_enabled = false
42+ analytics_enabled = false
43+ act_as_user_enabled = false
44+ welsh_enabled = true
45+ org_admin_alerts_enabled = false
46+ govuk_app_domain = " "
47+ synchronize_to_mailchimp = false
48+ synchronize_orgs_from_govuk = false
5049}
5150forms_product_page_settings = {
5251 cpu = 256
Original file line number Diff line number Diff line change @@ -160,10 +160,6 @@ module "ecs_service" {
160160 name = " SETTINGS__FEATURES__WELSH" ,
161161 value = var.welsh_enabled
162162 },
163- {
164- name = " SETTINGS__FEATURES__DAILY_SUBMISSION_EMAILS_ENABLED" ,
165- value = var.daily_submission_emails_enabled
166- },
167163 {
168164 name = " SETTINGS__FEATURES__ORG_ADMIN_ALERTS_ENABLED" ,
169165 value = var.org_admin_alerts_enabled
Original file line number Diff line number Diff line change @@ -96,12 +96,6 @@ variable "welsh_enabled" {
9696 default = false
9797}
9898
99- variable "daily_submission_emails_enabled" {
100- type = bool
101- description = " Enables the ability to configure sending daily emails with a CSV of all submissions for the previous day"
102- default = false
103- }
104-
10599variable "org_admin_alerts_enabled" {
106100 type = bool
107101 description = " Enables sending alerts to Org Admins about forms they control"
You can’t perform that action at this time.
0 commit comments