gazer 0.3.10 → 0.3.11

data/lib/gzr/commands/user/cat.rb

@@ -41,9 +41,11 @@ module Gzr
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
             data = query_user(@user_id,@options[:fields])
-            write_file(@options[:dir] ? "User_#{data.id}_#{data.display_name}.json" : nil, @options[:dir],nil, output) do |f|
-              f.puts JSON.pretty_generate(data.to_attrs)
-            end
+            data = trim_user(data) if @options[:trim]
+            write_file(@options[:dir] ? "User_#{data[:id]}_#{data[:first_name]}_#{data[:last_name]}.json" : nil, @options[:dir],nil, output) do |f|
+              f.puts JSON.pretty_generate(data)
+            end if data
+            say_error "user #{@user_id} not found" unless data
           end
         end
       end

data/lib/gzr/commands/user/delete.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -39,6 +39,7 @@ module Gzr
           say_warning(@options) if @options[:debug]
           with_session do
             data = delete_user(@user_id)
+            say_error "user #{@user_id} not found" unless data
           end
         end
       end

data/lib/gzr/commands/user/disable.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -39,6 +39,7 @@ module Gzr
           say_warning(@options) if @options[:debug]
           with_session do
             data = update_user(@user_id, { :is_disabled=>true })
+            say_error "user #{@user_id} not found" unless data
           end
         end
       end

data/lib/gzr/commands/user/enable.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -39,6 +39,7 @@ module Gzr
           say_warning(@options) if @options[:debug]
           with_session do
             data = update_user(@user_id, { :is_disabled=>false })
+            say_error "user #{@user_id} not found" unless data
           end
         end
       end

data/lib/gzr/commands/user/ls.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -37,9 +37,19 @@ module Gzr
 
         def execute(input: $stdin, output: $stdout)
           say_warning(@options) if @options[:debug]
+          credentials = [
+            'credentials_email',
+            'credentials_embed',
+            'credentials_google',
+            'credentials_ldap',
+            'credentials_looker_openid',
+            'credentials_oidc',
+            'credentials_saml',
+            'credentials_totp'
+          ]
           with_session do
             f = @options[:fields]
-            f += ',credentials_email,credentials_totp,credentials_google,credentials_saml,credentials_oidc' if @options[:"last-login"]
+            f = f + ',' + credentials.join(',') if @options[:"last-login"]
             data = query_all_users(f, "id")
             begin
               say_ok "No users found"
@@ -50,17 +60,18 @@ module Gzr
             fields = field_names(@options[:fields])
             fields.unshift 'last_login' if @options[:"last-login"]
             table_hash[:header] = fields unless @options[:plain]
-            expressions = fields.collect { |fn| field_expression(fn) }
+            expressions = fields.collect { |fn| field_expression_hash(fn) }
             table_hash[:rows] = data.map do |row|
               expressions.collect do |e|
-                next(eval "row.#{e}") unless (e == 'last_login')
-                [
-                  row.credentials_email()&.logged_in_at(),
-                  (row.credentials_totp()&.logged_in_at()),
-                  (row.credentials_google()&.logged_in_at()),
-                 (row.credentials_saml()&.logged_in_at()),
-                  (row.credentials_oidc()&.logged_in_at())
-                ].compact.max
+                next(eval "row#{e}") unless (e == '&.fetch(:last_login,nil)')
+                credentials.collect do |c|
+                  obj = row.fetch(c.to_sym)
+                  if obj.kind_of?(Array)
+                    obj.collect { |e| e.fetch(:logged_in_at,nil)&.to_s }
+                  else
+                    obj&.fetch(:logged_in_at,nil)&.to_s
+                  end
+                end.flatten.compact.max
               end
             end
             table = TTY::Table.new(table_hash)

data/lib/gzr/commands/user/me.rb

@@ -40,17 +40,20 @@ module Gzr
           say_warning(@options) if @options[:debug]
           with_session do
             data = query_me(@options[:fields])
+
             table_hash = Hash.new
             fields = field_names(@options[:fields])
             table_hash[:header] = fields unless @options[:plain]
-            expressions = fields.collect { |fn| field_expression(fn) }
+            expressions = fields.collect { |fn| field_expression_hash(fn) }
             table_hash[:rows] = [expressions.collect do |e|
-              eval "data.#{e}"
+              eval "data#{e}"
             end]
+
             table = TTY::Table.new(table_hash) if data
             alignments = fields.collect do |k|
               (k =~ /id$/) ? :right : :left
             end
+
             begin
               if @options[:csv] then
                 output.puts render_csv(table)
@@ -58,6 +61,7 @@ module Gzr
                 output.puts table.render(if @options[:plain] then :basic else :ascii end, alignments: alignments, width: @options[:width] || TTY::Screen.width)
               end
             end if table
+
           end
         end
       end

data/lib/gzr/commands/user.rb

@@ -72,6 +72,8 @@ module Gzr
                            desc: 'Fields to display'
       method_option :dir,  type: :string,
                            desc: 'Directory to store output file'
+      method_option :trim, type: :boolean,
+                           desc: 'Trim output to minimal set of fields for later import'
       def cat(user_id)
         if options[:help]
           invoke :help, ['cat']

data/lib/gzr/modules/alert.rb

@@ -26,7 +26,7 @@ module Gzr
     def get_alert(alert_id)
       data = nil
       begin
-        data = @sdk.get_alert(alert_id)
+        data = @sdk.get_alert(alert_id).to_attrs
       rescue LookerSDK::NotFound => e
         # do nothing
       rescue LookerSDK::Error => e
@@ -34,11 +34,11 @@ module Gzr
         say_error e
         raise
       end
-      if data[:owner_id]
+      if data and data[:owner_id]
         owner = get_user_by_id(data[:owner_id])
-        data[:owner] = owner.to_attrs.select do |k,v|
+        data[:owner] = owner.select do |k,v|
           [:email,:last_name,:first_name].include?(k) && !(v.nil? || v.empty?)
-        end
+        end if owner
       end
       data
     end
@@ -57,7 +57,7 @@ module Gzr
         req[:all_owners] = all_owners unless all_owners.nil?
         req[:limit] = 64
         loop do
-          page = @sdk.search_alerts(req)
+          page = @sdk.search_alerts(req).collect { |a| a.to_attrs }
           data+=page
           break unless page.length == req[:limit]
           req[:offset] = (req[:offset] || 0) + req[:limit]
@@ -75,6 +75,10 @@ module Gzr
     def follow_alert(alert_id)
       begin
         @sdk.follow_alert(alert_id)
+      rescue LookerSDK::NotFound => e
+        say_error "Alert #{alert_id} not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error following alert(#{alert_id})"
         say_error e
@@ -85,8 +89,12 @@ module Gzr
     def unfollow_alert(alert_id)
       begin
         @sdk.unfollow_alert(alert_id)
+      rescue LookerSDK::NotFound => e
+        say_error "Alert #{alert_id} not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
-        say_error "Error following alert(#{alert_id})"
+        say_error "Error unfollowing alert(#{alert_id})"
         say_error e
         raise
       end
@@ -99,20 +107,26 @@ module Gzr
       req[:disabled_reason] = disabled_reason unless disabled_reason.nil?
       req[:is_public] = is_public unless is_public.nil?
       req[:threshold] = threshold unless threshold.nil?
-      data = nil
       begin
-        data = @sdk.update_alert_field(alert_id, req)
+        @sdk.update_alert_field(alert_id, req).to_attrs
+      rescue LookerSDK::NotFound => e
+        say_error "Alert #{alert_id} not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error calling update_alert_field(#{alert_id},#{JSON.pretty_generate(req)})"
         say_error e
         raise
       end
-      data
     end
 
     def delete_alert(alert_id)
       begin
         @sdk.delete_alert(alert_id)
+      rescue LookerSDK::NotFound => e
+        say_error "Alert #{alert_id} not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error calling delete_alert(#{alert_id})"
         say_error e
@@ -126,7 +140,7 @@ module Gzr
       begin
         req[:limit] = 64
         loop do
-          page = @sdk.alert_notifications(req)
+          page = @sdk.alert_notifications(req).collect { |a| a.to_attrs }
           data+=page
           break unless page.length == req[:limit]
           req[:offset] = (req[:offset] || 0) + req[:limit]
@@ -142,28 +156,27 @@ module Gzr
     end
 
     def read_alert_notification(notification_id)
-      data = nil
       begin
-        data = @sdk.read_alert_notification(notification_id)
+        @sdk.read_alert_notification(notification_id).to_attrs
+      rescue LookerSDK::NotFound => e
+        say_error "Alert notification #{notification_id} not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error calling read_alert_notification(#{notification_id})"
         say_error e
         raise
       end
-      data.to_attrs
     end
 
     def create_alert(req)
-      data = nil
       begin
-        data = @sdk.create_alert(req)
+        @sdk.create_alert(req).to_attrs
       rescue LookerSDK::Error => e
         say_error "Error calling create_alert(#{JSON.pretty_generate(req)})"
         say_error e
         raise
       end
-      data.to_attrs
     end
-
   end
 end

data/lib/gzr/modules/attribute.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -24,89 +24,91 @@
 module Gzr
   module Attribute
     def query_user_attribute(attr_id,fields=nil)
-      data = nil
       begin
         req = {}
         req[:fields] = fields if fields
-        data = @sdk.user_attribute(attr_id,req)
+        @sdk.user_attribute(attr_id,req).to_attrs
       rescue LookerSDK::NotFound => e
-        # do nothing
+        say_error "User_attribute #{attr_id} not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error querying user_attribute(#{attr_id},#{JSON.pretty_generate(req)})"
         say_error e
         raise
       end
-      data
     end
 
     def query_all_user_attributes(fields=nil, sorts=nil)
-      data = nil
       begin
         req = {}
         req[:fields] = fields if fields
         req[:sorts] = sorts if sorts
-        data = @sdk.all_user_attributes(req)
+        @sdk.all_user_attributes(req).collect { |a| a.to_attrs }
+      rescue LookerSDK::NotFound => e
+        []
       rescue LookerSDK::Error => e
         say_error "Error querying all_user_attributes(#{JSON.pretty_generate(req)})"
         say_error e
         raise
       end
-      data
     end
 
     def get_attribute_by_name(name, fields = nil)
-      data = query_all_user_attributes(fields).select {|a| a.name == name}
+      data = query_all_user_attributes(fields).select {|a| a[:name] == name}
       return nil if data.empty?
       data.first
     end
 
     def get_attribute_by_label(label, fields = nil)
-      data = query_all_user_attributes(fields).select {|a| a.label == label}
+      data = query_all_user_attributes(fields).select {|a| a[:label] == label}
       return nil if data.empty?
       data.first
     end
 
     def create_attribute(attr)
-      data = nil
       begin
-        data = @sdk.create_user_attribute(attr)
+        @sdk.create_user_attribute(attr).to_attrs
       rescue LookerSDK::Error => e
         say_error "Error creating user_attribute(#{JSON.pretty_generate(attr)})"
         say_error e
         raise
       end
-      data
     end
 
     def update_attribute(id,attr)
-      data = nil
       begin
-        data = @sdk.update_user_attribute(id,attr)
+        @sdk.update_user_attribute(id,attr).to_attrs
+      rescue LookerSDK::NotFound => e
+        say_error "user_attribute #{id} not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error updating user_attribute(#{id},#{JSON.pretty_generate(attr)})"
         say_error e
         raise
       end
-      data
     end
 
     def delete_user_attribute(id)
-      data = nil
       begin
-        data = @sdk.delete_user_attribute(id)
+        @sdk.delete_user_attribute(id)
+      rescue LookerSDK::NotFound => e
+        say_error "user_attribute #{id} not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error deleting user_attribute(#{id})"
         say_error e
         raise
       end
-      data
     end
 
     def query_all_user_attribute_group_values(attr_id, fields=nil)
       begin
         req = {}
         req[:fields] = fields if fields
-        return @sdk.all_user_attribute_group_values(attr_id,req)
+        return @sdk.all_user_attribute_group_values(attr_id,req).collect { |v| v.to_attrs }
       rescue LookerSDK::NotFound => e
         return nil
       rescue LookerSDK::Error => e
@@ -117,7 +119,7 @@ module Gzr
     end
 
     def query_user_attribute_group_value(group_id, attr_id)
-      data = query_all_user_attribute_group_values(attr_id)&.select {|a| a.group_id == group_id}
+      data = query_all_user_attribute_group_values(attr_id)&.select {|a| a[:group_id] == group_id}
       return nil if data.nil? || data.empty?
       data.first
     end
@@ -141,7 +143,7 @@ module Gzr
           keys_to_keep('update_user_attribute').include?(k) && !(name_used[k] == v)
         end
 
-        return update_attribute(existing.id,upd_attr)
+        return update_attribute(existing[:id],upd_attr)
       else
         new_attr = source.select do |k,v|
           (keys_to_keep('create_user_attribute') - [:hidden_value_domain_whitelist]).include? k

data/lib/gzr/modules/connection.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -25,50 +25,41 @@ module Gzr
   module Connection
 
     def query_all_connections(fields=nil)
-      data = nil
       begin
-        data = @sdk.all_connections(fields ? {:fields=>fields} : nil )
+        @sdk.all_connections(fields ? {:fields=>fields} : nil ).collect { |e| e.to_attrs }
       rescue LookerSDK::Error => e
           say_error "Error querying all_connections({:fields=>\"#{fields}\"})"
           say_error e
           raise
       end
-      data
     end
 
     def query_all_dialects(fields=nil)
-      data = nil
       begin
-        data = @sdk.all_dialect_infos(fields ? {:fields=>fields} : nil )
+        @sdk.all_dialect_infos(fields ? {:fields=>fields} : nil ).collect { |e| e.to_attrs }
       rescue LookerSDK::Error => e
           say_error "Error querying all_dialect_infos({:fields=>\"#{fields}\"})"
           say_error e
           raise
       end
-      data
     end
 
     def test_connection(name, tests=nil)
-      data = nil
-
       if tests.nil?
         connection = cat_connection(name)
-        if connection.nil?
-          return nil
-        end
+        return nil if connection.nil?
         tests = connection[:dialect][:connection_tests]
       end
 
       begin
-        data = @sdk.test_connection(name, {}, tests: tests)
+        @sdk.test_connection(name, {}, tests: tests).collect { |e| e.to_attrs }
       rescue LookerSDK::NotFound => e
-        return nil
+        return []
       rescue LookerSDK::Error => e
         say_error "Error executing test_connection(#{name},#{tests})"
         say_error e
         raise
       end
-      data
     end
 
     def delete_connection(name)
@@ -84,21 +75,18 @@ module Gzr
     end
 
     def create_connection(body)
-      data = nil
       begin
-        data = @sdk.create_connection(body).to_attrs
+        @sdk.create_connection(body).to_attrs
       rescue LookerSDK::Error => e
         say_error "Error executing create_connection(#{JSON.pretty_generate(body)})"
         say_error e
         raise
       end
-      data
     end
 
     def update_connection(name,body)
-      data = nil
       begin
-        data = @sdk.update_connection(name,body).to_attrs
+        @sdk.update_connection(name,body).to_attrs
       rescue LookerSDK::NotFound => e
         say_warning "Connection #{name} not found"
       rescue LookerSDK::Error => e
@@ -106,21 +94,18 @@ module Gzr
         say_error e
         raise
       end
-      data
     end
 
     def cat_connection(name)
-      data = nil
       begin
-        data = @sdk.connection(name).to_attrs
+        @sdk.connection(name).to_attrs
       rescue LookerSDK::NotFound => e
-        return nil
+        nil
       rescue LookerSDK::Error => e
         say_error "Error executing connection(#{name})"
         say_error e
         raise
       end
-      data
     end
 
     def trim_connection(data)