From 6bb13ed811413f8b34bcfeb9a46b3b91c0592277 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 18 Apr 2023 09:55:51 -0700 Subject: [PATCH 1/4] Simplifies event rule patterns, relying only on details from cloudtrail event --- main.tf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/main.tf b/main.tf index ff068a49..10ad241d 100644 --- a/main.tf +++ b/main.tf @@ -66,8 +66,6 @@ locals { event_types = { CreateAccountResult = jsonencode( { - "source" : ["aws.organizations"], - "detail-type" : ["AWS Service Event via CloudTrail"] "detail" : { "eventSource" : ["organizations.amazonaws.com"], "eventName" : ["CreateAccountResult"] @@ -81,8 +79,6 @@ locals { ) InviteAccountToOrganization = jsonencode( { - "source" : ["aws.organizations"], - "detail-type" : ["AWS API Call via CloudTrail"] "detail" : { "eventSource" : ["organizations.amazonaws.com"], "eventName" : ["InviteAccountToOrganization"] From 5c52bbc704567f271d014c867a5f4dd31fdd8658 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 18 Apr 2023 14:04:08 -0700 Subject: [PATCH 2/4] Uses LOCALSTACK_VERSION env if available --- tests/docker-compose-localstack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker-compose-localstack.yml b/tests/docker-compose-localstack.yml index 5262a037..94129d67 100644 --- a/tests/docker-compose-localstack.yml +++ b/tests/docker-compose-localstack.yml @@ -3,7 +3,7 @@ version: "2.1" services: localstack: container_name: localstack - image: localstack/localstack + image: "localstack/localstack:${LOCALSTACK_VERSION:-latest}" ports: - "4566:4566" - "4571:4571" From 2c94e0e2aab9c49e71941dc2b205b1022e451ac4 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 18 Apr 2023 14:34:40 -0700 Subject: [PATCH 3/4] Updates docker-compose for current localstack --- .travis.yml | 4 +++- Makefile | 4 ++-- tests/docker-compose-localstack.yml | 8 ++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8c39d6b..87f72d0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,9 @@ jobs: - make docker-compose/install - make mockstack/up script: make mockstack/pytest/lambda - after_script: make mockstack/clean + after_script: + - docker-compose -f ./tests/docker-compose-localstack.yml logs + - make mockstack/clean - stage: deploy if: branch = master AND type = push AND repo = plus3it/terraform-aws-org-new-account-trust-policy before_script: diff --git a/Makefile b/Makefile index e09658b8..37a45ef2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL := /bin/bash export PYTHONPATH := $(PYTHONPATH):./lambda/src -export TERRAFORM_PYTEST_DIR := tests +export TERRAFORM_PYTEST_DIR := $(PWD)/tests include $(shell test -f .tardigrade-ci || curl -sSL -o .tardigrade-ci "https://raw.githubusercontent.com/plus3it/tardigrade-ci/master/bootstrap/Makefile.bootstrap"; echo .tardigrade-ci) @@ -19,7 +19,7 @@ python/deps: .PHONY: mockstack/pytest/lambda mockstack/pytest/lambda: @ echo "[$@] Running Terraform tests against LocalStack" - DOCKER_RUN_FLAGS="--network tests_default --rm -e LOCALSTACK_HOST=localstack" \ + DOCKER_RUN_FLAGS="--network terraform_pytest_default --rm -e LOCALSTACK_HOST=localstack" \ TARDIGRADE_CI_DOCKERFILE=Dockerfile_test \ IMAGE_NAME=new-account-trust-policy-integration-test:latest \ $(MAKE) docker/run target=terraform/pytest diff --git a/tests/docker-compose-localstack.yml b/tests/docker-compose-localstack.yml index 94129d67..0062fff5 100644 --- a/tests/docker-compose-localstack.yml +++ b/tests/docker-compose-localstack.yml @@ -1,4 +1,8 @@ -version: "2.1" +version: "3.8" + +networks: + default: + name: terraform_pytest_default services: localstack: @@ -8,7 +12,7 @@ services: - "4566:4566" - "4571:4571" environment: - - SERVICES=cloudwatch,events,lambda,iam,sts,organizations - MAIN_CONTAINER_NAME=localstack + - LAMBDA_DOCKER_NETWORK=terraform_pytest_default volumes: - "/var/run/docker.sock:/var/run/docker.sock" From bf81e5dba407d65d7f53896f25a20dfadf7a57a4 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 18 Apr 2023 09:55:56 -0700 Subject: [PATCH 4/4] Bumps version to 2.0.1 --- .bumpversion.cfg | 2 +- CHANGELOG.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b49e5139..b3432d35 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.0 +current_version = 2.0.1 commit = True message = Bumps version to {new_version} tag = False diff --git a/CHANGELOG.md b/CHANGELOG.md index e99068ed..a03c2929 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ 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/). +### [2.0.1](https://github.com/plus3it/terraform-aws-org-new-account-trust-policy/releases/tag/2.0.1) + +**Released**: 2023.04.18 + +**Summary**: + +* Simplifies event rule patterns, relying only on details from cloudtrail event + ### 1.0.0 **Commit Delta**: [Change from 0.2.2 release](https://github.com/plus3it/terraform-aws-org-new-account-support-case/compare/0.2.2...1.0.0)