fix Dockerfile and Gemfile.lock and update READMEs

Author: Simon So

Gemfile.lock

@@ -1,15 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    aws-sdk (2.11.197)
-      aws-sdk-resources (= 2.11.197)
-    aws-sdk-core (2.11.197)
+    aws-sdk (2.11.210)
+      aws-sdk-resources (= 2.11.210)
+    aws-sdk-core (2.11.210)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.197)
-      aws-sdk-core (= 2.11.197)
+    aws-sdk-resources (2.11.210)
+      aws-sdk-core (= 2.11.210)
     aws-sigv4 (1.0.3)
     azure_graph_rbac (0.17.0)
       ms_rest_azure (~> 0.11.0)
@@ -65,7 +65,7 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.25)
+    ffi (1.10.0)
     google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
@@ -118,12 +118,13 @@ GEM
     jmespath (1.4.0)
     json (2.1.0)
     jwt (2.1.0)
-    kitchen-terraform (4.1.1)
+    kitchen-terraform (4.3.0)
       dry-types (~> 0.9)
       dry-validation (~> 0.10)
       inspec (~> 3.0)
       mixlib-shellout (~> 2.2)
       test-kitchen (~> 1.23)
+      tty-which (~> 0.4.0)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -137,7 +138,7 @@ GEM
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-log (2.0.9)
+    mixlib-log (3.0.1)
     mixlib-shellout (2.4.4)
     mixlib-versioning (1.2.7)
     ms_rest (0.7.3)
@@ -159,7 +160,7 @@ GEM
       net-ssh (>= 2.6.5)
     nori (2.6.0)
     os (1.0.0)
-    parallel (1.12.1)
+    parallel (1.13.0)
     parslet (1.8.2)
     pastel (0.7.2)
       equatable (~> 0.5.0)
@@ -197,13 +198,13 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    sslshake (1.2.0)
+    sslshake (1.3.0)
     strings (0.1.4)
       strings-ansi (~> 0.1.0)
       unicode-display_width (~> 1.4.0)
       unicode_utils (~> 1.4.0)
     strings-ansi (0.1.0)
-    term-ansicolor (1.7.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
     test-kitchen (1.24.0)
       mixlib-install (~> 3.6)
@@ -217,7 +218,7 @@ GEM
       winrm-fs (~> 1.1)
     thor (0.20.3)
     timeliness (0.3.8)
-    timers (4.2.0)
+    timers (4.3.0)
     tins (1.20.2)
     tomlrb (1.2.8)
     train (1.6.3)
@@ -237,7 +238,7 @@ GEM
       winrm-fs (~> 1.0)
     tty-color (0.4.3)
     tty-cursor (0.6.0)
-    tty-prompt (0.18.0)
+    tty-prompt (0.18.1)
       necromancer (~> 0.4.0)
       pastel (~> 0.7.0)
       timers (~> 4.0)
@@ -254,6 +255,7 @@ GEM
       pastel (~> 0.7.2)
       strings (~> 0.1.0)
       tty-screen (~> 0.6.4)
+    tty-which (0.4.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext

README.md

@@ -50,16 +50,16 @@ make docker_run
 The root directory of the module will be mounted to `/cft/workdir` in the container. For example, to run the `mig-autoscaler` test suite:
 
 ```
-kitchen test mig-autosaler
+bundle exec kitchen test mig-autosaler
 ```
 
 or
 
 ```
-kitchen create mig-autoscaler
-kitchen converge mig-autoscaler
-kitchen verify mig-autoscaler
-kitchen destroy mig-autoscaler
+bundle exec kitchen create mig-autoscaler
+bundle exec kitchen converge mig-autoscaler
+bundle exec kitchen verify mig-autoscaler
+bundle exec kitchen destroy mig-autoscaler
 ```
 
 ## Permissions

build/docker/kitchen_terraform/Dockerfile

@@ -19,12 +19,9 @@ FROM $BASE_IMAGE
 RUN apk add --no-cache \
     ca-certificates=20171114-r3
 
-WORKDIR /opt/kitchen
+WORKDIR $APP_BASE_DIR/workdir
 COPY Gemfile .
-
 RUN bundle install
 
 RUN gcloud components install beta --quiet
 RUN gcloud components install alpha --quiet
-
-WORKDIR $APP_BASE_DIR/workdir

examples/instance_template/additional_disks/main.tf

@@ -35,13 +35,13 @@ module "instance_template" {
       boot         = "false"
     },
     {
-      disk_size_gb = 20
+      disk_size_gb = 10
       disk_type    = "pd-standard"
       auto_delete  = "true"
       boot         = "false"
     },
     {
-      disk_size_gb = 30
+      disk_size_gb = 10
       disk_type    = "pd-standard"
       auto_delete  = "true"
       boot         = "false"

modules/mig/variables.tf

@@ -54,10 +54,6 @@ variable "update_policy" {
   default     = []
 }
 
-##############
-# Autohealing
-##############
-
 ##############
 # Healthcheck
 ##############

modules/project_services/README.md

@@ -82,8 +82,8 @@
       end
     end
 
-    describe "autoscaled" do
-      it "should be yes" do
+    describe "autoscaling" do
+      it "should be enabled" do
         expect(data[0]['autoscaled']).to eq("yes")
       end
     end