swa 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515c45df8339e1e9c4168bc6ab96311385a0dcdac85e65d3425311c859ffef95
-  data.tar.gz: 827af0b7cd21516b46fa4f06eb751e934e752e4becd071aa1d750ce54244ba4d
+  metadata.gz: 36e1c1b0403a6cdb2a09bce49b2cc378f6b67f8abfbded1d6baf41d46e70504e
+  data.tar.gz: 91755af27947ed3028f7da36e44e1e2a53ed0555ce99a0107a557ee4767e6632
 SHA512:
-  metadata.gz: e2d5ca76c3a0acd50514e778d89da6992b7b217a23b69e19e8c6c74ed8b0c0987d3417d93376905b49446c581c1ca6d5a4aaaa221319b82057735f9cba81d76b
-  data.tar.gz: 4c6a89e273eac6ad8be3092292710ddafda571c70cc78ff0ed39f938bf212f80c4a9d1d7af142b2afbdc26da99b77ff3d1c717a7c55c38be57f45ac7f8d8a766
+  metadata.gz: 2c93335b35ff3b0e070847deee928481a77634d295dfe2e2240308fec7c8f776cfa8f6ab9658bfface70dfcb124f7b10ec55ae75c5375be98ce0161b3f8d1b1e
+  data.tar.gz: 1e64bf3fe18ba6398dc7d3af897a0223099b85a7112464a112a662d2caa763d35aa14c05d19de042ccdd35b36d4b78707938c720d8c5066504ca94c99fa21f57

data/lib/swa/cli/athena_command.rb

@@ -91,24 +91,25 @@ module Swa
 
       end
 
-      subcommand ["executions", "query-executions"], "List query executions" do
+      subcommand ["query", "q", "execute", "exec"], "Run a query" do
 
-        include CollectionBehaviour
+        option ["--database", "-D"], "NAME", "Database name"
+        option ["--output-location", "-O"], "S3_URL", "S3 output location for query results"
 
-        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"
+        parameter "[QUERY]", "SQL query", :default => "STDIN"
 
         def execute
-          start_query_response = athena_client.start_query_execution(query_string: query, work_group: workgroup)
+          start_query_response = athena_client.start_query_execution(
+            query_execution_context: {
+              catalog: catalog,
+              database: database
+            },
+            query_string: query,
+            result_configuration: {
+              output_location: output_location
+            },
+            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)
@@ -116,6 +117,10 @@ module Swa
 
         private
 
+        def default_query
+          $stdin.read
+        end
+
         def wait_for_query(query_execution_id)
           QueryCompletionWaiter.new(client: athena_client).wait(query_execution_id: query_execution_id)
         rescue Aws::Waiters::Errors::FailureStateError => error

data/lib/swa/cli/lake_formation_command.rb

@@ -0,0 +1,69 @@
+require "aws-sdk-lakeformation"
+require "swa/cli/base_command"
+require "swa/cli/collection_behaviour"
+require "swa/cli/item_behaviour"
+require "swa/lake_formation/resource_info"
+
+module Swa
+  module CLI
+
+    class LakeFormationCommand < BaseCommand
+
+      subcommand ["permissions"], "Show permissions" do
+
+        self.description = <<-EOF
+          List permissions.
+        EOF
+
+        include CollectionBehaviour
+
+        private
+
+        def collection
+          query_for(:list_permissions, :principal_resource_permissions, Swa::LakeFormation::Permission)
+        end
+
+      end
+
+      protected
+
+      def lf_client
+        ::Aws::LakeFormation::Client.new(aws_config)
+      end
+
+      def query_for(query_method, response_key, model)
+        records = lf_client.public_send(query_method).public_send(response_key)
+        model.list(records)
+      end
+
+      subcommand ["resources"], "Show resources" do
+
+        self.description = <<-EOF
+          List resources.
+        EOF
+
+        include CollectionBehaviour
+
+        private
+
+        def collection
+          query_for(:list_resources, :resource_info_list, Swa::LakeFormation::ResourceInfo)
+        end
+
+      end
+
+      protected
+
+      def lf_client
+        ::Aws::LakeFormation::Client.new(aws_config)
+      end
+
+      def query_for(query_method, response_key, model)
+        records = lf_client.public_send(query_method).public_send(response_key)
+        model.list(records)
+      end
+
+    end
+
+  end
+end

data/lib/swa/cli/main_command.rb

@@ -6,6 +6,7 @@ require "swa/cli/elb_command"
 require "swa/cli/glue_command"
 require "swa/cli/iam_command"
 require "swa/cli/kms_command"
+require "swa/cli/lake_formation_command"
 require "swa/cli/s3_command"
 
 module Swa
@@ -20,6 +21,7 @@ module Swa
       subcommand "glue", "Glue stuff", GlueCommand
       subcommand "iam", "IAM stuff", IamCommand
       subcommand "kms", "KMS stuff", KmsCommand
+      subcommand ["lf", "lakeformation"], "LakeFormation stuff", LakeFormationCommand
       subcommand "s3", "S3 stuff", S3Command
 
       protected

data/lib/swa/lake_formation/permission.rb

@@ -0,0 +1,32 @@
+require "swa/record"
+
+module Swa
+  module LakeFormation
+
+    class Permission < Record
+
+      def summary
+        [
+          principal_id,
+          permissions.join(","),
+          resource_summary
+        ].join("  ")
+      end
+
+      delegate :permissions
+      delegate :principal
+
+      def principal_id
+        aws_record.principal.data_lake_principal_identifier
+      end
+
+      def resource_summary
+        h = aws_record.resource.to_hash.compact
+        type, details = h.first
+        "#{type}:#{details.values.join("/")}"
+      end
+
+    end
+
+  end
+end

data/lib/swa/lake_formation/resource_info.rb

@@ -0,0 +1,21 @@
+require "swa/record"
+
+module Swa
+  module LakeFormation
+
+    class ResourceInfo < Record
+
+      def summary
+        [
+          resource_arn,
+          role_arn
+        ].join("  ")
+      end
+
+      delegate :resource_arn
+      delegate :role_arn
+
+    end
+
+  end
+end

data/lib/swa/version.rb

@@ -1,3 +1,3 @@
 module Swa
-  VERSION = "0.7.6"
+  VERSION = "0.8.0"
 end

data/swa.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "aws-sdk-glue", "~> 1"
   spec.add_runtime_dependency "aws-sdk-iam", "~> 1"
   spec.add_runtime_dependency "aws-sdk-kms", "~> 1"
+  spec.add_runtime_dependency "aws-sdk-lakeformation", "~> 1"
   spec.add_runtime_dependency "aws-sdk-s3", "~> 1"
   spec.add_runtime_dependency "pry"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swa
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Mike Williams
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-lakeformation
+  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-s3
   requirement: !ruby/object:Gem::Requirement
@@ -282,6 +296,7 @@ files:
 - lib/swa/cli/iam_command.rb
 - lib/swa/cli/item_behaviour.rb
 - lib/swa/cli/kms_command.rb
+- lib/swa/cli/lake_formation_command.rb
 - lib/swa/cli/main_command.rb
 - lib/swa/cli/s3_command.rb
 - lib/swa/cli/selector.rb
@@ -315,6 +330,8 @@ files:
 - lib/swa/iam/user.rb
 - lib/swa/kms/alias.rb
 - lib/swa/kms/key.rb
+- lib/swa/lake_formation/permission.rb
+- lib/swa/lake_formation/resource_info.rb
 - lib/swa/polyfill.rb
 - lib/swa/record.rb
 - lib/swa/resource.rb
@@ -343,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: AWS, backwards