soar-registry-directory 4.0.5 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 028c696fe4354e757584a552ba8540d3e1aa222c
-  data.tar.gz: 8f29ac83d07c6e88c7335a178d2a74b530155207
+  metadata.gz: f7534aad40030456e9a4b9fc88d8a58d52e2817a
+  data.tar.gz: 1afbcb2d7d1a1441eb2e0e5067399c237e3fb19f
 SHA512:
-  metadata.gz: 99bbd361eff61065eb6f67002113464a576de434bb47168812c0669647617c2af2f189719ec3b6b3f19f81ae9cc47bf7c935711abe76aeb3740e064d99a30651
-  data.tar.gz: 7f9d2e5506a53f05c4e45f73cc67ddd9ae8bb6bb90fb3d37ee17cdfe0d92f2a822c14716c2104ccf29e9970062aa58610d8e58396d5fa3520916bca1c3bce3cd
+  metadata.gz: 4ba850d7503dffb59cf24d74eff42a43acdb1b145d4920b7e2b053bfcbbf449d8c7ddc76986575b6b4725251b1fe867b3201c54275bd9729bfb9de6ff9337d7d
+  data.tar.gz: f567f1b47129a1a61997af5b08f29e19c12671dead9e6d8a38974847fa282d6701c4df17fe1709661c3d7f13f7e304953c9ad05a31513c8ab326f64fa017c1eb

data/README.md

@@ -34,7 +34,9 @@ Create an instance of the stub provider by passing in the name, primary key and
         password: "secret"
     },
     table: "mytable",
-    index: ['uuid', 'email'],
+    index: 
+      partition_key: 'uuid',
+      sort_key: 'role'
     config: {
         region: 'us-west-2'
         endpoint: 'http://localhost:8000'
@@ -116,6 +118,7 @@ $ cucumber
 ```bash
 docker-compose --file docker-compose.stub.yml --project-name soar-registry-directory-provider-stub up --abort-on-container-exit --remove-orphans --build --force-recreate
 EXIT_CODE=$(docker ps -a -f "name=soarregistrydirectoryproviderstub_tests" -q | xargs docker inspect -f "{{ .State.ExitCode }}")
+docker-compose --file docker-compose.stub.yml --project-name soar-registry-directory-provider-stub down --rmi local
 exit $EXIT_CODE 
 ```
 
@@ -125,12 +128,14 @@ exit $EXIT_CODE
 ```bash
 $ docker-compose --file docker-compose.dynamo_db.yml up --remove-orphans
 $ CONFIG_FILE=config.dynamo_db.yml TEST_ORCHESTRATION_PROVIDER=DynamoDb cucumber
+$ docker-compose --file docker-compose.dynamo_db.yml down local
 ```
 
 #### CI
 ```bash
 docker-compose --file docker-compose.ci.dynamo_db.yml --project-name soar-registry-directory-provider-dynamo_db up --abort-on-container-exit --remove-orphans --build --force-recreate
 EXIT_CODE=$(docker ps -a -f "name=soarregistrydirectoryproviderdynamodb_tests" -q | xargs docker inspect -f "{{ .State.ExitCode }}")
+docker-compose --file docker-compose.ci.dynamo_db.yml --project-name soar-registry-directory-provider-dynamo_db down --rmi local
 exit $EXIT_CODE 
 ```
 
@@ -140,12 +145,14 @@ exit $EXIT_CODE
 ```bash
 $ docker-compose --file docker-compose.ldap.yml up --remove-orphans
 $ CONFIG_FILE=config.ldap.yml TEST_ORCHESTRATION_PROVIDER=Ldap cucumber
+$ docker-compose --file docker-compose.ldap.yml down local
 ```
 
 #### CI
 ```bash
 docker-compose --file docker-compose.ci.ldap.yml --project-name soar-registry-directory-provider-ldap up --abort-on-container-exit --remove-orphans --build --force-recreate
 EXIT_CODE=$(docker ps -a -f "name=soarregistrydirectoryproviderldap_tests" -q | xargs docker inspect -f "{{ .State.ExitCode }}")
+docker-compose --file docker-compose.ci.ldap.yml --project-name soar-registry-directory-provider-ldap down --rmi local
 exit $EXIT_CODE 
 ```
 
@@ -155,12 +162,14 @@ exit $EXIT_CODE
 ```bash
 $ docker-compose --file docker-compose.mysql.yml up --remove-orphans
 $ CONFIG_FILE=config.mysql.yml TEST_ORCHESTRATION_PROVIDER=Mysql cucumber
+$ docker-compose --file docker-compose.mysql.yml down --rmi local
 ```
 
 #### CI
 ```bash
 docker-compose --file docker-compose.ci.mysql.yml --project-name soar-registry-directory-provider-mysql up --abort-on-container-exit --remove-orphans --build --force-recreate
 EXIT_CODE=$(docker ps -a -f "name=soarregistrydirectoryprovidermysql_tests" -q | xargs docker inspect -f "{{ .State.ExitCode }}")
+docker-compose --file docker-compose.ci.mysql.yml --project-name soar-registry-directory-provider-mysql down --rmi local
 exit $EXIT_CODE 
 ```
 

data/lib/soar/registry/directory/error.rb

@@ -2,9 +2,10 @@ module Soar
   module Registry
       module Directory
         module Error
-          class NoEntriesFound < StandardError; end;
+          class NoEntriesFoundError < StandardError; end;
           class MultipleEntriesFound < StandardError; end;
           class NetworkingError < StandardError; end;
+          class DuplicateEntryError < StandardError; end;
       end
     end
   end

data/lib/soar/registry/directory/model.rb

@@ -12,23 +12,24 @@ module Soar
         attr_reader :provider
 
         ##
-        # @param provider [Soar::Registry::Directory::Provider::Stub, Soar::Registry::Directory::Provider::DynamoDb, Soar::Registry::Directory::Provider::Ldap, Soar::Registry::Directory::Provider::Mysql] object
+        # @param [Soar::Registry::Directory::Provider::Stub, Soar::Registry::Directory::Provider::DynamoDb, Soar::Registry::Directory::Provider::Ldap, Soar::Registry::Directory::Provider::Mysql] provider
         ##
         def initialize(provider)
           @provider = provider
         end
 
         ##
-        # @param entity [Hash]
-        # @raise [Soar::Registry::Directory::Error::NetworkingError]
+        # @param [Hash] entity
+        # @return [Boolean]
+        # @raise [Soar::Registry::Directory::Error::NetworkingError, Soar::Registry::Directory::Error::DuplicateEntryError]
         ##
         def put(entity)
           @provider.put(entity)
         end
 
         ##
-        # @param primary_key [String] 
-        # @return [Hash] the identity
+        # @param [String] primary_key
+        # @return [Hash] entry
         # @raise [Soar::Registry:::Directory::Error::NoEntriesFound] if primary key not found
         # @raise [Soar::Registry::Directory::Error::NetworkingError]
         ##
@@ -37,17 +38,17 @@ module Soar
         end
 
         ##
-        # @param key [String] attribute name
-        # @param value [String] attribute value
+        # @param [String] key 
+        # @param [String] value
         # @return [Array] list of entries
-        # @raise [Soar::Registry::Directory::Error::NetworkingError]
+        # @raise [ArgumentError, Soar::Registry::Directory::Error::NetworkingError]
         ##
         def search(key, value)
           @provider.search(key, value)
         end
 
         ##
-        # @return [Array] a list of primary keys and global secondary indexes
+        # @return [Array] a list of provider specific indexes
         # @raise [Soar::Registry::Directory::Error::NetworkingError]
         ##
         def index

data/lib/soar/registry/directory/provider/dynamo_db.rb

@@ -12,54 +12,67 @@ module Soar
           attr_accessor :client
 
           ##
-          # @param credentials [Hash] { username: 'username', password: 'secret'}
-          # @param table [String]
-          # @param index [Array] primary key should be the first item
-          # @param configuration [Hash] { region: 'us-west-2', endpoint: 'http://localhost:8000' }
+          # @param [Hash] credentials
+          # @option credentials [String] :username
+          # @option credentials [String] :password
+          # @param [String] table table name
+          # @param [Hash] index 
+          # @option index [String] :partition_key
+          # @option index [String] :sort_key
+          # @option index [Array] :global_secondary_indexes
+          # @param configuration [Hash]
+          # @option configuration [String] :region
+          # @option configuration [String] :endpoint
           ##
           def initialize(credentials: , table: , index: , configuration: )
             @table_name = table
-            @primary_key = index[0]
-            @index = index
+            @partition_key = index['partition_key']
+            @sort_key = index['sort_key'] if index.key?('sort_key')
+            @global_secondary_indexes = index['global_secondary_index'] if index.key?('global_secondary_index')
             @credentials = Hashie.symbolize_keys(credentials)
             configuration[:credentials] = Aws::Credentials.new(@credentials[:username], @credentials[:password])
             @client = Aws::DynamoDB::Client.new(Hashie.symbolize_keys(configuration))
           end
 
           ##
+          # @param [Hash] entry
+          # @return [Boolean]
+          # @raise [Soar::Registry::Directory::Error::DuplicateEntryError]
           ##
-          def put(entity)
+          def put(entry)
             adapt_exceptions do
               @client.put_item({
                 table_name: @table_name,
-                item: entity
+                item: entry,
+                condition_expression: "attribute_not_exists(#{@partition_key})"
               })
+              return true
             end
           end
 
           ##
-          # @param [String] identity_id primary key of the identity
-          # @return [Hash] the identity
-          # @raise [Soar::Registry::Staff::Directory::DynamoDb::Error::UniqueIdentifierNotFoundError] if primary key not found
+          # @param [Hash] primary_key 
+          # @option primary_key [String] :partition_key required
+          # @option primary_key [String] :sort_key required only when defined in schema
+          # @return [Hash] a single matching entry
+          # @raise [Soar::Registry::Directory::Error::NoEntriesFoundError] if primary key not found
           ##
           def fetch(primary_key)
             adapt_exceptions do
               options = {
                 table_name: @table_name,
-                key: {
-                  "#{@primary_key}": primary_key
-                }
+                key: primary_key
               }
               identity = @client.get_item(options)
-              raise Soar::Registry::Directory::Error::NoEntriesFound, "No entries found for #{@primary_key} = #{primary_key}" if identity.item.nil?
+              raise Soar::Registry::Directory::Error::NoEntriesFoundError, "No entries found for #{@primary_key} = #{primary_key}" if identity.item.nil?
               identity.item
             end
           end
 
           ##
-          # @param [String] identifier_attribute 
-          # @param [String] identifier_value
-          # @return [Array] list of identities
+          # @param [String] key
+          # @param [String] value
+          # @return [Array] list of matching entries
           # @raise [ArgumentError] if query or index is not specified
           ##
           def search(key, value)
@@ -74,7 +87,7 @@ module Soar
                 }
               }
 
-              options.merge!({index_name: "#{key}-index"}) if @index.include?(key)
+              options.merge!({index_name: "#{key}-index"}) if @global_secondary_indexes.include?(key)
               identity = @client.query(options)
               identity.items.map { |item| 
                 Hashie.stringify_keys(item)
@@ -93,20 +106,23 @@ module Soar
               indexed_attributes = []
               resp['table']['key_schema'].each { |key_schema|
                 indexed_attributes << key_schema['attribute_name']
-              }
+              } if resp['table'].key?('key_schema')
+
               resp['table']['global_secondary_indexes'].each { |index| 
                 index['key_schema'].each { |key_schema| 
                   indexed_attributes << key_schema['attribute_name']
                 }
-              }
+              } if resp['table'].key?('global_secondary_indexes')
+
               indexed_attributes
             end
           end
 
           ##
           # Deletes existing table and creates a new one in its place
-          # @param name [String] table name
-          # @param structure [Hash] table structure
+          # @param [String] name the table name
+          # @param [Hash] structure table structure
+          # @return [Boolean]
           ##
           def recreate_table(name: nil, structure: nil)
 
@@ -117,6 +133,7 @@ module Soar
                 })
               end
               @client.create_table(Hashie.symbolize_keys(structure))
+              return true
             end
 
           end
@@ -128,6 +145,8 @@ module Soar
               yield
             rescue Seahorse::Client::NetworkingError => e
               raise Soar::Registry::Directory::Error::NetworkingError, e.message
+            rescue Aws::DynamoDB::Errors::ConditionalCheckFailedException => e
+              raise Soar::Registry::Directory::Error::DuplicateEntryError, e.message
             end
           end
 

data/lib/soar/registry/directory/provider/ldap.rb

@@ -11,10 +11,14 @@ module Soar
           attr_accessor :client
 
           ##
-          # @param config [Hash]
-          # @param base [String] ldap tree base eg 'dc=hetzner,dc=co,dc=za'
-          # @param attributes [Array] array of attributes to return for queries
-          # @param credentials [Hash]
+          # @param [Hash] config
+          # @option config [String] :host
+          # @option config [Number] :port
+          # @param [String] base ldap tree base eg 'dc=hetzner,dc=co,dc=za'
+          # @param [Array] attributes array of attributes to return for queries
+          # @param [Hash] credentials
+          # @option credentials [String] :username
+          # @option credentials [String] :password
           ##
           def initialize(config: , base: , attributes: , index: , credentials: )
             adapt_exceptions do
@@ -37,29 +41,43 @@ module Soar
             end
           end
 
+          ##
+          # @param [Hash] entry
+          # @return [Boolean] 
+          # @raise [Soar::Registry::Directory::Error::DuplicateEntryError]
+          ##
           def put(entry)
             adapt_exceptions do
+
+              @index.each { |index| 
+                if (entry[:attributes].keys.include?(index))
+                  result = search(index, entry[:attributes][index])
+                  raise Soar::Registry::Directory::Error::DuplicateEntryError if result.length > 0
+                end
+              }
+
               @client.add({
                 dn: entry[:dn],
                 attributes: entry[:attributes]
               })
+              return true
             end
           end
 
           ##
-          # @param [String] uuid primary key of the identity
-          # @return [Hash] the identity
-          # @raise [Soar::Registry::Directory::Error::NoEntriesFound] if primary key not found
+          # @param [String] primary key of the identity ie. the first index
+          # @return [Hash] single matching entry
+          # @raise [Soar::Registry::Directory::Error::NoEntriesFoundError] if primary key not found
           # @raise [Soar::Registry::Directory::Error::MultipleEntriesFound] if multiple matches found
           ##
-          def fetch(uuid)
+          def fetch(primary_key)
             adapt_exceptions do
               result = @client.search({
                 attributes: @attributes,
-                filter: Net::LDAP::Filter.eq(@index[0], uuid),
+                filter: Net::LDAP::Filter.eq(@index[0], primary_key),
                 return_result: true
               })
-              raise Soar::Registry::Directory::Error::NoEntriesFound, "No entries found for #{@index[0]} = #{uuid}" if result.empty?
+              raise Soar::Registry::Directory::Error::NoEntriesFoundError, "No entries found for #{@index[0]} = #{primary_key}" if result.empty?
               raise Soar::Registry::Directory::Error::MultipleEntriesFound if result.length > 1
               response = {}
               @attributes.each { |attribute| 
@@ -71,9 +89,9 @@ module Soar
 
 
           ##
-          # @param key, named index [String] 
-          # @param value [String]
-          # @return [Array] list of identities
+          # @param [String] key
+          # @param [String] value
+          # @return [Array] list of matching entries
           # @raise [ArgumentError] if value or named index is not specified
           ##
           def search(key, value)
@@ -97,7 +115,7 @@ module Soar
           end
 
           ##
-          # @return [Array] a list of primary keys and global secondary indexes
+          # @return [Array] a list of indexes
           ##
           def index
             adapt_exceptions do
@@ -105,9 +123,14 @@ module Soar
             end
           end
 
+          ##
+          # @param [String] dn
+          # @return [Boolean]
+          ##
           def delete(dn)
             adapt_exceptions do
               @client.delete(dn: dn)
+              return true
             end
           end
 

data/lib/soar/registry/directory/provider/mysql.rb

@@ -10,10 +10,16 @@ module Soar
           attr_accessor :client
 
           ##
-          # @param config [Hash]
-          # @param base [String] ldap tree base eg 'dc=hetzner,dc=co,dc=za'
-          # @param attributes [Array] array of attributes to return for queries
-          # @param credentials [Hash]
+          # @param [Hash] config
+          # @option config [String] :host
+          # @option config [Number] :port
+          # @option config [String] :database name
+          # @option config [String] :table name 
+          # @param [Array] attributes array of attributes to return for queries 
+          # @param [Array] index array of indexes starting with the primary key
+          # @param [Hash] credentials
+          # @option credentials [String] :username
+          # @option credentials [String] :password
           ##
           def initialize(config: , attributes: '*', index: , credentials: )
             adapt_exceptions do
@@ -31,40 +37,45 @@ module Soar
             end
           end
 
+          ##
+          # @param [Hash] entry
+          # @return [Boolean]
+          ##
           def put(entry)
             adapt_exceptions do
               statement = @client.prepare("INSERT INTO #{@table} (#{entry.keys.join(', ')}) VALUES(#{entry.values.map { |s| "?" }.join(', ')})")
-              return statement.execute(*entry.values)
+              statement.execute(*entry.values)
+              return true
             end
           end
 
           ##
-          # @param [String] uuid primary key of the identity
-          # @return [Hash] the identity
-          # @raise [Soar::Registry::Directory::Error::NoEntriesFound] if primary key not found
+          # @param [String] primary key the first index
+          # @return [Hash] single matching entry
+          # @raise [Soar::Registry::Directory::Error::NoEntriesFoundError] if primary key not found
           # @raise [Soar::Registry::Directory::Error::MultipleEntriesFound] if multiple matches found
           ##
-          def fetch(uuid)
+          def fetch(primary_key)
             adapt_exceptions do
               statement = @client.prepare("SELECT #{@attributes} FROM #{@table} WHERE #{@index[0]} = ? LIMIT 1")
-              mysql_statement = statement.execute(uuid)
-              raise Soar::Registry::Directory::Error::NoEntriesFound, "No entries found for #{@index[0]} = #{uuid}" if mysql_statement.num_rows == 0
+              mysql_statement = statement.execute(primary_key)
+              raise Soar::Registry::Directory::Error::NoEntriesFoundError, "No entries found for #{@index[0]} = #{primary_key}" if mysql_statement.num_rows == 0
               mysql_result = mysql_statement.result_metadata
               fields = mysql_result.fetch_fields
               field_names = fields.map { |field| 
                 field.name
               }
               result = mysql_statement.fetch
-              Hash[result.map.with_index { |value, index| 
+              result = Hash[result.map.with_index { |value, index| 
                 [field_names[index.to_i], value]
               }].symbolize_keys
             end
           end
 
           ##
-          # @param key, named index [String] 
-          # @param value [String]
-          # @return [Array] list of identities
+          # @param [String] key should be in indexed in db schema 
+          # @param [String] value
+          # @return [Array] list of matching entries
           # @raise [ArgumentError] if value or named index is not specified
           ##
           def search(key, value)
@@ -87,7 +98,7 @@ module Soar
           end
 
           ##
-          # @return [Array] a list of primary keys and global secondary indexes
+          # @return [Array] a list of indexes the first being the primary key
           ##
           def index
             adapt_exceptions do

data/lib/soar/registry/directory/provider/stub.rb

@@ -10,9 +10,8 @@ module Soar
         class Stub
 
           ##
-          # @param table [String] table name
-          # @param primary_key [String]
-          # @param index [Array] primary key should be the first item 
+          # @param [String] table the table name
+          # @param [Array] indexes primary key should be the first item 
           ##
           def initialize(table: , index: )
             @interface = Mince::HashyDb::Interface
@@ -23,31 +22,37 @@ module Soar
           end
 
           ##
-          # @param entity [Hash]
+          # @param [Hash] entry
+          # @raise [Soar::Registry::Directory::Error::DuplicateEntryError]
+          # @return [Boolean]
           ##
-          def put(entity)
+          def put(entry)
             adapt_exceptions do
-              @interface.add(@table, entity)
+              if not @interface.get_for_key_with_value(@table, @primary_key, entry[@primary_key])
+                 @interface.add(@table, entry)
+                 return true
+              end
+              raise Soar::Registry::Directory::Error::DuplicateEntryError, "Unable to add duplicate entry for index #{@primary_key} with value #{entry[@primary_key]}"
             end
           end
 
           ##
-          # @param uuid [String]
-          # @return entry [Hash] 
-          # @raise [Soar::Registry:::Directory::Error::NoEntriesFound] if primary key not found
+          # @param [String] primary_key
+          # @return [Hash] entry
+          # @raise [Soar::Registry:::Directory::Error::NoEntriesFoundError] if primary key not found
           ##
           def fetch(primary_key)
             adapt_exceptions do
               entry = @interface.get_for_key_with_value(@table, @primary_key, primary_key)
-              raise Soar::Registry::Directory::Error::NoEntriesFound, "No entries found for #{@primary_key} = #{primary_key}" if entry.nil?
+              raise Soar::Registry::Directory::Error::NoEntriesFoundError, "No entries found for #{@primary_key} = #{primary_key}" if entry.nil?
               entry
             end
           end
 
           ##
-          # @param [String] identifier_attribute 
-          # @param [String] identifier_value
-          # @return [Array] list of identities
+          # @param [String] key
+          # @param [String] value 
+          # @return [Array] list of matching entries
           # @raise [ArgumentError] if query or index is not specified
           ##
           def search(key, value)
@@ -65,7 +70,7 @@ module Soar
           end
 
           ##
-          # @return [Array] a list of primary keys and global secondary indexes
+          # @return [Array] a list of provider specific indexes
           ##
           def index
             adapt_exceptions do

data/lib/soar/registry/directory/test/fixtures/entries.json

@@ -1,56 +1,62 @@
 [
     {
-        "uuid": "identity-62936e70-1815-439b-bf89-8492855a7e6b",
-        "email": "test+publisher@hetzner.co.za",
-        "roles": {
-            "staff": {
-                "department": "technical"
-            },
-            "configuration_publisher": {
-                "configuration_identifiers": ["*"]
-            }
-        }
+        "partition_key": "62936e70-1815-439b-bf89-8492855a7e6b",
+        "sort_key": "staff",
+        "attributes" : {
+            "department": "technical"
+        },
+        "global_secondary_index1": "2160f6c31bb4c94e41bfcea8d04bba20"
     }, 
     {
-        "uuid": "identity-43353f18-8afe-11e6-ae22-56b6b6499611",
-        "email": "test+consumer@hetzner.co.za",
-        "roles": {
-            "staff": {},
-            "configuration_consumer": {
-                "configuration_identifiers": ["*"]
-            }
-
-        }
+        "partition_key": "62936e70-1815-439b-bf89-8492855a7e6b",
+        "sort_key": "configuration_publisher",
+        "attributes" : {
+            "configuration_identifiers": ["*"]
+        },
+        "global_secondary_index1": "d3db8f555418a0351d6c9b1e14f16c92"
     }, 
     {
-        "uuid": "identity-820d5660-2204-4f7d-8c04-746313439b81",
-        "email": "admin@hetzner.co.za",
-        "roles": {
-            "staff": {},
-            "configuration_publisher": {
-                "configuration_identifiers": ["*"]
-            },
-            "configuration_consumer": {
-                "configuration_identifiers": ["*"]
-            }
+        "partition_key": "43353f18-8afe-11e6-ae22-56b6b6499611",
+        "sort_key": "staff",
+        "global_secondary_index1": "c640072316e084efd14cfb811a3680e9"
+    }, 
+    {
+        "partition_key": "43353f18-8afe-11e6-ae22-56b6b6499611",
+        "sort_key": "configuration_consumer",
+        "attributes": {
+            "configuration_identifiers": ["*"]
+        },
+        "global_secondary_index1": "bf9b32d1d059c04f9ab4b2f0fda6dd05"
 
+    }, 
+    {
+        "partition_key": "820d5660-2204-4f7d-8c04-746313439b81",
+        "sort_key": "staff",
+        "global_secondary_index1": "d8450263f997a0b9e2131111ea20d659"
+    },
+    {
+        "partition_key": "820d5660-2204-4f7d-8c04-746313439b81",
+        "sort_key": "configuration_publisher",
+        "attributes": {
+            "configuration_identifiers": ["*"]
         },
-        "address": {
-            "detail": "Belvedere Office Park, Unit F",
-            "street": "Bella Rosa Street",
-            "suburb": "Tygervalley",
-            "city": "Durbanville",
-            "postal": "7550"
-        }
+        "global_secondary_index1": "20b0db680941f5178bbfd3458c1ca909"
     },
     {
-        "uuid": "identity-1ff472a6-8df3-4f13-82c3-89fde26db3cf",
-        "email": "none@example.com",
-        "client_nr": "C123456789",
-        "roles": {
-            "customer": {},
-            "reseller": {}
-        }
+        "partition_key": "820d5660-2204-4f7d-8c04-746313439b81",
+        "sort_key": "configuration_consumer",
+        "attributes": {
+            "configuration_identifiers": ["*"]
+        },
+        "global_secondary_index1": "3873523c6ff4c4803199aa757c271ed1"
+    },
+    {
+        "partition_key": "1ff472a6-8df3-4f13-82c3-89fde26db3cf",
+        "sort_key": "customer_profile",
+        "attributes": {
+            "owner": ["C123456789"]
+        },
+        "global_secondary_index1": "e72006881d15fc8747a85d05fa16b5cb"
     }
 ]
 

data/lib/soar/registry/directory/test/fixtures/table_structure.json

@@ -1,33 +1,40 @@
 {
-    "table_name": "identities",
+    "table_name": "identity_roles",
     "key_schema": [
         {
-            "attribute_name": "uuid",
+            "attribute_name": "partition_key",
             "key_type": "HASH" 
+        },
+        {
+            "attribute_name": "sort_key",
+            "key_type": "RANGE" 
         }
     ],
     "attribute_definitions": [
         {
-            "attribute_name": "uuid",
+            "attribute_name": "partition_key",
+            "attribute_type": "S"
+        },
+        {
+            "attribute_name": "sort_key",
             "attribute_type": "S"
         },
         {
-            "attribute_name": "email",
+            "attribute_name": "global_secondary_index1",
             "attribute_type": "S"
         }
     ],
     "global_secondary_indexes": [
         {
-            "index_name": "email-index",
+            "index_name": "global_secondary_index1-index",
             "key_schema": [
-            {
-                "attribute_name": "email",
-                "key_type": "HASH"
-            }
+                {
+                    "attribute_name": "global_secondary_index1",
+                    "key_type": "HASH"
+                }
             ],
             "projection": {
                 "projection_type": "ALL"
-
             },
             "provisioned_throughput": { 
                 "read_capacity_units": 10,

data/lib/soar/registry/directory/test/orchestrator.rb

@@ -30,6 +30,10 @@ module Soar
             @provider.put_entry
           end
 
+          def put_duplicate_entry
+            @provider.put_duplicate_entry
+          end
+
           def search_for_entry
             @provider.search_for_entry
           end
@@ -42,6 +46,10 @@ module Soar
             @provider.request_index
           end
 
+          def duplicate_entry?
+            @provider.duplicate_entry?
+          end
+
           def persisted?
             @provider.persisted?
           end

data/lib/soar/registry/directory/test/provider/dynamo_db.rb

@@ -44,19 +44,25 @@ module Soar
               @directory.provider.client = Aws::DynamoDB::Client.new(Hashie.symbolize_keys(@configuration['provider']['config']))
             end
 
+            def put_duplicate_entry
+              put_entry
+            end
+
             def put_entry
               begin
                 @directory.put(@entries[0])
               rescue Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @error = e
+              rescue Soar::Registry::Directory::Error::DuplicateEntryError => e
+                @error = e
               end
             end
 
             def search_for_entry
               begin
-                @result = @directory.search("email", @entries[0]['email'])
+                @result = @directory.search("global_secondary_index1", @entries[0]['global_secondary_index1'])
               rescue Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @error = e
               end
             end
 
@@ -64,20 +70,30 @@ module Soar
               begin
                 @result = @directory.index
               rescue Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @error = e
               end
             end
 
             def fetch_entry
               begin
-                @result = @directory.fetch(@entries[0]['uuid'])
-              rescue Soar::Registry::Directory::Error::NoEntriesFound, Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @result = @directory.fetch({
+                  @index.keys[0] => @entries[0]['partition_key'],
+                  @index.keys[1] => @entries[0]['sort_key']
+                })
+              rescue Soar::Registry::Directory::Error::NoEntriesFoundError, Soar::Registry::Directory::Error::NetworkingError => e
+                @error = e
               end
             end
 
+            def duplicate_entry?
+              @error.is_a?(Soar::Registry::Directory::Error::DuplicateEntryError)
+            end
+
             def persisted?
-              @entries[0] == @directory.fetch(@entries[0]["uuid"])
+              @entries[0] == @directory.fetch({
+                  @index.keys[0] => @entries[0]['partition_key'],
+                  @index.keys[1] => @entries[0]['sort_key']
+                })
             end
 
             def returned?
@@ -85,7 +101,11 @@ module Soar
             end
 
             def index?
-              @index
+              @index == {
+                'partition_key' => @index['partition_key'],
+                'sort_key' => @index['sort_key'],
+                'global_secondary_index' => @index['global_secondary_index']
+              }
             end
 
             def single_entry?
@@ -93,11 +113,11 @@ module Soar
             end
 
             def no_entries_found?
-              !!(@error =~ /\ANo entries found for .+\z/)
+              @error.is_a?(Soar::Registry::Directory::Error::NoEntriesFoundError)
             end
 
             def networking_error?
-              !!(@error =~ /\AFailed to open TCP connection to .+\z/)
+              @error.is_a?(Soar::Registry::Directory::Error::NetworkingError)
             end
 
             def no_matching_entries?

data/lib/soar/registry/directory/test/provider/ldap.rb

@@ -1,5 +1,6 @@
 require 'soar/registry/directory'
 require 'hashie'
+require 'securerandom'
 
 module Soar
   module Registry
@@ -65,13 +66,21 @@ module Soar
 
             end
 
+            def put_duplicate_entry
+              begin
+                @directory.put(@entries[0])
+              rescue Soar::Registry::Directory::Error::DuplicateEntryError => e
+                @error = e
+              end
+            end
+
             def put_entry
               begin
                 @directory.put(@entries[0])
                 result = @directory.search("mail", @entries[0][:attributes][:mail])
                 @entries[0][:attributes][:entryuuid] = result[0][@index[0]]
               rescue Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @error = e
               end
             end
 
@@ -79,7 +88,7 @@ module Soar
               begin
                 @result = @directory.search("mail", @entries[0][:attributes][:mail])
               rescue Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @error = e
               end
             end
 
@@ -87,18 +96,22 @@ module Soar
               begin
                 @result = @directory.index
               rescue Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @error = e
               end
             end
 
             def fetch_entry
               begin
                 @result = @directory.fetch(@entries[0][:attributes][:entryuuid])
-              rescue Soar::Registry::Directory::Error::NoEntriesFound, Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+              rescue Soar::Registry::Directory::Error::NoEntriesFoundError, Soar::Registry::Directory::Error::NetworkingError => e
+                @error = e
               end
             end
 
+            def duplicate_entry?
+              @error.is_a?(Soar::Registry::Directory::Error::DuplicateEntryError)
+            end
+
             def persisted?
               result = @directory.fetch(@entries[0][:attributes][:entryuuid])
               entry = @entries[0][:attributes]
@@ -113,7 +126,7 @@ module Soar
             end
 
             def index?
-              @index
+              @index.is_a?(Array)
             end
 
             def single_entry?
@@ -123,7 +136,7 @@ module Soar
             end
 
             def no_entries_found?
-              !!(@error =~ /\ANo entries found for .+\z/)
+              @error.is_a?(Soar::Registry::Directory::Error::NoEntriesFoundError)
             end
 
             def no_matching_entries?
@@ -131,7 +144,7 @@ module Soar
             end
 
             def networking_error?
-              !!(@error =~ /\A(Invalid binding information|Connection refused).*\z/)
+              @error.is_a?(Soar::Registry::Directory::Error::NetworkingError)
             end
 
           end

data/lib/soar/registry/directory/test/provider/mysql.rb

@@ -16,9 +16,11 @@ module Soar
               @index = @configuration['provider']['config']['index']
               @attributes = @configuration['provider']['config']['attributes']
               @entries = [{
+                ID: 1,
                 Client_Number: "C123456789",
                 Notifyemail_Invoice: "johnconner@example.com" 
               }, {
+                ID: 2,
                 Client_Number: "C101112134",
                 Notifyemail_Invoice: "sarahconnor@example.com" 
               }]
@@ -50,9 +52,13 @@ module Soar
               @directory.provider.client.close
             end
 
+            def put_duplicate_entry
+              put_entry
+            end
+
             def put_entry
               begin
-                @directory.put(@entries[0])
+                result = @directory.put(@entries[0])
               rescue Soar::Registry::Directory::Error::NetworkingError => e
                 @error = e.message
               end
@@ -76,14 +82,14 @@ module Soar
 
             def fetch_entry
               begin
-                @result = @directory.fetch(@entries[0][:Client_Number])
-              rescue Soar::Registry::Directory::Error::NoEntriesFound, Soar::Registry::Directory::Error::NetworkingError => e
+                @result = @directory.fetch(@entries[0][:ID])
+              rescue Soar::Registry::Directory::Error::NoEntriesFoundError, Soar::Registry::Directory::Error::NetworkingError => e
                 @error = e.message
               end
             end
 
             def persisted?
-              @directory.fetch(@entries[0][:Client_Number]) == @entries[0]
+              @directory.fetch(@entries[0][:ID]) == @entries[0]
             end
 
             def returned?
@@ -91,11 +97,15 @@ module Soar
             end
 
             def index?
-              @result 
+              @result == @index
+            end
+
+            def duplicate_entry?
+              !!(@error =~ /\ADuplicate entry .+\z/)
             end
 
             def single_entry?
-              @result == @entries[0]
+              @result == @entries[0]            
             end
 
             def no_entries_found?
@@ -107,7 +117,7 @@ module Soar
             end
 
             def networking_error?
-              patterns = [
+							patterns = [
                 /\Aquery: not connected.*\z/,
                 /\AMySQL server has gone away\z/,
                 /\ACan't connect to local MySQL server through socket.*\z/,

data/lib/soar/registry/directory/test/provider/stub.rb

@@ -32,11 +32,17 @@ module Soar
               @directory.provider.instance_variable_set(:@interface, Object.new)
             end
 
+            def put_duplicate_entry
+              put_entry
+            end
+
             def put_entry
               begin
                 @directory.put(@@entry)
               rescue Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @error = e
+              rescue Soar::Registry::Directory::Error::DuplicateEntryError => e
+                @error = e
               end
             end
 
@@ -44,7 +50,7 @@ module Soar
               begin
                 @entry = @directory.search("identifier", @@entry['identifier'])
               rescue Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @error = e
               end
             end
 
@@ -52,18 +58,22 @@ module Soar
               begin
                 @index = @directory.index
               rescue Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+                @error = e
               end
             end
 
             def fetch_entry
               begin
                 @entry = @directory.fetch(@@entry['uuid'])
-              rescue Soar::Registry::Directory::Error::NoEntriesFound, Soar::Registry::Directory::Error::NetworkingError => e
-                @error = e.message
+              rescue Soar::Registry::Directory::Error::NoEntriesFoundError, Soar::Registry::Directory::Error::NetworkingError => e
+                @error = e
               end
             end
 
+            def duplicate_entry?
+              @error.is_a?(Soar::Registry::Directory::Error::DuplicateEntryError)
+            end
+
             def persisted?
               @@entry == @directory.fetch(@@entry["uuid"])
             end
@@ -73,7 +83,7 @@ module Soar
             end
 
             def index?
-              @index
+              @index.is_a?(Array)
             end
 
             def single_entry?
@@ -81,7 +91,7 @@ module Soar
             end
 
             def no_entries_found?
-              !!(@error =~ /\ANo entries found for .+\z/)
+              @error.is_a?(Soar::Registry::Directory::Error::NoEntriesFoundError)
             end
 
             def no_matching_entries?
@@ -89,7 +99,7 @@ module Soar
             end
 
             def networking_error?
-              !!(@error =~ /\ANetworking error\z/)
+              @error.is_a?(Soar::Registry::Directory::Error::NetworkingError)
             end
 
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar-registry-directory
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 5.0.0
 platform: ruby
 authors:
 - Charles Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashy_db
@@ -128,7 +128,6 @@ files:
 - lib/soar/registry/directory/provider/stub.rb
 - lib/soar/registry/directory/test/fixtures/data-dump.sql
 - lib/soar/registry/directory/test/fixtures/entries.json
-- lib/soar/registry/directory/test/fixtures/entries.ldif
 - lib/soar/registry/directory/test/fixtures/table_structure.json
 - lib/soar/registry/directory/test/orchestrator.rb
 - lib/soar/registry/directory/test/provider/dynamo_db.rb