gazer 0.2.28 → 0.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f0cbb4a2a0249acc8a634fb3a813cecdbb60d00
-  data.tar.gz: a0b2d54e41d164fd34c199107f350b5332bf859b
+  metadata.gz: e1d752a6c9ab6c912a7ccabaafe45141f3e70e75
+  data.tar.gz: 6907072bde4d5f3150cea70615acb8ae693b3178
 SHA512:
-  metadata.gz: 2b7eff72d81f4b892e98b3924c1db00613f3819035d4d551718f74094c48857814f2e49d4bf0aaa744e1b9a920fa0ee13386dc549aa12e77114690fb12c0d174
-  data.tar.gz: 54aeaaf8808e134eced33969ff8bf78e82b3270d52a59b5cfb2a8298384af73c83aaf0197281d137d7aedce887ab2471c311f68a802e2162c0ee65c0527b4a2a
+  metadata.gz: bd7d987e4e78960c739a0b63e10eb16642392e5f4b1baecf3964e755521f2686b186a0951da02be95dd66e722526663132168d7ab1eebc1117da6718a28ca14e
+  data.tar.gz: d087140b4ae80317e54289e31d09b89ba859675b18422e51ed28e4d1cc14f0bf90b419fd36d00c3ee253de03fe13b399f9e97250cd95823ee7cbb017209ab7a9

data/CONTRIBUTING.md

@@ -0,0 +1,29 @@
+## How to contribute to Gazer
+
+Did you read the [code of conduct](https://github.com/looker-open-source/gzr/blob/master/CODE_OF_CONDUCT.md)?
+
+#### **Did you find a bug?**
+
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/looker-open-source/gzr/issues).
+
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/looker-open-source/gzr/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
+
+#### **Did you write a patch that fixes a bug?**
+
+* Open a new GitHub pull request with the patch.
+
+* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+* Depending on the content of the patch, we may need to work out a legal agreement to clarify everyone's rights before the patch is accepted.
+
+#### **Do you intend to add a new feature or change an existing one?**
+
+*  Again please open an issue in GitHub. Larger projects often segregate bugs from new features and enhancements, but we are still small enough that it is not an issue.
+
+#### **Do you have questions about the source code?**
+
+* Ask any question about how to use Gazer by contacting the [primary developer](mailto:deangelo+gzr@looker.com).
+
+Thanks! :heart: :heart: :heart:
+
+Gazer Team

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gazer (0.2.28)
+    gazer (0.2.30)
       looker-sdk (~> 0.0.6)
       netrc (~> 0.11.0)
       pastel (~> 0.7.2)

data/lib/gzr/modules/session.rb

@@ -21,11 +21,44 @@
 
 # frozen_string_literal: true
 
+require 'json'
 require 'pastel'
 require 'tty-reader'
 
 require_relative '../../gzr'
 
+# monkeypatch login to use /api/3.0/login enpoint instead of /login endpoint
+#
+# Customer has Looker instance that gets both API and UI traffic at 443
+# and then NGINX rule sends to 9999 or 19999. The UI /login and API
+# /login conflict. Same for /logout.
+module LookerSDK
+  module Authentication
+    
+    def authenticate
+      #puts "Using monkeypatch login to #{URI.parse(api_endpoint).path}/login"
+      raise "client_id and client_secret required" unless application_credentials?
+
+      set_access_token_from_params(nil)
+      without_authentication do
+        post("#{URI.parse(api_endpoint).path}/login", {}, :query => application_credentials)
+        raise "login failure #{last_response.status}" unless last_response.status == 200
+        set_access_token_from_params(last_response.data)
+      end
+    end
+
+    def logout
+      #puts "Using monkeypatch logout to #{URI.parse(api_endpoint).path}/logout"
+      without_authentication do
+        result = !!@access_token && ((delete("#{URI.parse(api_endpoint).path}/logout") ; delete_succeeded?) rescue false)
+        set_access_token_from_params(nil)
+        result
+      end
+    end
+
+  end
+end
+
 module Gzr
   module Session
 
@@ -49,9 +82,9 @@ module Gzr
       @v3_1_available ||= false
     end
 
-    def build_connection_hash(api_version)
+    def build_connection_hash()
       conn_hash = Hash.new
-      conn_hash[:api_endpoint] = "http#{@options[:ssl] ? "s" : ""}://#{@options[:host]}:#{@options[:port]}/api/#{api_version}"
+      conn_hash[:api_endpoint] = "http#{@options[:ssl] ? "s" : ""}://#{@options[:host]}:#{@options[:port]}/"
       if @options[:http_proxy]
         conn_hash[:connection_options] ||= {}
         conn_hash[:connection_options][:proxy] = {
@@ -96,38 +129,48 @@ module Gzr
 
     def login(api_version)
       @secret = nil
+      versions = nil
+      current_version = nil
       begin
-        conn_hash = build_connection_hash("3.0")
-        sdk = LookerSDK::Client.new(conn_hash)
+        conn_hash = build_connection_hash
+
+        sawyer_options = {
+          :links_parser => Sawyer::LinkParsers::Simple.new,
+          :serializer  => LookerSDK::Client::Serializer.new(JSON),
+          :faraday => conn_hash[:faraday] || Faraday.new(conn_hash[:connection_options])
+        }
+
+        agent = Sawyer::Agent.new(conn_hash[:api_endpoint], conn_hash) do |http|
+          http.headers[:accept] = 'application/json'
+          http.headers[:user_agent] = conn_hash[:user_agent]
+        end
+        
         begin 
-          sdk.get "/"
+          versions_response = agent.call(:get,"/versions")
+          versions = versions_response.data.supported_versions
+          current_version = versions_response.data.current_version
         rescue Faraday::SSLError => e
           raise Gzr::CLI::Error, "SSL Certificate could not be verified\nDo you need the --no-verify-ssl option or the --no-ssl option?"
         rescue Faraday::ConnectionFailed => cf
           raise Gzr::CLI::Error, "Connection Failed.\nDid you specify the --no-ssl option for an ssl secured server?"
         rescue LookerSDK::NotFound => nf
-          #ignore this
+          say_warning "endpoint #{conn_hash[:api_endpoint]}/versions was not found"
         end
-        raise Gzr::CLI::Error, "Invalid credentials" unless sdk.authenticated?
-        sdk.versions.supported_versions.each do |v|
+        versions.each do |v|
           @v3_1_available = true if v.version == "3.1"
         end
-        begin
-          sdk.logout
-        rescue LookerSDK::Error => e
-          # eat this error if it occurs
-        end
-      end unless @options[:api_version]
+      end
 
       say_warning "API 3.1 available? #{v3_1_available?}" if @options[:debug]
 
       raise Gzr::CLI::Error, "Operation requires API v3.1, but user specified a different version" if (api_version == "3.1") && @options[:api_version] && !("3.1" == @options[:api_version])
       raise Gzr::CLI::Error, "Operation requires API v3.1, which is not available from this host" if (api_version == "3.1") && !v3_1_available?
 
-      conn_hash = build_connection_hash(@options[:api_version] || api_version)
+      conn_hash = build_connection_hash()
+      conn_hash[:api_endpoint] = "#{conn_hash[:api_endpoint]}api/#{@options[:api_version] || current_version.version}"
       @secret = nil
 
-      say_ok("connecting to #{conn_hash.each { |k,v| "#{k}=>#{(k == :client_secret) ? '*********' : v}" }}") if @options[:debug]
+      say_ok("connecting to #{conn_hash.map { |k,v| "#{k}=>#{(k == :client_secret) ? '*********' : v}" }}") if @options[:debug]
 
       begin
         @sdk = LookerSDK::Client.new(conn_hash) unless @sdk

data/lib/gzr/version.rb

@@ -20,5 +20,5 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Gzr
-  VERSION = "0.2.28"
+  VERSION = "0.2.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.30
 platform: ruby
 authors:
 - Mike DeAngelo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader
@@ -191,6 +191,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt