Skip to content

Commit

Permalink
fix(proxy): upgrade the frigga module to resolve numeric type warning (
Browse files Browse the repository at this point in the history
…#61)

* fix(blueprint): upgrade modules to the latest version

* fix(proxy): upgrade the frigga module to resolve numeric type warning

* chore(proxy): move the aws-partitions to default values

* fix(proxy): upgrade vault module to resolve numeric warning
  • Loading branch information
Young-ook authored Jan 9, 2024
1 parent 112a8cb commit 26d04b1
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
22 changes: 11 additions & 11 deletions examples/blueprint/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ provider "aws" {
### vpc
module "vpc" {
source = "Young-ook/vpc/aws"
version = "1.0.3"
version = "1.0.7"
name = var.name
tags = var.tags
vpc_config = {
Expand All @@ -24,15 +24,15 @@ module "vpc" {

### rds cluster - amazon aurora
module "rds" {
source = "Young-ook/aurora/aws"
version = "2.1.3"
name = var.name
tags = var.tags
vpc = module.vpc.vpc.id
subnets = slice(values(module.vpc.subnets["private"]), 0, 3)
cidrs = [module.vpc.vpc.cidr_block]
aurora_cluster = var.aurora_cluster
aurora_instances = var.aurora_instances
source = "Young-ook/aurora/aws"
version = "2.2.1"
name = var.name
tags = var.tags
vpc = module.vpc.vpc.id
subnets = slice(values(module.vpc.subnets["private"]), 0, 3)
cidrs = [module.vpc.vpc.cidr_block]
cluster = var.aurora_cluster
instances = var.aurora_instances
}

resource "time_sleep" "wait" {
Expand All @@ -43,7 +43,7 @@ resource "time_sleep" "wait" {
module "proxy" {
depends_on = [time_sleep.wait]
source = "Young-ook/aurora/aws//modules/proxy"
version = "2.1.3"
version = "2.2.1"
tags = var.tags
subnets = slice(values(module.vpc.subnets["private"]), 0, 3)
proxy_config = {
Expand Down
5 changes: 5 additions & 0 deletions modules/proxy/defaults.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
### default values

### aws partition and region (global, gov, china)
module "aws" {
source = "Young-ook/spinnaker/aws//modules/aws-partitions"
}

locals {
default_proxy_config = {
debug_logging = false
Expand Down
2 changes: 1 addition & 1 deletion modules/proxy/labels.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
### frigga name
module "frigga" {
source = "Young-ook/spinnaker/aws//modules/frigga"
version = "2.3.3"
version = "3.0.0"
name = var.name == null || var.name == "" ? "rdsproxy" : var.name
petname = var.name == null || var.name == "" ? true : false
}
Expand Down
7 changes: 1 addition & 6 deletions modules/proxy/main.tf
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
### Amazon RDS Proxy

### aws partition and region (global, gov, china)
module "aws" {
source = "Young-ook/spinnaker/aws//modules/aws-partitions"
}

### database/parameter
locals {
security_groups = var.security_groups == [] ? null : var.security_groups
Expand All @@ -23,7 +18,7 @@ locals {
### security/secret
module "vault" {
source = "Young-ook/passport/aws//modules/aws-secrets"
version = "0.0.4"
version = "0.0.12"
name = join("-", [local.user_name, local.name])
secret = local.user_password
}
Expand Down

0 comments on commit 26d04b1

Please sign in to comment.