envirobly 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b171addcd3f154cbcf0707b05cb7957eb181778039fcb8981cfd94b34b5bd8e4
-  data.tar.gz: 41af85c70a1c67e33689dcf94c31550d6dedad8fce6fc9ab8d1fd2cd94d6c617
+  metadata.gz: 49c3237a5570bb1839a02b5cbdfb3c70725c6e200841a09b7299b46e62efb3c2
+  data.tar.gz: b90bcd5afcf383bfdac23320870c3c420cf30b842f1ec67dba152f94a9382ef3
 SHA512:
-  metadata.gz: 6d1e5cb4ef14663cba29fa3c45a17b256334fb323e54817d16ba041ccb4d288edbc4e7809d945faf4c278fbbe6562a9914a4b9d4345c18f4785d6d189135b6d5
-  data.tar.gz: e9bb93ab7780128b6c82e3ebe4c29c06f4a7440fa6c3b19ca926f7a86958b52183c33288718f651b8cab980ffb7bc8af78b3d72f7a2fb255b4df9ae1dc5db536
+  metadata.gz: c57b8f6e3e791afc1d392db80f501e1ee10cc7229465b3c3e10e300fe3f786ace269b79660b624ef099b2e0e1eddc8c9d4e03e8ac05d20b73f824f896223b6b9
+  data.tar.gz: 448da4b7847e9d067e722bbfcb1b011e3573259225a0ff2bf0114b8c757195d9b4d78096c47fccd137aade3d5508acafb19fba73a00a55b14454618b882c6ef7

data/lib/envirobly/cli/main.rb

@@ -101,7 +101,7 @@ class Envirobly::Cli::Main < Envirobly::Base
       region: options.region,
       project_id: options.project_id,
       project_name: options.project_name,
-      environ_name: environ_name.presence || commit.current_branch,
+      environ_name: environ_name.presence,
       commit:,
       shell:
     )
@@ -128,7 +128,7 @@ class Envirobly::Cli::Main < Envirobly::Base
   method_option :shell, type: :string
   method_option :user, type: :string
   def exec(service_name, *command)
-    Envirobly::ContainerShell.new(service_name, options).exec(command)
+    Envirobly::ContainerShell.new(service_name, options, shell:).exec(command)
   end
 
   desc "rsync [SERVICE_NAME:]SOURCE_PATH [SERVICE_NAME:]DESTINATION_PATH", <<~TXT
@@ -149,6 +149,6 @@ class Envirobly::Cli::Main < Envirobly::Base
       end
     end
 
-    Envirobly::ContainerShell.new(service_name, options).rsync(source, destination)
+    Envirobly::ContainerShell.new(service_name, options, shell:).rsync(source, destination)
   end
 end

data/lib/envirobly/container_shell.rb

@@ -1,113 +1,137 @@
 # frozen_string_literal: true
 
-class Envirobly::ContainerShell
-  AWS_ENV = [
-    "AWS_ACCESS_KEY_ID='%s'",
-    "AWS_SECRET_ACCESS_KEY='%s'",
-    "AWS_SESSION_TOKEN='%s'"
-  ]
-  SSH = [
-    "ssh -i %s",
-    "-o StrictHostKeyChecking=no",
-    "-o UserKnownHostsFile=/dev/null",
-    "-o SendEnv=ENVIROBLY_SERVICE_INTERACTIVE_SHELL",
-    "-o SendEnv=ENVIROBLY_SERVICE_SHELL_USER",
-    "-o ProxyCommand='aws ec2-instance-connect open-tunnel --instance-id %s --region %s'"
-  ]
-  USER_AND_HOST = "envirobly-service@%s"
-
-  attr_reader :options, :service_name
-
-  def initialize(service_name, options)
-    @service_name = service_name
-    @options = options
-    commit = Envirobly::Git::Commit.new "HEAD"
-
-    @params = {
-      account_id: options.account_id || Envirobly::Defaults::Account.new.value,
-      project_name: options.project_name || Envirobly::Defaults::Project.dirname,
-      project_id: options.project_id,
-      environ_name: options.environ_name || commit.current_branch,
-      service_name: service_name,
-      instance_slot: options.instance_slot || 0
-    }
-
-    if options.project_name.blank? && options.account_id.blank? && options.project_id.blank?
-      @params[:project_id] = Envirobly::Defaults::Project.new.value
-    end
-  end
+module Envirobly
+  class ContainerShell
+    AWS_ENV = [
+      "AWS_ACCESS_KEY_ID='%s'",
+      "AWS_SECRET_ACCESS_KEY='%s'",
+      "AWS_SESSION_TOKEN='%s'"
+    ]
+    SSH = [
+      "ssh -i %s",
+      "-o StrictHostKeyChecking=no",
+      "-o UserKnownHostsFile=/dev/null",
+      "-o SendEnv=ENVIROBLY_SERVICE_INTERACTIVE_SHELL",
+      "-o SendEnv=ENVIROBLY_SERVICE_SHELL_USER",
+      "-o ProxyCommand='aws ec2-instance-connect open-tunnel --instance-id %s --region %s'"
+    ]
+    USER_AND_HOST = "envirobly-service@%s"
+
+    attr_reader :options, :service_name
+
+    def initialize(service_name, options, shell:)
+      @service_name = service_name
+      @options = options
+
+      commit = Git::Commit.new "HEAD"
+      default_account = Defaults::Account.new(shell:)
+      default_project = Defaults::Project.new(shell:)
+
+      target = Target.new(
+        default_account_id: default_account.value,
+        default_project_id: default_project.value,
+        default_project_name: Defaults::Project.dirname,
+        default_environ_name: commit.current_branch,
+        account_id: options.account_id,
+        project_id: options.project_id,
+        project_name: options.project_name,
+        environ_name: options.environ_name
+      )
 
-  def exec(command = nil)
-    with_private_key do
-      system join(env_vars, ssh, user_and_host, command)
-    end
-  end
+      if target.missing_params.include?(:account_id)
+        target.account_id = default_account.require_value
+      end
 
-  def rsync(source, destination)
-    with_private_key do
-      system join(
-        env_vars,
-        %(rsync #{options.args} -e "#{ssh}"),
-        source.sub("#{service_name}:", "#{user_and_host}:"),
-        destination.sub("#{service_name}:", "#{user_and_host}:")
-      )
-    end
-  end
+      target.ignored_params.each do |param|
+        shell.say "--#{param.to_s.parameterize} ignored, due to other arguments overriding it"
+      end
 
-  private
-    def join(*parts)
-      parts.flatten.compact.join(" ")
+      @params = {
+        account_id: target.account_id,
+        project_id: target.project_id,
+        project_name: target.project_name,
+        environ_name: target.environ_name,
+        service_name:,
+        instance_slot: options.instance_slot || 0
+      }
+
+      if options.project_name.blank? && options.account_id.blank? && options.project_id.blank?
+        @params[:project_id] = Defaults::Project.new.value
+      end
     end
 
-    def connect_data
-      @connect_data ||= begin
-        api = Envirobly::Api.new
-        api.create_service_shell_connection(@params).object
+    def exec(command = nil)
+      with_private_key do
+        system join(env_vars, ssh, user_and_host, command)
       end
     end
 
-    def with_private_key
-      Tempfile.create do |file|
-        file.write connect_data.fetch("instance").fetch("private_key")
-        file.flush
+    def rsync(source, destination)
+      with_private_key do
+        system join(
+          env_vars,
+          %(rsync #{options.args} -e "#{ssh}"),
+          source.sub("#{service_name}:", "#{user_and_host}:"),
+          destination.sub("#{service_name}:", "#{user_and_host}:")
+        )
+      end
+    end
 
-        @private_key_path = file.path
+    private
+      def join(*parts)
+        parts.flatten.compact.join(" ")
+      end
 
-        yield
+      def connect_data
+        @connect_data ||= begin
+          api = Api.new
+          api.create_service_shell_connection(@params).object
+        end
       end
-    end
 
-    def env_vars
-      credentials = connect_data.fetch("open_tunnel_credentials")
+      def with_private_key
+        Tempfile.create do |file|
+          file.write connect_data.fetch("instance").fetch("private_key")
+          file.flush
 
-      result = sprintf(
-        join(AWS_ENV),
-        credentials.fetch("access_key_id"),
-        credentials.fetch("secret_access_key"),
-        credentials.fetch("session_token")
-      )
+          @private_key_path = file.path
 
-      if options.shell.present?
-        result = join "ENVIROBLY_SERVICE_INTERACTIVE_SHELL='#{options.shell}'", result
+          yield
+        end
       end
 
-      if options.user.present?
-        result = join "ENVIROBLY_SERVICE_SHELL_USER='#{options.user}'", result
-      end
+      def env_vars
+        credentials = connect_data.fetch("open_tunnel_credentials")
 
-      result
-    end
+        result = sprintf(
+          join(AWS_ENV),
+          credentials.fetch("access_key_id"),
+          credentials.fetch("secret_access_key"),
+          credentials.fetch("session_token")
+        )
 
-    def ssh
-      sprintf(
-        join(SSH),
-        @private_key_path,
-        connect_data.fetch("instance").fetch("aws_id"),
-        connect_data.fetch("region")
-      )
-    end
+        if options.shell.present?
+          result = join "ENVIROBLY_SERVICE_INTERACTIVE_SHELL='#{options.shell}'", result
+        end
 
-    def user_and_host
-      sprintf USER_AND_HOST, connect_data.fetch("instance").fetch("private_ipv4")
-    end
+        if options.user.present?
+          result = join "ENVIROBLY_SERVICE_SHELL_USER='#{options.user}'", result
+        end
+
+        result
+      end
+
+      def ssh
+        sprintf(
+          join(SSH),
+          @private_key_path,
+          connect_data.fetch("instance").fetch("aws_id"),
+          connect_data.fetch("region")
+        )
+      end
+
+      def user_and_host
+        sprintf USER_AND_HOST, connect_data.fetch("instance").fetch("private_ipv4")
+      end
+  end
 end

data/lib/envirobly/deployment.rb

@@ -2,95 +2,108 @@
 
 require "yaml"
 
-class Envirobly::Deployment
-  include Envirobly::Colorize
-
-  def initialize(environ_name:, commit:, account_id:, project_name:, project_id:, region:, shell:)
-    @environ_name = environ_name
-    @commit = commit
-    @config = Envirobly::Config.new
-    @default_account = Envirobly::Defaults::Account.new(shell:)
-    @default_project = Envirobly::Defaults::Project.new(shell:)
-    @default_region = Envirobly::Defaults::Region.new(shell:)
-
-    if account_id.blank?
-      account_id = @default_account.require_if_none
-    end
+module Envirobly
+  class Deployment
+    include Colorize
+
+    attr_reader :params
+
+    def initialize(environ_name:, commit:, account_id:, project_name:, project_id:, region:, shell:)
+      @environ_name = environ_name
+      @commit = commit
+      @config = Config.new
+      @default_account = Defaults::Account.new(shell:)
+      @default_project = Defaults::Project.new(shell:)
+      @default_region = Defaults::Region.new(shell:)
+
+      target = Target.new(
+        default_account_id: @default_account.value,
+        default_project_id: @default_project.value,
+        default_region: @default_region.value,
+        default_project_name: Defaults::Project.dirname,
+        default_environ_name: commit.current_branch,
+        account_id:,
+        project_id:,
+        region:,
+        project_name:,
+        environ_name:
+      )
+
+      if target.missing_params.include?(:account_id)
+        target.account_id = @default_account.require_value
+      end
 
-    if project_id.blank? && project_name.blank?
-      project_id = @default_project.value
+      if target.missing_params.include?(:region)
+        target.region = @default_region.require_value
+      end
 
-      if project_id.blank?
-        project_name = Envirobly::Defaults::Project.dirname
+      target.ignored_params.each do |param|
+        shell.say "--#{param.to_s.parameterize} ignored, due to other arguments overriding it"
       end
-    end
 
-    if region.blank?
-      region = @default_region.require_if_none
+      @params = {
+        account_id: target.account_id,
+        project_id: target.project_id,
+        project_name: target.project_name,
+        region: target.region,
+        deployment: {
+          environ_name: target.environ_name,
+          commit_ref: @commit.ref,
+          commit_time: @commit.time,
+          commit_message: @commit.message,
+          object_tree_checksum: @commit.object_tree_checksum,
+          **@config.to_params
+        }
+      }
     end
 
-    @params = {
-      account_id:,
-      project_id:,
-      project_name:,
-      region:,
-      deployment: {
-        environ_name:,
-        commit_ref: @commit.ref,
-        commit_time: @commit.time,
-        commit_message: @commit.message,
-        object_tree_checksum: @commit.object_tree_checksum,
-        **@config.to_params
-      }
-    }
-  end
+    def perform(dry_run:)
+      puts [ "Deploying commit", yellow(@commit.short_ref), faint("→"), green(@environ_name) ].join(" ")
+      puts
+      puts "    #{@commit.message}"
+      puts
 
-  def perform(dry_run:)
-    puts [ "Deploying commit", yellow(@commit.short_ref), faint("→"), green(@environ_name) ].join(" ")
-    puts
-    puts "    #{@commit.message}"
-    puts
+      if dry_run
+        puts YAML.dump(@params)
+        return
+      end
 
-    if dry_run
-      puts YAML.dump(@params)
-      return
-    end
+      # Create deployment
+      api = Api.new
 
-    # Create deployment
-    api = Envirobly::Api.new
+      Duration.measure do
+        response = api.create_deployment @params
 
-    Envirobly::Duration.measure do
-      response = api.create_deployment @params
+        unless response.success?
+          display_config_errors response.object.fetch("errors")
+          exit 1
+        end
 
-      unless response.success?
-        display_config_errors response.object.fetch("errors")
-        exit 1
-      end
+        print "Preparing project..."
 
-      print "Preparing project..."
+        @default_account.save_if_none response.object.fetch("account_id")
+        @default_project.save_if_none response.object.fetch("project_id")
+        @default_region.save_if_none response.object.fetch("region")
 
-      @default_account.save_if_none response.object.fetch("account_id")
-      @default_project.save_if_none response.object.fetch("project_id")
-      @default_region.save_if_none response.object.fetch("region")
+        # Fetch credentials for build context upload
+        @deployment_url = response.object.fetch("url")
+        @credentials_response = api.get_deployment_with_delay_and_retry @deployment_url
+      end
 
-      # Fetch credentials for build context upload
-      @deployment_url = response.object.fetch("url")
-      @credentials_response = api.get_deployment_with_delay_and_retry @deployment_url
-    end
+      credentials = @credentials_response.object.fetch("credentials")
+      region = @credentials_response.object.fetch("region")
+      bucket = @credentials_response.object.fetch("bucket")
+      watch_deployment_url = @credentials_response.object.fetch("deployment_url")
 
-    credentials = @credentials_response.object.fetch("credentials")
-    region = @credentials_response.object.fetch("region")
-    bucket = @credentials_response.object.fetch("bucket")
-    watch_deployment_url = @credentials_response.object.fetch("deployment_url")
+      Duration.measure do
+        # Upload build context
+        Aws::S3.new(bucket:, region:, credentials:).push @commit
 
-    Envirobly::Duration.measure do
-      # Upload build context
-      Envirobly::Aws::S3.new(bucket:, region:, credentials:).push @commit
+        # Perform deployment
+        api.put_as_json @deployment_url
+      end
 
-      # Perform deployment
-      api.put_as_json @deployment_url
+      puts "Follow at #{watch_deployment_url}"
     end
-
-    puts "Follow at #{watch_deployment_url}"
   end
 end

data/lib/envirobly/target.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module Envirobly
+  class Target
+    attr_accessor :account_id, :project_id, :region
+
+    def initialize(
+        default_account_id: nil,
+        default_project_id: nil,
+        default_region: nil,
+        default_project_name: nil,
+        default_environ_name: nil,
+        account_id: nil,
+        project_id: nil,
+        region: nil,
+        project_name: nil,
+        environ_name: nil
+      )
+      @default_account_id = default_account_id
+      @default_project_id = default_project_id
+      @default_region = default_region
+      @default_project_name = default_project_name
+      @default_environ_name = default_environ_name
+      @account_id = account_id
+      @project_id = project_id
+      @region = region
+      @project_name = project_name
+      @environ_name = environ_name
+    end
+
+    def missing_params
+      [].tap do |result|
+        if project_id.blank? && account_id.blank?
+          result << :account_id
+        end
+
+        if project_id.blank? && region.blank?
+          result << :region
+        end
+      end
+    end
+
+    def account_id
+      return if @project_id
+
+      @account_id || @default_account_id
+    end
+
+    def project_id
+      return if @project_id.blank? && (@account_id.present? || @project_name.present?)
+
+      @project_id || @default_project_id
+    end
+
+    def project_name
+      return if @project_id
+
+      @project_name.presence || @default_project_name
+    end
+
+    def environ_name
+      @environ_name.presence || @default_environ_name
+    end
+
+    def region
+      return if @project_id
+
+      @region || @default_region
+    end
+
+    def ignored_params
+      [].tap do |result|
+        if @account_id && @project_id
+          result << :account_id
+        end
+
+        if @project_id && @region
+          result << :region
+        end
+
+        if @project_id && @project_name.present?
+          result << :project_name
+        end
+      end
+    end
+  end
+end

data/lib/envirobly/version.rb

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

metadata

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