Merge pull request #3 from leandevops/develop

Develop

Author: lestex

.circleci/config.yml

@@ -10,9 +10,7 @@ jobs:
       - checkout
       - run:
           name: Terraform init
-          command: |
-            cd module
-            terraform init -input=false
+          command: make init
 
   terraform-validate:
     <<: *docker
@@ -67,7 +65,7 @@ jobs:
 
       - run:
           name: Run kitchen test
-          command: bundle exec kitchen test
+          command: make
 
 workflows:
   version: 2

.gitignore

@@ -1,7 +1,5 @@
-.kitchen/
 .terraform/
-terraform.tfstate.d/
-test/fixtures/tf_module/function/*.zip
-out.terraform
 terraform.tfstate
-terraform.tfstate.backup
+terraform.tfstate.backup
+.terraform.tfstate.lock.info
+*.zip

.kitchen.yml

@@ -1,6 +1,4 @@
 source 'https://rubygems.org/' do
   gem 'awspec'
-  gem 'kitchen-terraform'
-  gem 'kitchen-verifier-awspec'  
   gem 'hcl-checker'
 end

Gemfile

@@ -1,8 +1,6 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
     aws-eventstream (1.0.2)
     aws-partitions (1.144.0)
     aws-sdk (3.0.1)
@@ -717,115 +715,11 @@ GEM
       rspec-its
       term-ansicolor
       thor
-    builder (3.2.3)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    docker-api (1.34.2)
-      excon (>= 0.47.0)
-      multi_json
-    dry-configurable (0.8.2)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-    dry-container (0.7.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.7)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.2)
     dry-inflector (0.1.2)
-    dry-logic (0.5.0)
-      dry-container (~> 0.2, >= 0.2.6)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-types (0.14.0)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.2)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 0.5, >= 0.5)
-    dry-validation (0.13.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-      dry-core (~> 0.2, >= 0.2.1)
-      dry-equalizer (~> 0.2)
-      dry-logic (~> 0.5, >= 0.5.0)
-      dry-types (~> 0.14, >= 0.14)
-    erubis (2.7.0)
-    excon (0.62.0)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashie (3.6.0)
     hcl-checker (1.1.1)
-    htmlentities (4.3.4)
-    httpclient (2.8.3)
-    inspec (1.51.25)
-      addressable (~> 2.4)
-      faraday (>= 0.9.0)
-      hashie (~> 3.4)
-      htmlentities
-      json (>= 1.8, < 3.0)
-      method_source (~> 0.8)
-      mixlib-log
-      parallel (~> 1.9)
-      parslet (~> 1.5)
-      pry (~> 0)
-      rspec (~> 3)
-      rspec-its (~> 1.2)
-      rubyzip (~> 1.1)
-      semverse
-      sslshake (~> 1.2)
-      thor (~> 0.19)
-      tomlrb (~> 1.2)
-      train (~> 0.32)
     ipaddress (0.8.3)
     jmespath (1.4.0)
-    json (2.2.0)
-    kitchen-inspec (0.26.0)
-      hashie (~> 3.4)
-      inspec (>= 0.34.0, < 4.0.0)
-      test-kitchen (~> 1.6)
-    kitchen-terraform (3.3.1)
-      dry-types (~> 0.9)
-      dry-validation (~> 0.10)
-      kitchen-inspec (~> 0.18)
-      mixlib-shellout (~> 2.2)
-      test-kitchen (~> 1.16)
-    kitchen-verifier-awspec (0.1.2)
-      net-ssh (>= 3)
-      test-kitchen (~> 1.4)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    method_source (0.9.2)
-    mixlib-install (3.11.11)
-      mixlib-shellout
-      mixlib-versioning
-      thor
-    mixlib-log (3.0.1)
-    mixlib-shellout (2.4.4)
-    mixlib-versioning (1.2.7)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
-    net-ssh-gateway (1.3.0)
-      net-ssh (>= 2.6.5)
-    nori (2.6.0)
-    parallel (1.14.0)
-    parslet (1.8.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.3)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -842,59 +736,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubyntlm (0.6.2)
-    rubyzip (1.2.2)
-    semverse (3.0.0)
-    sslshake (1.3.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    test-kitchen (1.24.0)
-      mixlib-install (~> 3.6)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-gateway (~> 1.2)
-      thor (~> 0.19)
-      winrm (~> 2.0)
-      winrm-elevated (~> 1.0)
-      winrm-fs (~> 1.1)
     thor (0.20.3)
     tins (1.20.2)
-    tomlrb (1.2.8)
-    train (0.32.0)
-      docker-api (~> 1.26)
-      json (>= 1.8, < 3.0)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 5.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm (2.3.1)
-      builder (>= 2.1.2)
-      erubis (~> 2.7)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.1)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.3.2)
-      erubis (~> 2.7)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
-      winrm (~> 2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   awspec!
   hcl-checker!
-  kitchen-terraform!
-  kitchen-verifier-awspec!
 
 BUNDLED WITH
    2.0.1

Gemfile.lock

@@ -4,35 +4,74 @@ RED   = \033[0;31m
 NC    = \033[0m
 
 # run all
-all: build plan apply
+all: init validate plan apply run-tests destroy
 	@echo "$(GREEN)✓ 'make all' has completed $(NC)\n"
 
 # initial terraform setup
 init: ; @echo "$(GREEN)✓ Initializing terraform $(NC)\n"
-	@cd test/fixtures/tf_module/ && terraform get && terraform init
+	@terraform init -input=false -lock=true \
+			   -upgrade -force-copy -backend=true -get=true \
+			   -get-plugins=true -verify-plugins=true \
+			   tests/fixtures/tf_module
 	@$(MAKE) -s post-action
 
-# building a function
-build: ; @echo "$(GREEN)✓ Building a function $(NC)\n"
-	@cd test/fixtures/tf_module/function && zip function.zip *.py
+update: ; @echo "$(GREEN)✓ Updating terraform $(NC)\n"
+	@terraform get -update tests/fixtures/tf_module
+	@$(MAKE) -s post-action
+
+validate: ; @echo "$(GREEN)✓ Updating terraform $(NC)\n"
+	@terraform validate -check-variables=true \
+			   -var-file=tests/fixtures/tf_module/testing.tfvars \
+			   tests/fixtures/tf_module
 	@$(MAKE) -s post-action
 
-# plan terraform
+# terraform plan
 plan: ; @echo "$(GREEN)✓ Planning terraform $(NC)\n"
-	@cd test/fixtures/tf_module/ && terraform plan -var-file=testing.tfvars --out out.terraform
+	@terraform plan -lock=true -input=false \
+			   -parallelism=4 -refresh=true \
+			   -var-file=tests/fixtures/tf_module/testing.tfvars \
+			   tests/fixtures/tf_module
 	@$(MAKE) -s post-action
 
 # apply terraform
 apply: ; @echo "$(GREEN)✓ Applying terraform $(NC)\n"
-	@cd test/fixtures/tf_module/ && terraform apply out.terraform
+	@terraform apply -lock=true -input=false \
+			   -auto-approve=true -parallelism=4 -refresh=true \
+			   -var-file=tests/fixtures/tf_module/testing.tfvars \
+			   tests/fixtures/tf_module
+	@$(MAKE) -s post-action
+
+run-tests: ; @echo "$(GREEN)✓ Running rspec tests $(NC)\n"
+	@bundle exec rspec -c -f doc --default-path '.'  -P 'tests/scenarios/test_module.rb'
+	@$(MAKE) -s post-action
+
+# building a function
+build: ; @echo "$(GREEN)✓ Building a function $(NC)\n"
+	@cd tests/fixtures/tf_module/function && zip function.zip *.py
 	@$(MAKE) -s post-action
 
-# destroy all resources and amivar.tf file
+# destroy all resources
 destroy: ; @echo "$(RED)✓ Destroying terraform resources $(NC)\n"
-	@cd test/fixtures/tf_module/ && terraform destroy -force -var-file=testing.tfvars
+	@terraform destroy -force -input=false -parallelism=4 -refresh=true \
+			   -var-file=tests/fixtures/tf_module/testing.tfvars \
+			   tests/fixtures/tf_module
+	@rm terraform.tfstate*
+	@$(MAKE) -s post-action
+
+clean: ; @echo "$(RED)✓ Cleaning directory $(NC)\n"
+	@rm -rf test/fixtures/tf_module/.terraform
+	@rm -f terraform.tfstate*
+	@rm -f test/fixtures/tf_module/function/function.zip
+	@$(MAKE) -s post-action
+
+tflint: ; @echo "$(RED)✓ Running tflint $(NC)\n"
+	@cd module && tflint
+	@$(MAKE) -s post-action
+
+deps: ; @echo "$(RED)✓ Installing dependencies $(NC)\n"
+	@gem install bundler
+	@bundle check || bundle install
 	@$(MAKE) -s post-action
-.PHONY: destroy
 
-# run post actions
 post-action: ; @echo "$(BLUE)✓ Done. $(NC)\n"
 .PHONY: post-action