ops_manager_cli 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 275c833c1e7b72ba2ab90fa53b3ef0025556907f
-  data.tar.gz: 435c7bde99641128d0f9fb57f108918f4a92cd16
+  metadata.gz: 726b5d7b7e15a4f5cf99ba65471cf32a91e79f61
+  data.tar.gz: 534134302a6a63bf71492fa3ba1ef3c782ffd046
 SHA512:
-  metadata.gz: 41210680cd70a74580a55afd53368ac4e985b1e7c9b6cf6e08bd1a900711fd3c19252fa26d82042d860fbbb1836ea79708746e2473edb37de63a4dfca225a836
-  data.tar.gz: 507f8d1f8929e727e9fd6cf75955d3226150bd11251ea4baeb1099b22dd630d7e4df944780ebfe72866615130779d591f355fcc740fd1842a194aca3193aa450
+  metadata.gz: bccfac866feed2dcb40443e2eb86144792a5dc47e4b1f3b8f8cc60273f067e4579119528a370b0ef75b9f5d1fdab7d6d0975e2d50ba1042340992b5bfd0bc52a
+  data.tar.gz: b108eb9ccd98112839f5b5d3a8add837efa852965f0d57f335c5e039bfd24a4217c3a341e9e498f1d156b34443677359ac3144cbfd93365eb4680b8807cbd550

data/.travis.yml

@@ -1,4 +1,2 @@
 language: ruby
-rvm:
-  - 2.2.0
 before_install: gem install bundler -v 1.10.6

data/CHANGELOG.md

@@ -0,0 +1,40 @@
+# Change Log
+
+## [v0.4.0](https://github.com/compozed/ops_manager_cli/tree/v0.4.0) (2016-10-20)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.3.0...v0.4.0)
+
+**Implemented enhancements:**
+
+- Improve output for appliance deploy/upgrade [\#11](https://github.com/compozed/ops_manager_cli/issues/11)
+- Improve output for product deploy/upgrade [\#10](https://github.com/compozed/ops_manager_cli/issues/10)
+- Run errands when applying changes [\#9](https://github.com/compozed/ops_manager_cli/issues/9)
+- 1.8 support [\#5](https://github.com/compozed/ops_manager_cli/pull/5) ([bonzofenix](https://github.com/bonzofenix))
+
+**Fixed bugs:**
+
+- delete-unused-products command not working [\#8](https://github.com/compozed/ops_manager_cli/issues/8)
+- Hardcoded user name admin when logging agains ops\_manager [\#2](https://github.com/compozed/ops_manager_cli/issues/2)
+
+**Closed issues:**
+
+- Link to CLA is broken [\#4](https://github.com/compozed/ops_manager_cli/issues/4)
+
+**Merged pull requests:**
+
+- Ensures special shell characters are escaped in ovftool command [\#7](https://github.com/compozed/ops_manager_cli/pull/7) ([kpschuck](https://github.com/kpschuck))
+- Fix issue when collecting errands for applying changes [\#6](https://github.com/compozed/ops_manager_cli/pull/6) ([kpschuck](https://github.com/kpschuck))
+- Replaces hardcoded 'admin' username with user from login command [\#3](https://github.com/compozed/ops_manager_cli/pull/3) ([kpschuck](https://github.com/kpschuck))
+
+## [v0.3.0](https://github.com/compozed/ops_manager_cli/tree/v0.3.0) (2016-09-03)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.2.8...v0.3.0)
+
+## [v0.2.8](https://github.com/compozed/ops_manager_cli/tree/v0.2.8) (2016-08-09)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.2.7...v0.2.8)
+
+## [v0.2.7](https://github.com/compozed/ops_manager_cli/tree/v0.2.7) (2016-07-28)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.1.1...v0.2.7)
+
+## [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)*

data/Dockerfile

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

data/README.md

@@ -11,32 +11,27 @@ Questions? Pop in our [slack channel](https://cloudfoundry.slack.com/messages/op
 
 ### Core features
 
-- Support for deploying on vSphere infrastructure
+- Support vSphere infrastructure (easy to extend to any cloud provider)
 - Deploy/Upgrade Ops Manager appliance
 - Deploy/Upgrade product tiles
 - Generate config settings templates for product tiles deployments
+- Run errands on deploy/upgrade for ops_manager **< 1.7.x**
 
 ### Other features:
 
 - Show installation settings
 - Show installation logs
-- Get UAA token
 - Uploads stemcell to Ops Manager
 - Delete unused products
+- Curl ops_manager API
 
-### Limitations:
 
-- No support for enabling and running errands for ops_manager **< 1.7.x**
+## Upgrading OpsManager appliance 
 
+To upgrade from **1.7.x** -> **1.8.x** use ops_manager_cli **0.3.1** 
 
-### Test with Ops Manager Version
+Use ops_manager_cli **>=0.4.0** once you are on **1.8.x**.
 
-- up to 1.8.3.0
-
-## Upgrading OpsManager appliance from **1.7.x** to **1.8.x**
-
-On ops_manager_cli **>=0.4.0** support for upgrading to **1.8.x** was removed.
-Use ops_manager_cli **0.3.1** to upgrade from **1.7.x** -> **1.8.x**. 
 
 ## Dependencies
 
@@ -86,13 +81,16 @@ The ops_manager_cli tool can be installed in a docker container typically in con
 
 ### Building Docker image
 
-    bundle exec rake build
-    docker build -t compozed/ops_manager_cli # Optional: --build-arg DOWNLOAD_URL=http://your_blobstore.com/ovftool.bundle
+    git co vX.X.X
+    bundle exec rake build 
+    docker build  \
+      --build-arg DOWNLOAD_URL=http://your_blobstore.com/VMware-ovftool-4.1.0-2459827-lin.x86_64.bundle \
+      -t compozed/ops_manager_cli:vX.X.X
 
 
 ### Provisioning docker image to private registry
 
-    docker tag -f compozed/ops_manager_cli PRI_REGISTRY:PORT/compozed/ops_manager_cli
+    docker tag -f compozed/ops_manager_cli:vX.X.X PRI_REGISTRY:PORT/compozed/ops_manager_cli:vX.X.X
     docker push PRI_REGISTRY:PORT/compozed/ops_manager_cli
 
 

data/Rakefile

@@ -1,6 +1,10 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'github_changelog_generator/task'
 
 RSpec::Core::RakeTask.new(:spec)
 
+GitHubChangelogGenerator::RakeTask.new(:changelog)
+
 task :default => :spec
+task :release => :changelog

data/lib/ops_manager/director_template_generator.rb

@@ -2,11 +2,16 @@ class OpsManager
   class DirectorTemplateGenerator
     def generate
       merge_director_template_products
-      delete_schema_version
-      delete_director_ssl
-      delete_uaa_ssl
-      delete_guid
-      delete_ip_assignments
+
+    %w{ installation_schema_version ip_assignments guid }.each do |property_name|
+      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)
+    end
+
       add_merging_strategy_for_networks
 
       installation_settings.to_h
@@ -35,26 +40,6 @@ class OpsManager
       end
     end
 
-    def delete_schema_version
-      installation_settings.delete('installation_schema_version')
-    end
-
-    def delete_ip_assignments
-      installation_settings.delete('ip_assignments')
-    end
-
-    def delete_guid
-      installation_settings.delete('guid')
-    end
-
-    def delete_director_ssl
-      product_template["products"][1].delete("director_ssl")
-    end
-
-    def delete_uaa_ssl
-      product_template["products"][1].delete("uaa_ssl")
-    end
-
     def product_template
       @product_template ||= OpsManager::ProductTemplateGenerator.new('p-bosh').generate
     end

data/lib/ops_manager/product_template_generator.rb

@@ -2,7 +2,7 @@ class OpsManager
   class ProductTemplateGenerator
     OPS_MANAGER_PASSWORD_LENGTH = 32
     OPS_MANAGER_SECRET_LENGTH = 32
-    OPS_MANAGER_SALT_LENGTH = 16
+    OPS_MANAGER_SALT_LENGTH = 14
 
     attr_reader :product_name
 
@@ -10,101 +10,35 @@ class OpsManager
       @product_name = product_name
     end
 
-
     def generate
-      delete_partitions
-      delete_vm_credentials
-      delete_guid
-      delete_installation_name
-      delete_product_version
-      delete_jobs_guid
-      delete_prepared
-      delete_ops_manager_generated_passwords
-      delete_ops_manager_generated_salts
-      delete_ops_manager_generated_secrets
-      delete_private_key_pem
-      delete_product_version_from_properties
-      add_merging_strategy_for_jobs
-      add_merging_strategy_for_job_properties
-
-      { 'products' => [ "(( merge on identifier ))" , selected_product ] }
-    end
-
-    def generate_yml
-      generate.to_yaml
-        .gsub('"(( merge on identifier ))"', '(( merge on identifier ))')
-    end
-
-    private
-    def delete_product_version_from_properties
-      delete_value_from_product_properties_if do |property|
-        property['identifier'] == 'product_version'
-      end
-    end
-
-    def delete_ops_manager_generated_passwords
-      delete_value_from_job_properties_if do |value|
-        value.fetch('password', '').length == OPS_MANAGER_PASSWORD_LENGTH
-      end
-    end
-
-    def delete_private_key_pem
-      delete_value_from_product_properties_if do |property|
-        property['value'].is_a?(Hash) && property['value'].has_key?('private_key_pem')
+      %w{ prepared guid installation_name product_version stemcell }.each do |property_name|
+        delete_from_product(property_name)
       end
 
-      delete_value_from_job_properties_if do |value|
-        value.fetch('secret', '').length == OPS_MANAGER_SECRET_LENGTH
-        value.has_key?('private_key_pem')
+      %w{ partitions vm_credentials guid }.each do |property_name|
+      delete_from_jobs(property_name)
       end
-    end
 
-    def delete_ops_manager_generated_salts
-      delete_value_from_job_properties_if do |value|
-        value.fetch('salt', '').length == OPS_MANAGER_SALT_LENGTH
+      %w{ password secret salt private_key_pem }.each do |property_name|
+        delete_value_from_job_properties(property_name)
       end
-    end
 
-    def delete_ops_manager_generated_secrets
-      delete_value_from_product_properties_if do |property|
-        property['value'].is_a?(Hash) && property['value'].fetch('secret', '').length == OPS_MANAGER_SECRET_LENGTH
+      %w{ secret private_key_pem }.each do |property_name|
+        delete_value_from_product_properties(property_name)
       end
 
-      delete_value_from_job_properties_if do |value|
-        value.fetch('secret', '').length == OPS_MANAGER_SECRET_LENGTH
-      end
-    end
-
-    def delete_value_from_product_properties_if
-      selected_product.fetch('properties', []).each  do |p|
-        p.delete('value') if p.is_a?(Hash) && yield(p)
-      end
-    end
-
-    def delete_value_from_job_properties_if
-      selected_product['jobs'].each do |j|
-        j.fetch('properties', []).each  do |p|
-          value = p.fetch('value',{})
-          p.delete('value') if value.is_a?(Hash) && yield(value)
-        end
-      end
-    end
-
-    def delete_prepared
-      selected_product.delete("prepared")
-    end
+      add_merging_strategy_for_jobs
+      add_merging_strategy_for_job_properties
 
-    def delete_guid
-      selected_product.delete("guid")
+      { 'products' => [ "(( merge on identifier ))" , selected_product ] }
     end
 
-    def delete_installation_name
-      selected_product.delete("installation_name")
+    def generate_yml
+      generate.to_yaml
+        .gsub('"(( merge on identifier ))"', '(( merge on identifier ))')
     end
 
-    def delete_product_version
-      selected_product.delete("product_version")
-    end
+    private
 
     def add_merging_strategy_for_jobs
       selected_product['jobs'].unshift("(( merge on identifier ))")
@@ -116,16 +50,8 @@ class OpsManager
       end
     end
 
-    def delete_partitions
-      delete_from_jobs('partitions')
-    end
-
-    def delete_vm_credentials
-      delete_from_jobs('vm_credentials')
-    end
-
-    def delete_jobs_guid
-      delete_from_jobs('guid')
+    def delete_from_product(name)
+      selected_product.delete(name)
     end
 
     def selected_product
@@ -147,5 +73,21 @@ class OpsManager
       res = OpsManager::Api::Opsman.new(silent: true).get_installation_settings
       @installation_settings = JSON.parse(res.body)
     end
+
+    def delete_value_from_product_properties(name)
+      selected_product.fetch('properties', []).each  do |p|
+        value = p.fetch('value',{})
+        p.delete('value') if value.is_a?(Hash) && !!value[name]
+      end
+    end
+
+    def delete_value_from_job_properties(name)
+      selected_product['jobs'].each do |j|
+        j.fetch('properties', []).each  do |p|
+          value = p.fetch('value',{})
+          p.delete('value') if value.is_a?(Hash) && !!value[name]
+        end
+      end
+    end
   end
 end

data/lib/ops_manager/version.rb

@@ -1,3 +1,3 @@
 class OpsManager
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/ops_manager.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "github_changelog_generator"
   spec.add_dependency "rbvmomi"
   spec.add_dependency "multipart-post"
   spec.add_dependency "clamp"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - CompoZed
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -189,8 +203,9 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- CONTRIBUTION.md
+- CONTRIBUTING.md
 - Dockerfile
 - Gemfile
 - LICENSE.txt