dtk-client 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce708c08b83b191a7a19bfe1616eb930a9245b6ddfce6fbebe97ab536feff9eb
-  data.tar.gz: 423bea8f930d5cf107cbcf794b9678d7aaa3440163091f4b59cd896bc29bea5c
+  metadata.gz: 2d6e01820600b6104abd6570dd290f76f3b5f07e20e95a253ea754a9d6a6bd51
+  data.tar.gz: 8c56a1e9dc48c1ff6e51f5db7b2aaf5dddca9e657bd9214a3edbf2caf386ece9
 SHA512:
-  metadata.gz: 63beb7bd18dfcbe9e94ef455a3ef71dea3cf86efb19a12a978bca07100706abcfa3af825cb6beaa343fcf77dd031eddc148fe849e1548c07375f8efe8d376a38
-  data.tar.gz: 5493f43e020d443251eb00843c3f90fdfdeb2d9717ea3f4879e69a7e51bb954bc5f7d0bf79ba2631502953144680779cefb0a16842866fd0332fc21e0f344bdd
+  metadata.gz: 1936303d086ef2a97dcc9cad4bcc771ac75b4b01f60f81f54c5f3a570b4590f9094c162ddaaba09acc3779a4cbae5a7f47cf2f91d52338a8de727be57d71ac7b
+  data.tar.gz: ce033a299a700a6b2254a361c432f1ad76dabba28b0c221d33fb94a294490a3aaced7a16308108595e09507ef0a5e21dd89dcb2a915e225939a93a6599f61b8d

data/lib/cli/command/service/list_attributes.rb

@@ -19,12 +19,13 @@ module DTK::Client; module CLI
   module Command
     module Service
       subcommand_def 'list-attributes' do |c|
+        c.arg Token::Arg.attribute_name, :optional => true 
         command_body c, 'attributes', 'List attributes associated with service instance.' do |sc|
           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'
 #          sc.flag Token.node, :desc => 'Filter attributes by node'
           sc.flag Token.format
-#          sc.flag Token.component, :desc => 'Filter attributes by component'
-          sc.switch Token.all, :desc => 'List component and node level attributes with top level ones'
+          sc.flag Token.component, :desc => 'Filter attributes by component'
+        
           sc.switch Token.links, :desc => 'Display attribute links'
 
           sc.action do |_global_options, options, _args|
@@ -34,9 +35,9 @@ module DTK::Client; module CLI
               :service_instance => service_instance,
               :links            => options[:links],
               # :node             => options[:node],
-              # :component        => options[:component],
-              :all              => options[:all],
-              :format           => options[:format]
+              :component        => options[:component],
+              :format           => options[:format],
+              :attribute_name   => _args[0]
             }
             Operation::Service.list_attributes(args)
           end

data/lib/cli/command/token.rb

@@ -43,7 +43,7 @@ module DTK::Client
         :version                   => Flag.new(:v, 'VERSION', 'Version'),
         :type                      => Flag.new(:type, 'TYPE', 'Type'),
         :node                      => Flag.new(:n, 'NODE', 'Node'),
-        :component                 => Flag.new(:c, 'COMPONENT', 'Component'),
+        :component                 => Flag.new([:c, :component], 'COMPONENT', 'Component'),
         :remote_user               => Flag.new(:u, 'REMOTE-USER', 'Remote user'),
         :identity_file             => Flag.new(:i, 'PATH-TO-PEM', 'Path to pem file'),
         :mode                      => Flag.new(:mode, 'MODE', 'Mode'),

data/lib/cli/version.rb

@@ -18,7 +18,7 @@
 module DTK
   module Client
     module CLI
-      VERSION="0.12.3"
+      VERSION="0.12.4"
     end
   end
 end

data/lib/client/operation/service/list_attributes.rb

@@ -23,17 +23,21 @@ module DTK::Client
           service_instance = args.required(:service_instance)
           links            = args[:links]
           # node             = args[:node]
-          # component        = args[:component]
-          all              = args[:all]
+          name             = args[:attribute_name]
+          component        = args[:component]
           format           = args[:format] || 'table'
           format.downcase!
 
+          if component && name 
+            raise Error::Usage, "Command options ATTRIBUTE NAME and --component cannot be used at the same time."
+          end
+
           query_string_hash = QueryStringHash.new(
             :links?            => links,
             # :node_id?          => node,
-            :all               => all,
-            # :filter_component? => component,
-            :format            => format
+            :filter_component? => component,
+            :format            => format,
+            :attribute_name    => name
           )
           
           response = rest_get("#{BaseRoute}/#{service_instance}/attributes", query_string_hash)

data/lib/client/operation/service/set_attribute.rb

@@ -26,11 +26,26 @@ module DTK::Client
           encrypt = args[:encrypt]
           if encrypt
             hash = {
-              :name => "encryption_public_key"
+              :name                => attribute_name.split('/').last,
+              :component           => attribute_name.split('/').first
             }
-            response = rest_get "#{BaseRoute}/#{service_instance}/get_attribute", QueryStringHash.new(hash)
-            raise Error::Usage, "There is no encryption_public_key attribute in this component, or its' value is not set." if response.data.empty?
-            public_key = response.data
+            attribute_to_set = rest_get "#{BaseRoute}/#{service_instance}/get_attribute", QueryStringHash.new(hash)
+
+            if attribute_to_set.data.empty? 
+              raise Error::Usage, "There is no attribute named #{attribute_name}."
+            end
+
+            hash = {
+              :name                => "encryption_public_key",
+              :component           => attribute_to_set.data["nested_component"]["display_name"]
+            }
+            public_key_attribute = rest_get "#{BaseRoute}/#{service_instance}/get_attribute", QueryStringHash.new(hash)
+
+            if public_key_attribute.data.empty? || !(public_key_attribute.data["value_asserted"] || public_key_attribute.data["value_derived"])
+              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."
+            end
+
+            public_key = public_key_attribute.data["value_asserted"] || public_key_attribute.data["value_derived"]
             attribute_value = DTK::Client::SecurityUtil.encrypt(public_key, attribute_value) 
           end
           query_string_hash = QueryStringHash.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Reactor8
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dtk-common-core