ops_manager_cli 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56b6e170417bdbc8f71979da3dad7752b41886ef
-  data.tar.gz: 2448eaaadf82cede4803c522dd8c730e359723b3
+  metadata.gz: d349b5c21f3e0546bd40781c9674d8ee17d89877
+  data.tar.gz: 084606520b33f6ebb23285ea89392fef832d5f6b
 SHA512:
-  metadata.gz: 407651033ac5e16685ad22f7b8a19ca616516965757c316a6dc344b7648f37cbe7383003cba0937517cbd8e6e7641664731af044256ad60d80c0876abaf5b8aa
-  data.tar.gz: d5070005307c4a93dcf91d8e65c06cd80c37c8c47670eb60d633658aed31b72f6825f8b0f1d5a5b06d7842ebf1e222846044d56d40274615c8120ad7b123f7f3
+  metadata.gz: 2b1c06d9f0e05a3ed63a6b4b4971b9973b47eef367d99f634d476425d9bd947ef76eccc16606fc1ef0187d058108a01bfccffe77c0c87f26a8b102a09bc421a9
+  data.tar.gz: e10bdbbb12c7365ebc9108689660ebc3299facd79d88354546cc39113a00a518ac189436eeb4496dca64501a3b944dea470ec4dd32a36c48173eab62c644a888

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## [Unreleased](https://github.com/compozed/ops_manager_cli/tree/HEAD)
+
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.5.1...HEAD)
+
+**Closed issues:**
+
+- When upgrading opsman the token does not reset [\#27](https://github.com/compozed/ops_manager_cli/issues/27)
+- Support refresh tokens for re-authentication with UAA [\#24](https://github.com/compozed/ops_manager_cli/issues/24)
+- Allow toggling ops\_manager.log [\#21](https://github.com/compozed/ops_manager_cli/issues/21)
+
+## [v0.5.1](https://github.com/compozed/ops_manager_cli/tree/v0.5.1) (2017-01-25)
+[Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.5.0...v0.5.1)
+
+**Closed issues:**
+
+- Upgrading product does not work with opsman\_cli 0.5.0 on opsman 1.9 [\#23](https://github.com/compozed/ops_manager_cli/issues/23)
+
 ## [v0.5.0](https://github.com/compozed/ops_manager_cli/tree/v0.5.0) (2017-01-24)
 [Full Changelog](https://github.com/compozed/ops_manager_cli/compare/v0.4.1...v0.5.0)
 

data/Dockerfile

@@ -1,7 +1,7 @@
 FROM ruby:2.3.0
 
 ENV GEM_NAME ops_manager_cli
-ENV GEM_VERSION 0.5.1
+ENV GEM_VERSION 0.5.2
 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/api/opsman.rb

@@ -141,6 +141,14 @@ class OpsManager
         res
       end
 
+      def get_token
+        token_issuer.owner_password_grant(username, password, 'opsman.admin').tap do |token|
+          logger.info "UAA Token: #{token.inspect}"
+        end
+      rescue  CF::UAA::TargetError
+        nil
+      end
+
       def username
         @username ||= OpsManager.get_conf(:username)
       end
@@ -153,14 +161,14 @@ class OpsManager
         @target ||= OpsManager.get_conf(:target)
       end
 
-      def get_token
-        token_issuer.owner_password_grant(username, password, 'opsman.admin').tap do |token|
-          logger.info "UAA Token: #{token.inspect}"
-        end
-      rescue  CF::UAA::TargetError
-        nil
+
+      def reset_access_token
+        @access_token = nil
       end
 
+      def access_token
+        @access_token ||= get_token.info['access_token']
+      end
 
       private
       def token_issuer
@@ -168,10 +176,6 @@ class OpsManager
           "https://#{target}/uaa", 'opsman', nil, skip_ssl_validation: true )
       end
 
-      def access_token
-        @access_token ||= get_token.info['access_token']
-      end
-
       def authorization_header
         "Bearer #{access_token}"
       end

data/lib/ops_manager/appliance_deployment.rb

@@ -9,7 +9,7 @@ class OpsManager::ApplianceDeployment
     :get_product_release_files, :download_product_release_file
   def_delegators :opsman_api, :create_user, :trigger_installation, :get_installation_assets,
     :get_installation_settings, :get_diagnostic_report, :upload_installation_assets,
-    :import_stemcell, :target, :password, :username, :ops_manager_version=
+    :import_stemcell, :target, :password, :username, :ops_manager_version= , :reset_access_token
 
   attr_reader :config_file
 
@@ -130,6 +130,7 @@ class OpsManager::ApplianceDeployment
   end
 
   def provision_stemcells
+    reset_access_token
     Dir.glob("#{current_stemcell_dir}/*").each do |stemcell_filepath|
       import_stemcell(stemcell_filepath)
     end

data/lib/ops_manager/logging.rb

@@ -7,11 +7,22 @@ class OpsManager
     end
 
     def self.logger
-      @logger ||= Logger.new( ENV['DEBUG'].nil? ? 'ops_manager.log' : STDOUT)
+      @logger ||= Logger.new(STDOUT).tap do |l|
+        l.level = log_level
+      end
     end
 
     def self.logger=(logger)
       @logger = logger
     end
+
+    private
+    def self.log_level
+      if ENV['DEBUG'].nil?
+        Logger::WARN
+      else
+        Logger::INFO
+      end
+    end
   end
 end

data/lib/ops_manager/version.rb

@@ -1,3 +1,3 @@
 class OpsManager
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

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