Skip to content

add force_ssl configuration to pipeline #405

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
cweibel merged 1 commit into from
Mar 25, 2025
Merged

add force_ssl configuration to pipeline #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ci/terraform/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ output "rds_internal_rds_port" {
value = module.rds_internal.rds_port
}

output "s3_snapshots_bucket_id"{
output "s3_snapshots_bucket_id" {
value = module.snapshot_bucket.s3_bucket_id
}
1 change: 1 addition & 0 deletions ci/terraform/rds-internal.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ module "rds_internal" {
rds_parameter_group_family = var.rds_internal_db_parameter_group_family
apply_immediately = var.rds_internal_apply_immediately
allow_major_version_upgrade = var.rds_internal_allow_major_version_upgrade
rds_force_ssl = var.rds_force_ssl
}
14 changes: 7 additions & 7 deletions ci/terraform/snaps-bucket.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module "snapshot_bucket"{
source = "./s3_module"
stack_description = var.stack_description
s3_bucket_suffix = "aws-broker-snapshot-storage"
base_stack = var.base_stack
access_role_arn = var.platform_access_role_arn
s3_expire_after_days = var.snapshot_expiration
module "snapshot_bucket" {
source = "./s3_module"
stack_description = var.stack_description
s3_bucket_suffix = "aws-broker-snapshot-storage"
base_stack = var.base_stack
access_role_arn = var.platform_access_role_arn
s3_expire_after_days = var.snapshot_expiration
}
15 changes: 9 additions & 6 deletions ci/terraform/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ variable "stack_description" {
variable "remote_state_bucket" {
}

variable "aws_deploy_region"{
variable "aws_deploy_region" {

}

variable "aws_deploy_role_arn"{
variable "aws_deploy_role_arn" {

}

variable "platform_access_role_arn"{
variable "platform_access_role_arn" {

}

variable "snapshot_expiration"{
default = 14
variable "snapshot_expiration" {
default = 14
}

variable "rds_internal_instance_type" {
Expand Down Expand Up @@ -55,3 +55,6 @@ variable "rds_internal_apply_immediately" {

variable "rds_internal_allow_major_version_upgrade" {
}

variable "rds_force_ssl" {
}
4 changes: 2 additions & 2 deletions ci/terraform/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

terraform {
required_version = ">= 0.15"
required_providers {
required_providers {
aws = {
source = "hashicorp/aws"
source = "hashicorp/aws"
version = "< 6.0.0"
}
}
Expand Down