Skip to content

Commit

Permalink
fix: Examples Adjustments (terraform-aws-modules#2)
Browse files Browse the repository at this point in the history
* fix examples by adding kms key and setting backup retention

* fix examples mssql storage_encryption and oracle param and option group engines

* fix examples mssql add a comment for storage encryption set to false
  • Loading branch information
magreenbaum authored and bryantbiggs committed Jul 14, 2022
1 parent f9ee21e commit 95cde9b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
8 changes: 0 additions & 8 deletions examples/complete-oracle/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ provider "aws" {
region = local.region2
}

<<<<<<< HEAD
module "kms" {
source = "terraform-aws-modules/kms/aws"
version = "~> 1.0"
Expand All @@ -133,25 +132,18 @@ module "kms" {
aliases = [local.name]
aliases_use_name_prefix = true

key_owners = [local.current_identity]
tags = local.tags

providers = {
aws = aws.region2
}
}

=======
>>>>>>> adding db_instance_automated_backups_replication (#1)
module "db_automated_backups_replication" {
source = "../../modules/db_instance_automated_backups_replication"

source_db_instance_arn = module.db.db_instance_arn
<<<<<<< HEAD
kms_key_arn = module.kms.key_arn
=======
>>>>>>> adding db_instance_automated_backups_replication (#1)

providers = {
aws = aws.region2
Expand Down
8 changes: 0 additions & 8 deletions examples/complete-postgres/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ provider "aws" {
region = local.region2
}

<<<<<<< HEAD
module "kms" {
source = "terraform-aws-modules/kms/aws"
version = "~> 1.0"
Expand All @@ -188,25 +187,18 @@ module "kms" {
aliases = [local.name]
aliases_use_name_prefix = true

key_owners = [local.current_identity]
tags = local.tags

providers = {
aws = aws.region2
}
}

=======
>>>>>>> adding db_instance_automated_backups_replication (#1)
module "db_automated_backups_replication" {
source = "../../modules/db_instance_automated_backups_replication"

source_db_instance_arn = module.db.db_instance_arn
<<<<<<< HEAD
kms_key_arn = module.kms.key_arn
=======
>>>>>>> adding db_instance_automated_backups_replication (#1)

providers = {
aws = aws.region2
Expand Down

0 comments on commit 95cde9b

Please sign in to comment.