envirobly 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58cece10b3dc2908e0bce6a78f509463c8261fa34d54c9a45059b95205c494d3
-  data.tar.gz: 71b06913da6f29967a5f779c62a76423f30242474daeda744b34be44f7ba494a
+  metadata.gz: 2991e127dfd64a68b47720bf70561343e3b7107304d9f5da9c1423cd4a3f0105
+  data.tar.gz: 8d80a93f0af7427bd44668aaf47b68598ae9a62abd27168a35b52e9102cf9bf2
 SHA512:
-  metadata.gz: d67d5afc046a25396f822f86d17d584172468e277ff5626efbb1d11fadffdad86e821118b2d8dc0ee89f33b9d316d999fce182f5001be7e7029977aeb3a9604c
-  data.tar.gz: 224f58f13842244a423fbef3ab69540a97969a15c168e09a090f8a8c255340ec65657db6bf680d6c384d2dbda804d51708dc2bc99928ac03785495e00341837f
+  metadata.gz: ab2ba4141f8bbc95fa907bdbfe78d30a9b1600862c9a97a34412de4bc295a4db6a8d46d52d0c97bc744792b15d57b051cf467b7d638287fb2c23e26593832e8f
+  data.tar.gz: d9a69cb24f0d30fa89bdef0dfd06bfb07c78bc99f9fd32e9b2a2fbcfb136f81e1d72adfc39548b834b1c9ebe499fc6bb429e0dd5f9eeb1272448cf21f0018f26

data/lib/envirobly/api.rb

@@ -26,6 +26,10 @@ class Envirobly::Api
     post_as_json(api_v1_deployments_url, params:, headers: authorization_headers)
   end
 
+  def create_service_shell_connection(params)
+    post_as_json(api_v1_service_shell_connections_url, params:, headers: authorization_headers)
+  end
+
   def list_accounts
     get_as_json api_v1_accounts_url, headers: authorization_headers
   end
@@ -98,6 +102,10 @@ class Envirobly::Api
       api_url_for "v1/instance_types", query: "region=#{region}"
     end
 
+    def api_v1_service_shell_connections_url
+      api_url_for "v1/service_shell_connections"
+    end
+
     def api_url_for(path, query: nil)
       URI::HTTPS.build(host: HOST, path: "/api/#{path}", query:)
     end
@@ -126,8 +134,8 @@ class Envirobly::Api
           (200..299).include?(code.to_i)
         end
 
-        if @exit_on_error && !response.success? && response.object[:error_message].present?
-          puts response.object[:error_message] # TODO: Replace with shell.say_error
+        if @exit_on_error && !response.success? && response.object["error_message"].present?
+          puts response.object["error_message"] # TODO: Replace with shell.say_error
           exit 1
         end
       end

data/lib/envirobly/cli/main.rb

@@ -53,7 +53,7 @@ class Envirobly::Cli::Main < Envirobly::Base
     end
   end
 
-  desc "instance_types [region]", "List instance types in a given region, including price and performance characteristics."
+  desc "instance_types [REGION]", "List instance types in the given region, including price and performance characteristics."
   def instance_types(region = nil)
     default_region = Envirobly::Defaults::Region.new(shell:)
     region = region.presence || default_region.require_if_none
@@ -88,7 +88,7 @@ class Envirobly::Cli::Main < Envirobly::Base
     commit = Envirobly::Git::Commit.new options.commit
 
     unless commit.exists?
-      say_error "Commit '#{commit.ref}' doesn't exist in this repository. Aborting."
+      say_error "Commit '#{commit.ref}' doesn't exist in this repository"
       exit 1
     end
 
@@ -106,11 +106,26 @@ class Envirobly::Cli::Main < Envirobly::Base
     deployment.perform(dry_run: options.dry_run)
   end
 
-  desc "pull [REGION] [BUCKET] [REF] [PATH]", "Download build context. Used by Envirobly builders."
+  desc "pull REGION BUCKET REF PATH", "Download build context. Used by Envirobly builders."
   def pull(region, bucket, ref, path)
     Envirobly::Duration.measure("Build context download took %s") do
-      s3 = Envirobly::Aws::S3.new(region:, bucket:)
-      s3.pull ref, path
+      Envirobly::Aws::S3.new(region:, bucket:).pull ref, path
     end
   end
+
+  desc "exec SERVICE_NAME [COMMAND] [ARG...]", <<~TXT
+    Start interactive service shell when launched without arguments or execute a one-off command.
+    Keep in mind, your container might not have a shell installed. In such cases you won't be able
+    to start an interactive session.
+  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 :instance_slot, type: :numeric, default: 0
+  method_option :shell, type: :string
+  method_option :user, type: :string
+  def exec(service_name, *command)
+    Envirobly::ContainerShell.new(service_name, command, options).connect
+  end
 end

data/lib/envirobly/container_shell.rb

@@ -0,0 +1,66 @@
+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 " +
+    "-o ProxyCommand='aws ec2-instance-connect open-tunnel --instance-id %s --region %s'"
+
+  def initialize(service_name, command, options)
+    @command = command
+    @options = options
+    commit = Envirobly::Git::Commit.new "HEAD"
+    @params = {
+      project: {
+        account_id: options.account_id || Envirobly::Defaults::Account.new.id,
+        name: options.project_name || File.basename(Dir.pwd), # TODO: Extract into Defaults::ProjectName
+        id: options.project_id
+      },
+      environ: { name: options.environ_name || commit.current_branch },
+      service: { name: service_name },
+      instance: { slot: options.instance_slot }
+    }
+
+    if options.project_name.blank? && options.account_id.blank? && options.project_id.blank?
+      @params[:project][:id] = Envirobly::Defaults::Project.new.id
+    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")
+      )
+
+      if @options.shell.present?
+        cmd = "ENVIROBLY_SERVICE_INTERACTIVE_SHELL='#{@options.shell}' #{cmd} -o SendEnv=ENVIROBLY_SERVICE_INTERACTIVE_SHELL"
+      end
+
+      if @options.user.present?
+        cmd = "ENVIROBLY_SERVICE_SHELL_USER='#{@options.user}' #{cmd} -o SendEnv=ENVIROBLY_SERVICE_SHELL_USER"
+      end
+
+      if @command.present?
+        cmd = "#{cmd} #{@command.join(" ")}"
+      end
+
+      system cmd
+    end
+  end
+end

data/lib/envirobly/deployment.rb

@@ -87,8 +87,7 @@ class Envirobly::Deployment
 
     Envirobly::Duration.measure do
       # Upload build context
-      s3 = Envirobly::Aws::S3.new(bucket:, region:, credentials:)
-      s3.push @commit
+      Envirobly::Aws::S3.new(bucket:, region:, credentials:).push @commit
 
       # Perform deployment
       api.put_as_json @deployment_url

data/lib/envirobly/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Robert Starsi
@@ -168,6 +168,7 @@ files:
 - lib/envirobly/cli/main.rb
 - lib/envirobly/colorize.rb
 - lib/envirobly/config.rb
+- lib/envirobly/container_shell.rb
 - lib/envirobly/default.rb
 - lib/envirobly/defaults.rb
 - lib/envirobly/defaults/account.rb
@@ -198,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Envirobly command line interface
 test_files: []