dapi-client 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e0f07cc669169a046a40ea32e1560801a51711ae4b4a242b177c302daf9915d
-  data.tar.gz: 30d5902bab99804b96080253cc3253f1cec060a885771e29ee91f12b48b23b77
+  metadata.gz: 5e86e564f38a83ba3ce519489f75378906b36a9b88a5765a32e065d14d7126f4
+  data.tar.gz: eba493a9177cb48bfa847100219cb59240d54ff25d67f5e2fb21e6290863a529
 SHA512:
-  metadata.gz: 63264c21d46017aaf1739c314982b2705dc9583f8afd12d6f8cdfc9cec0582bad26d2fe317986d271a6a4ce63f5e89b4b91386a76e6062f26ca6abd8aa48d4b0
-  data.tar.gz: 7f0b4a9e75714a82300ee1483b339eb64ee1b50c506efb3e4d21dc4132c1534c981011c7197a618ebd66a38e9bc65da8a906838e4744e483d6dca1e9ebe9106a
+  metadata.gz: ce0fc691ff8a9f0c99e91433f4bbe8b92ada2c7b3f344c513da8650e0806544705de49fa96ac3dfd68f4b4d0436ffa06b50ae8e00ad221ca56e40f7eab2fd24b
+  data.tar.gz: 44060b8ca76d2f8551a6f5f6a5f6d329cbc1007fd70f7205db2ad19ae20759b1a5fe3b290b3ca3c347cb44afd15733290852ac10ffb8cb264d2d2fa9ddecc6e1

data/docker-compose.yml

@@ -11,13 +11,11 @@ services:
     links:
       - dapi
   dapi:
-    image: gitlab.host-h.net:4567/seals/dapi:v3.17.0-staging
+    image: gitlab.host-h.net:4567/seals/dapi:v3.23.4-fix-delete-validation
     command: bundle exec rackup --server webrick -o 0.0.0.0 -p 80
     environment:
       ENVIRONMENT: test
-      DNS_CONFIG_FILE: /usr/local/src/conf/test/dns.yml
-      AUTH_CONFIG_FILE: /usr/local/src/conf/test/auth_tokens.yml
-      ROLES_CONFIG_FILE: /usr/local/src/conf/test/roles.yml
+      CONFIG_FILE: config/config_development.yml
       DEBUG: "true"
       NSDB_PASSWORD_SA: secret
       NSDB_PASSWORD_DE: secret

data/lib/dapi/client.rb

@@ -37,15 +37,22 @@ module Dapi
       )
     end
 
-    def upsert_record(zone_name, lvalue, type, rvalue, ttl = nil)
+    def upsert_record(zone_name, lvalue, type, rvalues, ttl = nil)
+      rvalues = [rvalues].flatten
       modify_zone_records(
         zone_name,
         modify: ->(records) {
           records.
             reject { |r| r["name"] == lvalue && r["type"] == type }.
-            push("name" => lvalue, "type" => type, "value" => rvalue, "ttl" => ttl)
+            concat(
+              rvalues.map { |rvalue| {"name" => lvalue, "type" => type, "value" => rvalue, "ttl" => ttl} }
+            )
         },
-        check: ->(records) { records.detect { |r| r["name"] == lvalue && r["type"] == type && r["value"] == rvalue && r["ttl"] == ttl } }
+        check: ->(records) {
+          rvalues.all? { |rvalue|
+            records.detect { |r| r["name"] == lvalue && r["type"] == type && r["value"] == rvalue && r["ttl"] == ttl }
+          }
+        }
       )
     end
 
@@ -81,7 +88,7 @@ module Dapi
         end
       end
     rescue JSON::ParserError
-      raise Dapi::Client::Error, "error parsing server response (JSON)"
+      raise Dapi::Client::Error, "error parsing server response (JSON). Expected JSON, got: #{res.body}"
     end
 
     def optimistic_lock_check(zone_name, &block)

data/lib/dapi/client/version.rb

@@ -1,5 +1,5 @@
 module Dapi
   class Client
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapi-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Sheldon Hearn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http