seiton 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68c2eabf63161a231cb8de12a3836e3dbc0e66e73410978fe0f08600c4f916dd
-  data.tar.gz: 38e22caf6a46b10b8e5a133015da577b7c619801a8609f7a22ba7f8cdbbd042b
+  metadata.gz: 39b7e9ace75ea8a043e1fb37a7e38c932cee67a200da207c6fa436ade1b7fa8a
+  data.tar.gz: e013585b389fe0da300039dee1f894082825ce9b01483eb35cf41d9d3f9d2859
 SHA512:
-  metadata.gz: b99b0b5a3abe2d580c487c854a4d773f4e4dfa0ca19e01f484d36741a9b79df626dcee82ff17b3847dbee953cc52c8f9ea90e09cf52a2f3f3750e93dd320aa3f
-  data.tar.gz: 0d156ec83984ad4e0786824beeec9d7ebd5d6e6f56ec9d638af3ee09b6400a327ee3ceba4b4d626ae701a0175efd80c3e3e44d6390617582a325576a4f6caf98
+  metadata.gz: 6e68a105ead395cd8e7ecb39c577c67f761548e9ad08882feecdf4fb2a65932ecd2d3a54d1591f4d6c08a5264bd9abd7ffa7d329aa48d8920cdfadbb0778296e
+  data.tar.gz: ccb2ab88627ced7be15f1e3bb10a9cbf19e5278db9d9f03303097109e010d81918c8a4fbf8faf1abed743a67947227192fcb5cf7b8f36ff391754b36119f8575

data/README.md

@@ -107,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
@@ -238,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.)
@@ -253,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

@@ -3,12 +3,12 @@ require 'seiton/client'
 require 'seiton/common'
 require 'seiton/ext'
 require 'seiton/checks/ec2'
-require 'seiton/ec2'
+require 'seiton/resouces/ec2'
 require 'seiton/ignores'
 require 'seiton/checks/rds'
-require 'seiton/rds'
+require 'seiton/resouces/rds'
 require 'seiton/checks/sqs'
-require 'seiton/sqs'
+require 'seiton/resouces/sqs'
 require 'seiton/version'
 
 module Seiton

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|

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
@@ -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

data/lib/seiton/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiton
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - inokappa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,12 +131,12 @@ files:
 - lib/seiton/cli.rb
 - lib/seiton/client.rb
 - lib/seiton/common.rb
-- lib/seiton/ec2.rb
 - lib/seiton/ext.rb
 - lib/seiton/ignores.rb
 - lib/seiton/init.rb
-- lib/seiton/rds.rb
-- lib/seiton/sqs.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