seiton 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b1ae9a2d6899c5b2b5017f9cef164d078472d35491c6adf80aae8fb78792ca3
-  data.tar.gz: 56fbc87ba41e92a0f4995fda8a6637e653d65f207b21909da6c5a6648af3e9d9
+  metadata.gz: 68c2eabf63161a231cb8de12a3836e3dbc0e66e73410978fe0f08600c4f916dd
+  data.tar.gz: 38e22caf6a46b10b8e5a133015da577b7c619801a8609f7a22ba7f8cdbbd042b
 SHA512:
-  metadata.gz: a06cb2f21b274762fa470f2157adb23df042aeea89ad5ff041129d23b69f3c27035d03a9383f39dd59c174c547c3345c8d415fe794deab0a81fd73987f3d6a38
-  data.tar.gz: b51d138e4141d4ff0c94d814a4afcab6d98ab3a9d3cd908b4adfd1b94219d64af67e6a208fa890972d0fd2e38c825d1e4ffadce364e1c2daf25d2f519e6f903a
+  metadata.gz: b99b0b5a3abe2d580c487c854a4d773f4e4dfa0ca19e01f484d36741a9b79df626dcee82ff17b3847dbee953cc52c8f9ea90e09cf52a2f3f3750e93dd320aa3f
+  data.tar.gz: 0d156ec83984ad4e0786824beeec9d7ebd5d6e6f56ec9d638af3ee09b6400a327ee3ceba4b4d626ae701a0175efd80c3e3e44d6390617582a325576a4f6caf98

data/README.md

@@ -30,7 +30,7 @@ $ gem install seiton
 $ bundle exec seiton --help
 Commands:
   seiton ami             # Delete the EC2 AMI.
-  seiton ec2_snapshot    # Delete the EC2 Snapshot.
+  seiton ebs_snapshot    # Delete the EC2 Snapshot.
   seiton eip             # Delete the Elastic IP.
   seiton help [COMMAND]  # Describe available commands or one specific command
   seiton init            # Initialize seiton.
@@ -38,6 +38,12 @@ Commands:
   seiton rds_snapshot    # Delete the RDS Snapshot.
   seiton sqs_queue       # Delete the SQS Queue.
   seiton version         # Print the version number.
+
+Options:
+  -b, [--before-datetime=BEFORE_DATETIME]  # Specify the date and time for deletion (delete resources before the specified date and time.)
+  -i, [--ignores=one two three]            # Specify resources to be undeleted (you can specify multiple resources).
+      [--ignores-file=IGNORES_FILE]        # Specify file name for resources list to be undeleted.
+  -c, [--check], [--no-check]              # Check the resources to be deleted.
 ```
 
 ### Init

data/lib/seiton.rb

@@ -2,12 +2,12 @@ require 'seiton/cli'
 require 'seiton/client'
 require 'seiton/common'
 require 'seiton/ext'
-require 'seiton/ec2_check'
+require 'seiton/checks/ec2'
 require 'seiton/ec2'
 require 'seiton/ignores'
-require 'seiton/rds_check'
+require 'seiton/checks/rds'
 require 'seiton/rds'
-require 'seiton/sqs_check'
+require 'seiton/checks/sqs'
 require 'seiton/sqs'
 require 'seiton/version'
 

data/lib/seiton/{ec2_check.rb → checks/ec2.rb}

@@ -60,13 +60,13 @@ EOF
       end
     end
 
-    def generator_ec2_snapshots_check(delete_resources)
+    def generator_ebs_snapshots_check(delete_resources)
       template = <<-'EOF'
 <% delete_resources.each do |resource| %>
 <%= resource.snapshot_id %>
 <% end %>
 EOF
-      File.open("spec/" + "ec2_snapshots_list.txt", "w") do |file|
+      File.open("spec/" + "ebs_snapshots_list.txt", "w") do |file|
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end
     end

data/lib/seiton/cli.rb

@@ -10,6 +10,10 @@ require 'erb'
 module Seiton
   class CLI < Thor
     default_command :version
+    class_option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
+    class_option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
+    class_option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
+    class_option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
 
     desc 'version', 'Print the version number.'
     def version
@@ -23,10 +27,6 @@ module Seiton
     end
 
     desc 'ami', 'Delete the EC2 AMI.'
-    option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def ami
       unless options[:before_datetime] then
         puts '--before-datetime must be specified. (--before-datetime=YYYY/MM/DD)'
@@ -38,12 +38,8 @@ module Seiton
       seiton.ec2_image(options[:check], options[:before_datetime], ignores)
     end
 
-    desc 'ec2_snapshot', 'Delete the EC2 Snapshot.'
-    option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
-    def ec2_snapshot
+    desc 'ebs_snapshot', 'Delete the EC2 Snapshot.'
+    def ebs_snapshot
       unless options[:before_datetime] then
         puts '--before-datetime must be specified. (--before-datetime=YYYY/MM/DD)'
         exit 1
@@ -51,15 +47,11 @@ module Seiton
 
       ignores = Seiton::Ignores.new(options[:ignores_file], options[:ignores]).generate
       seiton = Seiton::Ec2.new
-      seiton.ec2_snapshots(options[:check],
+      seiton.ebs_snapshots(options[:check],
                            options[:before_datetime], ignores)
     end
 
     desc 'instance', 'Delete the EC2 Instance.'
-    option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def instance
       unless options[:before_datetime] then
         puts '--before-datetime must be specified. (--before-datetime=YYYY/MM/DD)'
@@ -72,10 +64,6 @@ module Seiton
     end
 
     desc 'rds_snapshot', 'Delete the RDS Snapshot.'
-    option :before_datetime, type: :string, aliases: '-b', desc: 'Specify the date and time for deletion (delete resources before the specified date and time.)'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def rds_snapshot
       unless options[:before_datetime] then
         puts '--before-datetime must be specified. (--before-datetime=YYYY/MM/DD)'
@@ -88,9 +76,6 @@ module Seiton
     end
 
     desc 'eip', 'Delete the Elastic IP.'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def eip
       ignores = Seiton::Ignores.new(options[:ignores_file], options[:ignores]).generate
       seiton = Seiton::Ec2.new
@@ -98,9 +83,6 @@ module Seiton
     end
 
     desc 'sqs_queue', 'Delete the SQS Queue.'
-    option :ignores, type: :array, aliases: '-i', desc: 'Specify resources to be undeleted (you can specify multiple resources).'
-    option :ignores_file, type: :string, aliases: nil, desc: 'Specify file name for resources list to be undeleted.'
-    option :check, type: :boolean, aliases: '-c', desc: 'Check the resources to be deleted.'
     def sqs_queue
       ignores = Seiton::Ignores.new(options[:ignores_file], options[:ignores]).generate
       seiton = Seiton::Sqs.new

data/lib/seiton/common.rb

@@ -38,25 +38,5 @@ module Seiton
       end
       volume_ids
     end
-
-    def ignores(ignores_file, ignore_list)
-      ignores = nil
-      begin
-        File.open(ignores_file) do |file|
-          file.read.split("\n").each do |ignore|
-            ignores << ignore
-          end
-        end
-      rescue SystemCallError => e
-        puts e.message
-        exit 1
-      rescue IOError => e
-        puts e.message
-        exit 1
-      end unless ignore_file.nil?
-      ignores.concat(ignore_list) unless ignore_list.nil?
-
-      ignores
-    end
   end
 end

data/lib/seiton/ec2.rb

@@ -156,10 +156,10 @@ module Seiton
         exit 0
       end
 
-      ec2_snapshot(delete_image_ids)
+      ebs_snapshot(delete_image_ids)
     end
 
-    def ec2_snapshots(check = false, dt, ignores)
+    def ebs_snapshots(check = false, dt, ignores)
       if check
         log.info('List up the resources to be removed.')
       else
@@ -202,7 +202,7 @@ module Seiton
       end
 
       puts display_snapshot_resources(delete_snapshots)
-      generator_ec2_snapshots_check(delete_snapshots)
+      generator_ebs_snapshots_check(delete_snapshots)
       exit 0 if check
 
       delete_snapshot_ids = []
@@ -219,10 +219,10 @@ module Seiton
         exit 0
       end
 
-      ec2_snapshot(delete_image_ids)
+      ebs_snapshot(delete_image_ids)
     end
 
-    def ec2_snapshot(delete_image_ids)
+    def ebs_snapshot(delete_image_ids)
       log.info('Start EC2 Snapshot deleting.')
       res = ec2_client.describe_snapshots(owner_ids: [iam_user.arn.split(':')[4]])
       delete_snapshots = []
@@ -238,7 +238,7 @@ module Seiton
       end
 
       puts display_snapshot_resources(delete_snapshots)
-      generator_ec2_snapshots_check(delete_snapshots)
+      generator_ebs_snapshots_check(delete_snapshots)
 
       if process_ok?
         begin

data/lib/seiton/version.rb

@@ -1,3 +1,3 @@
 module Seiton
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiton
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - inokappa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,18 +125,18 @@ files:
 - bin/setup
 - exe/seiton
 - lib/seiton.rb
+- lib/seiton/checks/ec2.rb
+- lib/seiton/checks/rds.rb
+- lib/seiton/checks/sqs.rb
 - lib/seiton/cli.rb
 - lib/seiton/client.rb
 - lib/seiton/common.rb
 - lib/seiton/ec2.rb
-- lib/seiton/ec2_check.rb
 - lib/seiton/ext.rb
 - lib/seiton/ignores.rb
 - lib/seiton/init.rb
 - lib/seiton/rds.rb
-- lib/seiton/rds_check.rb
 - lib/seiton/sqs.rb
-- lib/seiton/sqs_check.rb
 - lib/seiton/version.rb
 - seiton.gemspec
 homepage: https://github.com/oreno-tools/seiton