seiton 0.0.8 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9066a9f491889c3dded8379e4798f98bc99aee4a1cbae191368a3a6d634cbd9
-  data.tar.gz: ef1c4e9809d8393370f01d63f2689f6196a78c9d55c3bc0aea991e67b8e82c0a
+  metadata.gz: bfa987c327a26a6b36e5de1c0e88c4c29c6463855253559954e71998040ff13e
+  data.tar.gz: '09697cbfb9a2f95ae5a28b4b2aa65799b38038a5ee49ebdcfd17b884ca68cdec'
 SHA512:
-  metadata.gz: bb4074b6a8fc4b5fe520c0a174d54395773d21399c36b5185e6763588183238fbf373f5cdf54a284f06311d9072d4e6c8548fb1850147d6adaa226e3d1ad4031
-  data.tar.gz: f8f37955bffacf1fc3b6f18be5b619d1c0654ab6e8b676036d8d11a862eab404d9236f5f34532286003f82306dd69fb47f2de60a38dfdf646aaddfc3c2033ec1
+  metadata.gz: d5ec8973038887ef30e0ca987813a3306fb2e86710e95df11e7ed1ff1c878048e8fe8bb20c292d5859fd8079debd8f27ac8dabb36dc8292c480768264ca540a3
+  data.tar.gz: 1c5a9d41177a879adfa4bf53ec0a3ffd69c68f45db76d2a83b835982281840c24e0ff2aa2169714a7822dd7e1a8e698411972c7a02c964d77b0619f06027a4d1

data/.circleci/config.yml

@@ -0,0 +1,33 @@
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: cimg/ruby:2.6.5
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "Gemfile.lock" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            bundle exec rake spec
+      # collect reports
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results

data/README.md

@@ -1,4 +1,4 @@
-# seiton
+# seiton [![CircleCI](https://circleci.com/gh/oreno-tools/seiton.svg?style=svg)](https://circleci.com/gh/oreno-tools/seiton)
 
 The seiton (整頓) tidies up your AWS Resources.
 
@@ -8,7 +8,6 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'seiton'
-gem 'rake' # require
 ```
 
 And then execute:
@@ -31,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.
@@ -39,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
@@ -102,7 +107,7 @@ bundle exec seiton ami --before-datetime=2020/01/01 --ignores=xxxx yyyy zzzz
 
 ```sh
 bundle exec rake check:ec2_images    # AMI 
-bundle exec rake check:ec2_snapshots # Snapshot
+bundle exec rake check:ebs_snapshots # Snapshot
 ```
 
 ### Delete EIP
@@ -233,9 +238,9 @@ bundle exec rake check:db_snapshots  # RDS Snapshot
 #### help
 
 ```sh
-$ bundle exec seiton --help ec2_snapshot
+$ bundle exec seiton --help ebs_snapshot
 Usage:
-  seiton ec2_snapshot
+  seiton ebs_snapshot
 
 Options:
   -b, [--before-datetime=BEFORE_DATETIME]  # Specify the date and time for deletion (delete resources before the specified date and time.)
@@ -248,25 +253,25 @@ Delete the EC2 Snapshot.
 #### check
 
 ```sh
-bundle exec seiton ec2_snapshot --before-datetime=2020/01/01 --check
+bundle exec seiton ebs_snapshot --before-datetime=2020/01/01 --check
 ```
 
 #### delete
 
 ```sh
-bundle exec seiton ec2_snapshot --before-datetime=2020/01/01
+bundle exec seiton ebs_snapshot --before-datetime=2020/01/01
 ```
 
 #### ignore
 
 ```sh
-bundle exec seiton ec2_snapshot --before-datetime=2020/01/01 --ignores=xxxx yyyy zzzz
+bundle exec seiton ebs_snapshot --before-datetime=2020/01/01 --ignores=xxxx yyyy zzzz
 ```
 
 #### Testing for delete complete
 
 ```sh
-bundle exec rake check:ec2_snapshots  # EC2 Snapshot
+bundle exec rake check:ebs_snapshots  # EC2 Snapshot
 ```
 
 ### Delete SQS Queue

data/lib/seiton.rb

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

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

@@ -17,8 +17,7 @@ end
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "ec2_instance_spec.rb", "w") do |file|
+      File.open("spec/" + "ec2_instance_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end
@@ -32,8 +31,7 @@ describe ebs("<%= resource.volume_id %>") do
 end
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "ec2_volumes_spec.rb", "w") do |file|
+      File.open("spec/" + "ec2_volumes_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end
@@ -56,21 +54,19 @@ end
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "ec2_images_spec.rb", "w") do |file|
+      File.open("spec/" + "ec2_images_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       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
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "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
@@ -92,8 +88,7 @@ end
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "ec2_eips_spec.rb", "w") do |file|
+      File.open("spec/" + "ec2_eips_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end

data/lib/seiton/{rds_check.rb → checks/rds.rb}

@@ -11,8 +11,7 @@ ignore|<%= resouce.db_cluster_snapshot_identifier %>
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "db_snapshots_list.txt", "w") do |file|
+      File.open("spec/" + "db_snapshots_list.txt", "w") do |file|
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       end
     end

data/lib/seiton/{sqs_check.rb → checks/sqs.rb}

@@ -17,8 +17,7 @@ end
 <%- end -%>
 <% end %>
 EOF
-      FileUtils.mkdir_p("check") unless FileTest.exist?("check")
-      File.open("check/" + "sqs_queue_spec.rb", "w") do |file|
+      File.open("spec/" + "sqs_queue_spec.rb", "w") do |file|
         file.puts "require 'spec_helper'"
         file.puts ERB.new(template, nil, "-").result(binding).gsub(/^\n/, "")
       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/init.rb

@@ -47,7 +47,7 @@ namespace :check do
       t.rspec_opts = ["--format documentation"]
       t.pattern = "spec/\#{target}_spec.rb"
       t.verbose = true
-    end if target != 'ec2_snapshot'
+    end if target != 'ebs_snapshot'
   end
 
   targets2.each do |target|
@@ -95,7 +95,7 @@ def ignore_resource?(resource)
   return r, deleted, not_deleted
 end
 
-def check_ec2_snapshots(resouces)
+def check_ebs_snapshots(resouces)
   resouces.each do |resouce|
     r, deleted, not_deleted = ignore_resource?(resouce)
     begin

data/lib/seiton/{ec2.rb → resouces/ec2.rb}

@@ -102,7 +102,8 @@ module Seiton
       end
       res = ec2_client.describe_images({ owners: ['self'] })
       delete_images = []
-      res.images.each do |delete_image|
+      _images = res.images.sort_by { |x| x.creation_date }
+      _images.each do |delete_image|
         if datetime_parse(delete_image.creation_date) < datetime_parse(dt)
           delete_images << delete_image
         end
@@ -156,10 +157,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
@@ -167,7 +168,8 @@ module Seiton
       end
       res = ec2_client.describe_snapshots({ owner_ids: ['self'] })
       delete_snapshots = []
-      res.snapshots.each do |delete_snapshot|
+      _snapshots = res.snapshots.sort_by { |x| x.start_time }
+      _snapshots.each do |delete_snapshot|
         if datetime_parse(delete_snapshot.start_time) < datetime_parse(dt)
           delete_snapshots << delete_snapshot
         end
@@ -202,14 +204,14 @@ 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 = []
       if process_ok?
         begin
           delete_snapshots.each do |s|
-            delete_snapshot_ids << s.snaphost_id
+            delete_snapshot_action(s.snapshot_id)
           end
         rescue StandardError => e
           log.error(e)
@@ -218,11 +220,9 @@ module Seiton
       else
         exit 0
       end
-
-      ec2_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.0.8"
+  VERSION = "0.1.3"
 end

data/seiton.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.1.4"
-  spec.add_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_dependency "rake"
   spec.add_dependency 'thor'
   spec.add_dependency 'aws-sdk'
   spec.add_dependency 'terminal-table'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: seiton
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.3
 platform: ruby
 authors:
 - inokappa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - Gemfile
 - README.md
@@ -124,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/resouces/ec2.rb
+- lib/seiton/resouces/rds.rb
+- lib/seiton/resouces/sqs.rb
 - lib/seiton/version.rb
 - seiton.gemspec
 homepage: https://github.com/oreno-tools/seiton