Merge pull request #7 from newcontext-oss/brandoconnor-feature/migrat…

…e_to_inspec-gcp Brandoconnor feature/migrate to inspec gcp
newcontext-oss · Aug 7, 2019 · f298835 · f298835
2 parents bab45c2 + 62fd59f
commit f298835
Show file tree

Hide file tree

Showing 15 changed files with 386 additions and 123 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-.terraform
+.terraform/
 .kitchen/
 terraform.tfstate.d/
 terraform.tfstate*
@@ -7,3 +7,5 @@ credentials.json
 ubuntu*
 .vscode
 ci.tar.gz
+vendor/
+.bundle
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,16 @@
 language: ruby
+rvm:
+  - 2.5
 cache:
   directories:
     - vendor/bundle
     - vendor/cache
     - vendor/bin
     - vendor/google-cloud-sdk
+before_install:
+  - gem update --system
+  - gem install bundler
+  - bundle --full-index
 jobs:
   stages:
     - name: prepare cache
@@ -31,4 +37,4 @@ jobs:
         file: "**/*"
         on:
           repo: newcontext-oss/terraform-google-instance
-          branch: master
+          branch: master
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
 source 'https://rubygems.org/' do
-  gem 'kitchen-terraform'
-end
+  gem 'inspec', '~> 2.2.35'          # for Terraform 0.12+, make: ~> 4.0.0
+  gem 'kitchen-google', '~> 1.5'
+  gem 'kitchen-terraform', '~> 4.0.0'  # for Terraform 0.12+, make: >= 4.0.0
+end