ops_manager_cli 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54353d2183e22dbc6336cfa9effb657045473c3e
-  data.tar.gz: 757e9c28fcee50edcc0a9cf966bb1bd509b4320a
+  metadata.gz: 5a17efe939f01b0d30af761995ec9e53a2cce164
+  data.tar.gz: 10b1449933a1ff712335e1c0c0de34b9d717d84b
 SHA512:
-  metadata.gz: c7b416fa774836542dae54ccd31023254b95449a021dd9f804664421d0c49d805249b7b60433245daba46658d560fbab5b83c09f6e3d3f37ecda7cc6971efc15
-  data.tar.gz: 6859701012082484571dba53af2780d7d4b8769d554b673a89ee1b61a2111fa7b89af37ada4c377f8de82408cc6e0e51dd036e1d3b77b05d1ca31b325a4a7889
+  metadata.gz: 3a228e183de7d339979a7f060eea6702cea3111facdc396e219708597a2369ed980e8dc147e5d003fef35e884098e6ce8f69e02bcfe4be74edd8064a400b0c15
+  data.tar.gz: 6001b205c0f317a830341edaebd47b25d198aca7fb130324ebe5823b5ca9baca84690c9301599cc5b0aad5ae323c0a8ddcaa1e0e4c05d379f8e826937efacb54

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.4.1

data/CHANGELOG.md

@@ -1,10 +1,11 @@
 # Change Log
 
+## [v0.7.2](https://github.com/compozed/ops_manager_cli/tree/v0.7.2) (2017-11-03)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.1...v0.7.2)
+
 ## [v0.7.1](https://github.com/compozed/ops_manager_cli/tree/v0.7.1) (2017-10-25)
 [Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.7.0...v0.7.1)
 
-Fix issue when opsman appliance is starting on AWS
-
 ## [v0.7.0](https://github.com/compozed/ops_manager_cli/tree/v0.7.0) (2017-10-20)
 [Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.5.4...v0.7.0)
 
@@ -98,4 +99,4 @@ Fix issue when opsman appliance is starting on AWS
 ## [v0.1.1](https://github.com/compozed/ops_manager_cli/tree/v0.1.1) (2016-05-06)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Dockerfile

@@ -1,11 +1,16 @@
-FROM ruby:2.3.0
+FROM ruby:2.4.1
 
 ENV GEM_NAME ops_manager_cli
-ENV GEM_VERSION 0.7.1
+ENV GEM_VERSION 0.7.4
 ENV OVFTOOL_VERSION 4.1.0-2459827
 ENV OVFTOOL_INSTALLER VMware-ovftool-${OVFTOOL_VERSION}-lin.x86_64.bundle
 ARG DOWNLOAD_URL
 
+# ================== Installs sshpass ===============
+RUN echo "deb http://httpredir.debian.org/debian jessie utils" >> sources.list
+RUN apt-get update
+RUN apt-get install -y sshpass unzip
+
 # ================== Installs OVF tools ==============
 RUN echo $DOWNLOAD_URL
 RUN wget -v ${DOWNLOAD_URL} \
@@ -13,10 +18,9 @@ RUN wget -v ${DOWNLOAD_URL} \
   && rm -f ${OVFTOOL_INSTALLER}*
 
 # ================== Installs Spruce ==============
-RUN wget -v --no-check-certificate https://github.com/geofffranks/spruce/releases/download/v1.0.1/spruce_1.0.1_linux_amd64.tar.gz \
-    && tar -xvf spruce_1.0.1_linux_amd64.tar.gz \
-    && chmod +x /spruce_1.0.1_linux_amd64/spruce \
-    && ln -s /spruce_1.0.1_linux_amd64/spruce /usr/bin/.
+RUN wget -v --no-check-certificate https://github.com/geofffranks/spruce/releases/download/v1.13.1/spruce-linux-amd64 \
+    && chmod +x spruce-linux-amd64 \
+    && ln -s /spruce-linux-amd64 /usr/bin/spruce
 
 # ================== Installs JQ ==============
 RUN wget -v -O /usr/local/bin/jq --no-check-certificate https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
@@ -24,6 +28,5 @@ RUN chmod +x /usr/local/bin/jq
 
 # ================== Installs ops_manager_cli gem ==============
 COPY pkg/${GEM_NAME}-${GEM_VERSION}.gem /tmp/
-
 RUN gem install /tmp/${GEM_NAME}-${GEM_VERSION}.gem
 

data/lib/ops_manager/api/base.rb

@@ -153,7 +153,7 @@ class OpsManager
         Net::HTTP.new(uri.host, uri.port).tap do |http|
           http.use_ssl = true
           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          http.read_timeout = 1200
+          http.read_timeout = 1800
 
           ctx = OpenSSL::SSL::SSLContext.new
           ctx.ssl_version = :TLSv1_2

data/lib/ops_manager/api/opsman.rb

@@ -107,12 +107,16 @@ class OpsManager
       end
 
       def upload_product(filepath)
-        file = "#{filepath}"
-        cmd = "curl -s -k \"https://#{target}/api/v0/available_products\" -F 'product[file]=@#{file}' -X POST -H 'Authorization: Bearer #{access_token}'"
-        logger.info "running cmd: #{cmd}"
-        body = `#{cmd}`
-        logger.info "Upload product response: #{body}"
-        raise OpsManager::ProductUploadError if body.include? "error"
+        return unless filepath
+        tar = UploadIO.new(filepath, 'multipart/form-data')
+        print_green "====> Uploading product: #{filepath} ..."
+      #print "====> Uploading product ...".green
+        opts = { "product[file]" => tar }
+        res = authenticated_multipart_post("/api/v0/available_products" , opts)
+
+        raise OpsManager::ProductUploadError.new(res.body) unless res.code == '200'
+        say_green 'done'
+        res
       end
 
       def get_available_products

data/lib/ops_manager/appliance/aws.rb

@@ -40,7 +40,7 @@ class OpsManager
         # Create ami of stopped server
         response = connection.create_image(server.id, "#{name}-backup", "Backup of #{name}")
         image = connection.images.get( response.data[:body]['imageId'])
-        image.wait_for { image.state == "available" }
+        image.wait_for 36000 { image.state == "available" }
         if image.state != "available"
           fail "Error creating backup AMI, bailing out before destroying the VM"
         end

data/lib/ops_manager/config/base.rb

@@ -16,6 +16,7 @@ class OpsManager
       def expand_path_for!(*attrs)
         attrs.each do |attr|
           path = self[attr] 
+          next if path.nil?
           self[attr] = if path =~ %r{^file://}
             path = Dir.glob(path.gsub!('file://','')).first
             "file://#{path}"

data/lib/ops_manager/config/product_deployment.rb

@@ -6,7 +6,7 @@ class OpsManager
       def initialize(config)
         super(config)
         validate_presence_of! :name, :desired_version 
-        expand_path_for! :stemcell
+        expand_path_for! :stemcell, :filepath
       end
     end
   end

data/lib/ops_manager/director_template_generator.rb

@@ -7,9 +7,8 @@ class OpsManager
       installation_settings.delete(property_name)
     end
 
-    %w{ director_ssl uaa_ssl uaa_credentials uaa_admin_user_credentials
-      uaa_admin_client_credentials }.each do |property_name|
-      product_template["products"][1].delete(property_name)
+    %w{ uaa_credentials uaa_admin_user_credentials uaa_admin_client_credentials }.each do |property_name|
+      product_template["products"].select {|p| p["identifier"] == "p-bosh"}.first.delete(property_name)
     end
 
       add_merging_strategy_for_networks

data/lib/ops_manager/logging.rb

@@ -7,13 +7,11 @@ class OpsManager
     end
 
     def self.logger
-      @logger ||= Logger.new(STDOUT).tap do |l|
-        l.level = log_level
-      end
+      @logger ||= Logger.new(STDERR, level: log_level)
     end
 
-    def self.logger=(logger)
-      @logger = logger
+    def self.logger=(l)
+      @logger = l
     end
 
     private

data/lib/ops_manager/product_deployment.rb

@@ -43,12 +43,10 @@ class OpsManager
     end
 
     def upload
-      print "====> Uploading product ...".green
       if ProductDeployment.exists?(config[:name], config[:desired_version])
-        puts "product already exists".green
+        puts "====> Product already exists... skipping upload".green
       elsif config[:filepath]
         upload_product(config[:filepath])
-        puts "done".green
       else
         puts "no filepath provided, skipping product upload.".green
       end
@@ -87,7 +85,7 @@ class OpsManager
 
     def merge_product_installation_settings
       get_installation_settings({write_to: '/tmp/is.yml'})
-      puts `DEBUG=false spruce merge /tmp/is.yml #{config[:installation_settings_file]} > /tmp/new_is.yml`
+      puts `DEBUG=false DEFAULT_ARRAY_MERGE_KEY=identifier spruce merge /tmp/is.yml #{config[:installation_settings_file]} > /tmp/new_is.yml`
       upload_installation_settings('/tmp/new_is.yml')
     end
 

data/lib/ops_manager/product_template_generator.rb

@@ -27,29 +27,30 @@ class OpsManager
         delete_value_from_product_properties(property_name)
       end
 
-      add_merging_strategy_for_jobs
-      add_merging_strategy_for_job_properties
+      %w{ deployed }.each do |property_name|
+        delete_key_from_product_properties(property_name)
+      end
 
-      { 'products' => [ "(( merge on identifier ))" , selected_product ] }
-    end
+      %w{ deployed }.each do |property_name|
+        delete_key_from_job_properties(property_name)
+      end
 
-    def generate_yml
-      generate.to_yaml
-        .gsub('"(( merge on identifier ))"', '(( merge on identifier ))')
-    end
+      %w{ deployed }.each do |property_name|
+        delete_key_from_product_properties_options_properties(property_name)
+      end
 
-    private
+      %w{ deployed }.each do |property_name|
+        delete_key_from_job_properties_records_properties(property_name)
+      end
 
-    def add_merging_strategy_for_jobs
-      selected_product['jobs'].unshift("(( merge on identifier ))")
+      { 'products' => [ selected_product ] }
     end
 
-    def add_merging_strategy_for_job_properties
-      selected_product['jobs'].each do |j|
-        j['properties'].unshift("(( merge on identifier ))") if j['properties']
-      end
+    def generate_yml
+      generate.to_yaml
     end
 
+    private
     def delete_from_product(name)
       selected_product.delete(name)
     end
@@ -81,6 +82,42 @@ class OpsManager
       end
     end
 
+    def delete_key_from_job_properties(name)
+      selected_product['jobs'].each do |j|
+        j.fetch('properties', []).each  do |p|
+          p.delete(name) 
+        end
+      end
+    end
+
+    def delete_key_from_product_properties(name)
+      selected_product.fetch('properties', []).each  do |p|
+        p.delete(name) 
+      end
+    end
+
+    def delete_key_from_product_properties_options_properties(name)
+      selected_product.fetch('properties',[]).each do |p|
+        p.fetch('options',[]).each do |o|
+          o.fetch('properties', []).each  do |op|
+            op.delete(name) 
+          end
+        end
+      end
+    end
+
+    def delete_key_from_job_properties_records_properties(name)
+      selected_product['jobs'].each do |j|
+        j.fetch('properties',[]).each do |p|
+          p.fetch('records',[]).each do |o|
+            o.fetch('properties', []).each  do |op|
+              op.delete(name) 
+            end
+          end
+        end
+      end
+    end
+
     def delete_value_from_job_properties(name)
       selected_product['jobs'].each do |j|
         j.fetch('properties', []).each  do |p|

data/lib/ops_manager/version.rb

@@ -1,3 +1,3 @@
 class OpsManager
-  VERSION = "0.7.2"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_cli
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - CompoZed
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -252,6 +252,7 @@ files:
 - lib/ops_manager/semver.rb
 - lib/ops_manager/version.rb
 - ops_manager.gemspec
+- specs.4.8
 homepage: 
 licenses:
 - MIT
@@ -272,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Performs Ops Manager deployments.