opsmgr 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92779c8cfe52a2eb604969894523bda1b3a6d8f4
-  data.tar.gz: c54dde7aaf031aad52268fc29cc582d04f9dfe1e
+  metadata.gz: 8e4c3ef7cacf13a2ef564b5d3311f2c884ccc19c
+  data.tar.gz: 11a3a3f6e645425cc1d6cb1cde728bf1a04b0e83
 SHA512:
-  metadata.gz: 0ddbbeda6b4db32e31e8f04e2efe4ba99de33718234b8768e514fe2177c81a3f69a1f53157f36ccb8f08ab3ce9168764c67f26b57e4ba343f6e56b4d0cd4fca0
-  data.tar.gz: 76585c4007685c8396d123c6ac5a6dcf2e60733b05600dbf50335042a71983f2bae8bf06be147f4952a26640dfd6a83e22f0730a5295105b4d882a38101f8608
+  metadata.gz: 355a82586a8608b80bfaddabe496edb63c7d3536a077f563ceac99f9f4a31a6976d3964515eaee701c2202b3bf0858394a1ae9774dbc92033d3aa51ded20ca30
+  data.tar.gz: 6d6d1cc2c0d3cebd5dc5d4ec77338f691ca10de8211ca43bf73141b98994346c815956eb1079ac63018e31a2aedfd4de468e7ffb2892e099d511b821565e6c5a

data/lib/opsmgr/bosh_command_runner.rb

@@ -0,0 +1,57 @@
+module Opsmgr
+  class BoshCommandRunner
+    def initialize(iaas_gateway:, bosh_command:, logger:)
+      @iaas_gateway = iaas_gateway
+      @bosh_command = bosh_command
+      @logger = logger
+    end
+
+    def run(command)
+      iaas_gateway.gateway do
+        system_or_fail(
+          "#{bosh_command_prefix} #{command}",
+          "bosh #{command} failed"
+        )
+      end
+    end
+
+    def run_and_capture_output(command)
+      iaas_gateway.gateway do
+        capture_output_or_fail(
+          "#{bosh_command_prefix} #{command}",
+          "bosh #{command} failed"
+        )
+      end
+    end
+
+    private
+
+    def system_or_fail(command, failure_message)
+      logger.info("Running #{command}")
+      Bundler.clean_system(command) || fail(failure_message)
+    end
+
+    def capture_output_or_fail(command, failure_message)
+      logger.info("Running #{command}")
+      Bundler.with_clean_env do
+        output, status = Open3.capture2(command)
+        fail(failure_message) unless status.success?
+        output
+      end
+    end
+
+    def bosh_command_prefix
+      @bosh_command_prefix ||= bosh_command.command
+    end
+
+    attr_reader :iaas_gateway, :bosh_command, :logger
+  end
+end
+# Copyright (c) 2014-2015 Pivotal Software, Inc.
+# All rights reserved.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+# USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/opsmgr/cmd/bosh_command.rb

@@ -173,7 +173,7 @@ module Opsmgr
           'ubuntu',
           password: 'tempest'
         ).open(director_ip, 25_555, 25_555) do |_|
-          logger.info("Opened tunnel to MicroBOSH at #{director_ip}")
+          logger.info("Opened tunnel to Director at #{director_ip}")
           block.call
         end
       end
@@ -187,7 +187,7 @@ module Opsmgr
           'ubuntu',
           key_data: [ssh_key]
         ).open(director_ip, 25_555, 25_555) do |_|
-          logger.info("Opened tunnel to MicroBOSH at #{director_ip}")
+          logger.info("Opened tunnel to Director at #{director_ip}")
           block.call
         end
       end

data/lib/opsmgr/errand_runner.rb

@@ -1,4 +1,4 @@
-require 'opsmgr/environments'
+require 'opsmgr/bosh_command_runner'
 require 'open3'
 
 module Opsmgr
@@ -6,63 +6,54 @@ module Opsmgr
     def initialize(iaas_gateway:, bosh_command:, environment_name:, logger:, product_name:, errand_name:, download_logs:)
       @iaas_gateway = iaas_gateway
       @bosh_command = bosh_command
-      @environment = Opsmgr::Environments.for(environment_name)
+      @environment_name = environment_name
       @logger = logger
       @product_name = product_name
       @errand_name = errand_name
       @download_logs = download_logs ? "--download-logs" : ""
+
+      @bosh_command_runner = Opsmgr::BoshCommandRunner.new(
+        iaas_gateway: @iaas_gateway,
+        bosh_command: @bosh_command,
+        logger: @logger
+      )
     end
 
     def run_errand
-      iaas_gateway.gateway do
-        set_bosh_deployment
-
-        system_or_fail(
-          "#{bosh_command_prefix} run errand #{@errand_name} #{@download_logs}",
-          "Errand #{@errand_name} failed"
-        )
+      deployments_output = begin
+        @bosh_command_runner.run_and_capture_output('deployments')
+      rescue RuntimeError
+        raise 'bosh deployments failed'
       end
-    end
-
-    private
 
-    def set_bosh_deployment
-      system_or_fail(bosh_command.target, 'bosh target failed')
+      /#{@product_name}-[0-9a-f]{8,}/.match(deployments_output)
 
-      bosh_deployment = bosh_deployment_name(bosh_command_prefix)
+      bosh_deployment = $&
 
-      deployment_file = "#{ENV.fetch('TMPDIR', '/tmp')}/#{environment.settings.name}.yml"
+      fail 'Deployment not found' if bosh_deployment.nil?
 
-      system_or_fail(
-        "#{bosh_command_prefix} -n download manifest #{bosh_deployment} #{deployment_file}",
-        'bosh download manifest failed'
-      )
-      system_or_fail(
-        "#{bosh_command_prefix} deployment #{deployment_file}",
-        'bosh deployment failed'
-      )
-    end
+      deployment_file = "#{ENV.fetch('TMPDIR', '/tmp')}/#{environment_name}.yml"
 
-    def system_or_fail(command, failure_message)
-      logger.info("Running #{command}")
-      Bundler.clean_system(command) || fail(failure_message)
-    end
+      begin
+        @bosh_command_runner.run(
+          "-n download manifest #{bosh_deployment} #{deployment_file}"
+        )
+      rescue RuntimeError
+        raise 'bosh download manifest failed'
+      end
 
-    def bosh_deployment_name(command)
-      @bosh_deployment_name ||= begin
-        Bundler.with_clean_env do
-          bosh_deployment, status = Open3.capture2("#{command} deployments | grep -Eoh '#{@product_name}-[0-9a-f]{8,}'")
-          fail('bosh deployments failed') unless status.success?
-          bosh_deployment.chomp
-        end
+      begin
+        @bosh_command_runner.run(
+          "-d #{deployment_file} run errand #{@errand_name} #{@download_logs}"
+        )
+      rescue RuntimeError
+        raise "Errand #{@errand_name} failed"
       end
     end
 
-    def bosh_command_prefix
-      @bosh_command_prefix ||= bosh_command.command
-    end
+    private
 
-    attr_reader :iaas_gateway, :bosh_command, :environment, :logger, :product_name, :errand_name, :download_logs
+    attr_reader :bosh_command, :environment_name, :logger, :product_name, :errand_name, :download_logs
   end
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.

data/lib/opsmgr/tasks/bosh.rake

@@ -59,6 +59,29 @@ namespace :opsmgr do
     end
     system('ls *bosh*.tgz > stemcell_reference.txt')
   end
+
+  desc 'run a bosh command'
+  task :run_command, [:environment_name, :om_version, :command] do |_, args|
+    require 'opsmgr/cmd/bosh_command'
+    require 'opsmgr/log'
+    require 'opsmgr/bosh_command_runner'
+
+    logger = Opsmgr.logger_for('Rake')
+    bosh_command = Opsmgr::Cmd::BoshCommand.new(
+      env_name: args.environment_name,
+      om_version: args.om_version
+    )
+    iaas_gateway = Opsmgr::Cmd::IaasGateway.new(
+      bosh_command: bosh_command,
+      environment_name: args.environment_name,
+      logger: logger
+    )
+    Opsmgr::BoshCommandRunner.new(
+      iaas_gateway: iaas_gateway,
+      bosh_command: bosh_command,
+      logger: logger
+    ).run(args.command)
+  end
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.
 # All rights reserved.

data/lib/opsmgr/version.rb

@@ -1,5 +1,5 @@
 module Opsmgr
-  VERSION = '0.27.0'
+  VERSION = '0.28.0'
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.
 # All rights reserved.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsmgr
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Release Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -291,6 +291,7 @@ files:
 - lib/opsmgr/api/http_client.rb
 - lib/opsmgr/api/results.rb
 - lib/opsmgr/api/version20/endpoints.rb
+- lib/opsmgr/bosh_command_runner.rb
 - lib/opsmgr/cmd/bosh_command.rb
 - lib/opsmgr/cmd/ops_manager.rb
 - lib/opsmgr/environments.rb