proboscis_cli 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4f632a964f736abf931e8d14dbf01313710bd1cd9cde5fb95055903ee93c0d1
-  data.tar.gz: 82244db7f3fbaab6439ffa51f44cb9588de5598fec41ad4eac1ecd22b6280cc5
+  metadata.gz: 9b08e20f2e8f4a6771b7a8192a86a2083c169546137f1a0b069bdb4fb9bf6648
+  data.tar.gz: f63e3d0c12e1563317e2d4034172bc239b51d3f5690e6c72a9bacd45b4897b73
 SHA512:
-  metadata.gz: a89bb59acdf1e03ad2cf10fe97336d6feaa6d393db29b43269fb95f22861fbb04e72ca3c81388ce6ea6f8ce0e55281c39d8bad2620ce1e4c64571536533a34ea
-  data.tar.gz: af8c2f8f6517a8d69ffb6a8f1a88a4155704c0c3accf17b094d03a33e8d4d4eccc70c60e1aedfa0db2a29adf4b683767c36549e264f8335feb1296959a6ca273
+  metadata.gz: 9be97117c7a5d2d6efa5b6f00ab6dd2f9cc29c13e0e19e49fb5b8983a52bfa8ab49c5ae631cb5b2f72d8d77fa1b87575d417b58c4a71fe6a24eec0ff745d5265
+  data.tar.gz: 85ec027dbac647f5479cfc6b573d43b0a8fc1a0678fba499e9d32e52a175c6abe90cc7ce213883a76376a877a237da72dc464fe6317d95667bab1f02b1798114

data/README.md

@@ -30,6 +30,8 @@ Or install it yourself as:
   $ export proboscis_qa_target_user=<target_ssh_user>
   $ export proboscis_prod_target_port=<target_ssh_port>
   $ export proboscis_prod_target_user=<target_ssh_user>
+  $ export araneae_qa_token=<araneae_token>
+  $ export araneae_prod_token=<araneae_token>
 ```
 
 ```bash

data/bin/proboscis

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'proboscis_cli'
 
-if(ARGV.empty? || ARGV.size != 4)
+if(ARGV.empty? || ARGV.size > 5)
   puts "Usage proboscis <qa|prod> <subdomain> <server|worker> <b|i|c>"
   exit
 end
@@ -10,6 +10,10 @@ environment = ARGV[0].downcase
 subdomain = ARGV[1].downcase
 target = ARGV[2].downcase
 type = ARGV[3].downcase
+subpath = 'araneae'
+if not ARGV[4].nil?
+  subpath = ARGV[4].downcase
+end
 
 if((%w(qa prod).select {|e| e == environment}).empty? ||
   (%w(server worker).select {|e| e == target}).empty? ||
@@ -18,4 +22,4 @@ if((%w(qa prod).select {|e| e == environment}).empty? ||
   exit
 end
 
-Proboscis.connect(environment, subdomain, target, type)
+Proboscis.connect(environment, subdomain, target, type, subpath=subpath)

data/lib/proboscis_cli.rb

@@ -3,8 +3,14 @@ require 'httparty'
 require 'json'
 require "base64"
 
-class Server
-  def self.ip(auth_code, host, environment, subdomain, type)
+class Machine
+  def self.port(environment, type, subpath)
+    ENV["proboscis_#{environment}_target_port"] || "22"
+  end
+end
+
+class Server < Machine
+  def self.ip(auth_code, host, environment, subdomain, type, subpath)
     response = HTTParty.get("#{host}/api/api/hives/#{subdomain}/#{type}", headers: {"X-Authorization" => auth_code})
     if response.code != 200
       puts "Unable to fetch details for domain #{subdomain}"
@@ -15,8 +21,33 @@ class Server
   end
 end
 
-class Worker
-  def self.ip(auth_code, host, environment, subdomain, type)
+class CashServer < Server
+  def self.port(environment, type, subpath)
+    subpath == 'araneae' ? "1729" : "22"
+  end
+
+  def self.param(environment, lookup)
+    ENV["araneae_#{environment}_#{lookup}"]
+  end
+
+  def self.ip(auth_code, host, environment, subdomain, type, subpath)
+    super
+    if subpath == 'araneae'
+      return @ipAddress
+    end
+    res = HTTParty.get("http://#{@ipAddress}/admin/hosts", headers: {'X-Auth-Key': self.param(environment, 'token')})
+    if res.code != 200
+      puts "Failed to get subpath details. #{res.code}"
+      exit -1
+    end
+    subservers = JSON::parse(res.body)
+    @ipAddress = subservers.select {|s| s['name'] == subpath}[0]['host']
+    @ipAddress
+  end
+end
+
+class Worker < Machine
+  def self.ip(auth_code, host, environment, subdomain, type, subpath)
     @auth_code = auth_code
     @host = host
     self.client_list environment
@@ -26,6 +57,10 @@ class Worker
       exit -1
     end
     self.client environment, client_id.first
+    self.worker_ip subpath
+  end
+
+  def self.worker_ip(subpath)
     if(!@infra_info["WORKER_IP"])
       puts "Unable to find target WORKER_IP in #{@infra_info}. Is the machine up?"
     end
@@ -56,6 +91,16 @@ class Worker
    end
 end
 
+class CashWorker < Worker
+  def self.worker_ip(subpath)
+    key = "#{subpath.gsub('_', '-')}_WORKER_IP"
+    if(!@infra_info[key])
+      puts "Unable to find target WORKER_IP in #{@infra_info}. Is the machine up?"
+    end
+    @infra_info[key]
+  end
+end
+
 class Proboscis
   def self.host(environment)
     ENV["proboscis_#{environment}"]
@@ -65,21 +110,30 @@ class Proboscis
     ENV["proboscis_#{environment}_#{lookup}"]
   end
 
-  def self.connect(environment, subdomain, target, type)
+  def self.connect(environment, subdomain, target, type, subpath='araneae')
     type = type == 'b' ? 'BUSY_BEE' : (type == 'i' ? 'INSTANT_HONEY' : 'CASH_REPLENISHMENT')
     @host = self.host(environment)
     self.login environment
-    ip = self.get_ip environment, subdomain, type, target
+    machine = self.get_machine target, type
+    ip = machine.ip @auth_code, @host, environment, subdomain, type, subpath
     if(!ip)
       puts "Unable to find target #{ip}. Is the machine up?"
       exit -1
     end
     user = ENV["proboscis_#{environment}_target_user"] || "root"
-    port = ENV["proboscis_#{environment}_target_port"] || "22"
+    port = machine.port environment, type, subpath
     puts "Executing ssh #{user}@#{ip} -p #{port}"
     system "ssh #{user}@#{ip} -p #{port}"
   end
 
+  def self.get_machine(target, type)
+    if type == 'c'
+      target == 'server' ? Server : Worker
+    else
+      target == 'server' ? CashServer : CashWorker
+    end
+  end
+
   def self.login(environment)
     response = HTTParty.post("#{@host}/api/login", body: {phoneNumber: self.param(environment, 'user'), password: self.param(environment, 'pass')}.to_json, headers: { 'Content-Type' => 'application/json' })
     if response.code != 200
@@ -88,9 +142,4 @@ class Proboscis
     end
     @auth_code = Base64.strict_encode64(JSON::parse(response.body)["accessToken"])
   end
-
-  def self.get_ip(environment, subdomain, type, target)
-    machine = target.downcase == 'server' ? Server : Worker
-    machine.ip @auth_code, @host, environment, subdomain, type
-  end
 end

data/lib/proboscis_cli/version.rb

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

data/proboscis_cli.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'proboscis_cli'
-  s.version     = '0.0.7'
+  s.version     = '0.0.8'
   s.date        = '2018-04-10'
   s.summary     = "A cli client for proboscis"
   s.description = "A cli client for proboscis"

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: proboscis_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Simon Roy
 - Arvind
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-04-10 00:00:00.000000000 Z
@@ -73,7 +73,7 @@ homepage: http://rubygems.org/gems/proboscis_cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,8 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.0.4
+signing_key:
 specification_version: 4
 summary: A cli client for proboscis
 test_files: []