dyna 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4c57e85bcc9f5bce4b084da7b9c6c7338529d1b83512b1549bc31f47d48bc1e
-  data.tar.gz: 5a14ba531ff8a96bb56ccd09af7db82d8c9e6a3024f3051be520203a890d382e
+  metadata.gz: b2520a55eb00141922591e6267ab65b2b970e4f8d9fa0467aa036df4256906d7
+  data.tar.gz: c5ec98a3593ef45628fec2f16b7a5a7fe409d1ed1b46264ece28ee05482df9ab
 SHA512:
-  metadata.gz: cf9547e5373b6b690623732de1c70a2efce0128863f53a92a1cbffcc7539ca5294299a993ecf587af339a1fce3fd7ef3f549e5f4313e3b3283003ccb9a54f28c
-  data.tar.gz: cbefd166bad5e80202ef3d0f9e5f73da90642fbb0dbce0e6a1c406e85143cae539fc0f7464c0240c88d6c31a21c1f1f6c3c6d4d2d654e069342243c14c7a0d67
+  metadata.gz: ed0a5b3f61a5b1c059799c106fa15e0ff7e921cc7904590745ac97157a6c824fe696736085f82600eb2df9d1a7644d2005ac978453bc143387365891eba7b22c
+  data.tar.gz: 7709061ccca28977623adbfa5c0e44838103360e2abd0ea3fc7c6b700f4505cb8d7f93fcf2dff6a17ddb3fd1e32f632bb1c4f7e34fd5afc0e626e264b409c730

data/README.md

@@ -41,6 +41,7 @@ Usage: dyna [options]
     -k, --access-key ACCESS_KEY
     -s, --secret-key SECRET_KEY
     -r, --region REGION
+        --endpoint DYNAMO_ENDPOINT
     -a, --apply
     -f, --file FILE
     -n, --table_names TABLE_LIST
@@ -74,6 +75,11 @@ dynamo_db "ap-northeast-1" do
       attribute_type: "S",
     )
 
+    time_to_live_specification(
+      enabled: true,
+      attribute_name: "ttl",
+    )
+
     provisioned_throughput(
       read_capacity_units: 1,
       write_capacity_units: 2,

data/bin/dyna

@@ -45,6 +45,7 @@ ARGV.options do |opt|
     opt.on('-s', '--secret-key SECRET_KEY')                  {|v| secret_key                    = v      }
     opt.on('-r', '--region REGION')                          {|v| region                        = v      }
     opt.on('-l', '--use-local')                              {    options[:use_local]           = true   }
+    opt.on('',   '--endpoint DYNAMO_ENDPOINT')               {|v| options[:dynamo_endpoint]     = v      }
     opt.on('-a', '--apply')                                  {    mode                          = :apply }
     opt.on('-f', '--file FILE')                              {|v| file                          = v      }
     opt.on('',   '--table_names TABLE_NAMES', Array)         {|v| options[:table_names]         = v      }

data/dyna.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hashie', '~> 3.4'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.4'
 end

data/lib/dyna/dsl/table.rb

@@ -13,6 +13,10 @@ module Dyna
             :table_name => table_name,
             :scalable_targets => [],
             :scaling_policies => [],
+            :time_to_live_specification => {
+              enabled: false,
+              attribute_name: nil,
+            }
           })
           instance_eval(&block)
         end
@@ -100,6 +104,13 @@ module Dyna
           }
         end
 
+        def time_to_live_specification(enabled:, attribute_name:)
+          @result.time_to_live_specification = {
+            enabled: enabled,
+            attribute_name: attribute_name,
+          }
+        end
+
         class LocalSecondaryIndex
           attr_accessor :result
 

data/lib/dyna/exporter.rb

@@ -119,6 +119,7 @@ module Dyna
     end
 
     def self.scalable_targets_by_resource_id
+      return {} unless @aas
       return @scalable_targets_by_resource_id if @scalable_targets_by_resource_id
 
       results = []
@@ -138,6 +139,7 @@ module Dyna
     end
 
     def self.scaling_policies_by_resource_id
+      return {} unless @aas
       return @scaling_policies_by_resource_id if @scaling_policies_by_resource_id
 
       results = []

data/lib/dyna/version.rb

@@ -1,3 +1,3 @@
 module Dyna
-  VERSION = '0.2.0'
+  VERSION = '0.2.3'
 end

data/lib/dyna/wrapper/dynamo_db_wrapper.rb

@@ -23,6 +23,7 @@ module Dyna
         params = dsl.symbolize_keys
         params.delete(:scalable_targets)
         params.delete(:scaling_policies)
+        params.delete(:time_to_live_specification)
         result = @ddb.create_table(params)
         @options.updated = true
         result

data/lib/dyna/wrapper/table.rb

@@ -31,6 +31,9 @@ module Dyna
           wait_until_table_is_active
           update_stream_specification(dsl_stream_specification(dsl))
         end
+        unless time_to_live_eql?(dsl)
+          update_time_to_live(dsl)
+        end
         unless auto_scaling_eql?(dsl)
           update_auto_scaling(dsl)
         end
@@ -65,6 +68,23 @@ module Dyna
       end
 
       private
+
+      def aws_time_to_live
+        @ttl ||= @ddb.describe_time_to_live(table_name: @table.table_name).time_to_live_description
+      end
+
+      def time_to_live_eql?(dsl)
+        wait_until_table_is_active
+        ttl = aws_time_to_live
+        unless %w/ENABLED DISABLED/.include?(ttl.time_to_live_status)
+          raise "time to live status is #{ttl.time_to_live_status} and must be ENABLED or DISABLED to apply"
+        end
+        same_status = dsl.time_to_live_specification.enabled.to_s == 'false' && ttl.time_to_live_status == 'DISABLED' || dsl.time_to_live_specification.enabled.to_s == 'true' && ttl.time_to_live_status == 'ENABLED'
+        same_name = dsl.time_to_live_specification.attribute_name.to_s == ttl.attribute_name.to_s
+
+        same_status && same_name
+      end
+
       def auto_scaling_eql?(dsl)
         scalable_targets_eql?(dsl) && scaling_policies_eql?(dsl)
       end
@@ -218,7 +238,7 @@ module Dyna
           df_params[:billing_mode] = definition[:billing_mode]
         end
 
-        if provisioned_throughput_eql?(dsl) == false && dsl[:scalable_targets].empty?
+        if dsl[:provisioned_throughput] && provisioned_throughput_eql?(dsl) == false && dsl[:scalable_targets].empty?
           params[:provisioned_throughput] = dsl[:provisioned_throughput].symbolize_keys
           df_params[:provisioned_throughput] = self_provisioned_throughput[:provisioned_throughput]
         end
@@ -262,6 +282,11 @@ module Dyna
       end
 
       def update_auto_scaling(dsl)
+        unless @options.aas
+          log(:warn, "auto scalings can not be used in local mode.".yellow, false)
+          return
+        end
+
         has_change = false
         unless scalable_targets_eql?(dsl)
           has_change = true
@@ -302,6 +327,31 @@ module Dyna
           @options.updated = true
         end
       end
+
+      def update_time_to_live(dsl)
+        params = { table_name: @table.table_name }
+        if dsl.time_to_live_specification.enabled.to_s == 'true'
+          params[:time_to_live_specification] = {
+            enabled: dsl.time_to_live_specification.enabled,
+            attribute_name: dsl.time_to_live_specification.attribute_name,
+          }
+        else
+          params[:time_to_live_specification] = {
+            enabled: false,
+            attribute_name: aws_time_to_live.attribute_name,
+          }
+        end
+
+        log(:info, "  table: #{@table.table_name}(update time to live)".green, false)
+        log(:info, "    => enabled: #{params[:time_to_live_specification][:enabled]}".cyan, false)
+        log(:info, "    => attribute_name: #{params[:time_to_live_specification][:attribute_name]}".cyan, false)
+
+        unless @options.dry_run
+          log(:debug, params, false)
+          @ddb.update_time_to_live(params)
+          @options.updated = true
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyna
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - wata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
@@ -98,16 +98,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -187,8 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Codenize DynamoDB table