omc 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46021d8d49c5f6627c59c726ab9d46ca780cae4e
-  data.tar.gz: 399407808e128c45549e0473a85f3f749ba86b30
+  metadata.gz: a6f0467e39b53057c023904b1d13696c2959bf9f
+  data.tar.gz: 89ca19b9cf793ca0a38e6dc1e0f9353457a26f7e
 SHA512:
-  metadata.gz: 1f4f9dcbff7fa1a3199aaadd08473f1ad7afcb94dd1a7f6f32275c630e2b1c9ad89f7a13aa0d07309813acbffc2d573f3b700f11eb48fbee516e9f2561bc420f
-  data.tar.gz: 8bb6dbb519b9f98230bce973ea1658debc63bf00d3ec5362c9a26322f0b4bf56d75fc7159e958e12dd0551f10005c4793e6625d960093cc75a75f575d1121353
+  metadata.gz: 642d1acc7fdc9fc3e06c0c45cd75ac4bf6a875b60c4e65cae90aed0a059c1f636ca4638819ceaba636942b23c50cf9ee012569c37d69d07d58efa06810358d77
+  data.tar.gz: ebe7a0e6e7fb88a09732835b0ce89ee50088e2147945f74bf1b2aea8c5306bea8eca53c4941db0cf2347c6523b97659f686080c5240ccb0b567cce2f55a2a9a6

data/lib/omc/account.rb

@@ -10,7 +10,7 @@ module Omc
 
     def stacks
       @stacks ||= client.describe_stacks[:stacks].map do |stack|
-        ::Omc::Stack.new(self, stack)
+        Stack.new(self, stack)
       end
     end
   end

data/lib/omc/cli.rb

@@ -11,41 +11,50 @@ module Omc
 
     desc 'ssh STACK', 'Connect to an instance on a stack on an account'
     def ssh(stack)
-      command = StackCommand.new(user, stack, layer: options[:layer])
+      command = StackCommand.new(aws_account, user, stack, layer: options[:layer])
       command.ssh
     end
 
+    desc 'ssh_exec STACK COMMAND', 'Connect to an instance on a stack on an account and execute a command'
+    def ssh_exec(stack, user_command)
+      command = StackCommand.new(aws_account, user, stack, layer: options[:layer])
+      command.ssh_and_execute user_command
+    end
+
     desc 'console STACK', 'Run a rails console on the given stack'
     method_option :app
     def console(stack)
-      command = StackCommand.new(user, stack, app: options[:app], layer: options[:layer])
+      command = StackCommand.new(aws_account, user, stack, app: options[:app], layer: options[:layer])
       command.console
     end
 
     desc 'db STACK', 'Connect and run the database client on the given stack'
     method_option :app
     def db(stack)
-      command = StackCommand.new(user, stack, app: options[:app], layer: options[:layer])
+      command = StackCommand.new(aws_account, user, stack, app: options[:app], layer: options[:layer])
       command.db
     end
 
     desc 'unicorn ACTION STACK', 'Connect and run the given action on the unicorns'
     method_option :app
     def unicorn(action, stack)
-      command = StackCommand.new(user, stack, app: options[:app])
+      command = StackCommand.new(aws_account, user, stack, app: options[:app])
       command.unicorn(action)
     end
 
     desc 'status STACK', 'Show the instance status for the given stack'
     def status(stack)
-      command = StackCommand.new(user, stack, app: options[:app], layer: options[:layer])
+      command = StackCommand.new(aws_account, user, stack, app: options[:app], layer: options[:layer])
       command.status(self)
     end
 
     private
     def user
-      iam_account = vault.account(account) || abort("Account #{account.inspect} not configured")
-      iam_account.users.first || abort("No users configured under #{account.inspect}")
+      aws_account.users.first || abort("No users configured under #{account.inspect}")
+    end
+
+    def aws_account
+      vault.account(account) || abort("Account #{account.inspect} not configured")
     end
 
     def account

data/lib/omc/stack.rb

@@ -17,21 +17,15 @@ module Omc
     end
 
     def instances
-      @instances ||= client.describe_instances(stack_id: self[:stack_id])[:instances].map do |instance|
-        ::Omc::Instance.new(self, instance)
-      end
+      @instances ||= describe(:instances).map{ |instance| Instance.new(self, instance) }
     end
 
     def apps
-      @apps ||= client.describe_apps(stack_id: self[:stack_id])[:apps].map do |app|
-        ::Omc::App.new(self, app)
-      end
+      @apps ||= describe(:apps).map{ |app| App.new(self, app) }
     end
 
     def layers
-      @layers ||= client.describe_layers(stack_id: self[:stack_id])[:layers].map do |layer|
-        ::Omc::Layer.new(self, layer)
-      end
+      @layers ||= describe(:layers).map{ |layer| Layer.new(self, layer) }
     end
 
     def execute_recipes(app, recipes: [], name: "execute_recipes")
@@ -46,5 +40,11 @@ module Omc
         }
       )
     end
+
+    private
+
+    def describe(object)
+      client.public_send("describe_#{object}", stack_id: self[:stack_id])[object]
+    end
   end
 end

data/lib/omc/stack_command.rb

@@ -3,7 +3,8 @@ require 'omc/account'
 
 module Omc
   class StackCommand
-    def initialize user, stack_name, app: nil, layer: nil
+    def initialize aws_account, user, stack_name, app: nil, layer: nil
+      @aws_account = aws_account
       @user = user
       @stack_name = stack_name
       @app_name = app
@@ -11,15 +12,15 @@ module Omc
     end
 
     def ssh
-      exec "ssh", ssh_host
+      exec "ssh", *([ssh_host] + default_ssh_args)
     end
 
     def console
-      ssh_and_execute "cd /srv/www/#{app[:name]}/current && RAILS_ENV=#{app[:attributes]['RailsEnv']} bundle exec rails c"
+      ssh_and_execute_as_deploy "cd /srv/www/#{app[:shortname]}/current && RAILS_ENV=#{app[:attributes]['RailsEnv']} bundle exec rails c"
     end
 
     def db
-      ssh_and_execute "cd /srv/www/#{app[:name]}/current && RAILS_ENV=#{app[:attributes]['RailsEnv']} bundle exec rails db -p"
+      ssh_and_execute_as_deploy "cd /srv/www/#{app[:shortname]}/current && RAILS_ENV=#{app[:attributes]['RailsEnv']} bundle exec rails db -p"
     end
 
     def unicorn(action)
@@ -40,14 +41,22 @@ module Omc
           i[:availability_zone],
           i[:ec2_instance_id],
           i[:public_ip],
+          i[:private_ip],
         ]
       end
       thor.print_table(details)
     end
 
-    private
     def ssh_and_execute(command)
-      exec 'ssh', '-t', ssh_host, "sudo su deploy -c '#{command}'"
+      puts "Executing '#{command}'"
+      args = default_ssh_args + ['-t', ssh_host, command]
+
+      exec 'ssh', *args
+    end
+
+    private
+    def ssh_and_execute_as_deploy(command)
+      ssh_and_execute "sudo su deploy -c '#{command}'"
     end
 
     def app
@@ -70,7 +79,10 @@ module Omc
     end
 
     def ssh_host
-      "#{@user.name}@#{instance[:public_ip]}"
+      ip_address = bastion ? instance[:private_ip] : instance[:public_ip]
+      host = "#{@user.name}@#{ip_address}"
+      puts "Connecting to #{host}"
+      host
     end
 
     def account
@@ -81,6 +93,14 @@ module Omc
       @stack ||= get_by_name(account.stacks, @stack_name)
     end
 
+    def bastion
+      @aws_account.bastions.detect { |y| y.name == @stack_name }
+    end
+
+    def default_ssh_args
+      bastion ? [ '-o', "ProxyCommand ssh -W %h:%p #{bastion.host}" ] : []
+    end
+
     def get_by_name collection, name, key: :name
       collection.detect do |x|
         x[key] == name

data/lib/omc/version.rb

@@ -1,3 +1,3 @@
 module Omc
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/omc.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor", '~> 0.19'
-  spec.add_dependency "aws_cred_vault", '~> 0.0'
+  spec.add_dependency "aws_cred_vault", '~> 0.0.7'
   spec.add_dependency "aws-sdk", '~> 1.56'
 
   spec.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omc
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Clarke Brunsdon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Opsworks Missing Console - Useful Commands for Opsworks