dh-proteus 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b4cd808da9cf190dae73451425d2b8633fdea7c9131c5fc505d6d76ac40f2b1
-  data.tar.gz: fd1fc07d943ec61586b0bcc3dc58b9b4747f3cbcf649f732a7f9e07458c9680a
+  metadata.gz: 84b2b69ce04378ef96f36162ba523acd0926398dd959b8e4d13ecf888803f06c
+  data.tar.gz: df48273ded3eab015226a485753753ce363e31826b23a63cd17e982cf0717163
 SHA512:
-  metadata.gz: 1b982f923196565229bbf2e90fd8705b2fa57afe94d60da265f33f075ba05df33fba5d5bb4c3763382b7efe3ca8db6a531858bd3302b05090a6611d628f12fe5
-  data.tar.gz: 1a2cf23aaa872cf602e19c85a3ba13323ef14dfefa1c31881fa3b15444be1865c99079b4da20638209384c4c4f107c437901607880a9109f67b1ee13a39b3718
+  metadata.gz: f4f832d9e2c1578e758c961faad4da64dc0fc1c1fba84fa3f299f6984d6be781717b076122390d337dae19081821a868c1249cfa10e2e660757284c15db8f183
+  data.tar.gz: bdcaaec5de032a8eba1e112ad6b42240a685dcdd39cb96856ed8ad2114c5cd40729c2ab9bc3fb9e779e32d37141ee7c8ede68cb408520e5cd80b5d2e860c1577

data/bin/proteus

@@ -2,4 +2,5 @@
 
 require 'proteus'
 
+$stdout.sync = true
 Proteus::App.start(ARGV)

data/lib/proteus/backend/backend.rb

@@ -6,11 +6,23 @@ module Proteus
       include Proteus::Helpers::PathHelpers
       include Thor::Shell
 
+      attr_reader :backend_key
+
       def initialize(config:, context:, environment:)
         @config = config
         @context = context
         @environment = environment
-      end
+
+        @config[:providers].select {|p| p[:name] == 'aws' }.first[:environments].each do |env|
+          env[:match].each do |m|
+            if @environment == m
+              @provider_environment = env
+            end
+          end
+        end
+
+        @backend_key = @provider_environment[:backend]
+    end
 
       def render
         File.open(File.join(context_path(@context), 'backend.tf'), 'w') do |file|
@@ -28,10 +40,10 @@ module Proteus
         <<~TEMPLATE
           terraform {
             backend "s3" {
-              bucket  = "<%= @config[:backend][:bucket][:name] %>"
-              key     = "<%= @config[:backend][:key_prefix] %>#{@context}-#{@environment}.tfstate"
-              region  = "<%= @config[:backend][:bucket][:region] %>"
-              profile = "<%= @config[:backend][:bucket][:profile]%>"
+              bucket  = "<%= @config[:backend][@backend_key][:bucket][:name] %>"
+              key     = "<%= @config[:backend][@backend_key][:key_prefix] %>#{@context}-#{@environment}.tfstate"
+              region  = "<%= @config[:backend][@backend_key][:bucket][:region] %>"
+              profile = "<%= @config[:backend][@backend_key][:bucket][:profile]%>"
             }
           }
         TEMPLATE

data/lib/proteus/common.rb

@@ -30,14 +30,17 @@ module Proteus
     end
 
     def render_backend
-      Proteus::Backend::Backend.new(config: config, context: context, environment: environment).render
+      backend = Proteus::Backend::Backend.new(config: config, context: context, environment: environment)
+      backend.render
+
+      backend
     end
 
     def init(verbose: false)
       say "initializing", :green
       say "environment: #{environment}", :green
 
-      render_backend
+      backend = render_backend
 
       `rm -rf #{context_path(context)}/.terraform/*.tf*`
       `rm -rf #{context_path(context)}/.terraform/modules`
@@ -46,7 +49,7 @@ module Proteus
       terraform_command = <<~TERRAFORM_COMMAND
         cd #{context_path(context)} && \
         terraform init \
-        -backend-config='key=#{config[:backend][:key_prefix]}#{context}-#{environment}.tfstate' \
+        -backend-config='key=#{config[:backend][backend.backend_key][:key_prefix]}#{context}-#{environment}.tfstate' \
         #{aws_profile} \
         #{context_path(context)}
       TERRAFORM_COMMAND

data/lib/proteus/config/config.rb

@@ -26,7 +26,7 @@ module Proteus
               ensure_uniqueness_across :match
 
               each do
-                ensure_keys :profile
+                ensure_keys :profile, :backend
               end
             end
           end
@@ -41,10 +41,12 @@ module Proteus
         end
 
         within :backend do
-          ensure_presence :key_prefix
+          each_key do
+            ensure_presence :key_prefix
 
-          within :bucket do
-            ensure_keys :name, :region, :profile
+            within :bucket do
+              ensure_keys :name, :region, :profile
+            end
           end
         end
       end

data/lib/proteus/version.rb

@@ -1,5 +1,5 @@
 module Proteus
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end
 
 if $0 == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Simon Albrecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler