Skip to content
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.

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

Update provide/module versions and add missing variable file #37

Merged
merged 2 commits into from
Mar 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.0.4
current_version = 0.0.5
commit = True
message = Bumps version to {new_version}
tag = False
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ Gemfile.lock
.tardigrade-ci
tardigrade-ci/

# Add local variables file
!tenant-local.auto.tfvars
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).

### 0.0.5

**Commit Delta**: [Change from 0.0.4 release](https://github.com/plus3it/tardigrade/compare/0.0.4...0.0.5)

**Released**: 2020.03.11

**Summary**:

* Fix missing local variables file
* Update module version references
* Update terraform provider version
* Update aws provider version
* Update external provider version

### 0.0.4

**Commit Delta**: [Change from 0.0.3 release](https://github.com/plus3it/tardigrade/compare/0.0.3...0.0.4)
Expand Down
5 changes: 5 additions & 0 deletions tardigrade/aws/609421024627/base/tenant-local.auto.tfvars
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
name = "plus3-demo"
stage = "dev"
vpc_cidr = "10.0.0.0/16"
private_subnets = ["10.0.0.0/19", "10.0.64.0/19", "10.0.128.0/19"]
public_subnets = ["10.0.32.0/20", "10.0.96.0/20", "10.0.160.0/20"]
6 changes: 3 additions & 3 deletions tardigrade/aws/tenant.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
terraform {
required_version = "0.12.12"
required_version = "0.12.23"

backend "s3" {}
}

provider aws {
version = "~> 2.31.0"
version = "~> 2.52"
region = "${var.region}"
}

Expand All @@ -22,7 +22,7 @@ provider template {
}

provider external {
version = "~> 1.0"
version = "~> 1.2"
}

variable "partition" {
Expand Down
24 changes: 12 additions & 12 deletions tardigrade/roots/aws/baseline/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ data "template_file" "keystore_bucket_policy" {
}

module "keystore_bucket" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-s3-bucket.git?ref=1.0.4"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-s3-bucket.git?ref=1.1.1"

providers = {
aws = aws
Expand All @@ -105,7 +105,7 @@ module "keystore_bucket" {
}

module "keystore_s3" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-keystore.git?ref=1.0.0"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-keystore.git?ref=1.0.3"

providers = {
aws = aws
Expand All @@ -126,7 +126,7 @@ module "keystore_s3" {
}

module "keystore_ssm" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-keystore.git?ref=1.0.0"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-keystore.git?ref=1.0.3"

providers = {
aws = aws
Expand All @@ -145,7 +145,7 @@ module "keystore_ssm" {

##### IAM ALIAS #####
module "iam_account" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-iam-account.git?ref=1.0.1"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-iam-account.git?ref=1.1.0"

providers = {
aws = aws
Expand Down Expand Up @@ -221,7 +221,7 @@ resource "aws_iam_group_policy_attachment" "this" {

##### VPC #####
module "vpc" {
source = "github.com/plus3it/terraform-aws-vpc?ref=v2.15.0"
source = "github.com/plus3it/terraform-aws-vpc?ref=v2.25.0"

providers = {
aws = aws
Expand All @@ -248,7 +248,7 @@ module "vpc" {
}

module "vpc_endpoints" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-vpc-endpoints.git?ref=1.0.0"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-vpc-endpoints.git?ref=1.0.2"

providers = {
aws = aws
Expand All @@ -273,7 +273,7 @@ data "template_file" "vpcflowlog_bucket_policy" {
}

module "vpcflowlog_bucket" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-s3-bucket.git?ref=1.0.4"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-s3-bucket.git?ref=1.1.1"

providers = {
aws = aws
Expand All @@ -289,7 +289,7 @@ module "vpcflowlog_bucket" {
}

module "vpc_flow_log" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-vpc-flow-log.git?ref=1.0.0"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-vpc-flow-log.git?ref=1.0.2"

providers = {
aws = aws
Expand All @@ -315,7 +315,7 @@ data "template_file" "cloudtrail_bucket_policy" {
}

module "cloudtrail_bucket" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-s3-bucket.git?ref=1.0.4"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-s3-bucket.git?ref=1.1.1"

providers = {
aws = aws
Expand Down Expand Up @@ -356,7 +356,7 @@ data "template_file" "config_bucket_policy" {
}

module "config_bucket" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-s3-bucket.git?ref=1.0.4"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-s3-bucket.git?ref=1.1.1"

providers = {
aws = aws
Expand Down Expand Up @@ -385,7 +385,7 @@ module "config" {
}

module "config_rules" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-config-rules.git?ref=1.0.5"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-config-rules.git?ref=1.0.6"

providers = {
aws = aws
Expand All @@ -402,7 +402,7 @@ module "config_rules" {

##### INSPECTOR #####
module "inspector" {
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-inspector.git?ref=1.0.5"
source = "git::https://github.com/plus3it/terraform-aws-tardigrade-inspector.git?ref=1.0.6"

providers = {
aws = aws
Expand Down