ops_manager_cli 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 726b5d7b7e15a4f5cf99ba65471cf32a91e79f61
-  data.tar.gz: 534134302a6a63bf71492fa3ba1ef3c782ffd046
+  metadata.gz: e8af7fdbbb2293c2f7f6a1e609776f7bc0f66ec9
+  data.tar.gz: dd774257ac657f9602d02583d657896fe483cf29
 SHA512:
-  metadata.gz: bccfac866feed2dcb40443e2eb86144792a5dc47e4b1f3b8f8cc60273f067e4579119528a370b0ef75b9f5d1fdab7d6d0975e2d50ba1042340992b5bfd0bc52a
-  data.tar.gz: b108eb9ccd98112839f5b5d3a8add837efa852965f0d57f335c5e039bfd24a4217c3a341e9e498f1d156b34443677359ac3144cbfd93365eb4680b8807cbd550
+  metadata.gz: 1c598d8b6023fb4d2d6d8b95fc1c7d246be7d4c5bdd5f738c9664ce6f0d39184b8d72851c26e6f16b5e02b9669a36b7194d76b39135cdefe6151e1c8ce1a6faa
+  data.tar.gz: e1e533f82c2ac7e7b7dc0fc9114b5d0ef79ed7ff8f6131610d79230a4653526d941a7d50cf24ca6d7e163ce23d8cc90b61fadcc1811890ebab4d22a014f6cb7e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [v0.4.1](https://github.com/compozed/ops_manager_cli/tree/v0.4.1) (2016-10-21)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.4.0...v0.4.1)
+
+**Fixed bugs:**
+
+- Director template generator does not delete UAA sensitive data [\#13](https://github.com/compozed/ops_manager_cli/issues/13)
+- Product template generator does not delete stemcell metadata properties [\#12](https://github.com/compozed/ops_manager_cli/issues/12)
+
 ## [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)
 
@@ -37,4 +45,4 @@
 ## [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,7 +1,7 @@
 FROM ruby:2.3.0
 
 ENV GEM_NAME ops_manager_cli
-ENV GEM_VERSION 0.4.1
+ENV GEM_VERSION 0.5.0
 ENV OVFTOOL_VERSION 4.1.0-2459827
 ENV OVFTOOL_INSTALLER VMware-ovftool-${OVFTOOL_VERSION}-lin.x86_64.bundle
 ARG DOWNLOAD_URL

data/README.md

@@ -1,4 +1,4 @@
-# OpsManagerCli [![Build Status](https://travis-ci.org/compozed/ops_manager_cli.png?branch=master)](https://travis-ci.org/compozed/ops_manager_cli) [![Code Climate](https://codeclimate.com/github/compozed/ops_manager_cli.png)](https://codeclimate.com/github/compozed/ops_manager_cli)
+# OpsManagerCli [![Build Status](https://travis-ci.org/compozed/ops_manager_cli.png?branch=master)](https://travis-ci.org/compozed/ops_manager_cli) [![Code Climate](https://codeclimate.com/github/compozed/ops_manager_cli.png)](https://codeclimate.com/github/compozed/ops_manager_cli) [![Gem Version](https://badge.fury.io/rb/ops_manager_cli.svg)](https://badge.fury.io/rb/ops_manager_cli)
 
 
 Command line tool to interact with Pivotal Operations Manager through its API, because GUIs are evil.
@@ -75,6 +75,35 @@ All dependencies must be installed and available in user PATH
 
     ./ops_manager deploy-product product_deployment.yml
 
+### Regenerating SSL Certificates
+
+Ops Manager generates certificates for BOSH director and UAA automatically before deploying director.
+[Periodically you will want to regenerate this certificates.](https://discuss.pivotal.io/hc/en-us/articles/115000453368)
+There is a workaround on how to do this with ops_manager_cli:
+
+1. Get director template:
+
+        $ ops_manager get-director-template > product_installation_settings.yml
+  
+2. Set director's cert and private key to null:
+
+        # product_installation_settings.yml
+        # For director ssl certs
+        + director_ssl:
+        +   private_key_pem:
+        +   cert_pem:
+
+        # For director ssl certs
+        + uaa_ssl:
+        +   private_key_pem:
+        +   cert_pem:
+
+3. Perform director deployment:
+
+        $ ops_manager deploy-product product_deployment.yml
+
+**Note:** remove this lines unless you want to regenerate certs on every single deployment :)
+
 ## Using with Docker
 
 The ops_manager_cli tool can be installed in a docker container typically in conjunction with [Concourse CI](http://concourse.ci/).  This allows users to build concourse pipelines to deploy and manage their Pivotal Cloud Foundry deployments.
@@ -96,7 +125,7 @@ The ops_manager_cli tool can be installed in a docker container typically in con
 
 ## Contributing
 
-See our [CONTRUBUTING](CONTRIBUTING.md) section for more information.
+See our [CONTRIBUTING](CONTRIBUTING.md) section for more information.
 
 
 ## License

data/lib/ops_manager/api/base.rb

@@ -62,7 +62,6 @@ class OpsManager
           end
         end
 
-
         body = opts[:body] || ''
         request.body= body
 
@@ -82,6 +81,7 @@ class OpsManager
         uri = uri_for(endpoint)
         http = http_for(uri)
         request = Net::HTTP::Put.new(uri.request_uri)
+
         request.set_form_data(opts)
 
         request.basic_auth(username, password) if self.respond_to?(:username)
@@ -91,7 +91,12 @@ class OpsManager
             request[k] = v
           end
         end
-        # body = opts.fetch( :body )
+
+        request['Content-Type'] = 'application/json'
+
+        body = opts[:body] || ''
+        request.body= body
+
         http.request(request).tap do |res|
           logger.info("performing put to #{uri} with opts: #{opts.inspect}  res.code: #{res.code}")
           logger.info("put response body #{res.body}")
@@ -130,7 +135,10 @@ class OpsManager
             request[k] = v
           end
         end
-        http.request(request)
+        http.request(request).tap do |res|
+          logger.info("performing delete to #{uri} with opts: #{opts.inspect}  res.code: #{res.code}")
+          logger.info("post response body #{res.body}")
+        end
       end
 
       def uri_for(endpoint)

data/lib/ops_manager/api/opsman.rb

@@ -124,7 +124,7 @@ class OpsManager
       def import_stemcell(filepath)
         return unless filepath
         tar = UploadIO.new(filepath, 'multipart/form-data')
-        print_green "====> Uploading stemcell: #{tar} ..."
+        print_green "====> Uploading stemcell: #{filepath} ..."
         opts = { "stemcell[file]" => tar }
         res = nil
 

data/lib/ops_manager/cli.rb

@@ -106,15 +106,20 @@ class OpsManager
     end
 
     class Curl < Clamp::Command
-      option ['-X', '--http-method'], "HTTP_METHOD", "HTTP Method (GET,POST)", default: 'GET'
+      option ['-X', '--http-method'], "HTTP_METHOD", "HTTP Method (DELETE, GET, POST, PUT)", default: 'GET'
+      option ['-d', '--data'], "HTTP_POST_DATA", "HTTP Post Data(POST, PUT)", default: ''
       parameter "ENDPOINT", "OpsManager api endpoint. eg: /api/v0/installation_settings", required: true
 
       def execute
         puts case http_method.strip
         when 'GET'
           opsman.authenticated_get(@endpoint).body
+        when 'DELETE'
+          opsman.authenticated_delete(@endpoint).body
         when 'POST'
           opsman.authenticated_post(@endpoint).body
+        when 'PUT'
+          opsman.authenticated_put(@endpoint, body: strip(@data, "'")).body
         else
           "Unsupported method: #{http_method.strip}"
         end
@@ -124,6 +129,11 @@ class OpsManager
       def opsman
         OpsManager::Api::Opsman.new(silent: true)
       end
+
+      def strip(string, chars)
+        chars = Regexp.escape(chars)
+        string.strip.gsub(/\A[#{chars}]+|[#{chars}]+\z/, "")
+      end
     end
 
     class Version < Clamp::Command

data/lib/ops_manager/deployments/vsphere.rb

@@ -18,7 +18,7 @@ class OpsManager
       end
 
       def stop_current_vm(name)
-        print "====> Stopping vm #{name}...".green
+        print "====> Stopping vm #{name} ...".green
         dc = vim.serviceInstance.find_datacenter(config.opts['vcenter']['datacenter'])
         logger.info "finding vm: #{name}"
         vm = dc.find_vm(name) or fail "VM not found"

data/lib/ops_manager/product_deployment.rb

@@ -41,7 +41,7 @@ class OpsManager
     end
 
     def upload
-      print "====> Uploading product...".green
+      print "====> Uploading product ...".green
       if ProductDeployment.exists?(config.name, config.desired_version)
         puts "product already exists".green
       elsif config.filepath
@@ -60,6 +60,7 @@ class OpsManager
       puts "====> Upgrading #{config.name} version from #{installation.current_version.to_s} to #{config.desired_version}...".green
       upload
       upgrade_product_installation(installation.guid, config.desired_version)
+      merge_product_installation_settings
       OpsManager::InstallationRunner.trigger!.wait_for_result
 
       puts "====> Finish!".green
@@ -75,14 +76,19 @@ class OpsManager
       puts "====> Deploying #{config.name} version #{config.desired_version}...".green
       upload
       add_to_installation
-      get_installation_settings({write_to: '/tmp/is.yml'})
-      puts `DEBUG=false spruce merge /tmp/is.yml #{config.installation_settings_file} > /tmp/new_is.yml`
-      upload_installation_settings('/tmp/new_is.yml')
+      merge_product_installation_settings
       OpsManager::InstallationRunner.trigger!.wait_for_result
 
       puts "====> Finish!".green
     end
 
+
+    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`
+      upload_installation_settings('/tmp/new_is.yml')
+    end
+
     def self.exists?(name, version)
       res = JSON.parse(OpsManager::Api::Opsman.new.get_available_products.body)
       !!res.find{ |o| o['name'] == name && o['product_version'].include?(version) }

data/lib/ops_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - CompoZed
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler