swa 0.8.3 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0863918be3963c4a4fefbf9f7d4c7f049617cf5e6b9fe53ca1d3743eace7c364'
-  data.tar.gz: d1d2972dbcfd1c90379202aabc80dbc4968c231bf27054842270d98aae5a6e00
+  metadata.gz: 731347c42ce0823ababd94ff7eeb58ea42e9d42cfbf152cea6d103356f8ea9d2
+  data.tar.gz: fe2feaa04f3fd3df8f2664160b70d362050b587e22772018a6221ebe13482ff5
 SHA512:
-  metadata.gz: dcb11477f1210b8a6e766a0ed9b3623d60d4a7cc4b95b643cf2b634e95cb4230c024e5853e7cf4b71bc789cd006885d5ab7313275739bc7d31daf706739d2d6f
-  data.tar.gz: e7c298215ee0cf718992d8afde6b78ab1c8e00b25a82d3f8cd45615112bc544db33791350abb2698991f5b0d9e3d711fefaf8c38dcc4341c5664c3eaab326814
+  metadata.gz: a2e6b01eb2be3d32536688c14db2b5511281f735b989716a26be37a8feb773ee153497de1a9ac1816112cedf8b5387ab656db38e14da1f8bbe6f6245e37965a1
+  data.tar.gz: 9a6939b4984e7a5eb0e2a66e795312e91e634a173310607b2bcf3f2ba4f885a4fc98bb8ee51b6ca201465922c14a60d813f5ac0e54e0321ae8a1e1b4935fc7d9

data/lib/swa/cli/athena_command.rb

@@ -112,7 +112,11 @@ module Swa
           )
           wait_for_query(start_query_response.query_execution_id)
           query_results = athena_client.get_query_results(query_execution_id: start_query_response.query_execution_id)
-          output_results_as_csv(query_results.result_set)
+          if query =~ /\AEXPLAIN/
+            output_explain_result(query_results.result_set)
+          else
+            output_results_as_csv(query_results.result_set)
+          end
         end
 
         private
@@ -127,6 +131,12 @@ module Swa
           signal_error error.response.query_execution.status.state_change_reason
         end
 
+        def output_explain_result(result_set)
+          result_set.rows.drop(1).each do |row|
+            puts row.data.first.var_char_value
+          end
+        end
+
       end
 
       subcommand ["workgroups", "wgs"], "Show work-groups" do
@@ -148,8 +158,7 @@ module Swa
       end
 
       def query_for(query_method, response_key, model, **query_args)
-        records = athena_client.public_send(query_method, **query_args).public_send(response_key)
-        model.list(records)
+        model.list_from_query(athena_client, query_method, response_key, **query_args)
       end
 
       def output_results_as_csv(result_set)

data/lib/swa/cli/base_command.rb

@@ -27,6 +27,8 @@ module Swa
         super(arguments)
       rescue Aws::Errors::MissingCredentialsError
         signal_error "no credentials provided"
+      rescue Aws::Errors::MissingRegionError, Aws::Errors::InvalidRegionError => e
+        signal_error e.message
       rescue Aws::Errors::ServiceError => e
         signal_error e.message
       end

data/lib/swa/cli/glue_command.rb

@@ -211,8 +211,7 @@ module Swa
       end
 
       def query_for(query_method, response_key, model, **query_args)
-        records = glue_client.public_send(query_method, **query_args).public_send(response_key)
-        model.list(records)
+        model.list_from_query(glue_client, query_method, response_key, **query_args)
       end
 
     end

data/lib/swa/cli/kms_command.rb

@@ -54,9 +54,8 @@ module Swa
         ::Aws::KMS::Client.new(aws_config)
       end
 
-      def query_for(query_method, response_key, model)
-        records = kms_client.public_send(query_method).public_send(response_key)
-        model.list(records)
+      def query_for(query_method, response_key, model, **query_args)
+        model.list_from_query(kms_client, query_method, response_key, **query_args)
       end
 
     end

data/lib/swa/cli/lake_formation_command.rb

@@ -59,8 +59,7 @@ module Swa
       end
 
       def query_for(query_method, response_key, model, **query_args)
-        records = lf_client.public_send(query_method, **query_args).public_send(response_key)
-        model.list(records)
+        model.list_from_query(lf_client, query_method, response_key, **query_args)
       end
 
     end

data/lib/swa/record.rb

@@ -9,6 +9,13 @@ module Swa
       records.lazy.map(&method(:new))
     end
 
+    def self.list_from_query(client, query_method, response_key, **query_args)
+      records = client.public_send(query_method, **query_args).each.lazy.flat_map { |page|
+        page.public_send(response_key)
+      }
+      list(records)
+    end
+
     def initialize(aws_record)
       @aws_record = aws_record
     end

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.8.3"
+  VERSION = "0.8.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.5
 platform: ruby
 authors:
 - Mike Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler