Skip to content

Commit 7ee48ce

Browse files
authored
fix for issue-122 (#123)
* Add db_cluster_parameter_group_family variable * Bitops docker image version update
1 parent ffc6f48 commit 7ee48ce

File tree

6 files changed

+18
-5
lines changed

6 files changed

+18
-5
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ The following inputs can be used as `step.with` keys
192192
| `aws_postgres_subnets` | String | Specify which subnets to use as a list of strings. Example: `i-1234,i-5678,i-9101`. |
193193
| `aws_postgres_database_name` | String | Specify a database name. Will be created if it does not exist. Default is `root`. |
194194
| `aws_postgres_database_port` | String | Specify a listening port for the database. Default is `5432`.|
195+
| `aws_postgres_group_family` | String | Specify aws postgres group family. Default is `aurora-postgresql11`.|
195196
<hr/>
196197
<br/>
197198

action.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,11 @@ inputs:
160160
aws_postgres_database_port:
161161
description: 'Postgres database port'
162162
required: false
163-
163+
164+
aws_postgres_database_group_family:
165+
description: 'Postgres database group family'
166+
required: false
167+
164168
# Ansible
165169
application_mount_target:
166170
description: "Directory path in application env to mount directory, default is `data`"
@@ -222,6 +226,7 @@ runs:
222226
AWS_ENABLE_POSTGRES: ${{ inputs.aws_enable_postgres }}
223227
AWS_POSTGRES_ENGINE: ${{ inputs.aws_postgres_engine }}
224228
AWS_POSTGRES_ENGINE_VERSION: ${{ inputs.aws_postgres_engine_version }}
229+
AWS_POSTGRES_GROUP_FAMILY: ${{ inputs.aws_postgres_group_family }}
225230
AWS_POSTGRES_INSTANCE_CLASS: ${{ inputs.aws_postgres_instance_class }}
226231
AWS_POSTGRES_SUBNETS: ${{ inputs.aws_postgres_subnets }}
227232
AWS_POSTGRES_DATABASE_NAME: ${{ inputs.aws_postgres_database_name }}

operations/_scripts/deploy/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ docker run --rm --name bitops \
7373
-e DEFAULT_FOLDER_NAME="_default" \
7474
-e BITOPS_FAST_FAIL="${BITOPS_FAST_FAIL}" \
7575
-v $(echo $GITHUB_ACTION_PATH)/operations:/opt/bitops_deployment \
76-
bitovi/bitops:2.4.0
76+
bitovi/bitops:2.5.0
7777
BITOPS_RESULT=$?
7878
echo "::endgroup::"
7979

operations/_scripts/generate/generate_tf_vars.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ if [[ $AWS_ENABLE_POSTGRES = true ]]; then
135135
aws_enable_postgres=$(generate_var aws_enable_postgres $AWS_ENABLE_POSTGRES)
136136
aws_postgres_engine=$(generate_var aws_postgres_engine $AWS_POSTGRES_ENGINE)
137137
aws_postgres_engine_version=$(generate_var aws_postgres_engine_version $AWS_POSTGRES_ENGINE_VERSION)
138+
aws_postgres_group_family=$(generate_var aws_postgres_group_family $AWS_POSTGRES_GROUP_FAMILY)
138139
aws_postgres_instance_class=$(generate_var aws_postgres_instance_class $AWS_POSTGRES_INSTANCE_CLASS)
139140
aws_postgres_database_name=$(generate_var aws_postgres_database_name $AWS_POSTGRES_DATABASE_NAME)
140141
aws_postgres_database_port=$(generate_var aws_postgres_database_port $AWS_POSTGRES_DATABASE_PORT)
@@ -209,6 +210,7 @@ $aws_security_group_name_pg
209210
$aws_enable_postgres
210211
$aws_postgres_engine
211212
$aws_postgres_engine_version
213+
$aws_postgres_group_family
212214
$aws_postgres_instance_class
213215
$aws_postgres_database_name
214216
$aws_postgres_database_port

operations/deployment/terraform/postgres.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module "rds_cluster" {
6262
skip_final_snapshot = true
6363
create_db_cluster_parameter_group = true
6464
db_cluster_parameter_group_name = var.aws_resource_identifier
65-
db_cluster_parameter_group_family = "aurora-postgresql11"
65+
db_cluster_parameter_group_family = var.aws_postgres_group_family
6666
db_cluster_parameter_group_description = "${var.aws_resource_identifier} cluster parameter group"
6767
db_cluster_parameter_group_parameters = [
6868
{
@@ -77,7 +77,7 @@ module "rds_cluster" {
7777
]
7878
create_db_parameter_group = true
7979
db_parameter_group_name = var.aws_resource_identifier
80-
db_parameter_group_family = "aurora-postgresql11"
80+
db_parameter_group_family = var.aws_postgres_group_family
8181
db_parameter_group_description = "${var.aws_resource_identifier} example DB parameter group"
8282
db_parameter_group_parameters = [
8383
{

operations/deployment/terraform/variables.tf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,12 @@ variable "aws_postgres_database_port" {
178178
default = "5432"
179179
description = "database port"
180180
}
181-
181+
182+
variable "aws_postgres_group_family" {
183+
type = string
184+
default = "aurora-postgresql11"
185+
description = "postgres group family"
186+
}
182187

183188
## -- EFS -- ##
184189
variable "aws_create_efs" {

0 commit comments

Comments
 (0)