dapi-client 0.1.3 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/docker-compose.yml +2 -4
- data/lib/dapi/client.rb +11 -4
- data/lib/dapi/client/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5e86e564f38a83ba3ce519489f75378906b36a9b88a5765a32e065d14d7126f4
|
|
4
|
+
data.tar.gz: eba493a9177cb48bfa847100219cb59240d54ff25d67f5e2fb21e6290863a529
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ce0fc691ff8a9f0c99e91433f4bbe8b92ada2c7b3f344c513da8650e0806544705de49fa96ac3dfd68f4b4d0436ffa06b50ae8e00ad221ca56e40f7eab2fd24b
|
|
7
|
+
data.tar.gz: 44060b8ca76d2f8551a6f5f6a5f6d329cbc1007fd70f7205db2ad19ae20759b1a5fe3b290b3ca3c347cb44afd15733290852ac10ffb8cb264d2d2fa9ddecc6e1
|
data/docker-compose.yml
CHANGED
|
@@ -11,13 +11,11 @@ services:
|
|
|
11
11
|
links:
|
|
12
12
|
- dapi
|
|
13
13
|
dapi:
|
|
14
|
-
image: gitlab.host-h.net:4567/seals/dapi:v3.
|
|
14
|
+
image: gitlab.host-h.net:4567/seals/dapi:v3.23.4-fix-delete-validation
|
|
15
15
|
command: bundle exec rackup --server webrick -o 0.0.0.0 -p 80
|
|
16
16
|
environment:
|
|
17
17
|
ENVIRONMENT: test
|
|
18
|
-
|
|
19
|
-
AUTH_CONFIG_FILE: /usr/local/src/conf/test/auth_tokens.yml
|
|
20
|
-
ROLES_CONFIG_FILE: /usr/local/src/conf/test/roles.yml
|
|
18
|
+
CONFIG_FILE: config/config_development.yml
|
|
21
19
|
DEBUG: "true"
|
|
22
20
|
NSDB_PASSWORD_SA: secret
|
|
23
21
|
NSDB_PASSWORD_DE: secret
|
data/lib/dapi/client.rb
CHANGED
|
@@ -37,15 +37,22 @@ module Dapi
|
|
|
37
37
|
)
|
|
38
38
|
end
|
|
39
39
|
|
|
40
|
-
def upsert_record(zone_name, lvalue, type,
|
|
40
|
+
def upsert_record(zone_name, lvalue, type, rvalues, ttl = nil)
|
|
41
|
+
rvalues = [rvalues].flatten
|
|
41
42
|
modify_zone_records(
|
|
42
43
|
zone_name,
|
|
43
44
|
modify: ->(records) {
|
|
44
45
|
records.
|
|
45
46
|
reject { |r| r["name"] == lvalue && r["type"] == type }.
|
|
46
|
-
|
|
47
|
+
concat(
|
|
48
|
+
rvalues.map { |rvalue| {"name" => lvalue, "type" => type, "value" => rvalue, "ttl" => ttl} }
|
|
49
|
+
)
|
|
47
50
|
},
|
|
48
|
-
check: ->(records) {
|
|
51
|
+
check: ->(records) {
|
|
52
|
+
rvalues.all? { |rvalue|
|
|
53
|
+
records.detect { |r| r["name"] == lvalue && r["type"] == type && r["value"] == rvalue && r["ttl"] == ttl }
|
|
54
|
+
}
|
|
55
|
+
}
|
|
49
56
|
)
|
|
50
57
|
end
|
|
51
58
|
|
|
@@ -81,7 +88,7 @@ module Dapi
|
|
|
81
88
|
end
|
|
82
89
|
end
|
|
83
90
|
rescue JSON::ParserError
|
|
84
|
-
raise Dapi::Client::Error, "error parsing server response (JSON)"
|
|
91
|
+
raise Dapi::Client::Error, "error parsing server response (JSON). Expected JSON, got: #{res.body}"
|
|
85
92
|
end
|
|
86
93
|
|
|
87
94
|
def optimistic_lock_check(zone_name, &block)
|
data/lib/dapi/client/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dapi-client
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.2.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sheldon Hearn
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2021-03-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: http
|