gazer 0.3.10 → 0.3.11

data/lib/gzr/modules/model/set.rb

@@ -29,7 +29,7 @@ module Gzr
         req = {}
         req[:fields] = fields if fields
         begin
-          return @sdk.all_model_sets(req)
+          @sdk.all_model_sets(req).collect { |s| s.to_attrs }
         rescue LookerSDK::NotFound => e
           return nil
         rescue LookerSDK::Error => e
@@ -43,7 +43,7 @@ module Gzr
         req = {}
         req[:fields] = fields if fields
         begin
-          return @sdk.model_set(set_id,req)&.to_attrs
+          @sdk.model_set(set_id,req)&.to_attrs
         rescue LookerSDK::NotFound => e
           return nil
         rescue LookerSDK::Error => e
@@ -73,7 +73,7 @@ module Gzr
           req[:filter_or] = filter_or unless filter_or.nil?
           req[:limit] = 64
           loop do
-            page = @sdk.search_model_sets(req)
+            page = @sdk.search_model_sets(req).collect { |s| s.to_attrs }
             data+=page
             break unless page.length == req[:limit]
             req[:offset] = (req[:offset] || 0) + req[:limit]
@@ -90,7 +90,7 @@ module Gzr
 
       def update_model_set(model_set_id, data)
         begin
-          return @sdk.update_model_set(model_set_id, data)&.to_attrs
+          @sdk.update_model_set(model_set_id, data)&.to_attrs
         rescue LookerSDK::Error => e
           say_error "Error calling update_model_set(#{model_set_id},#{JSON.pretty_generate(data)})"
           say_error e
@@ -100,7 +100,7 @@ module Gzr
 
       def create_model_set(data)
         begin
-          return @sdk.create_model_set(data)&.to_attrs
+          @sdk.create_model_set(data)&.to_attrs
         rescue LookerSDK::Error => e
           say_error "Error calling create_model_set(#{JSON.pretty_generate(data)})"
           say_error e
@@ -110,7 +110,7 @@ module Gzr
 
       def delete_model_set(model_set_id)
         begin
-          return @sdk.delete_model_set(model_set_id)
+          @sdk.delete_model_set(model_set_id)
         rescue LookerSDK::Error => e
           say_error "Error calling delete_model_set(#{model_set_id}})"
           say_error e

data/lib/gzr/modules/model.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
@@ -23,12 +23,19 @@
 
 module Gzr
   module Model
-    def query_all_lookml_models(fields=nil)
-      data = nil
+    def query_all_lookml_models(fields=nil, progress=false)
+      data = []
       begin
         req = Hash.new
         req[:fields] = fields if fields
-        data = @sdk.all_lookml_models(req)
+        req[:limit] = 16
+        loop do
+          puts "fetching #{req[:limit]} offset #{req[:offset] || 0}" if progress
+          page = @sdk.all_lookml_models(req).collect { |m| m.to_attrs }
+          data+=page
+          break unless page.length == req[:limit]
+          req[:offset] = (req[:offset] || 0) + req[:limit]
+        end
       rescue LookerSDK::Error => e
         say_error "Error querying all_lookml_models(#{JSON.pretty_generate(req)})"
         say_error e
@@ -39,7 +46,7 @@ module Gzr
 
     def cat_model(model_name)
       begin
-        return @sdk.lookml_model(model_name)&.to_attrs
+        @sdk.lookml_model(model_name)&.to_attrs
       rescue LookerSDK::NotFound => e
         return nil
       rescue LookerSDK::Error => e
@@ -57,7 +64,7 @@ module Gzr
 
     def create_model(body)
       begin
-        return @sdk.create_lookml_model(body)&.to_attrs
+        @sdk.create_lookml_model(body)&.to_attrs
       rescue LookerSDK::Error => e
         say_error "Error running create_lookml_model(#{JSON.pretty_generate(body)})"
         say_error e
@@ -67,7 +74,7 @@ module Gzr
 
     def update_model(model_name,body)
       begin
-        return @sdk.update_lookml_model(model_name,body)&.to_attrs
+        @sdk.update_lookml_model(model_name,body)&.to_attrs
       rescue LookerSDK::Error => e
         say_error "Error running update_lookml_model(#{model_name},#{JSON.pretty_generate(body)})"
         say_error e

data/lib/gzr/modules/permission/set.rb

@@ -29,7 +29,7 @@ module Gzr
         req = {}
         req[:fields] = fields if fields
         begin
-          return @sdk.all_permission_sets(req)
+          @sdk.all_permission_sets(req).collect { |s| s.to_attrs }
         rescue LookerSDK::NotFound => e
           return nil
         rescue LookerSDK::Error => e
@@ -73,7 +73,7 @@ module Gzr
           req[:filter_or] = filter_or unless filter_or.nil?
           req[:limit] = 64
           loop do
-            page = @sdk.search_permission_sets(req)
+            page = @sdk.search_permission_sets(req).collect { |s| s.to_attrs }
             data+=page
             break unless page.length == req[:limit]
             req[:offset] = (req[:offset] || 0) + req[:limit]

data/lib/gzr/modules/permission.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,15 +25,13 @@ module Gzr
   module Permission
 
     def query_all_permissions()
-      data = nil
       begin
-        data = @sdk.all_permissions()
+        @sdk.all_permissions().collect { |p| p.to_attrs }
       rescue LookerSDK::Error => e
           say_error "Error querying all_permissions()"
           say_error e
           raise
       end
-      data
     end
 
   end

data/lib/gzr/modules/plan.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
@@ -28,17 +28,15 @@ module Gzr
       req[:all_users] = true if user_id == "all"
       req[:user_id] = user_id if user_id && !(user_id == "all")
       req[:fields] = fields if fields
-      data = nil
-      id = nil
-      id = user_id unless user_id == "all"
       begin
-        data = @sdk.all_scheduled_plans(req)
-      rescue LookerSDK::ClientError => e
+        @sdk.all_scheduled_plans(req).collect { |p| p.to_attrs }
+      rescue LookerSDK::NotFound => e
+        return []
+      rescue LookerSDK::Error => e
         say_error "Unable to get all_scheduled_plans(#{JSON.pretty_generate(req)})"
         say_error e
         raise
       end
-      data
     end
 
     def query_scheduled_plans_for_look(look_id,user_id,fields=nil)
@@ -46,18 +44,15 @@ module Gzr
       req[:all_users] = true if user_id == "all"
       req[:user_id] = user_id if user_id && !(user_id == "all")
       req[:fields] = fields if fields
-      data = nil
       begin
-        data = @sdk.scheduled_plans_for_look(look_id,req)
-        return nil if data.respond_to?(:message) && data.message == 'Not found'
-      rescue LookerSDK::NotFound
-        return nil
-      rescue LookerSDK::ClientError => e
+        @sdk.scheduled_plans_for_look(look_id,req).collect { |p| p.to_attrs }
+      rescue LookerSDK::NotFound => e
+        return []
+      rescue LookerSDK::Error => e
         say_error "Unable to get scheduled_plans_for_look(#{look_id},#{JSON.pretty_generate(req)})"
         say_error e
         raise
       end
-      data
     end
 
     def query_scheduled_plans_for_dashboard(dashboard_id,user_id,fields=nil)
@@ -65,76 +60,81 @@ module Gzr
       req[:all_users] = true if user_id == "all"
       req[:user_id] = user_id if user_id && !(user_id == "all")
       req[:fields] = fields if fields
-      data = nil
       begin
-        data = @sdk.scheduled_plans_for_dashboard(dashboard_id,req)
-        return nil if data.respond_to?(:message) && data.message == 'Not found'
+        @sdk.scheduled_plans_for_dashboard(dashboard_id,req).collect { |p| p.to_attrs }
       rescue LookerSDK::NotFound
-        return nil
-      rescue LookerSDK::ClientError => e
+        return []
+      rescue LookerSDK::Error => e
         say_error "Unable to get scheduled_plans_for_dashboard(#{dashboard_id},#{JSON.pretty_generate(req)})"
         say_error e
         raise
       end
-      data.map! {|plan| plan.to_attrs}
-      data
     end
 
     def query_scheduled_plan(plan_id,fields=nil)
       req = {}
       req[:fields] = fields if fields
       begin
-        data = @sdk.scheduled_plan(plan_id,req)
-      rescue LookerSDK::ClientError => e
+        @sdk.scheduled_plan(plan_id,req).to_attrs
+      rescue LookerSDK::NotFound
+        return nil
+      rescue LookerSDK::Error => e
         say_error "Unable to get scheduled_plan(#{plan_id},#{JSON.pretty_generate(req)})"
         say_error e
         raise
       end
-      data
     end
 
     def delete_scheduled_plan(plan_id)
       begin
-        data = @sdk.delete_scheduled_plan(plan_id)
-      rescue LookerSDK::ClientError => e
+        @sdk.delete_scheduled_plan(plan_id)
+      rescue LookerSDK::NotFound
+        say_error "delete_scheduled_plan(#{plan_id}) not found"
+        say_error e
+        raise
+      rescue LookerSDK::Error => e
         say_error "Unable to delete scheduled_plan(#{plan_id})"
         say_error e
         raise
       end
-      data
     end
 
     def create_scheduled_plan(plan)
       begin
-        data = @sdk.create_scheduled_plan(plan)
+        @sdk.create_scheduled_plan(plan).to_attrs
       rescue LookerSDK::Error => e
         say_error "Error creating scheduled_plan(#{JSON.pretty_generate(plan)})"
         say_error e
         raise
       end
-      data
     end
 
     def update_scheduled_plan(plan_id,plan)
       begin
-        data = @sdk.update_scheduled_plan(plan_id,plan)
+        @sdk.update_scheduled_plan(plan_id,plan).to_attrs
+      rescue LookerSDK::NotFound
+        say_error "update_scheduled_plan(#{plan_id},#{JSON.pretty_generate(plan)}) not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error updating scheduled_plan(#{plan_id},#{JSON.pretty_generate(plan)})"
         say_error e
         raise
       end
-      data
     end
 
     def run_scheduled_plan(plan)
       begin
-        data = @sdk.scheduled_plan_run_once(plan)
+        @sdk.scheduled_plan_run_once(plan)
+      rescue LookerSDK::NotFound
+        say_error "scheduled_plan_run_once(#{plan_id}) not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error executing scheduled_plan_run_once(#{JSON.pretty_generate(plan)})"
         say_error e
         raise
       end
-      data
     end
 
     def upsert_plans_for_look(look_id,user_id,source_plans)
@@ -167,9 +167,9 @@ module Gzr
     end
 
     def upsert_plan_for_obj(user_id, source_plan, existing_plans)
-      matches = existing_plans.select { |p| p.name == source_plan[:name] && user_id == p.user_id }
+      matches = existing_plans.select { |p| p[:name] == source_plan[:name] && user_id == p[:user_id] }
       if matches.length > 0 then
-        say_ok "Modifying existing plan #{matches.first.id} #{matches.first.name}"
+        say_ok "Modifying existing plan #{matches.first[:id]} #{matches.first[:name]}"
         plan = keys_to_keep('update_scheduled_plan').collect do |e|
           [e,nil]
         end.to_h
@@ -194,7 +194,7 @@ module Gzr
         plan[:run_once] = false if plan[:run_once].nil?
         plan[:include_links] = false if plan[:include_links].nil?
         yield plan
-        update_scheduled_plan(matches.first.id,plan)
+        update_scheduled_plan(matches.first[:id],plan)
       else
         plan = source_plan.select do |k,v|
           (keys_to_keep('create_scheduled_plan') - [:plan_id,:dashboard_id,:user_id,:dashboard_filters,:lookml_dashboard_id,:scheduled_plan_destination]).include? k

data/lib/gzr/modules/project.rb

@@ -25,9 +25,8 @@ module Gzr
   module Project
 
     def all_projects(fields: 'id')
-      data = []
       begin
-        data = @sdk.all_projects({ fields: fields })
+        @sdk.all_projects({ fields: fields }).collect { |p| p.to_attrs }
       rescue LookerSDK::NotFound => e
         return []
       rescue LookerSDK::Error => e
@@ -35,14 +34,15 @@ module Gzr
         say_error e
         raise
       end
-      data
     end
 
     def cat_project(project_id)
       begin
-        return @sdk.project(project_id)&.to_attrs
+        @sdk.project(project_id)&.to_attrs
       rescue LookerSDK::NotFound => e
-        return nil
+        say_error "project(#{project_id}) not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error getting project(#{project_id})"
         say_error e
@@ -58,7 +58,7 @@ module Gzr
 
     def create_project(body)
       begin
-        return @sdk.create_project(body)&.to_attrs
+        @sdk.create_project(body)&.to_attrs
       rescue LookerSDK::Error => e
         say_error "Error running create_project(#{JSON.pretty_generate(body)})"
         say_error e
@@ -68,9 +68,11 @@ module Gzr
 
     def update_project(id,body)
       begin
-        return @sdk.update_project(id,body)&.to_attrs
+        @sdk.update_project(id,body)&.to_attrs
       rescue LookerSDK::NotFound => e
-        return nil
+        say_error "update_project(#{id},#{JSON.pretty_generate(body)} not found)"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error running update_project(#{id},#{JSON.pretty_generate(body)})"
         say_error e
@@ -80,9 +82,9 @@ module Gzr
 
     def git_deploy_key(id)
       begin
-        return @sdk.git_deploy_key(id)
+        @sdk.git_deploy_key(id)
       rescue LookerSDK::NotFound => e
-        return nil
+        nil
       rescue LookerSDK::Error => e
         say_error "Error running git_deploy_key(#{id})"
         say_error e
@@ -92,9 +94,9 @@ module Gzr
 
     def create_git_deploy_key(id)
       begin
-        return @sdk.create_git_deploy_key(id)
+        @sdk.create_git_deploy_key(id)
       rescue LookerSDK::NotFound => e
-        return nil
+        nil
       rescue LookerSDK::Error => e
         say_error "Error running create_git_deploy_key(#{id})"
         say_error e
@@ -104,9 +106,9 @@ module Gzr
 
     def all_git_branches(proj_id)
       begin
-        return @sdk.all_git_branches(proj_id)
+        @sdk.all_git_branches(proj_id).collect { |b| b.to_attrs }
       rescue LookerSDK::NotFound => e
-        return nil
+        []
       rescue LookerSDK::Error => e
         say_error "Error running all_git_branches(#{proj_id})"
         say_error e
@@ -116,9 +118,9 @@ module Gzr
 
     def git_branch(proj_id)
       begin
-        return @sdk.git_branch(proj_id)
+        @sdk.git_branch(proj_id).to_attrs
       rescue LookerSDK::NotFound => e
-        return nil
+        nil
       rescue LookerSDK::Error => e
         say_error "Error running git_branch(#{proj_id})"
         say_error e
@@ -128,9 +130,11 @@ module Gzr
 
     def deploy_to_production(proj_id)
       begin
-        return @sdk.deploy_to_production(proj_id)
+        @sdk.deploy_to_production(proj_id)
       rescue LookerSDK::NotFound => e
-        return nil
+        say_error "deploy_to_production(#{proj_id}) not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error running deploy_to_production(#{proj_id})"
         say_error e
@@ -141,15 +145,16 @@ module Gzr
     def update_git_branch(proj_id, name)
       body = { name: name }
       begin
-        return @sdk.update_git_branch(proj_id, body)&.to_attrs
+        @sdk.update_git_branch(proj_id, body)&.to_attrs
       rescue LookerSDK::NotFound => e
-        return nil
+        say_error "update_git_branch(#{proj_id},#{JSON.pretty_generate(body)}) not found"
+        say_error e
+        raise
       rescue LookerSDK::Error => e
         say_error "Error running update_git_branch(#{proj_id},#{JSON.pretty_generate(body)})"
         say_error e
         raise
       end
     end
-
   end
 end

data/lib/gzr/modules/role.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
@@ -26,33 +26,33 @@ module Gzr
     def query_all_roles(fields=nil)
       req = Hash.new
       req[:fields] = fields if fields
-      data = Array.new
       begin
-        data = @sdk.all_roles(req)
+        @sdk.all_roles(req).collect { |r| r.to_attrs }
       rescue LookerSDK::NotFound => e
-        # do nothing
-      rescue LookerSDK::ClientError => e
+        []
+      rescue LookerSDK::Error => e
         say_error "Unable to get all_roles(#{JSON.pretty_generate(req)})"
         say_error e
         say_error e.errors if e.errors
         raise
       end
-      data
     end
+
     def query_role(role_id)
-      data = nil
       begin
-        data = @sdk.role(role_id)
+        @sdk.role(role_id).to_attrs
       rescue LookerSDK::NotFound => e
-        # do nothing
-      rescue LookerSDK::ClientError => e
+        say_error "role(#{role_id}) not found"
+        say_error e
+        raise
+      rescue LookerSDK::Error => e
         say_error "Unable to get role(#{role_id})"
         say_error e
         say_error e.errors if e.errors
         raise
       end
-      data
     end
+
     def trim_role(data)
       trimmed = data.select do |k,v|
         (keys_to_keep('create_role') + [:id]).include? k
@@ -65,87 +65,99 @@ module Gzr
       end
       trimmed
     end
+
     def delete_role(role_id)
-      data = nil
       begin
-        data = @sdk.delete_role(role_id)
+        @sdk.delete_role(role_id)
       rescue LookerSDK::NotFound => e
-        # do nothing
-      rescue LookerSDK::ClientError => e
+        say_error "role(#{role_id}) not found"
+        say_error e
+        raise
+      rescue LookerSDK::Error => e
         say_error "Unable to delete_role(#{role_id})"
         say_error e
         say_error e.errors if e.errors
         raise
       end
-      data
     end
+
     def query_role_groups(role_id,fields=nil)
       req = Hash.new
       req[:fields] = fields if fields
-      data = Array.new
       begin
-        data = @sdk.role_groups(role_id, req)
+        @sdk.role_groups(role_id, req).collect { |g| g.to_attrs }
       rescue LookerSDK::NotFound => e
-        # do nothing
-      rescue LookerSDK::ClientError => e
+        say_error "role_groups(#{role_id},#{JSON.pretty_generate(req)}) not found"
+        say_error e
+        raise
+      rescue LookerSDK::Error => e
         say_error "Unable to get role_groups(#{role_id},#{JSON.pretty_generate(req)})"
         say_error e
         say_error e.errors if e.errors
         raise
       end
-      data
     end
+
     def query_role_users(role_id,fields=nil,direct_association_only=true)
       req = Hash.new
       req[:fields] = fields if fields
       req[:direct_association_only] = direct_association_only
-      data = Array.new
       begin
-        data = @sdk.role_users(role_id, req)
+        @sdk.role_users(role_id, req).collect { |u| u.to_attrs }
       rescue LookerSDK::NotFound => e
-        # do nothing
-      rescue LookerSDK::ClientError => e
+        say_error "role_users(#{role_id},#{JSON.pretty_generate(req)}) not found"
+        say_error e
+        say_error e.errors if e.errors
+        raise
+      rescue LookerSDK::Error => e
         say_error "Unable to get role_users(#{role_id},#{JSON.pretty_generate(req)})"
         say_error e
         say_error e.errors if e.errors
         raise
       end
-      data
     end
+
     def set_role_groups(role_id,groups=[])
-      data = Array.new
       begin
-        data = @sdk.set_role_groups(role_id, groups)
-      rescue LookerSDK::ClientError => e
+        @sdk.set_role_groups(role_id, groups)
+      rescue LookerSDK::NotFound => e
+        say_error "set_role_groups(#{role_id},#{JSON.pretty_generate(groups)}) not found"
+        say_error e
+        say_error e.errors if e.errors
+        raise
+      rescue LookerSDK::Error => e
         say_error "Unable to call set_role_groups(#{role_id},#{JSON.pretty_generate(groups)})"
         say_error e
         say_error e.errors if e.errors
         raise
       end
-      data
     end
+
     def set_role_users(role_id,users=[])
-      data = Array.new
       begin
-        data = @sdk.set_role_users(role_id, users)
-      rescue LookerSDK::ClientError => e
+        @sdk.set_role_users(role_id, users)
+      rescue LookerSDK::NotFound => e
+        say_error "set_role_users(#{role_id},#{JSON.pretty_generate(users)}) not found"
+        say_error e
+        say_error e.errors if e.errors
+        raise
+      rescue LookerSDK::Error => e
         say_error "Unable to call set_role_users(#{role_id},#{JSON.pretty_generate(users)})"
         say_error e
         say_error e.errors if e.errors
         raise
       end
-      data
     end
+
     def create_role(name,pset,mset)
       req = { name: name, permission_set_id: pset, model_set_id: mset }
       begin
-        return @sdk.create_role(req)&.to_attrs
+        @sdk.create_role(req)&.to_attrs
       rescue LookerSDK::Error => e
         say_error "Unable to call create_role(#{JSON.pretty_generate(req)})"
         say_error e
         raise
       end
     end
-
   end
 end

data/lib/gzr/modules/session.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
@@ -317,7 +317,7 @@ module Gzr
       body = {}
       body[:workspace_id] = workspace_id
       begin
-        return @sdk.update_session(body)&.to_attrs
+        @sdk.update_session(body)&.to_attrs
       rescue LookerSDK::Error => e
         say_error "Unable to run update_session(#{JSON.pretty_generate(body)})"
         say_error e