envirobly 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2991e127dfd64a68b47720bf70561343e3b7107304d9f5da9c1423cd4a3f0105
-  data.tar.gz: 8d80a93f0af7427bd44668aaf47b68598ae9a62abd27168a35b52e9102cf9bf2
+  metadata.gz: 826c2cc2bbd5fe59d2e90e2ce7860025c327794a214735b08090b91008b3908e
+  data.tar.gz: d3390a6c48429e76a1cd1bc2f5a1d00a237996d63398f9cd521f512b0bc09964
 SHA512:
-  metadata.gz: ab2ba4141f8bbc95fa907bdbfe78d30a9b1600862c9a97a34412de4bc295a4db6a8d46d52d0c97bc744792b15d57b051cf467b7d638287fb2c23e26593832e8f
-  data.tar.gz: d9a69cb24f0d30fa89bdef0dfd06bfb07c78bc99f9fd32e9b2a2fbcfb136f81e1d72adfc39548b834b1c9ebe499fc6bb429e0dd5f9eeb1272448cf21f0018f26
+  metadata.gz: 74d0637bc3e704e07e2927f37ebbd68cc8c694bf1269f2a7d73536480798aad3985c91320654dac18b14532399d744820c4075d87f9cf7d072099db5908c264a
+  data.tar.gz: '08e97323c8c3ceffa549e64f5580d2edd33ebb6dac899a83773f92ae599ae33a645980ded7bfa3d93dfa019c0492a5314287a844cb64c5fee409a9cdb2b56cbc'

data/lib/envirobly/cli/main.rb

@@ -126,6 +126,27 @@ 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, command, options).connect
+    Envirobly::ContainerShell.new(service_name, options).exec(command)
+  end
+
+  desc "rsync [SERVICE_NAME:]SOURCE_PATH [SERVICE_NAME:]DESTINATION_PATH", <<~TXT
+    Synchronize files between you and your service's data volume.
+  TXT
+  method_option :account_id, type: :numeric
+  method_option :project_id, type: :numeric
+  method_option :project_name, type: :string
+  method_option :environ_name, type: :string
+  method_option :args, type: :string, default: "-avzP"
+  def rsync(source, destination)
+    service_name = nil
+
+    [ source, destination ].each do |path|
+      if path =~ /\A([a-z0-9\-_]+):/i
+        service_name = $1
+        break
+      end
+    end
+
+    Envirobly::ContainerShell.new(service_name, options).rsync(source, destination)
   end
 end

data/lib/envirobly/container_shell.rb

@@ -1,17 +1,25 @@
 class Envirobly::ContainerShell
-  CMD_TEMLATE =
-    "AWS_ACCESS_KEY_ID='%s' " +
-    "AWS_SECRET_ACCESS_KEY='%s' " +
-    "AWS_SESSION_TOKEN='%s' " +
-    "ssh -i %s " +
-    "envirobly-service@%s " +
-    "-o StrictHostKeyChecking=accept-new " +
+  AWS_ENV = [
+    "AWS_ACCESS_KEY_ID='%s'",
+    "AWS_SECRET_ACCESS_KEY='%s'",
+    "AWS_SESSION_TOKEN='%s'"
+  ]
+  SSH = [
+    "ssh -i %s",
+    "-o StrictHostKeyChecking=accept-new",
+    "-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"
 
-  def initialize(service_name, command, options)
-    @command = command
+  attr_reader :options, :service_name
+
+  def initialize(service_name, options)
+    @service_name = service_name
     @options = options
     commit = Envirobly::Git::Commit.new "HEAD"
+
     @params = {
       project: {
         account_id: options.account_id || Envirobly::Defaults::Account.new.id,
@@ -20,7 +28,7 @@ class Envirobly::ContainerShell
       },
       environ: { name: options.environ_name || commit.current_branch },
       service: { name: service_name },
-      instance: { slot: options.instance_slot }
+      instance: { slot: options.instance_slot || 0 }
     }
 
     if options.project_name.blank? && options.account_id.blank? && options.project_id.blank?
@@ -28,39 +36,77 @@ class Envirobly::ContainerShell
     end
   end
 
-  def connect
-    api = Envirobly::Api.new
-    response = api.create_service_shell_connection @params
-    ssh_params = response.object
-
-    Tempfile.create do |tempkey|
-      tempkey.write ssh_params.fetch("instance").fetch("private_key")
-      tempkey.flush
-
-      cmd = sprintf(
-        CMD_TEMLATE,
-        ssh_params.fetch("open_tunnel_credentials").fetch("access_key_id"),
-        ssh_params.fetch("open_tunnel_credentials").fetch("secret_access_key"),
-        ssh_params.fetch("open_tunnel_credentials").fetch("session_token"),
-        tempkey.path,
-        ssh_params.fetch("instance").fetch("private_ipv4"),
-        ssh_params.fetch("instance").fetch("aws_id"),
-        ssh_params.fetch("region")
+  def exec(command = nil)
+    with_private_key do
+      system join(env_vars, ssh, user_and_host, command)
+    end
+  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
+
+  private
+    def join(*parts)
+      parts.flatten.compact.join(" ")
+    end
+
+    def connect_data
+      @connect_data ||= begin
+        api = Envirobly::Api.new
+        api.create_service_shell_connection(@params).object
+      end
+    end
 
-      if @options.shell.present?
-        cmd = "ENVIROBLY_SERVICE_INTERACTIVE_SHELL='#{@options.shell}' #{cmd} -o SendEnv=ENVIROBLY_SERVICE_INTERACTIVE_SHELL"
+    def with_private_key
+      Tempfile.create do |file|
+        file.write connect_data.fetch("instance").fetch("private_key")
+        file.flush
+
+        @private_key_path = file.path
+
+        yield
       end
+    end
+
+    def env_vars
+      credentials = connect_data.fetch("open_tunnel_credentials")
+
+      result = sprintf(
+        join(AWS_ENV),
+        credentials.fetch("access_key_id"),
+        credentials.fetch("secret_access_key"),
+        credentials.fetch("session_token")
+      )
 
-      if @options.user.present?
-        cmd = "ENVIROBLY_SERVICE_SHELL_USER='#{@options.user}' #{cmd} -o SendEnv=ENVIROBLY_SERVICE_SHELL_USER"
+      if options.shell.present?
+        result = join "ENVIROBLY_SERVICE_INTERACTIVE_SHELL='#{options.shell}'", result
       end
 
-      if @command.present?
-        cmd = "#{cmd} #{@command.join(" ")}"
+      if options.user.present?
+        result = join "ENVIROBLY_SERVICE_SHELL_USER='#{options.user}'", result
       end
 
-      system cmd
+      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/version.rb

@@ -1,3 +1,3 @@
 module Envirobly
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Robert Starsi