swa 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c40d983e15b51e98b660a8ad7646b60c55ecc5dbe2aa390d64d69f6f8576b4e0
-  data.tar.gz: 947bccdf34d4dfd1fd5dde03cd790211a81d5eab5e1c35b688a19aaf4865a940
+  metadata.gz: 3e104c27cd170b45f520bf23f8ea1c1b3f2c08dfb5b4fbce5c81778d8dac8812
+  data.tar.gz: 25be55194508205f3d044a22734e144a777972c8b091f99e7658742d3214175f
 SHA512:
-  metadata.gz: 47ed26af61683becc4e72eced8bbcf4b3414046d0f1ebebe379a69e1097f52bd6f1ff55c714046973c46f78b49acf64b3680943d5c66fb5c240c02266e25b430
-  data.tar.gz: 55ced2ec8ae59f6d6305a7f697b0b38429b76c551e3e0d33354f7ea7d3461df239575078bd805357e6827cb30c5b4a2ad97a87a09f86dad7d5096035d2e9fa6d
+  metadata.gz: e5e1856a85450d6b8194a253cbb7773dd81a8cfa2206ff24853ce1da0e55268b4c4ccf2448a91adc2c934da5ec6d43135b4d0c4d1ac7cb4d05cd97d044d49fc9
+  data.tar.gz: 700faafa6b9e53f0dd926b7fd63768c0cc9dedae487fb28e74a7bb5a63c9a5ab79015028f5e285666606fb0e3eb732ff0f4f500ea1242cc52e30c1721b15cc93

data/lib/swa/athena/catalog.rb

@@ -0,0 +1,24 @@
+require "swa/record"
+
+module Swa
+  module Athena
+
+    class Catalog < Record
+
+      def summary
+        [
+          pad(name, 48),
+          type
+        ].join("  ")
+      end
+
+      def name
+        aws_record.catalog_name
+      end
+
+      delegate :type
+
+    end
+
+  end
+end

data/lib/swa/athena/database.rb

@@ -0,0 +1,21 @@
+require "swa/record"
+
+module Swa
+  module Athena
+
+    class Database < Record
+
+      def summary
+        [
+          pad(name, 48),
+          description
+        ].join("  ")
+      end
+
+      delegate :name
+      delegate :description
+
+    end
+
+  end
+end

data/lib/swa/athena/query_execution.rb

@@ -0,0 +1,28 @@
+require "swa/record"
+
+module Swa
+  module Athena
+
+    class QueryExecution < Record
+
+      def summary
+        [
+          pad(id, 48),
+          pad(state, 12)
+        ].join("  ")
+      end
+
+      delegate :id
+
+      def id
+        aws_record.query_execution_id
+      end
+
+      def state
+        aws_record.status.state
+      end
+
+    end
+
+  end
+end

data/lib/swa/athena/work_group.rb

@@ -0,0 +1,23 @@
+require "swa/record"
+
+module Swa
+  module Athena
+
+    class WorkGroup < Record
+
+      def summary
+        [
+          pad(name, 48),
+          pad(state, 12),
+          description
+        ].join("  ")
+      end
+
+      delegate :name
+      delegate :state
+      delegate :description
+
+    end
+
+  end
+end

data/lib/swa/cli/athena_command.rb

@@ -0,0 +1,198 @@
+require "aws-sdk-athena"
+require "csv"
+require "swa/cli/base_command"
+require "swa/cli/collection_behaviour"
+require "swa/cli/item_behaviour"
+require "swa/athena/catalog"
+require "swa/athena/database"
+require "swa/athena/query_execution"
+require "swa/athena/work_group"
+
+module Swa
+  module CLI
+
+    class AthenaCommand < BaseCommand
+
+      option "--catalog", "NAME", "Data catalog name", default: "AwsDataCatalog"
+      option %w(--workgroup -W), "NAME", "Workgroup name"
+
+      subcommand "catalogs", "Show catalogs" do
+
+        include CollectionBehaviour
+
+        private
+
+        def collection
+          query_for(:list_data_catalogs, :data_catalogs_summary, Swa::Athena::Catalog)
+        end
+
+      end
+
+      subcommand "database", "Database" do
+
+        parameter "NAME", "database name", attribute_name: :database
+
+        include ItemBehaviour
+
+        private
+
+        def item
+          Swa::Athena::Database.new(
+            athena_client.get_database(catalog_name: catalog, database_name: database).database
+          )
+        end
+
+      end
+
+      subcommand ["databases", "dbs"], "Show databases" do
+
+        include CollectionBehaviour
+
+        private
+
+        def collection
+          query_for(:list_databases, :database_list, Swa::Athena::Database, catalog_name: catalog)
+        end
+
+      end
+
+      subcommand ["execution", "query-execution"], "Inspect query execution" do
+
+        parameter "ID", "execution ID", attribute_name: :execution_id
+
+        include ItemBehaviour
+
+        private
+
+        def item
+          Swa::Athena::QueryExecution.new(
+            athena_client.get_query_execution(query_execution_id: execution_id).query_execution
+          )
+        end
+
+        subcommand "results", "Show results" do
+
+          def execute
+            query_results = athena_client.get_query_results(query_execution_id: execution_id)
+            output_results_as_csv(query_results.result_set)
+          end
+
+        end
+
+      end
+
+      subcommand ["executions", "query-executions"], "List query executions" do
+
+        def execute
+          athena_client.list_query_executions(work_group: workgroup).query_execution_ids.each do |id|
+            puts id
+          end
+        end
+
+      end
+
+      subcommand ["executions", "query-executions"], "List query executions" do
+
+        include CollectionBehaviour
+
+        private
+
+        def collection
+          query_for(:list_query_executions, :query_execution_ids, Swa::Athena::QueryExecution, work_group: workgroup)
+        end
+
+      end
+
+      subcommand ["query", "q", "run"], "Run a query" do
+
+        parameter "QUERY", "SQL query"
+
+        def execute
+          start_query_response = athena_client.start_query_execution(query_string: query, work_group: workgroup)
+          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)
+        end
+
+        private
+
+        def wait_for_query(query_execution_id)
+          QueryCompletionWaiter.new(client: athena_client).wait(query_execution_id: query_execution_id)
+        end
+
+      end
+
+      subcommand ["workgroups", "wgs"], "Show work-groups" do
+
+        include CollectionBehaviour
+
+        private
+
+        def collection
+          query_for(:list_work_groups, :work_groups, Swa::Athena::WorkGroup)
+        end
+
+      end
+
+      protected
+
+      def athena_client
+        ::Aws::Athena::Client.new(aws_config)
+      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)
+      end
+
+      def output_results_as_csv(result_set)
+        CSV($stdout.dup) do |csv|
+          result_set.rows.each do |row|
+            csv << row.data.map(&:var_char_value)
+          end
+        end
+      end
+
+      class QueryCompletionWaiter
+
+        def initialize(options)
+          @client = options.fetch(:client)
+          @waiter = Aws::Waiters::Waiter.new({
+            max_attempts: 30,
+            delay: 5,
+            poller: Aws::Waiters::Poller.new(
+              operation_name: :get_query_execution,
+              acceptors: [
+                {
+                  "matcher" => "path",
+                  "argument" => "query_execution.status.state",
+                  "expected" => "SUCCEEDED",
+                  "state" => "success",
+                },
+                {
+                  "matcher" => "path",
+                  "argument" => "query_execution.status.state",
+                  "expected" => "FAILED",
+                  "state" => "failure",
+                },
+                {
+                  "matcher" => "path",
+                  "argument" => "query_execution.status.state",
+                  "expected" => "CANCELLED",
+                  "state" => "error",
+                }
+              ]
+            )
+          }.merge(options))
+        end
+
+        def wait(params = {})
+          @waiter.wait(client: @client, params: params)
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/swa/cli/main_command.rb

@@ -1,4 +1,5 @@
 require "swa/cli/base_command"
+require "swa/cli/athena_command"
 require "swa/cli/cloud_formation_command"
 require "swa/cli/ec2_command"
 require "swa/cli/elb_command"
@@ -12,6 +13,7 @@ module Swa
 
     class MainCommand < BaseCommand
 
+      subcommand "athena", "Athena stuff", AthenaCommand
       subcommand ["cf", "cloudformation"], "CloudFormation stuff", CloudFormationCommand
       subcommand "ec2", "EC2 stuff", Ec2Command
       subcommand "elb", "elb stuff", ElbCommand

data/lib/swa/data_presentation.rb

@@ -42,21 +42,18 @@ module Swa
       pad(value, width)
     end
 
-    def camelize_keys(data)
+
+    def stringify_keys(data)
       case data
       when Hash
-        data.map { |k,v| [camelize(k), camelize_keys(v)] }.to_h
+        data.map { |k,v| [k.to_s, stringify_keys(v)] }.to_h
       when Array
-        data.map { |v| camelize_keys(v) }
+        data.map { |v| stringify_keys(v) }
       else
         data
       end
     end
 
-    def camelize(symbol)
-      symbol.to_s.split("_").map(&:capitalize).join("")
-    end
-
   end
 
 end

data/lib/swa/record.rb

@@ -16,7 +16,7 @@ module Swa
     include DataPresentation
 
     def data
-      camelize_keys(aws_record.to_h)
+      stringify_keys(aws_record.to_h)
     end
 
     extend Forwardable

data/lib/swa/resource.rb

@@ -19,7 +19,7 @@ module Swa
     include DataPresentation
 
     def data
-      camelize_keys(_resource_.data.to_h)
+      stringify_keys(_resource_.data.to_h)
     end
 
     extend Forwardable

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/swa.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 12.0"
 
+  spec.add_runtime_dependency "aws-sdk-athena", "~> 1"
   spec.add_runtime_dependency "aws-sdk-cloudformation", "~> 1"
   spec.add_runtime_dependency "aws-sdk-ec2", "~> 1"
   spec.add_runtime_dependency "aws-sdk-elasticloadbalancing", "~> 1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Mike Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-athena
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +266,11 @@ files:
 - bin/setup
 - exe/swa
 - lib/swa.rb
+- lib/swa/athena/catalog.rb
+- lib/swa/athena/database.rb
+- lib/swa/athena/query_execution.rb
+- lib/swa/athena/work_group.rb
+- lib/swa/cli/athena_command.rb
 - lib/swa/cli/base_command.rb
 - lib/swa/cli/cloud_formation_command.rb
 - lib/swa/cli/collection_behaviour.rb