Skip to content

Commit

Permalink
Updating to Terraform 0.13
Browse files Browse the repository at this point in the history
  • Loading branch information
jnonino committed Sep 4, 2020
1 parent 2a6f12c commit b163ef8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ version: 2
jobs:
check-format:
docker:
- image: hashicorp/terraform:0.12.29
- image: hashicorp/terraform
steps:
- checkout
- run:
command: terraform fmt -check -recursive -diff
validate:
docker:
- image: hashicorp/terraform:0.12.29
- image: hashicorp/terraform
steps:
- checkout
- run:
Expand Down
6 changes: 3 additions & 3 deletions examples/test/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ provider "aws" {

module "base-network" {
source = "cn-terraform/networking/aws"
version = "2.0.7"
name_preffix = "test-networking"
version = "2.0.10"
name_prefix = "test-networking"
vpc_cidr_block = "192.168.0.0/16"
availability_zones = ["us-east-1a", "us-east-1b", "us-east-1c", "us-east-1d"]
public_subnets_cidrs_per_availability_zone = ["192.168.0.0/19", "192.168.32.0/19", "192.168.64.0/19", "192.168.96.0/19"]
Expand All @@ -14,7 +14,7 @@ module "base-network" {

module "nexus" {
source = "../../"
name_preffix = "nexus"
name_prefix = "nexus"
region = "us-east-1"
vpc_id = module.base-network.vpc_id
availability_zones = module.base-network.availability_zones
Expand Down
12 changes: 6 additions & 6 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
#------------------------------------------------------------------------------
module aws_cw_logs {
source = "cn-terraform/cloudwatch-logs/aws"
version = "1.0.6"
version = "1.0.7"
# source = "../terraform-aws-cloudwatch-logs"

logs_path = "/ecs/service/${var.name_preffix}-nexus"
logs_path = "/ecs/service/${var.name_prefix}-nexus"
}

#------------------------------------------------------------------------------
# ECS Fargate Service
#------------------------------------------------------------------------------
module "ecs_fargate" {
source = "cn-terraform/ecs-fargate/aws"
version = "2.0.17"
version = "2.0.18"
# source = "../terraform-aws-ecs-fargate"

name_preffix = "${var.name_preffix}-nexus"
name_prefix = "${var.name_prefix}-nexus"
vpc_id = var.vpc_id
public_subnets_ids = var.public_subnets_ids
private_subnets_ids = var.private_subnets_ids
container_name = "${var.name_preffix}-nexus"
container_name = "${var.name_prefix}-nexus"
container_image = "sonatype/nexus3"
container_cpu = 4096
container_memory = 8192
Expand All @@ -54,7 +54,7 @@ module "ecs_fargate" {
logDriver = "awslogs"
options = {
"awslogs-region" = var.region
"awslogs-group" = "/ecs/service/${var.name_preffix}-nexus"
"awslogs-group" = "/ecs/service/${var.name_prefix}-nexus"
"awslogs-stream-prefix" = "ecs"
}
secretOptions = null
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#------------------------------------------------------------------------------
# Misc
#------------------------------------------------------------------------------
variable "name_preffix" {
description = "Name preffix for resources on AWS"
variable "name_prefix" {
description = "Name prefix for resources on AWS"
}

#------------------------------------------------------------------------------
Expand Down

0 comments on commit b163ef8

Please sign in to comment.