dtk-client 0.12.3 → 0.12.4
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2d6e01820600b6104abd6570dd290f76f3b5f07e20e95a253ea754a9d6a6bd51
|
4
|
+
data.tar.gz: 8c56a1e9dc48c1ff6e51f5db7b2aaf5dddca9e657bd9214a3edbf2caf386ece9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1936303d086ef2a97dcc9cad4bcc771ac75b4b01f60f81f54c5f3a570b4590f9094c162ddaaba09acc3779a4cbae5a7f47cf2f91d52338a8de727be57d71ac7b
|
7
|
+
data.tar.gz: ce033a299a700a6b2254a361c432f1ad76dabba28b0c221d33fb94a294490a3aaced7a16308108595e09507ef0a5e21dd89dcb2a915e225939a93a6599f61b8d
|
@@ -19,12 +19,13 @@ module DTK::Client; module CLI
|
|
19
19
|
module Command
|
20
20
|
module Service
|
21
21
|
subcommand_def 'list-attributes' do |c|
|
22
|
+
c.arg Token::Arg.attribute_name, :optional => true
|
22
23
|
command_body c, 'attributes', 'List attributes associated with service instance.' do |sc|
|
23
24
|
sc.flag Token.directory_path, :desc => 'Absolute or relative path to service instance directory containing updates to pull; not need if in the service instance directory'
|
24
25
|
# sc.flag Token.node, :desc => 'Filter attributes by node'
|
25
26
|
sc.flag Token.format
|
26
|
-
|
27
|
-
|
27
|
+
sc.flag Token.component, :desc => 'Filter attributes by component'
|
28
|
+
|
28
29
|
sc.switch Token.links, :desc => 'Display attribute links'
|
29
30
|
|
30
31
|
sc.action do |_global_options, options, _args|
|
@@ -34,9 +35,9 @@ module DTK::Client; module CLI
|
|
34
35
|
:service_instance => service_instance,
|
35
36
|
:links => options[:links],
|
36
37
|
# :node => options[:node],
|
37
|
-
|
38
|
-
:
|
39
|
-
:
|
38
|
+
:component => options[:component],
|
39
|
+
:format => options[:format],
|
40
|
+
:attribute_name => _args[0]
|
40
41
|
}
|
41
42
|
Operation::Service.list_attributes(args)
|
42
43
|
end
|
data/lib/cli/command/token.rb
CHANGED
@@ -43,7 +43,7 @@ module DTK::Client
|
|
43
43
|
:version => Flag.new(:v, 'VERSION', 'Version'),
|
44
44
|
:type => Flag.new(:type, 'TYPE', 'Type'),
|
45
45
|
:node => Flag.new(:n, 'NODE', 'Node'),
|
46
|
-
:component => Flag.new(:c, 'COMPONENT', 'Component'),
|
46
|
+
:component => Flag.new([:c, :component], 'COMPONENT', 'Component'),
|
47
47
|
:remote_user => Flag.new(:u, 'REMOTE-USER', 'Remote user'),
|
48
48
|
:identity_file => Flag.new(:i, 'PATH-TO-PEM', 'Path to pem file'),
|
49
49
|
:mode => Flag.new(:mode, 'MODE', 'Mode'),
|
data/lib/cli/version.rb
CHANGED
@@ -23,17 +23,21 @@ module DTK::Client
|
|
23
23
|
service_instance = args.required(:service_instance)
|
24
24
|
links = args[:links]
|
25
25
|
# node = args[:node]
|
26
|
-
|
27
|
-
|
26
|
+
name = args[:attribute_name]
|
27
|
+
component = args[:component]
|
28
28
|
format = args[:format] || 'table'
|
29
29
|
format.downcase!
|
30
30
|
|
31
|
+
if component && name
|
32
|
+
raise Error::Usage, "Command options ATTRIBUTE NAME and --component cannot be used at the same time."
|
33
|
+
end
|
34
|
+
|
31
35
|
query_string_hash = QueryStringHash.new(
|
32
36
|
:links? => links,
|
33
37
|
# :node_id? => node,
|
34
|
-
:
|
35
|
-
|
36
|
-
:
|
38
|
+
:filter_component? => component,
|
39
|
+
:format => format,
|
40
|
+
:attribute_name => name
|
37
41
|
)
|
38
42
|
|
39
43
|
response = rest_get("#{BaseRoute}/#{service_instance}/attributes", query_string_hash)
|
@@ -26,11 +26,26 @@ module DTK::Client
|
|
26
26
|
encrypt = args[:encrypt]
|
27
27
|
if encrypt
|
28
28
|
hash = {
|
29
|
-
:name
|
29
|
+
:name => attribute_name.split('/').last,
|
30
|
+
:component => attribute_name.split('/').first
|
30
31
|
}
|
31
|
-
|
32
|
-
|
33
|
-
|
32
|
+
attribute_to_set = rest_get "#{BaseRoute}/#{service_instance}/get_attribute", QueryStringHash.new(hash)
|
33
|
+
|
34
|
+
if attribute_to_set.data.empty?
|
35
|
+
raise Error::Usage, "There is no attribute named #{attribute_name}."
|
36
|
+
end
|
37
|
+
|
38
|
+
hash = {
|
39
|
+
:name => "encryption_public_key",
|
40
|
+
:component => attribute_to_set.data["nested_component"]["display_name"]
|
41
|
+
}
|
42
|
+
public_key_attribute = rest_get "#{BaseRoute}/#{service_instance}/get_attribute", QueryStringHash.new(hash)
|
43
|
+
|
44
|
+
if public_key_attribute.data.empty? || !(public_key_attribute.data["value_asserted"] || public_key_attribute.data["value_derived"])
|
45
|
+
raise Error::Usage, "There is no encryption_public_key attribute in component '#{attribute_to_set.data["nested_component"]["display_name"]}', or its' value is not set."
|
46
|
+
end
|
47
|
+
|
48
|
+
public_key = public_key_attribute.data["value_asserted"] || public_key_attribute.data["value_derived"]
|
34
49
|
attribute_value = DTK::Client::SecurityUtil.encrypt(public_key, attribute_value)
|
35
50
|
end
|
36
51
|
query_string_hash = QueryStringHash.new(
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dtk-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.12.
|
4
|
+
version: 0.12.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Reactor8
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-03-
|
11
|
+
date: 2019-03-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: dtk-common-core
|