envirobly 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4069ab1f0da67a7bc06444c1d32cef454c23924f125925f1bc00bcd56419b94f
-  data.tar.gz: e5f5628338e7b9deda59a6c26f6e95b967f8ecbbfa0a1b41994aa3834f92a77a
+  metadata.gz: d0c82c3d281dbf388ec284da2fa021ff0156c1f31186ff5be11941da5f61dde3
+  data.tar.gz: 59d859fcf27af7159039c3ff989ec7680a1e026a7f9c3e10703fa23e0e21fa3c
 SHA512:
-  metadata.gz: de515ea959bef33ba5a1e89ffa6862d3a8f116a8f4cab2249b97042e7a92e19020daeba4c5a93babbee793656f1f34b86850924cf97cb22b17f0a739333de4a1
-  data.tar.gz: af5c4e4b6d08d1c08a06be9089a9e0f0d790915efafbf0cf0694a0e0ff90c68fbfdebdcb78c2921a3f7dd571561132968839832c0c5c5cb8be7a5b13b59afba0
+  metadata.gz: 64b90a90f4f60bafa98dc3900cf1c35f43a59c1236ec68a912e81a2bd7d1a72cb61c5e6cb95676d453128fe011203a7189c654b90e3e522a5fcdd40b11f827fd
+  data.tar.gz: df34ff8fb88ed79df45e741c1e031492f093f5556f858757c30ebbd828aa6ffb3e878461d656dd6752f2109903f4efaa58f97b5a97e1814e21d4447afb85284a

data/lib/envirobly/access_token.rb

@@ -69,7 +69,7 @@ class Envirobly::AccessToken
         exit
       end
 
-      api = Envirobly::Api.new(access_token: self)
+      api = Envirobly::Api.new(access_token: self, exit_on_error: false)
 
       # TODO: Eventually replace with custom `whoami` API that returns name, email...
       if api.list_accounts.success?

data/lib/envirobly/api.rb

@@ -8,7 +8,8 @@ class Envirobly::Api
   USER_AGENT = "Envirobly CLI v#{Envirobly::VERSION}"
   CONTENT_TYPE = "application/json"
 
-  def initialize(access_token: Envirobly::AccessToken.new)
+  def initialize(access_token: Envirobly::AccessToken.new, exit_on_error: true)
+    @exit_on_error = exit_on_error
     @access_token = access_token
   end
 
@@ -25,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
@@ -97,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
@@ -117,11 +126,18 @@ class Envirobly::Api
       http.request(request).tap do |response|
         def response.object
           @json_parsed_body ||= JSON.parse(body)
+        rescue
+          @json_parsed_body = { error_message: body }
         end
 
         def response.success?
           (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
+          exit 1
+        end
       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
@@ -80,48 +80,52 @@ class Envirobly::Cli::Main < Envirobly::Base
   TXT
   method_option :account_id, type: :numeric
   method_option :region, type: :string
-  method_option :project, type: :string
+  method_option :project_id, type: :numeric
+  method_option :project_name, type: :string
   method_option :commit, type: :string, default: "HEAD"
   method_option :dry_run, type: :boolean, default: false
   def deploy(environ_name = nil)
     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
 
     Envirobly::AccessToken.new(shell:).require!
 
-    environ_name = environ_name.presence || commit.current_branch
-    project_name = nil
-    project_id = nil
-
-    if options.project.present?
-      if options.project =~ Envirobly::Defaults::Project.regexp
-        project_id = $1.to_i
-      else
-        project_name = options.project
-      end
-    end
-
     deployment = Envirobly::Deployment.new(
       account_id: options.account_id,
       region: options.region,
-      project_name:,
-      environ_name:,
-      project_id:,
+      project_id: options.project_id,
+      project_name: options.project_name,
+      environ_name: environ_name.presence || commit.current_branch,
       commit:,
       shell:
     )
     deployment.perform(dry_run: options.dry_run)
   end
 
-  desc "pull", "Download build context"
+  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.1.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 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