Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/setup-opentofu/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ runs:
"image_tags_mutable" "key_recovery_period" "log_level" "program"
"project" "queue_empty_threshold" "redoer_container_count"
"redoer_cpu" "redoer_memory" "region" "repository"
"senzing_license_base64"
)
for var in ${variables[@]}; do
name="TF_VAR_$(echo $var | tr '[:lower:]' '[:upper:]')"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
TF_VAR_REDOER_MEMORY: ${{ secrets.TF_VAR_REDOER_MEMORY }}
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}
Expand Down Expand Up @@ -119,6 +120,7 @@ jobs:
TF_VAR_REDOER_MEMORY: ${{ secrets.TF_VAR_REDOER_MEMORY }}
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/export.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
TF_VAR_QUEUE_EMPTY_THRESHOLD: ${{ secrets.TF_VAR_QUEUE_EMPTY_THRESHOLD }}
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/launch-tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ jobs:
TF_VAR_QUEUE_EMPTY_THRESHOLD: ${{ secrets.TF_VAR_QUEUE_EMPTY_THRESHOLD }}
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/plan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ on:
required: false
TF_VAR_REPOSITORY:
required: false
TF_VAR_SENZING_LICENSE_BASE64:
required: false
workflow_dispatch:
inputs:
config:
Expand Down Expand Up @@ -140,6 +142,7 @@ jobs:
TF_VAR_REDOER_MEMORY: ${{ secrets.TF_VAR_REDOER_MEMORY }}
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
TF_VAR_REDOER_MEMORY: ${{ secrets.TF_VAR_REDOER_MEMORY }}
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}
Expand Down
21 changes: 11 additions & 10 deletions tofu/config/service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@ module "inputs" {
module "system" {
source = "../../modules/system"

environment = var.environment
project = var.project
export_expiration = var.export_expiration
key_recovery_period = var.key_recovery_period
logging_bucket = module.inputs.values["logging/bucket"]
logging_key_arn = module.inputs.values["logging/key"]
log_level = var.log_level
tags = merge({ awsApplication : module.inputs.values["application/tag"] }, var.tags)
vpc_id = module.inputs.values["vpc/id"]
queue_empty_threshold = var.queue_empty_threshold
environment = var.environment
project = var.project
export_expiration = var.export_expiration
key_recovery_period = var.key_recovery_period
logging_bucket = module.inputs.values["logging/bucket"]
logging_key_arn = module.inputs.values["logging/key"]
log_level = var.log_level
tags = merge({ awsApplication : module.inputs.values["application/tag"] }, var.tags)
vpc_id = module.inputs.values["vpc/id"]
queue_empty_threshold = var.queue_empty_threshold
senzing_license_base64 = var.senzing_license_base64

database_subnets = split(",", module.inputs.values["vpc/private_subnets"])
apply_database_updates_immediately = var.apply_database_updates_immediately
Expand Down
7 changes: 7 additions & 0 deletions tofu/config/service/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,13 @@ variable "region" {
default = "us-west-1"
}

variable "senzing_license_base64" {
type = string
description = "Base64 encoded Senzing license."
default = null
sensitive = true
}

variable "tags" {
type = map(string)
description = "Tags to apply to all resources."
Expand Down
8 changes: 4 additions & 4 deletions tofu/modules/persistent_service/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ module "service" {
source = "HENNGE/ecs/aws//modules/core/service"
version = "5.3.0"

cluster = var.cluster_name
name = local.prefix
create_task_definition = false
task_definition_arn = module.task.task_definition_arn
cluster = var.cluster_name
name = local.prefix
create_task_definition = false
task_definition_arn = module.task.task_definition_arn

# Ignore changes to the desired count to prevent conflicts with auto-scaling.
ignore_desired_count_changes = true
Expand Down
2 changes: 1 addition & 1 deletion tofu/modules/system/ecs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ module "senzing_config" {
database_host : module.database.cluster_endpoint
database_username : jsondecode(data.aws_secretsmanager_secret_version.database.secret_string).username
database_password : urlencode(jsondecode(data.aws_secretsmanager_secret_version.database.secret_string).password)
senzing_license_base64 : " "
senzing_license_base64 : coalesce(var.senzing_license_base64, " ")
})))

tags = var.tags
Expand Down
7 changes: 7 additions & 0 deletions tofu/modules/system/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,13 @@ variable "redoer_memory" {
default = 4096
}

variable "senzing_license_base64" {
type = string
description = "Base64 encoded Senzing license."
default = null
sensitive = true
}

variable "tags" {
type = map(string)
description = "Tags to apply to resources."
Expand Down