Skip to content

Commit c057b23

Browse files
committedNov 10, 2023
Adding aws_rds_db_ca_cert_identifier
1 parent 89611ad commit c057b23

File tree

7 files changed

+16
-0
lines changed

7 files changed

+16
-0
lines changed
 

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ The following inputs can be used as `step.with` keys
231231
| `aws_rds_db_user`| String | Username for the db. Defaults to `dbuser`. |
232232
| `aws_rds_db_engine`| String | Which Database engine to use. Defaults to `postgres`. |
233233
| `aws_rds_db_engine_version`| String | Which Database engine version to use. |
234+
| `aws_rds_db_ca_cert_identifier`| String | Certificate to use with the database. Defaults to `rds-ca-ecc384-g1`.|
234235
| `aws_rds_db_security_group_name`| String | The name of the database security group. Defaults to `SG for ${aws_resource_identifier} - RDS`. |
235236
| `aws_rds_db_allowed_security_groups` | String | Comma separated list of security groups to add to the DB SG. |
236237
| `aws_rds_db_ingress_allow_all` | Boolean | Allow incoming traffic from 0.0.0.0/0. Defaults to `true`. |

‎action.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@ inputs:
326326
aws_rds_db_engine_version:
327327
description: 'Which Database engine version to use.'
328328
required: false
329+
aws_rds_db_ca_cert_identifier:
330+
description: 'Certificate to use with the database. Defaults to rds-ca-ecc384-g1'
331+
required: false
329332
aws_rds_db_security_group_name:
330333
description: 'The name of the database security group. Defaults to SG for aws_resource_identifier - RDS.'
331334
required: false
@@ -1026,6 +1029,7 @@ runs:
10261029
AWS_RDS_DB_USER: ${{ inputs.aws_rds_db_user }}
10271030
AWS_RDS_DB_ENGINE: ${{ inputs.aws_rds_db_engine }}
10281031
AWS_RDS_DB_ENGINE_VERSION: ${{ inputs.aws_rds_db_engine_version }}
1032+
AWS_RDS_DB_CA_CERT_IDENTIFIER: ${{ inputs.aws_rds_db_ca_cert_identifier }}
10291033
AWS_RDS_DB_SECURITY_GROUP_NAME: ${{ inputs.aws_rds_db_security_group_name }}
10301034
AWS_RDS_DB_ALLOWED_SECURITY_GROUPS: ${{ inputs.aws_rds_db_allowed_security_groups }}
10311035
AWS_RDS_DB_INGRESS_ALLOW_ALL: ${{ inputs.aws_rds_db_ingress_allow_all }}

‎operations/_scripts/generate/generate_vars_terraform.sh

+2
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ if [[ $(alpha_only "$AWS_RDS_DB_ENABLE") == true ]]; then
167167
aws_rds_db_user=$(generate_var aws_rds_db_user $AWS_RDS_DB_USER)
168168
aws_rds_db_engine=$(generate_var aws_rds_db_engine $AWS_RDS_DB_ENGINE)
169169
aws_rds_db_engine_version=$(generate_var aws_rds_db_engine_version $AWS_RDS_DB_ENGINE_VERSION)
170+
aws_rds_db_ca_cert_identifier=$(generate_var aws_rds_db_ca_cert_identifier $AWS_RDS_DB_CA_CERT_IDENTIFIER)
170171
aws_rds_db_security_group_name=$(generate_var aws_rds_db_security_group_name $AWS_RDS_DB_SECURITY_GROUP_NAME)
171172
aws_rds_db_allowed_security_groups=$(generate_var aws_rds_db_allowed_security_groups $AWS_RDS_DB_ALLOWED_SECURITY_GROUPS)
172173
aws_rds_db_ingress_allow_all=$(generate_var aws_rds_db_ingress_allow_all $AWS_RDS_DB_INGRESS_ALLOW_ALL)
@@ -462,6 +463,7 @@ $aws_rds_db_name
462463
$aws_rds_db_user
463464
$aws_rds_db_engine
464465
$aws_rds_db_engine_version
466+
$aws_rds_db_ca_cert_identifier
465467
$aws_rds_db_security_group_name
466468
$aws_rds_db_allowed_security_groups
467469
$aws_rds_db_ingress_allow_all

‎operations/deployment/terraform/aws/aws_variables.tf

+6
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,12 @@ variable "aws_rds_db_engine_version" {
426426
default = null
427427
}
428428

429+
variable "aws_rds_db_ca_cert_identifier" {
430+
type = string
431+
description = "Certificate to use with the database"
432+
default = "rds-ca-ecc384-g1"
433+
}
434+
429435
variable "aws_rds_db_security_group_name" {
430436
type = string
431437
description = "The name of the database security group. Defaults to SG for aws_resource_identifier - RDS"

‎operations/deployment/terraform/aws/bitovi_main.tf

+1
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ module "rds" {
137137
aws_rds_db_identifier = var.aws_rds_db_identifier != "" ? var.aws_rds_db_identifier : lower(var.aws_resource_identifier)
138138
aws_rds_db_engine = var.aws_rds_db_engine
139139
aws_rds_db_engine_version = var.aws_rds_db_engine_version
140+
aws_rds_db_ca_cert_identifier = var.aws_rds_db_ca_cert_identifier
140141
aws_rds_db_security_group_name = var.aws_rds_db_security_group_name
141142
aws_rds_db_allowed_security_groups = var.aws_rds_db_allowed_security_groups
142143
aws_rds_db_ingress_allow_all = var.aws_rds_db_ingress_allow_all

‎operations/deployment/terraform/modules/aws/rds/aws_rds.tf

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ resource "aws_db_instance" "default" {
5656
identifier = var.aws_rds_db_identifier
5757
engine = var.aws_rds_db_engine
5858
engine_version = var.aws_rds_db_engine_version
59+
ca_cert_identifier = var.aws_rds_db_ca_cert_identifier
5960
db_subnet_group_name = aws_db_subnet_group.selected.name
6061
db_name = var.aws_rds_db_name != null ? var.aws_rds_db_name : null
6162
port = var.aws_rds_db_port != null ? tonumber(var.aws_rds_db_port) : null

‎operations/deployment/terraform/modules/aws/rds/aws_rds_vars.tf

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ variable "aws_rds_db_name" {}
33
variable "aws_rds_db_user" {}
44
variable "aws_rds_db_engine" {}
55
variable "aws_rds_db_engine_version" {}
6+
variable "aws_rds_db_ca_cert_identifier" {}
67
variable "aws_rds_db_security_group_name" {}
78
variable "aws_rds_db_allowed_security_groups" {}
89
variable "aws_rds_db_ingress_allow_all" {}

0 commit comments

Comments
 (0)
Please sign in to comment.