ops_manager_cli 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a17efe939f01b0d30af761995ec9e53a2cce164
-  data.tar.gz: 10b1449933a1ff712335e1c0c0de34b9d717d84b
+  metadata.gz: 9ec7bfea49668d843eb2f5519458611f50d9f15b
+  data.tar.gz: 6c97e25bc6fdbd920211707f7616d93073f3ee87
 SHA512:
-  metadata.gz: 3a228e183de7d339979a7f060eea6702cea3111facdc396e219708597a2369ed980e8dc147e5d003fef35e884098e6ce8f69e02bcfe4be74edd8064a400b0c15
-  data.tar.gz: 6001b205c0f317a830341edaebd47b25d198aca7fb130324ebe5823b5ca9baca84690c9301599cc5b0aad5ae323c0a8ddcaa1e0e4c05d379f8e826937efacb54
+  metadata.gz: 2b2c5ad35553858b37bf1589a9370e5b9ec01daa9bf66ee892a1352eb3041b364236ec748edae8d730232a00f538cfaee3b5fd54d8a0069747c97de43ff6a9e6
+  data.tar.gz: 91f1862c59af627398b69fd6a0cad1ed0cb289bb05c681da67ba2dc3055b5d073ce5858e04b98515410b05eceaf066ad300e20da92c451e7045cd6b2fa2dce8e

data/Dockerfile

@@ -1,7 +1,7 @@
 FROM ruby:2.4.1
 
 ENV GEM_NAME ops_manager_cli
-ENV GEM_VERSION 0.7.4
+ENV GEM_VERSION 0.7.6
 ENV OVFTOOL_VERSION 4.1.0-2459827
 ENV OVFTOOL_INSTALLER VMware-ovftool-${OVFTOOL_VERSION}-lin.x86_64.bundle
 ARG DOWNLOAD_URL

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 36000 { image.state == "available" }
+        image.wait_for(timeout=36000) { image.state == "available" }
         if image.state != "available"
           fail "Error creating backup AMI, bailing out before destroying the VM"
         end

data/lib/ops_manager/appliance/base.rb

@@ -16,7 +16,8 @@ class OpsManager
 
       private
       def vm_name
-        @vm_name ||= "#{config[:name]}-#{config[:desired_version]}"
+        desired_version = OpsManager::Semver.new(config[:desired_version])
+        @vm_name ||= "#{config[:name]}-#{desired_version}"
       end
     end
   end

data/lib/ops_manager/appliance_deployment.rb

@@ -80,8 +80,12 @@ class OpsManager::ApplianceDeployment
 
   def list_current_stemcells
     JSON.parse(installation_settings).fetch('products').inject([]) do |a, p|
-      a << p['stemcell'].fetch('version')
-    end
+      product_name = "stemcells"
+      if p['stemcell'].fetch('os') =~ /windows/i
+        product_name = "stemcells-windows-server"
+      end
+      a << { version: p['stemcell'].fetch('version'), product: product_name }
+    end.uniq
   end
 
   # Finds available stemcell's pivotal network release.
@@ -89,9 +93,9 @@ class OpsManager::ApplianceDeployment
   # #
   # @param version [String] the version number, eg: '2362.17'
   # @return release_id [Integer] the pivotal netowkr release id of the found stemcell.
-  def find_stemcell_release(version)
+  def find_stemcell_release(version, product_name)
     version  = OpsManager::Semver.new(version)
-    releases = stemcell_releases.collect do |r|
+    releases = stemcell_releases(product_name).collect do |r|
       {
         release_id:  r['id'],
         version:     OpsManager::Semver.new(r['version']),
@@ -109,8 +113,8 @@ class OpsManager::ApplianceDeployment
   # @param release_id [String] the version number, eg: '2362.17'
   # @param filename [Regex] the version number, eg: /vsphere/
   # @return id and name [Array] the pivotal network file ID and Filename for the matching stemcell.
-  def find_stemcell_file(release_id, filename)
-    files = JSON.parse(get_product_release_files('stemcells', release_id).body).fetch('product_files')
+  def find_stemcell_file(release_id, filename, product_name)
+    files = JSON.parse(get_product_release_files(product_name, release_id).body).fetch('product_files')
     file = files.select{ |r| r.fetch('aws_object_key') =~ filename }.first
     return file['id'], file['aws_object_key'].split('/')[-1]
   end
@@ -121,16 +125,18 @@ class OpsManager::ApplianceDeployment
     print "====> Downloading existing stemcells ...".green
     puts "no stemcells found".green if list_current_stemcells.empty?
     FileUtils.mkdir_p current_stemcell_dir
-    list_current_stemcells.each do |stemcell_version|
-      release_id = find_stemcell_release(stemcell_version)
-      accept_product_release_eula('stemcells', release_id )
+    list_current_stemcells.each do |stemcell_info|
+      stemcell_version = stemcell_info[:version]
+      product_name = stemcell_info[:product]
+      release_id = find_stemcell_release(stemcell_version, product_name)
+      accept_product_release_eula(product_name, release_id)
       stemcell_regex = /vsphere/
       if config[:provider] == "AWS"
         stemcell_regex = /aws/
       end
 
-      file_id, file_name = find_stemcell_file(release_id, stemcell_regex)
-      download_product_release_file('stemcells', release_id, file_id, write_to: "#{current_stemcell_dir}/#{file_name}")
+      file_id, file_name = find_stemcell_file(release_id, stemcell_regex, product_name)
+      download_product_release_file(product_name, release_id, file_id, write_to: "#{current_stemcell_dir}/#{file_name}")
     end
   end
 
@@ -212,12 +218,8 @@ class OpsManager::ApplianceDeployment
     @installation_settings ||= get_installation_settings.body
   end
 
-  def get_stemcell_releases
-    get_product_releases('stemcells')
-  end
-
-  def stemcell_releases
-    @stemcell_releases ||= JSON.parse(get_stemcell_releases.body).fetch('releases')
+  def stemcell_releases(product_name)
+    JSON.parse(get_product_releases(product_name).body).fetch('releases')
   end
 
   def current_stemcell_dir

data/lib/ops_manager/product_template_generator.rb

@@ -19,11 +19,11 @@ class OpsManager
       delete_from_jobs(property_name)
       end
 
-      %w{ password secret salt }.each do |property_name|
+      %w{ password secret salt private_key_pem cert_pem }.each do |property_name|
         delete_value_from_job_properties(property_name)
       end
 
-      %w{ secret }.each do |property_name|
+      %w{ secret private_key_pem cert_pem }.each do |property_name|
         delete_value_from_product_properties(property_name)
       end
 
@@ -126,5 +126,15 @@ class OpsManager
         end
       end
     end
+
+    def delete_certs_from_template
+      selected_product['jobs'].each do |j|
+        j.fetch('properties',[]).each do |p|
+          
+        end
+      end
+
+    end
+
   end
 end

data/lib/ops_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_cli
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - CompoZed
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler