swa 0.8.6 → 1.0.0

data/lib/swa/cli/ec2_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aws-sdk-ec2"
 require "swa/cli/base_command"
 require "swa/cli/collection_behaviour"
@@ -13,6 +15,7 @@ require "swa/ec2/volume"
 require "swa/ec2/vpc"
 
 module Swa
+
   module CLI
 
     class Ec2Command < BaseCommand
@@ -56,7 +59,7 @@ module Swa
           use `--owned-by` to select a different scope.
         EOF
 
-        option "--owned-by", "OWNER", "with specified owner", :default => "self"
+        option "--owned-by", "OWNER", "with specified owner", default: "self"
         option "--named", "PATTERN", "with matching name"
 
         option ["--created-after", "--after"], "WHEN", "earliest creation-date"
@@ -65,8 +68,6 @@ module Swa
         include TagFilterOptions
         include CollectionBehaviour
 
-        private
-
         def named=(name_pattern)
           add_filter("name", name_pattern)
         end
@@ -108,8 +109,13 @@ module Swa
 
         end
 
-        %w(stop start reboot terminate).each do |action|
-          class_eval <<-RUBY
+        %w[stop start reboot terminate].each do |action|
+          # subcommand "stop", "Stop the instance" do
+          #   def execute
+          #     instance.stop
+          #   end
+          # end
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
             subcommand "#{action}", "#{action.capitalize} the instance" do
               def execute
                 instance.#{action}
@@ -118,8 +124,6 @@ module Swa
           RUBY
         end
 
-        private
-
         def instance
           Swa::EC2::Instance.new(ec2.instance(instance_id))
         end
@@ -138,7 +142,7 @@ module Swa
         EOF
 
         option ["--state"], "STATE", "with specified status",
-               :default => "running"
+               default: "running"
 
         option "--named", "NAME", "with matching name" do |name|
           add_tag_filter("Name", name)
@@ -162,8 +166,13 @@ module Swa
         include TagFilterOptions
         include CollectionBehaviour
 
-        %w(stop start reboot terminate).each do |action|
-          class_eval <<-RUBY
+        %w[stop start reboot terminate].each do |action|
+          # subcommand "stop", "Stop all instances" do
+          #   def execute
+          #     instances.each { |i| i.stop }
+          #   end
+          # end
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
             subcommand "#{action}", "#{action.capitalize} all instances" do
               def execute
                 instances.each do |i|
@@ -188,8 +197,6 @@ module Swa
           end
         end
 
-        private
-
         def instances
           add_filter("instance-state-name", state)
           query_for(:instances, Swa::EC2::Instance)
@@ -211,8 +218,6 @@ module Swa
           end
         end
 
-        private
-
         def key_pair
           Swa::EC2::KeyPair.new(ec2.key_pair(name))
         end
@@ -238,8 +243,6 @@ module Swa
           end
         end
 
-        private
-
         def named=(pattern)
           selector.add do |kp|
             File.fnmatch(pattern, kp.name)
@@ -266,8 +269,6 @@ module Swa
           end
         end
 
-        private
-
         def security_group
           Swa::EC2::SecurityGroup.new(ec2.security_group(group_id))
         end
@@ -287,8 +288,6 @@ module Swa
           end
         end
 
-        private
-
         def security_groups
           query_for(:security_groups, Swa::EC2::SecurityGroup)
         end
@@ -309,8 +308,6 @@ module Swa
           end
         end
 
-        private
-
         def snapshot
           Swa::EC2::Snapshot.new(ec2.snapshot(snapshot_id))
         end
@@ -328,7 +325,7 @@ module Swa
           use `--owned-by` to select a different scope.
         EOF
 
-        option "--owned-by", "OWNER", "with specified owner", :default => "self"
+        option "--owned-by", "OWNER", "with specified owner", default: "self"
         option ["--volume", "--of"], "VOLUME-ID", "for specified volume"
 
         option ["--started-after", "--after"], "WHEN", "earliest start-time"
@@ -337,8 +334,6 @@ module Swa
         include TagFilterOptions
         include CollectionBehaviour
 
-        private
-
         def volume=(volume_id)
           add_filter("volume-id", volume_id)
         end
@@ -372,8 +367,6 @@ module Swa
 
         include ItemBehaviour
 
-        private
-
         def subnet
           Swa::EC2::Subnet.new(ec2.subnet(subnet_id))
         end
@@ -387,8 +380,6 @@ module Swa
         include TagFilterOptions
         include CollectionBehaviour
 
-        private
-
         def subnets
           query_for(:subnets, Swa::EC2::Subnet)
         end
@@ -403,8 +394,6 @@ module Swa
 
         include ItemBehaviour
 
-        private
-
         def volume
           Swa::EC2::Volume.new(ec2.volume(volume_id))
         end
@@ -422,8 +411,6 @@ module Swa
         include TagFilterOptions
         include CollectionBehaviour
 
-        private
-
         def volumes
           query_for(:volumes, Swa::EC2::Volume)
         end
@@ -438,8 +425,6 @@ module Swa
 
         include ItemBehaviour
 
-        private
-
         def vpc
           Swa::EC2::Vpc.new(ec2.vpc(vpc_id))
         end
@@ -457,8 +442,6 @@ module Swa
           add_tag_filter("Name", name)
         end
 
-        private
-
         def vpcs
           query_for(:vpcs, Swa::EC2::Vpc)
         end
@@ -482,4 +465,5 @@ module Swa
     end
 
   end
+
 end

data/lib/swa/cli/elb_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aws-sdk-elasticloadbalancing"
 require "swa/cli/base_command"
 require "swa/cli/collection_behaviour"
@@ -5,6 +7,7 @@ require "swa/cli/item_behaviour"
 require "swa/elb/load_balancer"
 
 module Swa
+
   module CLI
 
     class ElbCommand < BaseCommand
@@ -18,7 +21,7 @@ module Swa
         private
 
         def item
-          results = describe_load_balancers(:load_balancer_names => [name])
+          results = describe_load_balancers(load_balancer_names: [name])
           signal_error "No such ELB '#{name}'" unless results.any?
           Swa::ELB::LoadBalancer.new(results.first)
         end
@@ -29,8 +32,6 @@ module Swa
 
         include CollectionBehaviour
 
-        private
-
         def collection
           Swa::ELB::LoadBalancer.list(describe_load_balancers)
         end
@@ -50,4 +51,5 @@ module Swa
     end
 
   end
+
 end

data/lib/swa/cli/filter_options.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require "clamp"
 
 module Swa
+
   module CLI
 
     module FilterOptions
@@ -8,7 +11,7 @@ module Swa
       extend Clamp::Option::Declaration
 
       option "--filter", "NAME=VALUE", "apply a filter",
-             :multivalued => true, :attribute_name => :filters
+             multivalued: true, attribute_name: :filters
 
       protected
 
@@ -26,10 +29,12 @@ module Swa
       def append_to_filters(arg)
         name, value = arg.split("=", 2)
         raise ArgumentError, "no value supplied" unless value
+
         add_filter(name, value)
       end
 
     end
 
   end
+
 end

data/lib/swa/cli/glue_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aws-sdk-glue"
 require "swa/cli/base_command"
 require "swa/cli/collection_behaviour"
@@ -12,6 +14,7 @@ require "swa/glue/partition"
 require "swa/glue/table"
 
 module Swa
+
   module CLI
 
     class GlueCommand < BaseCommand
@@ -29,15 +32,13 @@ module Swa
           private
 
           def collection
-            query_for(:list_crawls, :crawls, Swa::Glue::Crawl, :crawler_name => name)
+            query_for(:list_crawls, :crawls, Swa::Glue::Crawl, crawler_name: name)
           end
 
         end
 
-        private
-
         def item
-          Swa::Glue::Crawler.new(glue_client.get_crawler(:name => name).crawler)
+          Swa::Glue::Crawler.new(glue_client.get_crawler(name: name).crawler)
         end
 
       end
@@ -46,8 +47,6 @@ module Swa
 
         include CollectionBehaviour
 
-        private
-
         def collection
           query_for(:get_crawlers, :crawlers, Swa::Glue::Crawler)
         end
@@ -56,20 +55,28 @@ module Swa
 
       subcommand ["database"], "Show database" do
 
+        option %w[--catalog], "NAME", "Catalog ID"
+
         parameter "NAME", "database name"
 
         include ItemBehaviour
 
-        private
-
         def item
-          Swa::Glue::Database.new(glue_client.get_database(:name => name).database)
+          Swa::Glue::Database.new(glue_client.get_database(catalog_id: catalog, name: name).database)
+        end
+
+        subcommand ["arn"], "Show database ARN" do
+
+          def execute
+            puts "arn:aws:glue:#{region}:#{item.catalog_id}:database/#{name}"
+          end
+
         end
 
         subcommand ["delete"], "Delete database" do
 
           def execute
-            glue_client.delete_database(:name => name)
+            glue_client.delete_database(name: name, **catalog_constraint)
           end
 
         end
@@ -84,10 +91,9 @@ module Swa
 
             include CollectionBehaviour
 
-            private
-
             def collection
-              query_for(:get_partitions, :partitions, Swa::Glue::Partition, :database_name => name, :table_name => table_name)
+              query_for(:get_partitions, :partitions, Swa::Glue::Partition, catalog_id: catalog,
+                                                                            database_name: name, table_name: table_name)
             end
 
           end
@@ -95,29 +101,68 @@ module Swa
           subcommand ["delete"], "Delete table" do
 
             def execute
-              glue_client.delete_table(:database_name => name, :name => table_name)
+              glue_client.delete_table(catalog_id: catalog, database_name: name, name: table_name)
             end
 
           end
 
-          private
+          subcommand ["lf-tags"], "Show associated LakeFormation tags" do
+
+            include CollectionBehaviour
+
+            def collection
+              Swa::LakeFormation::Tag.list_from_query(
+                lf_client, :get_resource_lf_tags, :lf_tags_on_table, resource: lf_resource_spec
+              )
+            end
+
+          end
+
+          subcommand ["lf-permissions"], "Show LakeFormation permissions" do
+
+            option ["--principal", "-P"], "ARN", "Principal ARN"
+
+            include CollectionBehaviour
+
+            def collection
+              query_args = {
+                resource: lf_resource_spec
+              }
+              if principal
+                query_args[:principal] = {
+                  data_lake_principal_identifier: principal
+                }
+              end
+              Swa::LakeFormation::Permission.list_from_query(
+                lf_client, :list_permissions, :principal_resource_permissions, **query_args
+              )
+            end
+
+          end
 
           def item
             Swa::Glue::Table.new(glue_client.get_table(
-              :database_name => name, :name => table_name
+              catalog_id: catalog, database_name: name, name: table_name
             ).table)
           end
 
+          def lf_resource_spec
+            {
+              table: {
+                database_name: name,
+                name: table_name
+              }
+            }
+          end
+
         end
 
         subcommand ["tables"], "Show tables" do
 
           include CollectionBehaviour
 
-          private
-
           def collection
-            query_for(:get_tables, :table_list, Swa::Glue::Table, :database_name => name)
+            query_for(:get_tables, :table_list, Swa::Glue::Table, catalog_id: catalog, database_name: name)
           end
 
         end
@@ -126,12 +171,12 @@ module Swa
 
       subcommand ["databases"], "Show databases" do
 
-        include CollectionBehaviour
+        option %w[--catalog], "NAME", "Catalog ID"
 
-        private
+        include CollectionBehaviour
 
         def collection
-          query_for(:get_databases, :database_list, Swa::Glue::Database)
+          query_for(:get_databases, :database_list, Swa::Glue::Database, catalog_id: catalog)
         end
 
       end
@@ -142,10 +187,8 @@ module Swa
 
         include ItemBehaviour
 
-        private
-
         def item
-          Swa::Glue::Job.new(glue_client.get_job(:job_name => name).job)
+          Swa::Glue::Job.new(glue_client.get_job(job_name: name).job)
         end
 
         subcommand ["run"], "Show run" do
@@ -160,20 +203,16 @@ module Swa
 
             include ItemBehaviour
 
-            private
-
             def item
               Swa::Glue::JobBookmarkEntry.new(
-                glue_client.get_job_bookmark(:job_name => name, :run_id => run_id).job_bookmark_entry
+                glue_client.get_job_bookmark(job_name: name, run_id: run_id).job_bookmark_entry
               )
             end
 
           end
 
-          private
-
           def item
-            Swa::Glue::JobRun.new(glue_client.get_job_run(:job_name => name, :run_id => run_id).job_run)
+            Swa::Glue::JobRun.new(glue_client.get_job_run(job_name: name, run_id: run_id).job_run)
           end
 
         end
@@ -182,10 +221,8 @@ module Swa
 
           include CollectionBehaviour
 
-          private
-
           def collection
-            query_for(:get_job_runs, :job_runs, Swa::Glue::JobRun, :job_name => name)
+            query_for(:get_job_runs, :job_runs, Swa::Glue::JobRun, job_name: name)
           end
 
         end
@@ -196,8 +233,6 @@ module Swa
 
         include CollectionBehaviour
 
-        private
-
         def collection
           query_for(:get_jobs, :jobs, Swa::Glue::Job)
         end
@@ -214,7 +249,20 @@ module Swa
         model.list_from_query(glue_client, query_method, response_key, **query_args)
       end
 
+      def lf_client
+        ::Aws::LakeFormation::Client.new(aws_config)
+      end
+
+      def parse_parameters
+        case remaining_arguments.first
+        when /^(\w+)\.(\w+)$/
+          remaining_arguments[0, 1] = ["database", ::Regexp.last_match(1), "table", ::Regexp.last_match(2)]
+        end
+        super
+      end
+
     end
 
   end
+
 end