terragov 0.2.5.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34fec7129f031849a422749f2d0d9a9f54c3c6a4
-  data.tar.gz: f14943b68ac8e627bb12873a43a941ff7c682a41
+  metadata.gz: 7a6a1b21ce61bd33cbe176f659736df43d5b675e
+  data.tar.gz: f795a6e0a83173b5c324a19f8e849442128a111a
 SHA512:
-  metadata.gz: bf982e8c0e14e751ad7646940b29c2fbf70b5667ee335abf79daf0c17ec3eef9a4fb83acc423685b123d96b86d7c69cdc6b20fae7fc023f02d2e851e3e711ac5
-  data.tar.gz: 539b16c5019e21402f4bf975e048bb1f05dfae3be5dd18d5a84cd6a8ce495e073d52aa931d7208aa4b75986b381a9974c2419963a513b70f832885ba079e19fa
+  metadata.gz: 4aece8878211d2e6a066a90e811d0284ddfe844ec4785d7b04abee636f5126d96a417a1f26f274aea757e431cf489e22fec64565b88b649671b2f90177e06f5a
+  data.tar.gz: e670688f84d0966ba605341927626a1ebc26abf42d7bea949eaca980f9d2dd7b4b64b1e28621c302aea7f8784a25e416c31af651983397a8c9cb5c75c3501c59

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0 (2017-11-26)
+
+ - Updated configuration file to allow default values and project specific values
+ - Uses `-detailed-exitcode` by default, and warns user if there are changes pending
+ - Small code tidy
+
 ## 0.2.4 (2017-10-15)
 
  - Updated cleaner method to check for both ".terraform" and "terraform.tfstate.backup"

data/README.md

@@ -63,12 +63,20 @@ The contents should be YAML, and look like the following:
 
 ```
 ---
-environment: 'integration'
-stack: 'blue'
-repo_dir: '~/govuk/govuk-aws'
-data_dir: '~/govuk/govuk-aws-data/data'
+default:
+  environment: 'integration'
+  stack: 'blue'
+  repo_dir: '~/govuk/govuk-aws'
+  data_dir: '~/govuk/govuk-aws-data/data'
+
+app-some-project:
+  stack: 'green'
 ```
 
+Specify default values under the "default" block, and if you need any project specific values, add them under the key of the same name of that project.
+
+Project specific values will take precedence over default values.
+
 ## Optional global arguments
 
 These may be set in the same way as described above, with the same precedence, but they are not required.

data/lib/terragov/cli.rb

@@ -96,59 +96,90 @@ module Terragov
     def load_config_file
       if $config_file || ENV['TERRAGOV_CONFIG_FILE']
         file = $config_file || ENV['TERRAGOV_CONFIG_FILE']
-        $values = YAML.load_file(File.expand_path(file))
-        $values
+        YAML.load_file(File.expand_path(file))
+      end
+    end
+
+    def config_file_default
+      if load_config_file['default'].nil?
+        return nil
+      else
+        return load_config_file['default']
+      end
+    end
+
+    def config_file_specific_project(project_name)
+      load_config_file[project_name]
+    end
+
+    def config_file(option)
+      # This has to be loaded in seperately to avoid any cyclic dependencies
+      project_name = $project || ENV['TERRAGOV_PROJECT']
+
+      if project_name.nil?
+        if config_file_default.nil?
+          return nil
+        else
+          return config_file_default[option]
+        end
+      else
+        project_config = config_file_specific_project(project_name)
+        if project_config.nil? or project_config[option].nil?
+          return config_file_default[option]
+        else
+          return project_config[option]
+        end
       end
     end
 
     def config(option, file = false, required = true)
       env_var = "TERRAGOV_#{option.upcase}"
       error_message = "Must set #{option}. Use --help for details."
+
+      # Load from CLI option
       if public_send(option)
         if file
           return File.expand_path(public_send(option))
         else
           return public_send(option)
         end
+
+      # Load from environment variable
       elsif ENV[env_var]
         if file
           return File.expand_path(ENV[env_var])
         else
           return ENV[env_var]
         end
+
+      # Load from config file
       elsif !load_config_file.nil?
-        if load_config_file[option].nil?
-          if required
-            abort(error_message)
-          else
-            return false
-          end
+        if config_file(option).nil?
+          abort(error_message) if required
+          return false
         else
           if file
-            return File.expand_path(load_config_file[option])
+            return File.expand_path(config_file(option))
           else
-            return load_config_file[option]
+            return config_file(option)
           end
         end
       else
-        if required
-          abort(error_message)
-        else
-          return false
-        end
+        abort(error_message) if required
+        return false
       end
     end
 
     def cmd_options
-      cmd_options_hash = {
+      {
+        # Always load the project name first
+        'project'     => config('project'),
         'environment' => config('environment'),
         'data_dir'    => config('data_dir', true),
-        'project'     => config('project'),
         'stack'       => config('stack'),
         'repo_dir'    => config('repo_dir', true),
         'extra'       => extra
       }
-      cmd_options_hash
     end
 
     def git_compare_repo_and_data(skip = false)

data/lib/terragov/terraform.rb

@@ -26,6 +26,10 @@ module Terragov
       Dir.chdir directory
       init(backend, dryrun, verbose)
 
+      if command == 'plan'
+        command = 'plan -detailed-exitcode'
+      end
+
       full_command = "bash -c 'terraform #{command} #{vars}'"
 
       run(full_command, dryrun, verbose)
@@ -41,7 +45,15 @@ module Terragov
         puts command
       else
         puts command if verbose
-        abort("There was an issue running the command: #{command}") unless system(command)
+        system(command)
+
+        # Catch the output of "-detailed-exitcode"
+        if $?.exitstatus == 2
+          puts "Command completed successfully, but with updates available to apply"
+          exit 2
+        elsif $?.exitstatus != (0 or 2)
+          abort("There was an issue running command: #{command}")
+        end
       end
     end
   end

data/lib/terragov/version.rb

@@ -1,3 +1,3 @@
 module Terragov
-  VERSION = '0.2.5.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terragov
 version: !ruby/object:Gem::Version
-  version: 0.2.5.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Laura Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-05 00:00:00.000000000 Z
+date: 2017-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander