elastic_beans 0.10.0.alpha10 → 0.10.0.alpha11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7080610cdba10edf2a2bb8413e2d738febbc415f
-  data.tar.gz: b9c95b1062a85eec83478ee53ca50b7f34934883
+  metadata.gz: 1baec72dd59bc86eedee59dcafe6965b4c2d12b1
+  data.tar.gz: 5a50bf6ccae347c30691f131c6ab8ca1f3e7d286
 SHA512:
-  metadata.gz: d1b63b448029c173f635c6a952921dea8ba0a93470f6e55317539988e41cf8c78c2ffc5faae84f2efa6f42b3135c4496f5c193198f36d6cd4c389b1f7370d721
-  data.tar.gz: 6d059ce51759b9621a4bc5bfff0e12ce4e3d8dd7436e8991af8b0dc1cf9ce461d99062977348bf623046fdfcfddef12c219ba0e92bc7de38795084b820705950
+  metadata.gz: 37e66cfb04a05853f6fbdc5ead050531b4038a532cc06a26d96c40a4f6183900ce03d988a9caff6c90d5cac717b390a31f62b46383db32faeeb98cb681dd1184
+  data.tar.gz: 83b5db9fd76e13d82ae2da0f3e3870cd18d8510fa3ad3b56f266e04e0772d52f1b7b14d46f1e51064a14e0ac079249904df4623e74b49769ca0bc078647acb6b

data/lib/elastic_beans/application.rb

@@ -101,10 +101,24 @@ module ElasticBeans
       raise AccessDeniedS3Error.new
     end
 
+    # Removes command metadata created by #register_command.
+    # Used by `beans exec --interactive` to clean up the interactive task metadata.
+    #
+    # Raises an error if access is denied.
+    def deregister_command(command)
+      key = "#{command_key_prefix}#{command.id}.json"
+      s3.delete_object(
+        bucket: bucket_name,
+        key: key,
+      )
+    rescue ::Aws::S3::Errors::AccessDenied
+      raise AccessDeniedS3Error.new(bucket: bucket_name, key: key)
+    end
+
     # Enqueues a one-off Exec::Command to be run on the application's +exec+ environment.
     # Does not wait for action to be taken, but returns immediately after enqueuing the command.
     #
-    # Raises an error if the exec environment or queue cannot be found.
+    # Raises an error if the exec environment or queue cannot be found, or if access is denied.
     def enqueue_command(command)
       if environments.none? { |environment| environment.is_a?(Environment::Exec) }
         raise MissingExecEnvironmentError.new(application: self)
@@ -113,20 +127,12 @@ module ElasticBeans
       if command.to_s == command
         command = Exec::Command.new(command_string: command)
       end
-      command.metadata[:bucket] = bucket_name
-      command.metadata[:key] = "#{command_key_prefix}#{command.id}.json"
-      s3.put_object(
-        bucket: bucket_name,
-        key: command.metadata[:key],
-        body: command.to_json,
-      )
 
+      register_command(command)
       sqs.send_message(
         queue_url: exec_queue_url,
         message_body: command.to_json,
       )
-    rescue ::Aws::S3::Errors::AccessDenied
-      raise AccessDeniedS3Error.new(bucket: bucket_name, key: command.metadata[:key])
     end
 
     # Fetches up to 100 previously-enqueued commands that are running or scheduled to run.
@@ -197,6 +203,27 @@ module ElasticBeans
       raise AccessDeniedS3Error.new(bucket: bucket_name, key: key)
     end
 
+    # Registers command metadata so that #enqueued_commands will find it.
+    # Adds +:bucket+ and +:key+ keys to the command's ElasticBeans::Exec::Command#metadata.
+    # Used by +beans exec --interactive" so that +beans ps+ displays interactive tasks that are not enqueued normally.
+    #
+    # Raises an error if access is denied.
+    def register_command(command)
+      unless exists?
+        raise MissingApplicationError.new(application: self)
+      end
+
+      command.metadata[:bucket] = bucket_name
+      command.metadata[:key] = "#{command_key_prefix}#{command.id}.json"
+      s3.put_object(
+        bucket: bucket_name,
+        key: command.metadata[:key],
+        body: command.to_json,
+      )
+    rescue ::Aws::S3::Errors::AccessDenied
+      raise AccessDeniedS3Error.new(bucket: bucket_name, key: command.metadata[:key])
+    end
+
     # Returns an ElasticBeans::ApplicationVersion for each version of the Elastic Beanstalk application.
     def versions
       response = elastic_beanstalk.describe_application_versions(application_name: name)

data/lib/elastic_beans/command/exec.rb

@@ -59,8 +59,13 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           begin
             ui.debug { "Freezing exec instance... (ID=#{freeze_command.id})" }
             application.enqueue_command(freeze_command)
+            application.register_command(command)
+
             freeze_command = wait_until_command_taken(freeze_command)
             ui.debug { "Frozen exec instance: '#{freeze_command.instance_id}'" }
+            command.instance_id = freeze_command.instance_id
+            command.start_time = freeze_command.start_time
+            application.register_command(command)
 
             begin
               instance_ip = ec2.describe_instances(instance_ids: [freeze_command.instance_id]).reservations[0].instances[0].private_ip_address
@@ -105,6 +110,7 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
             raise BastionAuthenticationError.new(cause: e)
           ensure
             application.kill_command(freeze_command)
+            application.deregister_command(command)
           end
         else
           application.enqueue_command(command)

data/lib/elastic_beans/exec/command.rb

@@ -13,10 +13,10 @@ module ElasticBeans
       attr_reader :command_string
 
       # The instance ID this command is being executed on.
-      attr_reader :instance_id
+      attr_accessor :instance_id
 
       # The time this command started execution.
-      attr_reader :start_time
+      attr_accessor :start_time
 
       # Command metadata, such as where to store execution data in S3.
       attr_reader :metadata

data/lib/elastic_beans/exec/sqs_consumer.rb

@@ -65,7 +65,7 @@ class SQSConsumer
               log("Freeze command ID=#{command['id']} never terminated; timing out after #{FREEZE_TIMEOUT} seconds")
             end
           else
-            # poll command metadata to see if it is still available, if it disappears then kill the process
+            # poll killed metadata to see if it has appeared, if it appears then kill the process
             killed_thread = Thread.new do
               while_killed(command) do
                 if already_killed?

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.10.0.alpha10"
+  VERSION = "0.10.0.alpha11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.10.0.alpha10
+  version: 0.10.0.alpha11
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk