From b163ef8b94c35252867b06678e6aef487b37621b Mon Sep 17 00:00:00 2001 From: Julian Nonino Date: Fri, 4 Sep 2020 14:41:12 +0100 Subject: [PATCH] Updating to Terraform 0.13 --- .circleci/config.yml | 4 ++-- examples/test/main.tf | 6 +++--- main.tf | 12 ++++++------ variables.tf | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9a4e58..80486c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/examples/test/main.tf b/examples/test/main.tf index f86c532..a67e257 100644 --- a/examples/test/main.tf +++ b/examples/test/main.tf @@ -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"] @@ -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 diff --git a/main.tf b/main.tf index 7d3c92c..0272169 100644 --- a/main.tf +++ b/main.tf @@ -12,10 +12,10 @@ #------------------------------------------------------------------------------ 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" } #------------------------------------------------------------------------------ @@ -23,14 +23,14 @@ module aws_cw_logs { #------------------------------------------------------------------------------ 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 @@ -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 diff --git a/variables.tf b/variables.tf index 3ab9e1f..fbffb7f 100644 --- a/variables.tf +++ b/variables.tf @@ -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" } #------------------------------------------------------------------------------