dynamodb_framework 1.6.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 55a46773068e83886458c0eee5039bd178b19fbc
-  data.tar.gz: 20f5be12c0088c57f66bcbb6000b3a46513a9979
+SHA256:
+  metadata.gz: 5d9a2ecc9b210da16d54487ea960efebff8288ddc48377fd502074d7f097a465
+  data.tar.gz: 4cc72bf572029b6cfc3e1387c54e421dd918b025742dda9829d5879ade7bfcab
 SHA512:
-  metadata.gz: 07451860166a51aafc5d9f19f0fe91e96c92f3fc97a5946f17912cc0848b807e74426577ff7a856a081967282c9510ac0d7a8abaa39da0a4713dac42abae057d
-  data.tar.gz: c91698ba754717a5c523d80cd25b92793453106a5b1676acca0bb815eece2742cea1d733f0c468b9d9cda08bb41c87c1f62a685bc1f247e51d123ba89fe7a661
+  metadata.gz: d00e324200b92de8f700d48440148ab9b57eae283e6203a0d0bfcfc24fb529a4bdef5b3f5d3e00f10a4f392e1be8365f288b4f66968e32371d7402eacb8527cd
+  data.tar.gz: 2e1274ede9f04d24b38ef7c93910e988d80f192a9e8899f082e049dae1f660ac632748ebf2b37b42e9dd888c6528f28c445e7a29aa7c580ac4b66431ed31f3a5

data/lib/dynamodb_framework/dynamodb_index.rb

@@ -46,7 +46,7 @@ module DynamoDbFramework
       self.instance_variable_set(:@range_key, { field: field, type: type })
     end
 
-    def create(store: DynamoDbFramework.default_store, read_capacity: 25, write_capacity: 25, submit: true)
+    def create(store: DynamoDbFramework.default_store, read_capacity: 25, write_capacity: 25, submit: true, billing_mode: 'PROVISIONED')
       unless self.instance_variable_defined?(:@table)
         raise DynamoDbFramework::Index::InvalidConfigException.new('Table must be specified.')
       end
@@ -84,10 +84,10 @@ module DynamoDbFramework
 
       range_key_field = range_key[:field] unless range_key == nil
 
-      index =table_manager.create_global_index(full_index_name, partition_key[:field], range_key_field, read_capacity, write_capacity)
+      index =table_manager.create_global_index(full_index_name, partition_key[:field], range_key_field, read_capacity, write_capacity, billing_mode)
 
       if submit
-        table_manager.add_index(table_name, builder.attributes, index)
+        table_manager.add_index(table_name, builder.attributes, index, billing_mode)
       end
 
       index

data/lib/dynamodb_framework/dynamodb_table_manager.rb

@@ -66,7 +66,7 @@ module DynamoDbFramework
 
     end
 
-    def add_index(table_name, attributes, global_index)
+    def add_index(table_name, attributes, global_index, billing_mode = 'PROVISIONED')
 
       attribute_definitions = []
 
@@ -79,7 +79,8 @@ module DynamoDbFramework
           :attribute_definitions => attribute_definitions,
           :global_secondary_index_updates => [
               :create => global_index
-          ]
+          ],
+          :billing_mode => billing_mode
       }
 
       dynamodb.client.update_table(table)
@@ -115,6 +116,33 @@ module DynamoDbFramework
       DynamoDbFramework.logger.info "[#{self.class}] -Table: [#{table_name}] updated."
     end
 
+    def update_ttl_attribute(table_name, enabled, attribute_name)
+      table = {
+          :table_name => table_name,
+          :time_to_live_specification => {
+            :enabled => enabled,
+            :attribute_name => attribute_name
+          }
+      }
+
+      DynamoDbFramework.logger.info "[#{self.class}] -Updating TTL Attribute: #{attribute_name}."
+      dynamodb.client.update_time_to_live(table)
+
+      # wait for table to be updated
+      DynamoDbFramework.logger.info "[#{self.class}] -Waiting for table: [#{table_name}] to be updated."
+      wait_until_ttl_changed(table_name)
+
+      DynamoDbFramework.logger.info "[#{self.class}] -Table: [#{table_name}] updated."
+    end
+
+    def get_ttl_status(table_name)
+      table = {
+        :table_name => table_name
+      }
+
+      dynamodb.client.describe_time_to_live(table)['time_to_live_description']
+    end
+
     def drop_index(table_name, index_name)
       unless has_index?(table_name, index_name)
         return
@@ -235,7 +263,25 @@ module DynamoDbFramework
 
     end
 
-    def create(table_name, attributes, partition_key, range_key = nil, read_capacity = 20, write_capacity = 10, global_indexes = nil)
+    def wait_until_ttl_changed(table_name)
+
+      end_time = wait_timeout
+      while Time.now < end_time do
+
+        status = get_ttl_status(table_name)['time_to_live_status']
+
+        if status == 'ENABLED' || status == 'DISABLED'
+          return
+        end
+
+        sleep(5)
+      end
+
+      raise "Timeout occurred while waiting for table: #{table_name}, to update TTL status."
+
+    end
+
+    def create(table_name, attributes, partition_key, range_key = nil, read_capacity = 20, write_capacity = 10, global_indexes = nil, billing_mode = 'PROVISIONED')
 
       if exists?(table_name)
         return
@@ -257,11 +303,17 @@ module DynamoDbFramework
           :table_name => table_name,
           :attribute_definitions => attribute_definitions,
           :key_schema => key_schema,
+          :billing_mode => billing_mode
+      }
+
+      unless billing_mode == 'PAY_PER_REQUEST'
+        table = table.merge(
           :provisioned_throughput => {
-              :read_capacity_units => read_capacity,
-              :write_capacity_units => write_capacity
+            :read_capacity_units => read_capacity,
+            :write_capacity_units => write_capacity
           }
-      }
+        )
+      end
 
       if global_indexes != nil
         table[:global_secondary_indexes] = global_indexes
@@ -316,17 +368,27 @@ module DynamoDbFramework
           :table_name => table_name,
           :attribute_definitions => attribute_definitions,
           :key_schema => key_schema,
+          :billing_mode => options[:billing_mode] || 'PROVISIONED'
+      }
+
+      unless options[:billing_mode] == 'PAY_PER_REQUEST'
+        table = table.merge(
           :provisioned_throughput => {
-              :read_capacity_units => options[:read_capacity],
-              :write_capacity_units => options[:write_capacity]
+            :read_capacity_units => options[:read_capacity],
+            :write_capacity_units => options[:write_capacity]
           }
-      }
+        )
+      end
 
       if options[:global_indexes] != nil
         table[:global_secondary_indexes] = options[:global_indexes]
       end
 
-      dynamodb.client.create_table(table)
+      begin
+        dynamodb.client.create_table(table)
+      rescue Aws::DynamoDB::Errors::ResourceInUseException => e
+        DynamoDbFramework.logger.warn "[#{self.class}] - Table #{table_name} already exists!"
+      end
 
       # wait for table to be created
       DynamoDbFramework.logger.info "[#{self.class}] - Waiting for table: [#{table_name}] to be created."
@@ -334,7 +396,7 @@ module DynamoDbFramework
       DynamoDbFramework.logger.info "[#{self.class}] - Table: [#{table_name}] created."
     end
 
-    def create_global_index(name, partition_key, range_key = nil, read_capacity = 20, write_capacity = 10)
+    def create_global_index(name, partition_key, range_key = nil, read_capacity = 20, write_capacity = 10, billing_mode = 'PROVISIONED')
 
       key_schema = []
 
@@ -348,13 +410,18 @@ module DynamoDbFramework
           :key_schema => key_schema,
           :projection => {
               :projection_type => :ALL
-          },
-          :provisioned_throughput => {
-              :read_capacity_units => read_capacity,
-              :write_capacity_units => write_capacity,
           }
       }
 
+      if billing_mode == 'PROVISIONED'
+        index = index.merge(
+          :provisioned_throughput => {
+            :read_capacity_units => read_capacity,
+            :write_capacity_units => write_capacity,
+          }
+        )
+      end
+
       return index
     end
 

data/lib/dynamodb_framework/version.rb

@@ -1,3 +1,3 @@
 module DynamoDbFramework
-  VERSION = '1.6.1'
+  VERSION = '2.0.0'
 end

data/spec/{dynamodb_table_manager_spec.rb → dynamodb_framework/dynamodb_table_manager_spec.rb}

@@ -117,6 +117,56 @@ RSpec.describe DynamoDbFramework::TableManager do
 
   end
 
+  it 'can update the TTL attribute' do
+
+    exists = subject.exists?('update_ttl_test')
+
+    if exists
+      subject.drop('update_ttl_test')
+    end
+
+    builder = DynamoDbFramework::AttributesBuilder.new
+    builder.add(:ttl_date, :N)
+
+    subject.create('update_ttl_test', builder.attributes, :ttl_date)
+
+    subject.update_ttl_attribute('update_ttl_test', true, 'ttl_date')
+
+    expect(subject.get_ttl_status('update_ttl_test')['time_to_live_status']).to eq('ENABLED')
+
+    subject.drop('update_ttl_test')
+
+  end
+
+  it 'can disable the TTL attribute' do
+
+    exists = subject.exists?('update_ttl_test')
+
+    if exists
+      subject.drop('update_ttl_test')
+    end
+
+    builder = DynamoDbFramework::AttributesBuilder.new
+    builder.add(:ttl_date, :N)
+
+    subject.create('update_ttl_test', builder.attributes, :ttl_date)
+
+    subject.update_ttl_attribute('update_ttl_test', true, 'ttl_date')
+
+    subject.update_ttl_attribute('update_ttl_test', false, 'ttl_date')
+
+    expect(subject.get_ttl_status('update_ttl_test')['time_to_live_status']).to eq('DISABLED')
+
+    subject.drop('update_ttl_test')
+
+  end
+
+  it 'handles timeouts when dynamodb fails to respond' do
+    allow(subject).to receive('wait_timeout').and_return(Time.now)
+
+    expect{subject.wait_until_ttl_changed('update_ttl_test')}.to raise_error("Timeout occurred while waiting for table: update_ttl_test, to update TTL status.")
+  end
+
   it 'can drop an existing global secondary index' do
 
     exists = subject.exists?('drop_index_test')

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
 require "rubygems"
 require "bundler"
-require 'aws-sdk-core'
+require 'aws-sdk-dynamodb'
 require 'dynamodb_framework'
 require_relative '../spec/test_migration_script1'
 require_relative '../spec/test_migration_script2'
@@ -9,12 +14,7 @@ require_relative '../spec/example_table'
 require_relative '../spec/example_index'
 require 'pry'
 
-require 'simplecov'
-SimpleCov.start do
-  add_filter '/spec/'
-end
-
-DYNAMODB_STORE_ENDPOINT = 'http://dynamodb:8000'
+DYNAMODB_STORE_ENDPOINT = ENV.fetch('DYNAMODB_ENDPOINT', 'http://localhost:8000')
 
 Aws.config[:credentials] = Aws::Credentials.new('test_key', 'test_secret')
 Aws.config[:region] = 'eu-west-1'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb_framework
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.0.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -95,23 +95,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: aws-sdk-dynamodb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 description: A lightweight framework to provide managers for working with aws dynamodb
   (incuding local version).
 email:
-- vaughanbritton@gmail.com
+- vaughan.britton@sage.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -132,16 +146,16 @@ files:
 - lib/dynamodb_framework/dynamodb_table_manager.rb
 - lib/dynamodb_framework/hash_helper.rb
 - lib/dynamodb_framework/version.rb
-- spec/dynamodb_index_spec.rb
-- spec/dynamodb_migration_manager_spec.rb
-- spec/dynamodb_namespace_migration_manager_spec.rb
-- spec/dynamodb_query_spec.rb
-- spec/dynamodb_repository_spec.rb
-- spec/dynamodb_table_manager_spec.rb
-- spec/dynamodb_table_spec.rb
+- spec/dynamodb_framework/dynamodb_index_spec.rb
+- spec/dynamodb_framework/dynamodb_migration_manager_spec.rb
+- spec/dynamodb_framework/dynamodb_namespace_migration_manager_spec.rb
+- spec/dynamodb_framework/dynamodb_query_spec.rb
+- spec/dynamodb_framework/dynamodb_repository_spec.rb
+- spec/dynamodb_framework/dynamodb_table_manager_spec.rb
+- spec/dynamodb_framework/dynamodb_table_spec.rb
+- spec/dynamodb_framework/hash_helper_spec.rb
 - spec/example_index.rb
 - spec/example_table.rb
-- spec/hash_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_item.rb
 - spec/test_migration_script1.rb
@@ -165,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A lightweight framework to provide managers for working with aws dynamodb