dh-proteus 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb5e638db16f99a0788b308916d6788599591155e71f0b3112ba14efa899c03
-  data.tar.gz: 5b76029b2b37a7db6c28ffef458514f84eee2a3a08f05376d7f5e199de2ce96d
+  metadata.gz: ee44660b54c99fcc0430739f91d7c983be8ae26dc5f7dd6bd240a8faf1419e94
+  data.tar.gz: 3321c7016cde53892060b64e05cc26a55e14a6cdfd66584bb38297fbc059fe57
 SHA512:
-  metadata.gz: 27daef8b98d42b544611c2f411cd7b454b4e4706b4acbf263e0cd716c6d46ce37927ec86aa61acba8aa8923dc6e5eea9d382ddc812737e49d393c4c212faa7de
-  data.tar.gz: aca86a828d979fff964167e593a74d1e0eb416feeb10a8391b1c4fe6e340cd57d4c32fc3e7f0a6a50eb8e352ff9606599dad228440b3770215b94fc969ed159f
+  metadata.gz: efe2adfa660b4e6e05760301eefc5fe382906bf76d3f38e6aca879eb9772ccd6a5f1f955904fd936862fe460ae8b77c8f920ed03ffde71806a2e94aa9d98d9bc
+  data.tar.gz: a131676d34b70fbaa94a0e02e317ba26f64f32f9d5a309494f7959ccb753d588463cc5b6a5b57299dafa7360d874ed27fd0210c1ccf4759102f13b29d73e69be

data/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: .
   specs:
-    dh-proteus (0.1.4)
+    dh-proteus (0.3.4)
       activesupport (~> 5.1.1)
-      aws-sdk-elasticsearchservice (~> 1.4.0)
-      aws-sdk-rds (~> 1.11.0)
-      aws-sdk-route53 (~> 1.7.0)
       erubis (~> 2.7.0)
+      terminal-table (~> 3.0.0)
       thor (~> 0.20.0)
 
 GEM
@@ -17,33 +15,14 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.189.0)
-    aws-sdk-core (3.59.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-elasticsearchservice (1.4.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-rds (1.11.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-route53 (1.7.0)
-      aws-sdk-core (~> 3)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
     coderay (1.1.1)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.3)
     erubis (2.7.0)
-    i18n (1.6.0)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
     method_source (0.8.2)
-    minitest (5.11.3)
+    minitest (5.14.4)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -63,10 +42,13 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     slop (3.6.0)
+    terminal-table (3.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -79,4 +61,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.0.1
+   2.2.3

data/dh-proteus.gemspec

@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activesupport', '~> 5.1.1'
   spec.add_runtime_dependency 'thor', '~> 0.20.0'
   spec.add_runtime_dependency 'erubis', '~> 2.7.0'
+  spec.add_runtime_dependency 'terminal-table', '~> 3.0.0'
 end

data/lib/proteus/app.rb

@@ -1,6 +1,7 @@
 require 'proteus/common'
 require 'proteus/generate'
 require 'proteus/init'
+require 'proteus/backend_info'
 require 'proteus/global_commands/validate'
 require 'proteus/global_commands/version'
 require 'proteus/context_management/context'
@@ -22,7 +23,7 @@ module Proteus
     extend Proteus::ContextManagement::Helpers
 
     class_option :dryrun, type: :boolean, default: false, aliases: '-d'
-    class_option :verbose, type: :boolean, default: false, aliases: '-v'
+    class_option :verbose, type: :boolean, default: true, aliases: '-v'
 
     contexts.each do |context|
 
@@ -113,6 +114,9 @@ module Proteus
     desc 'init', 'Initializes a new proteus root directory in the current working directory'
     subcommand('init', Proteus::Init)
 
+    desc 'backend_info', 'Shows information about backends'
+    subcommand('backend_info', Proteus::BackendInfo)
+
     include Proteus::GlobalCommands::Validate
     include Proteus::GlobalCommands::Version
   end

data/lib/proteus/backend/backend.rb

@@ -13,17 +13,7 @@ module Proteus
         @context = context
         @environment = environment
 
-        @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]
+        find_backend_key
     end
 
       def render
@@ -36,8 +26,51 @@ module Proteus
         exit 1
       end
 
+      def show_backends
+        require 'terminal-table'
+        table = Terminal::Table.new do |t|
+            t << ['Context', 'Environment', 'Profile', 'Bucket']
+
+          @config[:contexts].each do |ctx|
+            ctx[:environments].each do |env|
+              env[:match].each do |m|
+                t << [
+                  ctx[:name],
+                  m,
+                  @config[:backend][env[:backend]][:profile],
+                  @config[:backend][env[:backend]][:bucket][:name]
+                ]
+              end
+            end
+          end
+        end
+
+        say table, :green
+
+      end
+
+      def aws_profile
+        @config[:backend][@backend_key][:profile]
+      end
+
       protected
 
+      def find_backend_key
+        @config[:contexts].each do |ctx|
+          if ctx[:name] == @context
+            ctx[:environments].each do |env|
+              env[:match].each do |m|
+                if @environment == m
+                  @backend_key = env[:backend]
+                  say "Using backend #{@backend_key}", :green
+                  return
+                end
+              end
+            end
+          end
+        end
+      end
+
       def template
         <<~TEMPLATE
           terraform {
@@ -45,7 +78,7 @@ module Proteus
               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]%>"
+              profile = "<%= @config[:backend][@backend_key][:profile]%>"
             }
           }
         TEMPLATE

data/lib/proteus/backend_info.rb

@@ -0,0 +1,19 @@
+require 'proteus/backend/backend'
+
+module Proteus
+  class BackendInfo < Thor
+    include Thor::Actions
+    include Helpers
+    include Config
+
+    desc "backend-info", "Shows information about backend configuration"
+    long_desc <<-LONGDESC
+      Shows information about backend configuration
+    LONGDESC
+    def backend_info
+      Proteus::Backend::Backend.new(config: config, context: nil, environment: nil).show_backends
+    end
+
+    default_task :backend_info
+  end
+end

data/lib/proteus/commands/apply.rb

@@ -7,10 +7,7 @@ module Proteus
           desc 'apply', 'Applies the current terraform code'
           long_desc <<-LONGDESC
             Applies the current terraform code
-
-            With --limit option, Terraform will only apply changes for the the specified resources
           LONGDESC
-          option :limit, type: :array, aliases: "-l", required: false, default: nil
           def apply
             init(verbose: parent_options[:verbose])
 
@@ -30,7 +27,6 @@ module Proteus
                 terraform apply \
                 -input=true \
                 -refresh=true \
-                #{limit(options[:limit])} \
                 #{plan_file(context, environment)}
               APPLY_COMMAND
 

data/lib/proteus/common.rb

@@ -30,17 +30,17 @@ module Proteus
     end
 
     def render_backend
-      backend = Proteus::Backend::Backend.new(config: config, context: context, environment: environment)
-      backend.render
+      @backend = Proteus::Backend::Backend.new(config: config, context: context, environment: environment)
+      @backend.render
 
-      backend
+      @backend
     end
 
     def init(verbose: false)
       say "initializing", :green
       say "environment: #{environment}", :green
 
-      backend = render_backend
+      @backend = render_backend
 
       `rm -rf #{context_path(context)}/.terraform/*.tf*`
       `rm -rf #{context_path(context)}/.terraform/modules`
@@ -49,23 +49,16 @@ module Proteus
       terraform_command = <<~TERRAFORM_COMMAND
         cd #{context_path(context)} && \
         terraform init \
-        -backend-config='key=#{config[:backend][backend.backend_key][: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
 
-      output = syscall terraform_command.squeeze(' '), suppress: true, capture: true
-      say(output, :green) if verbose
+      syscall terraform_command.squeeze(' ')
     end
 
     def aws_profile
-      config[:providers].select {|p| p[:name] == 'aws' }.first[:environments].each do |env|
-        env[:match].each do |m|
-          return "-var 'aws_profile=#{env[:profile]}'" if environment == m
-        end
-      end
-
-      ""
+      "-var 'aws_profile=#{@backend.aws_profile}'"
     end
 
     def dryrun

data/lib/proteus/config/config.rb

@@ -16,17 +16,19 @@ module Proteus
 
     class ConfigValidator < Proteus::Validators::BaseValidator
       def validate
-        within :providers do
+        within :contexts do
           ensure_data_type Array
+          ensure_uniqueness_across :name
 
           each do
             ensure_keys :name
+            ensure_uniqueness_across :name
 
             within :environments do
               ensure_uniqueness_across :match
 
               each do
-                ensure_keys :profile, :backend
+                ensure_keys :backend
               end
             end
           end
@@ -42,10 +44,10 @@ module Proteus
 
         within :backend do
           each_key do
-            ensure_presence :key_prefix
+            ensure_keys :key_prefix, :profile
 
             within :bucket do
-              ensure_keys :name, :region, :profile
+              ensure_keys :name, :region
             end
           end
         end

data/lib/proteus/global_commands/validate.rb

@@ -20,14 +20,18 @@ module Proteus
             # case 2: no changes in root => run contexts only
             status = `git --no-pager diff origin/master --stat --name-only`.split("\n")
 
-            run_full_validation = if status.map {|l| !l.include?('/') }.any? || !options[:selective]
+            run_full_validation = if status.map { |l| !l.include?('/') }.any? || !options[:selective]
                                     say "Found changes in the root of the repository or --selective is not set. Running full validation.", :green
                                     true
                                   else
                                     say "Running selective validation.", :green
                                     false
                                   end
-            selected_contexts = status.map { |s| s.scan(/contexts\/([a-zA-Z0-9_]+)\/((.+)\/)?/).flatten.first }.reject { |s| s.nil? }.uniq!
+
+            selected_contexts = status.collect do |s|
+              parts = s.split("/")
+              parts.size > 1 ? parts[1] : nil
+            end.reject { |s| s.nil? }.uniq
 
             self.class.contexts.each do |context|
               unless run_full_validation

data/lib/proteus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dh-proteus
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - Simon Albrecht
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description:
 email:
 - simon.albrecht@deliveryhero.com
@@ -132,6 +146,7 @@ files:
 - lib/proteus.rb
 - lib/proteus/app.rb
 - lib/proteus/backend/backend.rb
+- lib/proteus/backend_info.rb
 - lib/proteus/commands/apply.rb
 - lib/proteus/commands/clean.rb
 - lib/proteus/commands/destroy.rb
@@ -199,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Proteus is a Terraform wrapper application.