Skip to content

fix for issue-122 #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 15, 2023
Merged

fix for issue-122 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8664c0
fix for issue-122
fir1 May 13, 2023
fa29429
remove all old files before copying new ones from the repo
fir1 May 14, 2023
f54cd2c
bitops docker image version update
fir1 May 14, 2023
01ed3d2
Revert "remove all old files before copying new ones from the repo"
fir1 May 14, 2023
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ The following inputs can be used as `step.with` keys
| `aws_postgres_subnets` | String | Specify which subnets to use as a list of strings. Example: `i-1234,i-5678,i-9101`. |
| `aws_postgres_database_name` | String | Specify a database name. Will be created if it does not exist. Default is `root`. |
| `aws_postgres_database_port` | String | Specify a listening port for the database. Default is `5432`.|
| `aws_postgres_group_family` | String | Specify aws postgres group family. Default is `aurora-postgresql11`.|
<hr/>
<br/>

Expand Down
7 changes: 6 additions & 1 deletion action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,11 @@ inputs:
aws_postgres_database_port:
description: 'Postgres database port'
required: false


aws_postgres_database_group_family:
description: 'Postgres database group family'
required: false

# Ansible
application_mount_target:
description: "Directory path in application env to mount directory, default is `data`"
Expand Down Expand Up @@ -222,6 +226,7 @@ runs:
AWS_ENABLE_POSTGRES: ${{ inputs.aws_enable_postgres }}
AWS_POSTGRES_ENGINE: ${{ inputs.aws_postgres_engine }}
AWS_POSTGRES_ENGINE_VERSION: ${{ inputs.aws_postgres_engine_version }}
AWS_POSTGRES_GROUP_FAMILY: ${{ inputs.aws_postgres_group_family }}
AWS_POSTGRES_INSTANCE_CLASS: ${{ inputs.aws_postgres_instance_class }}
AWS_POSTGRES_SUBNETS: ${{ inputs.aws_postgres_subnets }}
AWS_POSTGRES_DATABASE_NAME: ${{ inputs.aws_postgres_database_name }}
Expand Down
2 changes: 1 addition & 1 deletion operations/_scripts/deploy/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ docker run --rm --name bitops \
-e DEFAULT_FOLDER_NAME="_default" \
-e BITOPS_FAST_FAIL="${BITOPS_FAST_FAIL}" \
-v $(echo $GITHUB_ACTION_PATH)/operations:/opt/bitops_deployment \
bitovi/bitops:2.4.0
bitovi/bitops:2.5.0
BITOPS_RESULT=$?
echo "::endgroup::"

Expand Down
2 changes: 2 additions & 0 deletions operations/_scripts/generate/generate_tf_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ if [[ $AWS_ENABLE_POSTGRES = true ]]; then
aws_enable_postgres=$(generate_var aws_enable_postgres $AWS_ENABLE_POSTGRES)
aws_postgres_engine=$(generate_var aws_postgres_engine $AWS_POSTGRES_ENGINE)
aws_postgres_engine_version=$(generate_var aws_postgres_engine_version $AWS_POSTGRES_ENGINE_VERSION)
aws_postgres_group_family=$(generate_var aws_postgres_group_family $AWS_POSTGRES_GROUP_FAMILY)
aws_postgres_instance_class=$(generate_var aws_postgres_instance_class $AWS_POSTGRES_INSTANCE_CLASS)
aws_postgres_database_name=$(generate_var aws_postgres_database_name $AWS_POSTGRES_DATABASE_NAME)
aws_postgres_database_port=$(generate_var aws_postgres_database_port $AWS_POSTGRES_DATABASE_PORT)
Expand Down Expand Up @@ -209,6 +210,7 @@ $aws_security_group_name_pg
$aws_enable_postgres
$aws_postgres_engine
$aws_postgres_engine_version
$aws_postgres_group_family
$aws_postgres_instance_class
$aws_postgres_database_name
$aws_postgres_database_port
Expand Down
4 changes: 2 additions & 2 deletions operations/deployment/terraform/postgres.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module "rds_cluster" {
skip_final_snapshot = true
create_db_cluster_parameter_group = true
db_cluster_parameter_group_name = var.aws_resource_identifier
db_cluster_parameter_group_family = "aurora-postgresql11"
db_cluster_parameter_group_family = var.aws_postgres_group_family
db_cluster_parameter_group_description = "${var.aws_resource_identifier} cluster parameter group"
db_cluster_parameter_group_parameters = [
{
Expand All @@ -77,7 +77,7 @@ module "rds_cluster" {
]
create_db_parameter_group = true
db_parameter_group_name = var.aws_resource_identifier
db_parameter_group_family = "aurora-postgresql11"
db_parameter_group_family = var.aws_postgres_group_family
db_parameter_group_description = "${var.aws_resource_identifier} example DB parameter group"
db_parameter_group_parameters = [
{
Expand Down
7 changes: 6 additions & 1 deletion operations/deployment/terraform/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,12 @@ variable "aws_postgres_database_port" {
default = "5432"
description = "database port"
}


variable "aws_postgres_group_family" {
type = string
default = "aurora-postgresql11"
description = "postgres group family"
}

## -- EFS -- ##
variable "aws_create_efs" {
Expand Down