dh-proteus 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9166f710a73dd5e425c1c57678b074953e822f18373115dab83c2bb69c1a4e1
-  data.tar.gz: 536e2c89ea79aeb66cd751d280905bdad818d0f3dde221d8b6a8ed3714a1f16d
+  metadata.gz: 263b0afd288fa51a29ea54621b191dd8cb86a4337456226694bf8c8047dd2534
+  data.tar.gz: 202ba99d158dabcfb19db4bc583f9a7fe4657697f38f0f0923b240232f50524b
 SHA512:
-  metadata.gz: addf02fb05acde3f7fbe087fb969725ea07ff5aa191ddb3a3025dbaf8b8abb6ead4b9a0639151698ae74f758ec05da7777f9d838c4361be933ff18e0fb2a2288
-  data.tar.gz: 0fc89209ad85a76df1010b7842b9a6ff427b9171b3e888ad5ff5cb2a4533d755f4d2070a7f6599af991ac20c5dfb9b056d8f1f135818dbfa0a4e655aa0c686ad
+  metadata.gz: '09320cdfeb939b664384449b04496fd649886df20adab89c947b1c89b82cc94b91d2f9afd8c4749de3c9c93202b9aa71bb403e3f0f2e36d7bada77d41fb9c8ff'
+  data.tar.gz: c2c3c0d51070d4db497cf14e1f3a1b00d8df9efc3e555c2f1feba7776e088436b066eca4f650615d02b44102a4a080b457610ba40814153b3aba45dae21b1cd9

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,25 @@ 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].each do |provider|
+          provider[:environments].each do |env|
+            env[:match].each do |m|
+              if @environment == m
+                @provider_environment = env
+              end
+            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 +42,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
@@ -62,7 +65,7 @@ module Proteus
         end
       end
 
-      raise "No AWS profile found in config."
+      ""
     end
 
     def dryrun

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/helpers.rb

@@ -33,7 +33,15 @@ module Proteus
     end
 
     def current_user
-      Etc.getpwnam(Etc.getlogin).gecos
+       user = ENV['CURRENT_USER_NAME'] ? ENV['CURRENT_USER_NAME'] : Etc.getpwnam(Etc.getlogin).gecos
+       if user.empty?
+         puts "Please set your git username properly:"
+         puts "git config --global user.name \"FIRST_NAME LAST_NAME\""
+         puts "git config --global user.email \"YOUR_NAME@example.com\""
+         exit 1
+       else
+         user
+       end
     end
 
     def slack_webhook

data/lib/proteus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Simon Albrecht
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
-description: 
+description:
 email:
 - simon.albrecht@deliveryhero.com
 executables:
@@ -184,7 +184,7 @@ metadata:
   homepage_uri: https://github.com/deliveryhero/proteus
   source_code_uri: https://github.com/deliveryhero/proteus
   changelog_uri: https://github.com/deliveryhero/proteus/CHANGELOG
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,9 +199,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Proteus is a Terraform wrapper application.
 test_files: []