Skip to content

Commit

Permalink
Merge pull request #229 from silinternational/develop
Browse files Browse the repository at this point in the history
Release 11.3.0 -- add Sentry DSN
  • Loading branch information
briskt authored Oct 13, 2023
2 parents 7d68d15 + 20d2c4a commit 7fe4913
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 0 deletions.
1 change: 1 addition & 0 deletions terraform/040-id-broker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ This module is used to create an ECS service running id-broker.
- `send_password_changed_emails` - Bool of whether or not to send password changed emails. Default: `true`
- `send_refresh_backup_codes_emails` - Bool of whether or not to send refresh backup codes emails. Default: `true`
- `send_welcome_emails` - Bool of whether or not to send welcome emails. Default: `true`
- `sentry_dsn` - Sentry DSN for error logging and alerting. Obtain from Sentry dashboard: Settings - Projects - (project) - Client Keys
- `subject_for_abandoned_users` - Email subject text for abandoned user emails. Default: `Unused {idpDisplayName} Identity Accounts`
- `subject_for_get_backup_codes` - Email subject text for get backup codes emails. Default: `Get printable codes for your {idpDisplayName} Identity account`
- `subject_for_invite` - Email subject text for invite emails. Default: `Your new {idpDisplayName} Identity account`
Expand Down
2 changes: 2 additions & 0 deletions terraform/040-id-broker/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ locals {
send_password_expiring_emails = var.send_password_expiring_emails
send_refresh_backup_codes_emails = var.send_refresh_backup_codes_emails
send_welcome_emails = var.send_welcome_emails
sentry_dsn = var.sentry_dsn
subject_for_abandoned_users = var.subject_for_abandoned_users
subject_for_get_backup_codes = var.subject_for_get_backup_codes
subject_for_invite = var.subject_for_invite
Expand Down Expand Up @@ -290,6 +291,7 @@ locals {
send_password_expiring_emails = var.send_password_expiring_emails
send_refresh_backup_codes_emails = var.send_refresh_backup_codes_emails
send_welcome_emails = var.send_welcome_emails
sentry_dsn = var.sentry_dsn
subject_for_abandoned_users = var.subject_for_abandoned_users
subject_for_get_backup_codes = var.subject_for_get_backup_codes
subject_for_invite = var.subject_for_invite
Expand Down
4 changes: 4 additions & 0 deletions terraform/040-id-broker/task-definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,10 @@
"name": "SEND_WELCOME_EMAILS",
"value": "${send_welcome_emails}"
},
{
"name": "SENTRY_DSN",
"value": "${sentry_dsn}"
},
{
"name": "SUBJECT_FOR_ABANDONED_USERS",
"value": "${subject_for_abandoned_users}"
Expand Down
6 changes: 6 additions & 0 deletions terraform/040-id-broker/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,12 @@ variable "send_welcome_emails" {
default = "true"
}

variable "sentry_dsn" {
description = "Sentry DSN for error logging and alerting"
type = string
default = ""
}

variable "ssl_policy" {
type = string
}
Expand Down
1 change: 1 addition & 0 deletions terraform/050-pw-manager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ The password manager UI can be deployed using the [silinternatonal/pages/cloudfl
- `password_rule_maxlength` - Maximum password length. Default: `255`
- `password_rule_minlength` - Minimum password length. Default: `10`
- `password_rule_minscore` - Minimum password score. Default: `3`
- `sentry_dsn` - Sentry DSN for error logging and alerting. Obtain from Sentry dashboard: Settings - Projects - (project) - Client Keys
- `support_feedback` - Email address for end user feedback, displayed on PW UI.
- `support_phone` - Phone number for end user support, displayed on PW UI.
- `support_url` - URL for end user support, displayed on PW UI.
Expand Down
1 change: 1 addition & 0 deletions terraform/050-pw-manager/main-api.tf
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ locals {
password_rule_minscore = var.password_rule_minscore
recaptcha_secret_key = var.recaptcha_secret
recaptcha_site_key = var.recaptcha_key
sentry_dsn = var.sentry_dsn
support_email = var.support_email
support_feedback = var.support_feedback
support_name = var.support_name
Expand Down
4 changes: 4 additions & 0 deletions terraform/050-pw-manager/task-definition-api.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@
"name": "RECAPTCHA_SITE_KEY",
"value": "${recaptcha_site_key}"
},
{
"name": "SENTRY_DSN",
"value": "${sentry_dsn}"
},
{
"name": "SUPPORT_EMAIL",
"value": "${support_email}"
Expand Down
6 changes: 6 additions & 0 deletions terraform/050-pw-manager/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,12 @@ variable "recaptcha_secret" {
type = string
}

variable "sentry_dsn" {
description = "Sentry DSN for error logging and alerting"
type = string
default = ""
}

variable "support_email" {
description = "Email address for end user support, displayed on PW UI and in emails"
type = string
Expand Down
1 change: 1 addition & 0 deletions terraform/070-id-sync/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ store.
- `create_dns_record` - Controls creation of a DNS CNAME record for the ECS service. Default: `true`
- `enable_new_user_notification` - Enable email notification to HR Contact upon creation of a new user, if set to 'true'. Default: `false`
- `enable_sync` - Set to false to disable the sync process.
- `sentry_dsn` - Sentry DSN for error logging and alerting. Obtain from Sentry dashboard: Settings - Projects - (project) - Client Keys

## Outputs

Expand Down
1 change: 1 addition & 0 deletions terraform/070-id-sync/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ locals {
sync_safety_cutoff = var.sync_safety_cutoff
allow_empty_email = var.allow_empty_email
enable_new_user_notification = var.enable_new_user_notification
sentry_dsn = var.sentry_dsn
})
}

Expand Down
4 changes: 4 additions & 0 deletions terraform/070-id-sync/task-definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@
"name": "ENABLE_NEW_USER_NOTIFICATION",
"value": "${enable_new_user_notification}"
},
{
"name": "SENTRY_DSN",
"value": "${sentry_dsn}"
},
${id_store_config}
],
"links": null,
Expand Down
6 changes: 6 additions & 0 deletions terraform/070-id-sync/vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,9 @@ variable "create_dns_record" {
type = bool
default = true
}

variable "sentry_dsn" {
description = "Sentry DSN for error logging and alerting"
type = string
default = ""
}

0 comments on commit 7fe4913

Please sign in to comment.