Skip to content

Commit 355a9ad

Browse files
jamesiarmesjamesiarmes
committed
fix: Set the Senzing license into the config.
1 parent 4a5170d commit 355a9ad

File tree

11 files changed

+47
-36
lines changed

11 files changed

+47
-36
lines changed

‎.github/actions/setup-opentofu/action.yaml‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,16 @@ runs:
2626
shell: bash
2727
env:
2828
TF_VAR_REGION: ${{ env.AWS_REGION }}
29-
# For any of the defined variables that have a value set into TF_VAR_*
30-
# (all uppercase), we set the corresponding TF_VAR_* (lowercase) variable
31-
# that OpenTofu expects.
29+
# For any environment variables set into TF_VAR_* (all uppercase) we set
30+
# the corresponding TF_VAR_* (lowercase) variable that OpenTofu expects.
3231
run: |
33-
variables=(
34-
"apply_database_updates_immediately" "consumer_container_count"
35-
"consumer_container_max" "consumer_cpu" "consumer_memory"
36-
"consumer_message_threshold" "database_instance_count"
37-
"database_skip_final_snapshot" "deletion_protection"
38-
"deployment_environments" "environment" "export_expiration"
39-
"image_tags_mutable" "key_recovery_period" "log_level" "program"
40-
"project" "queue_empty_threshold" "redoer_container_count"
41-
"redoer_cpu" "redoer_memory" "region" "repository"
42-
)
43-
for var in ${variables[@]}; do
44-
name="TF_VAR_$(echo $var | tr '[:lower:]' '[:upper:]')"
45-
if [ -n "${!name}" ]; then
46-
echo "Setting TF_VAR_$var"
47-
echo "TF_VAR_$var=${!name}" >> $GITHUB_ENV
48-
else
49-
echo "$name is not set"
50-
fi
32+
for var in $(env | grep '^TF_VAR_' | awk -F= '{print $1}'); do
33+
suffix="${var#TF_VAR_}"
34+
value="${!var}"
35+
new_var="TF_VAR_$(echo "$suffix" | tr 'A-Z' 'a-z')"
36+
37+
echo "Setting $new_var"
38+
echo $new_var="$value" >> $GITHUB_ENV
5139
done
5240
- name: Initialize OpenTofu
5341
shell: bash

‎.github/workflows/deploy.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
TF_VAR_REDOER_MEMORY: ${{ secrets.TF_VAR_REDOER_MEMORY }}
6363
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
6464
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
65+
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
6566
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
6667
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
6768
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}
@@ -119,6 +120,7 @@ jobs:
119120
TF_VAR_REDOER_MEMORY: ${{ secrets.TF_VAR_REDOER_MEMORY }}
120121
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
121122
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
123+
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
122124
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
123125
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
124126
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}

‎.github/workflows/export.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
TF_VAR_QUEUE_EMPTY_THRESHOLD: ${{ secrets.TF_VAR_QUEUE_EMPTY_THRESHOLD }}
5757
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
5858
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
59+
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
5960
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
6061
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
6162
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}

‎.github/workflows/launch-tools.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ jobs:
6464
TF_VAR_QUEUE_EMPTY_THRESHOLD: ${{ secrets.TF_VAR_QUEUE_EMPTY_THRESHOLD }}
6565
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
6666
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
67+
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
6768
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
6869
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
6970
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}

‎.github/workflows/plan.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ on:
6868
required: false
6969
TF_VAR_REPOSITORY:
7070
required: false
71+
TF_VAR_SENZING_LICENSE_BASE64:
72+
required: false
7173
workflow_dispatch:
7274
inputs:
7375
config:
@@ -140,6 +142,7 @@ jobs:
140142
TF_VAR_REDOER_MEMORY: ${{ secrets.TF_VAR_REDOER_MEMORY }}
141143
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
142144
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
145+
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
143146
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
144147
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
145148
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}

‎.github/workflows/pull-request.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
TF_VAR_REDOER_MEMORY: ${{ secrets.TF_VAR_REDOER_MEMORY }}
6767
TF_VAR_REPO_OIDC_ARN: ${{ secrets.TF_VAR_REPO_OIDC_ARN }}
6868
TF_VAR_REPOSITORY: ${{ secrets.TF_VAR_REPOSITORY }}
69+
TF_VAR_SENZING_LICENSE_BASE64: ${{ secrets.TF_VAR_SENZING_LICENSE_BASE64 }}
6970
TF_VAR_VPC_CIDR: ${{ secrets.TF_VAR_VPC_CIDR }}
7071
TF_VAR_VPC_PRIVATE_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PRIVATE_SUBNET_CIDRS }}
7172
TF_VAR_VPC_PUBLIC_SUBNET_CIDRS: ${{ secrets.TF_VAR_VPC_PUBLIC_SUBNET_CIDRS }}

‎tofu/config/service/main.tf‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ module "inputs" {
1818
module "system" {
1919
source = "../../modules/system"
2020

21-
environment = var.environment
22-
project = var.project
23-
export_expiration = var.export_expiration
24-
key_recovery_period = var.key_recovery_period
25-
logging_bucket = module.inputs.values["logging/bucket"]
26-
logging_key_arn = module.inputs.values["logging/key"]
27-
log_level = var.log_level
28-
tags = merge({ awsApplication : module.inputs.values["application/tag"] }, var.tags)
29-
vpc_id = module.inputs.values["vpc/id"]
30-
queue_empty_threshold = var.queue_empty_threshold
21+
environment = var.environment
22+
project = var.project
23+
export_expiration = var.export_expiration
24+
key_recovery_period = var.key_recovery_period
25+
logging_bucket = module.inputs.values["logging/bucket"]
26+
logging_key_arn = module.inputs.values["logging/key"]
27+
log_level = var.log_level
28+
tags = merge({ awsApplication : module.inputs.values["application/tag"] }, var.tags)
29+
vpc_id = module.inputs.values["vpc/id"]
30+
queue_empty_threshold = var.queue_empty_threshold
31+
senzing_license_base64 = var.senzing_license_base64
3132

3233
database_subnets = split(",", module.inputs.values["vpc/private_subnets"])
3334
apply_database_updates_immediately = var.apply_database_updates_immediately

‎tofu/config/service/variables.tf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,13 @@ variable "region" {
145145
default = "us-west-1"
146146
}
147147

148+
variable "senzing_license_base64" {
149+
type = string
150+
description = "Base64 encoded Senzing license."
151+
default = null
152+
sensitive = true
153+
}
154+
148155
variable "tags" {
149156
type = map(string)
150157
description = "Tags to apply to all resources."

‎tofu/modules/persistent_service/main.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ module "service" {
3030
source = "HENNGE/ecs/aws//modules/core/service"
3131
version = "5.3.0"
3232

33-
cluster = var.cluster_name
34-
name = local.prefix
35-
create_task_definition = false
36-
task_definition_arn = module.task.task_definition_arn
33+
cluster = var.cluster_name
34+
name = local.prefix
35+
create_task_definition = false
36+
task_definition_arn = module.task.task_definition_arn
3737

3838
# Ignore changes to the desired count to prevent conflicts with auto-scaling.
3939
ignore_desired_count_changes = true

‎tofu/modules/system/ecs.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module "senzing_config" {
6767
database_host : module.database.cluster_endpoint
6868
database_username : jsondecode(data.aws_secretsmanager_secret_version.database.secret_string).username
6969
database_password : urlencode(jsondecode(data.aws_secretsmanager_secret_version.database.secret_string).password)
70-
senzing_license_base64 : " "
70+
senzing_license_base64 : coalesce(var.senzing_license_base64, " ")
7171
})))
7272

7373
tags = var.tags

0 commit comments

Comments
 (0)