envirobly 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67a8f774fbb1618b3b2ed3401af23dd53a0455e3b2439cc540724c95566ee063
-  data.tar.gz: 27cf8de4722ce015fcf4be795212912e84319b4ce3a9ca7a293b5ecb01f9631a
+  metadata.gz: 78d045fc1a7ddd776a3f83e20a5e3b8f49882e6477075c6f10ecd7308af9132e
+  data.tar.gz: dca43cc5b0184b7efdf18c867109f1eea1cb2f70e23b233d2182a99715a95e98
 SHA512:
-  metadata.gz: 5dc44c7ef4dc39dd1b80e71301309e749cadda497f03a5088c15d20c35af27d5e305751980e824b5503022115aa67afff4968c56c57c09560ec229c690f344af
-  data.tar.gz: 8deea030920fa4aacc0d0018e6eb2256c7c7982a2376aedbbcb58f0374e3d26d90a2352e80ec35defb65b3e1515f1c267a491b0d2c9a90f93b536387a39be38f
+  metadata.gz: 4a9b3835b2002fbdac6aed8f9981c8261d5509cb9bdde6e2398612e58cf432176d486b89311f61eb24e25c4e783925f93349b797f16961e45141c04609f1ae66
+  data.tar.gz: 15ca73d3b36db3b9d812516d71cbc6af2e8a5afe3a4a6db8fc928a3e18d8148ce88a8d3703f6e84395661b2d5e6a6ed6729c3ca32797f3be1a79dc9dda26c0f0

data/lib/envirobly/cli/main.rb

@@ -36,14 +36,14 @@ class Envirobly::Cli::Main < Envirobly::Base
     Envirobly::Defaults::Region.new(shell:).require_value
   end
 
-  desc "validate", "Validates config"
-  def validate
+  desc "validate", "Validates config (for given environ)"
+  def validate(environ_name = nil)
     Envirobly::AccessToken.new(shell:).require!
 
     config = Envirobly::Config.new
     api = Envirobly::Api.new
 
-    params = { validation: { configs: config.configs } }
+    params = { validation: { config: config.merge(environ_name).to_yaml } }
     api.validate_shape params
 
     say "Config is valid #{green_check}"

data/lib/envirobly/config.rb

@@ -1,26 +1,62 @@
 # frozen_string_literal: true
 
-class Envirobly::Config
-  DIR = ".envirobly"
-  BASE = "deploy.yml"
-  OVERRIDES_PATTERN = /deploy\.([a-z0-9\-_]+)\.yml/i
+module Envirobly
+  class Config
+    DIR = ".envirobly"
+    BASE = "deploy.yml"
+    OVERRIDES_PATTERN = /deploy\.([a-z0-9\-_]+)\.yml/i
 
-  def initialize(dir = DIR)
-    @dir = Pathname.new dir
-  end
+    attr_reader :errors
 
-  def configs
-    Dir.entries(@dir).map do |file|
-      path = File.join(@dir, file)
+    def initialize(dir = DIR)
+      @dir = Pathname.new dir
+      @errors = []
+    end
 
-      next unless File.file?(path) && config_file?(file)
+    def configs
+      Dir.entries(@dir).map do |file|
+        path = File.join(@dir, file)
 
-      [ "#{DIR}/#{file}", ERB.new(File.read(path)).result ]
-    end.compact.to_h
-  end
+        next unless File.file?(path) && config_file?(file)
+
+        [ "#{DIR}/#{file}", File.read(path) ]
+      end.compact.to_h
+    end
+
+    def merge(environ_name = nil)
+      path = Pathname.new(DIR).join(BASE).to_s
+      yaml = configs.fetch(path)
+      result = parse yaml, path
 
-  private
-    def config_file?(file)
-      file == BASE || file.match?(OVERRIDES_PATTERN)
+      if environ_name.present?
+        override_path = Pathname.new(DIR).join("deploy.#{environ_name}.yml").to_s
+
+        if configs.key?(override_path)
+          other_yaml = configs.fetch(override_path)
+          override = parse other_yaml, override_path
+          result = result.deep_merge(override) if override.is_a?(Hash)
+        end
+      end
+
+      @errors.empty? ? result : nil
     end
+
+    private
+      def config_file?(file)
+        file == BASE || file.match?(OVERRIDES_PATTERN)
+      end
+
+      def parse(content, path)
+        begin
+          yaml = ERB.new(content).result
+        rescue Exception => e
+          @errors << { message: e.message, path: }
+          return
+        end
+
+        YAML.safe_load yaml, aliases: true, permitted_classes: [ Secret ]
+      rescue Psych::Exception => e
+        @errors << { message: e.message, path: }
+      end
+  end
 end

data/lib/envirobly/deployment.rb

@@ -6,7 +6,7 @@ module Envirobly
   class Deployment
     include Colorize
 
-    attr_reader :params
+    attr_reader :params, :shell
 
     def initialize(environ_name:, commit:, account_id:, project_name:, project_id:, region:, shell:)
       @commit = commit
@@ -53,19 +53,40 @@ module Envirobly
           commit_time: @commit.time,
           commit_message: @commit.message,
           object_tree_checksum: @commit.object_tree_checksum,
-          configs: @config.configs
+          config: @config.merge(@environ_name).to_yaml
         }
       }
     end
 
     def perform(dry_run:)
+      if dry_run
+        shell.say "This is a dry run, nothing will be deployed.", :green
+      end
+
+      # TODO: Replace with shell
       puts [ "Deploying commit", yellow(@commit.short_ref), faint("→"), green(@environ_name) ].join(" ")
       puts
+      # TODO: Multiline indent
       puts "    #{@commit.message}"
       puts
 
       if dry_run
-        puts YAML.dump(@params)
+        puts green("Config:")
+        puts @params[:deployment][:config]
+
+        shell.say
+        shell.say "Targeting:", :green
+
+        targets_and_values = [
+          [ "Account ID", @params[:account_id].to_s ],
+          [ "Project ID", @params[:project_id].to_s ],
+          [ "Region", @params[:region] ],
+          [ "Project Name", @params[:project_name] ],
+          [ "Environ Name", @params[:deployment][:environ_name] ]
+        ]
+
+        shell.print_table targets_and_values, borders: true
+
         return
       end
 

data/lib/envirobly/secret.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Envirobly
+  class Secret
+    attr_reader :plain
+
+    def initialize(value)
+      @plain = value
+    end
+
+    def init_with(coder)
+      @plain = coder.scalar
+    end
+
+    def encode_with(coder)
+      coder.scalar = @plain
+    end
+
+    def to_s
+      "[SECRET]"
+    end
+
+    def ==(other)
+      other.is_a?(Secret) && other.plain == plain
+    end
+  end
+end
+
+YAML.add_tag("!secret", Envirobly::Secret)

data/lib/envirobly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Envirobly
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Robert Starsi
@@ -180,6 +180,7 @@ files:
 - lib/envirobly/git/commit.rb
 - lib/envirobly/git/unstaged.rb
 - lib/envirobly/numeric.rb
+- lib/envirobly/secret.rb
 - lib/envirobly/target.rb
 - lib/envirobly/version.rb
 homepage: https://github.com/envirobly/envirobly-cli