dtk-client 0.5.14 → 0.5.15

data/lib/commands/thor/service_module.rb

@@ -19,6 +19,8 @@ dtk_require_common_commands('thor/common')
 module DTK::Client
   class ServiceModule < CommandBaseThor
 
+    PULL_CATALOGS = ["dtkn"]
+
     no_tasks do
       include CloneMixin
       include PushToRemoteMixin
@@ -82,15 +84,15 @@ module DTK::Client
 
       })
     end
-    
+
     ##MERGE-QUESTION: need to add options of what info is about
     desc "SERVICE-MODULE-NAME/ID info", "Provides information about specified service module"
     def info(context_params)
       if context_params.is_there_identifier?(:assembly)
         response = DTK::Client::ContextRouter.routeTask("assembly", "info", context_params, @conn)
-      else  
+      else
         service_module_id = context_params.retrieve_arguments([:service_module_id!],method_argument_names)
-        
+
         post_body = {
          :service_module_id => service_module_id
         }
@@ -128,20 +130,20 @@ module DTK::Client
       if service_module_id.nil? && !service_module_name.nil?
         service_module_id = service_module_name
       end
-      
+
       # If user is on service level, list task can't have about value set
       if (context_params.last_entity_name == :"service-module") and about.nil?
         action    = options.remote? ? "list_remote" : "list"
         post_body = (options.remote? ? { :rsa_pub_key => SSHUtil.rsa_pub_key_content() } : {:detail_to_include => ["remotes"]})
         post_body[:diff] = options.diff? ? options.diff : {}
-        
+
         response = post rest_url("service_module/#{action}"), post_body
       # If user is on service identifier level, list task can't have '--remote' option.
       else
         # TODO: this is temp; will shortly support this
         raise DTK::Client::DtkValidationError.new("Not supported '--remote' option when listing service module assemblies, component templates or modules", true) if options.remote?
         raise DTK::Client::DtkValidationError.new("Not supported type '#{about}' for list for current context level. Possible type options: 'assembly'", true) unless(about == "assembly" || about == "modules")
-      
+
         if about
           case about
           when "assembly"
@@ -153,7 +155,7 @@ module DTK::Client
             action           = "list_component_modules"
           else
             raise_validation_error_method_usage('list')
-          end 
+          end
         end
         response = post rest_url("service_module/#{action}"), { :service_module_id => service_module_id }
       end
@@ -170,7 +172,7 @@ module DTK::Client
         :service_module_id => service_module_id,
       }
       response = post rest_url("service_module/list_instances"), post_body
-      
+
       response.render_table(:assembly_template)
     end
 
@@ -196,7 +198,7 @@ module DTK::Client
       resolve_direct_access(::DTK::Client::Configurator.check_direct_access)
       remote_module_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
       ignore_component_error = options.ignore?
-      
+
       remote_namespace, local_module_name = get_namespace_and_name(remote_module_name)
 
       version = options["version"]
@@ -209,8 +211,9 @@ module DTK::Client
         :local_module_name => local_module_name,
         :rsa_pub_key => SSHUtil.rsa_pub_key_content()
       }
-      
+
       response = post rest_url("service_module/import"), post_body
+      RemoteDependencyUtil.print_dependency_warnings(response)
 
       # case when we need to import additional components
       if (response.ok? && (missing_components = response.data(:missing_module_components)))
@@ -224,13 +227,13 @@ module DTK::Client
         post_body.merge!(opts)
         response = post rest_url("service_module/import"), post_body
       end
-      
+
       return response unless response.ok?
       @@invalidate_map << :service_module
 
       if error = response.data(:dsl_parsed_info)
         dsl_parsed_message = ServiceImporter.error_message(remote_module_name, error)
-        DTK::Client::OsUtil.print(dsl_parsed_message, :red) 
+        DTK::Client::OsUtil.print(dsl_parsed_message, :red)
       end
 
       service_module_id, module_name, namespace, repo_url, branch = response.data(:module_id, :module_name, :namespace, :repo_url, :workspace_branch)
@@ -277,7 +280,7 @@ module DTK::Client
 
     #   if error = response.data(:dsl_parsed_info)
     #     dsl_parsed_message = ServiceImporter.error_message("#{module_name}-#{version}", error)
-    #     DTK::Client::OsUtil.print(dsl_parsed_message, :red) 
+    #     DTK::Client::OsUtil.print(dsl_parsed_message, :red)
     #   end
 
     #   #TODO: need to check if local clone directory exists
@@ -307,14 +310,17 @@ module DTK::Client
        :rsa_pub_key => SSHUtil.rsa_pub_key_content()
       }
 
-      post rest_url("service_module/export"), post_body
-    end    
+      response = post rest_url("service_module/export"), post_body
+      return response unless response.ok?
+      RemoteDependencyUtil.print_dependency_warnings(response, "Module has been successfully published!")
+      nil
+    end
 
     # desc "SERVICE-MODULE-NAME/ID push-to-dtkn [-n NAMESPACE] [-v VERSION]", "Push local copy of service module to remote repository."
     # version_method_option
     # desc "SERVICE-MODULE-NAME/ID push-to-dtkn [-n NAMESPACE]", "Push local copy of service module to remote repository."
     #     method_option "namespace",:aliases => "-n",
-    #     :type => :string, 
+    #     :type => :string,
     #     :banner => "NAMESPACE",
     #     :desc => "Remote namespace"
     # def push_to_dtkn(context_params)
@@ -332,7 +338,7 @@ module DTK::Client
     #   unless File.directory?(module_location)
     #     if Console.confirmation_prompt("Unable to push to remote because module '#{service_module_name}#{version && "-#{version}"}' has not been cloned. Would you like to clone module now"+'?')
     #       response = clone_aux(:service_module,service_module_id,version,false)
-          
+
     #       if(response.nil? || response.ok?)
     #         reparse_aux(module_location)
     #         push_to_remote_aux(:service_module, service_module_id, service_module_name, options["namespace"], version) if Console.confirmation_prompt("Would you like to push changes to remote"+'?')
@@ -344,7 +350,7 @@ module DTK::Client
     #       return
     #     end
     #   end
-      
+
     #   reparse_aux(module_location)
     #   push_to_remote_aux(:service_module, service_module_id, service_module_name, options["namespace"], options["version"])
     # end
@@ -352,15 +358,15 @@ module DTK::Client
     # desc "SERVICE-MODULE-NAME/ID pull-from-dtkn [-n NAMESPACE] [-v VERSION]", "Update local service module from remote repository."
     desc "SERVICE-MODULE-NAME/ID pull-dtkn [-n NAMESPACE]", "Update local service module from remote repository."
     method_option "namespace",:aliases => "-n",
-      :type => :string, 
+      :type => :string,
       :banner => "NAMESPACE",
       :desc => "Remote namespace"
     def pull_dtkn(context_params)
       service_module_id, service_module_name = context_params.retrieve_arguments([:service_module_id!,:service_module_name],method_argument_names)
       catalog = 'dtkn'
       version = options["version"]
-      
-      raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PullCatalogs}" unless catalog
+
+      raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PULL_CATALOGS}" unless catalog
 
       if service_module_name.to_s =~ /^[0-9]+$/
         service_module_id   = service_module_name
@@ -384,17 +390,9 @@ module DTK::Client
       #elsif catalog.to_s.eql?("origin")
         #needs to be implemented
       else
-        raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PullCatalogs}"
+        raise DtkValidationError, "You have to provide valid catalog to pull changes from! Valid catalogs: #{PULL_CATALOGS}"
       end
     end
-    PullCatalogs = ["dtkn"]
-
-    desc "SERVICE-MODULE-NAME/ID chown REMOTE-USER", "Set remote module owner"
-    method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
-    def chown(context_params)
-      service_module_id, remote_user = context_params.retrieve_arguments([:service_module_id!,:option_1!],method_argument_names)
-      chown_aux(service_module_id, remote_user, options.namespace)
-    end
 
     desc "SERVICE-MODULE-NAME/ID chmod PERMISSION-SELECTOR", "Update remote permissions e.g. ug+rw , user and group get RW permissions"
     method_option "namespace", :aliases => "-n", :type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
@@ -439,7 +437,7 @@ module DTK::Client
     method_option "namespace",:aliases => "-n",:type => :string, :banner => "NAMESPACE", :desc => "Remote namespace"
     def list_collaborators(context_params)
       service_module_id = context_params.retrieve_arguments([:service_module_id!],method_argument_names)
-      response = collaboration_list_aux(component_module_id, options.namespace)
+      response = collaboration_list_aux(service_module_id, options.namespace)
       response.render_table(:module_collaborators)
       response
     end
@@ -525,7 +523,7 @@ module DTK::Client
     #   post_body = {
     #     :service_module_id => service_module_id,
     #     :component_module_id => component_module_id,
-    #     :version => version                                                                                          
+    #     :version => version
     #   }
     #   response = post rest_url("service_module/set_component_module_version"), post_body
     #   @@invalidate_map << :service_module
@@ -543,18 +541,18 @@ module DTK::Client
       response = Helper(:git_repo).check_local_dir_exists_with_content(:service_module,module_name)
       return response unless response.ok?
       service_directory = response.data(:module_directory)
-      
+
       #check for yaml/json parsing errors before import
       reparse_aux(service_directory)
 
       # first call to create empty module
-      response = post rest_url("service_module/create"), { :module_name => module_name }        
+      response = post rest_url("service_module/create"), { :module_name => module_name }
       return response unless response.ok?
       @@invalidate_map << :service_module
-      
+
       if error = response.data(:dsl_parsed_info)
         dsl_parsed_message = ServiceImporter.error_message(module_name, error)
-        DTK::Client::OsUtil.print(dsl_parsed_message, :red) 
+        DTK::Client::OsUtil.print(dsl_parsed_message, :red)
       end
 
       # initial commit for given service module
@@ -574,11 +572,11 @@ module DTK::Client
 =begin
     desc "SERVICE-MODULE-NAME/ID push origin|dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of service module to server (origin) or to remote repository (dtkn)."
     method_option "message",:aliases => "-m" ,
-      :type => :string, 
+      :type => :string,
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
     method_option "namespace",:aliases => "-n",
-        :type => :string, 
+        :type => :string,
         :banner => "NAMESPACE",
         :desc => "Remote namespace"
     #hidden option for dev
@@ -586,7 +584,7 @@ module DTK::Client
     def push(context_params, internal_trigger=false)
       service_module_id, service_module_name, catalog = context_params.retrieve_arguments([:service_module_id!, :service_module_name, :option_1],method_argument_names)
       version = options["version"]
-      
+
       raise DtkValidationError, "You have to provide valid catalog to push changes to! Valid catalogs: #{PushCatalogs}" unless catalog
 
       if service_module_name.to_s =~ /^[0-9]+$/
@@ -604,7 +602,7 @@ module DTK::Client
         unless File.directory?(module_location)
           if Console.confirmation_prompt("Unable to push to remote because module '#{service_module_name}#{version && "-#{version}"}' has not been cloned. Would you like to clone module now"+'?')
             response = clone_aux(:service_module,service_module_id,version,false)
-            
+
             if(response.nil? || response.ok?)
               reparse_aux(module_location)
               push_to_remote_aux(:service_module, service_module_id, service_module_name, options["namespace"], version) if Console.confirmation_prompt("Would you like to push changes to remote"+'?')
@@ -616,7 +614,7 @@ module DTK::Client
             return
           end
         end
-        
+
       push_to_remote_aux(:service_module, service_module_id, service_module_name, options["namespace"], options["version"])
       else
         raise DtkValidationError, "You have to provide valid catalog to push changes to! Valid catalogs: #{PushCatalogs}"
@@ -628,7 +626,7 @@ module DTK::Client
 #    desc "SERVICE-MODULE-NAME/ID push [-m COMMIT-MSG]", "Push changes from local copy to server (origin)."
     desc "SERVICE-MODULE-NAME/ID push", "Push changes from local copy to server."
     method_option "message",:aliases => "-m" ,
-      :type => :string, 
+      :type => :string,
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
     #hidden option for dev
@@ -651,18 +649,18 @@ module DTK::Client
 #    desc "SERVICE-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [-m COMMIT-MSG]", "Push changes from local copy of service module to remote repository (dtkn)."
     desc "SERVICE-MODULE-NAME/ID push-dtkn [-n NAMESPACE]", "Push changes from local copy of service module to remote repository (dtkn)."
     method_option "message",:aliases => "-m" ,
-      :type => :string, 
+      :type => :string,
       :banner => "COMMIT-MSG",
       :desc => "Commit message"
     method_option "namespace",:aliases => "-n",
-        :type => :string, 
+        :type => :string,
         :banner => "NAMESPACE",
         :desc => "Remote namespace"
     def push_dtkn(context_params, internal_trigger=false)
       service_module_id, service_module_name = context_params.retrieve_arguments([:service_module_id!, :service_module_name],method_argument_names)
       catalog = 'dtkn'
       version = options["version"]
-      
+
       if service_module_name.to_s =~ /^[0-9]+$/
         service_module_id   = service_module_name
         service_module_name = get_service_module_name(service_module_id)
@@ -673,7 +671,8 @@ module DTK::Client
       reparse_aux(module_location) unless internal_trigger
 
       if catalog.to_s.eql?("dtkn")
-        remote_module_info = get_remote_module_info_aux(:service_module, service_module_id, options["namespace"], version)
+        module_refs_content = RemoteDependencyUtil.module_ref_content(module_location)
+        remote_module_info = get_remote_module_info_aux(:service_module, service_module_id, options["namespace"], version, module_refs_content)
         return remote_module_info unless remote_module_info.ok?
 
         unless File.directory?(module_location)
@@ -686,7 +685,7 @@ module DTK::Client
 
           return response
         end
-        
+
         push_to_remote_aux(remote_module_info, :service_module)
       else
         raise DtkValidationError, "You have to provide valid catalog to push changes to!"
@@ -710,13 +709,13 @@ module DTK::Client
         return unless Console.confirmation_prompt("Are you sure you want to delete service-module #{version.nil? ? '' : 'version '}'#{service_module_name}#{version.nil? ? '' : ('-' + version.to_s)}' and all items contained in it"+'?')
       end
 
-      response = 
+      response =
         if options.purge?
           opts = {:module_name => service_module_name}
           if version then opts.merge!(:version => version)
           else opts.merge!(:delete_all_versions => true)
           end
-          
+
           purge_clone_aux(:service_module,opts)
         else
           Helper(:git_repo).unlink_local_clone?(:service_module,service_module_name,version)
@@ -733,7 +732,7 @@ module DTK::Client
       response = post rest_url("service_module/#{action}"), post_body
       return response unless response.ok?
       module_name = response.data(:module_name)
-      
+
       # when changing context send request for getting latest services instead of getting from cache
       @@invalidate_map << :service_module
 
@@ -749,7 +748,7 @@ module DTK::Client
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     def delete_from_catalog(context_params)
       remote_service_name = context_params.retrieve_arguments([:option_1!],method_argument_names)
-      
+
       unless options.force?
         # Ask user if really want to delete service module and all items contained in it, if not then return to dtk-shell without deleting
         return unless Console.confirmation_prompt("Are you sure you want to delete remote service-module '#{remote_service_name}' and all items contained in it"+'?')
@@ -779,20 +778,20 @@ module DTK::Client
       end
 
       return unless Console.confirmation_prompt("Are you sure you want to delete assembly '#{assembly_template_name||assembly_template_id}'"+'?') unless options.force?
-      
+
       post_body = {
         :service_module_id => service_module_id,
         :assembly_id => assembly_template_id,
-        :subtype => :template                                                                                       
+        :subtype => :template
       }
 
       response = post rest_url("service_module/delete_assembly_template"), post_body
       return response unless response.ok?
-      
+
       modules_path               = OsUtil.service_clone_location()
       module_location            = "#{modules_path}/#{service_module_name}" if service_module_name
-      assembly_template_location = "#{module_location}/assemblies/#{assembly_template_name}" if (module_location && assembly_template_name) 
-      
+      assembly_template_location = "#{module_location}/assemblies/#{assembly_template_name}" if (module_location && assembly_template_name)
+
       if File.directory?(assembly_template_location)
         unless (assembly_template_location.nil? || ("#{module_location}/assemblies/" == assembly_template_location))
           FileUtils.rm_rf("#{assembly_template_location}")
@@ -806,17 +805,17 @@ module DTK::Client
       Response::Ok.new()
     end
 =begin
-    desc "SERVICE-NAME/ID assembly-templates list", "List assembly templates optionally filtered by service ID/NAME." 
+    desc "SERVICE-NAME/ID assembly-templates list", "List assembly templates optionally filtered by service ID/NAME."
     def assembly_template(context_params)
 
       service_id, method_name = context_params.retrieve_arguments([:service_name!, :option_1!],method_argument_names)
 
       options_args = ["-s", service_id]
-      
+
       entity_name = "assembly_template"
       load_command(entity_name)
       entity_class = DTK::Client.const_get "#{cap_form(entity_name)}"
-      
+
       response = entity_class.execute_from_cli(@conn, method_name, DTK::Shell::ContextParams.new, options_args, false)
 
     end
@@ -840,7 +839,7 @@ TODO: needs to be rewritten
       #TODO: right now JenkinsClient wil throw error if problem; better to create an error resonse
       response
     end
-=end        
+=end
   end
 end
 

data/lib/commands/thor/target.rb

@@ -1,5 +1,7 @@
+dtk_require_common_commands('thor/inventory_parser')
 module DTK::Client
   class Target < CommandBaseThor
+    include InventoryParserMixin
 
     def self.pretty_print_cols()
       PPColumns.get(:target)
@@ -9,20 +11,51 @@ module DTK::Client
       return ['PROVIDER']
     end
 
+    def self.extended_context()
+      {
+        :context => {
+          # want auto complete for --provider option
+          "--provider" => "provider"
+        }
+      }
+    end
+
     desc "TARGET-NAME/ID list-nodes","Lists node instances in given targets."
     def list_nodes(context_params)
       context_params.method_arguments = ["nodes"]
-      list_targets(context_params)
+      list(context_params)
+    end
+
+    desc "TARGET-NAME/ID info","Provides information about specified target"
+    def info(context_params)
+      target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
+
+      post_body = {:target_id => target_id}
+      response = post rest_url('target/info'), post_body
+      response.render_custom_info("target")
     end
 
-    desc "TARGET-NAME/ID import-nodes","Reads from inventory dsl and populates the node instance objects in the dtk server."
+    desc "TARGET-NAME/ID import-nodes --source SOURCE","Reads from inventory dsl and populates the node instance objects (SOURCE: file:/path/to/file.yaml)."
+    method_option :source, :type => :string
     def import_nodes(context_params)
       target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
+      source = context_params.retrieve_thor_options([:source!], options)
 
-      post_body = {
-          :target_id => target_id
-        }
+      parsed_source = source.match(/^(\w+):(.+)/)
+      raise DTK::Client::DtkValidationError, "Invalid source! Valid source should contain source_type:source_path (e.g. --source file:path/to/file.yaml)." unless parsed_source
+
+      import_type = parsed_source[1]
+      path = parsed_source[2]
+      
+      raise DTK::Client::DtkValidationError, "We do not support '#{import_type}' as import source at the moment. Valid sources: #{ValidImportTypes}" unless ValidImportTypes.include?(import_type)
 
+      post_body = {:target_id => target_id}
+
+      if import_type.eql?('file')
+        inventory_data = parse_inventory_file(path)
+        post_body.merge!(:inventory_data => inventory_data)
+      end
+      
       response  = post rest_url("target/import_nodes"), post_body
       return response unless response.ok?
 
@@ -35,14 +68,50 @@ module DTK::Client
         end
       end
     end
+    ValidImportTypes = ["file"]
+
+    desc "set-default-target TARGET-IDENTIFIER","Sets the default target."
+    def set_default_target(context_params)
+      target_id = context_params.retrieve_arguments([:option_1!],method_argument_names)
+      post rest_url("target/set_default"), { :target_id => target_id }
+    end
+
+    desc "TARGET-NAME/ID install-agents","Install node agents on imported physical nodes."
+    def install_agents(context_params)
+      target_id   = context_params.retrieve_arguments([:target_id!],method_argument_names)
+
+      post_body = {:target_id => target_id}
+      post rest_url("target/install_agents"), post_body
+    end
+
+    desc "create-target [TARGET-NAME] --provider PROVIDER --region REGION", "Create target based on given provider"
+    method_option :provider, :type => :string
+    method_option :region, :type => :string
+    def create_target(context_params)
+      # we use :target_id but that will retunr provider_id (another name for target template ID)
+      target_name = context_params.retrieve_arguments([:option_1],method_argument_names)
+      provider    = context_params.retrieve_thor_options([:provider!], options)
+      region      = context_params.retrieve_thor_options([:region], options)
+
+      DTK::Shell::InteractiveWizard.validate_region(region) if region
+
+      post_body = {
+        :provider_id => provider
+      }
+      post_body.merge!(:target_name => target_name) if target_name
+      post_body.merge!(:region => region) if region
+      response = post rest_url("target/create"), post_body
+
+      @@invalidate_map << :target
+      return response
+    end
 
     desc "TARGET-NAME/ID list-services","Lists service instances in given targets."
     def list_services(context_params)
       context_params.method_arguments = ["assemblies"]
-      list_targets(context_params)
+      list(context_params)
     end
 
-
     def self.validation_list(context_params)
       provider_id = context_params.retrieve_arguments([:provider_id])
 
@@ -62,8 +131,8 @@ module DTK::Client
       response
     end
 
-    desc "list-targets","Lists available targets."
-    def list_targets(context_params)
+    desc "list","Lists available targets."
+    def list(context_params)
       provider_id, target_id, about = context_params.retrieve_arguments([:provider_id, :target_id, :option_1],method_argument_names||="")
 
       if target_id.nil?
@@ -82,13 +151,14 @@ module DTK::Client
 
         case about
           when "nodes"
-          response  = post rest_url("target/info_about"), post_body
-          data_type =  :node
+            response  = post rest_url("target/info_about"), post_body
+            data_type =  :node
           when "assemblies"
-          response  = post rest_url("target/info_about"), post_body
-          data_type =  :assembly
-         else
-          raise_validation_error_method_usage('list')
+            post_body.merge!(:detail_level => 'nodes', :include_workspace => true)
+            response  = post rest_url("target/info_about"), post_body
+            data_type =  :assembly
+          else
+            raise_validation_error_method_usage('list')
         end
 
         response.render_table(data_type)

data/lib/commands/thor/workspace.rb

@@ -382,7 +382,7 @@ module DTK::Client
     end
 
     desc "WORKSPACE-NAME/ID list-component-modules","List component modules associated with workspace."
-    def list_modules(context_params)
+    def list_component_modules(context_params)
       list_modules_aux(context_params)
     end
 

data/lib/config/disk_cacher.rb

@@ -16,11 +16,14 @@ class DiskCacher
 
   def initialize(cache_dir=DTK::Client::OsUtil.get_temp_location())
     @cache_dir = cache_dir
+    @current_user = ::DTK::Client::Configurator.client_username
   end
 
   def fetch(file_name, max_age=0, use_mock_up=true)
     file = Digest::MD5.hexdigest(file_name)
-    file_path = File.join(@cache_dir, file)
+    # current user is important so that there are no clashes in writting to temp file
+    # between multiple users on same machine
+    file_path = File.join(@cache_dir, "#{@current_user}::#{file}")
 
     # we check if the file -- a MD5 hexdigest of the URL -- exists
     #  in the dir. If it does and the data is fresh, we just read

data/lib/configurator.rb

@@ -9,18 +9,11 @@ module DTK
 			CONFIG_FILE   = File.join(OsUtil.dtk_local_folder, "client.conf")
 	  	CRED_FILE 	  = File.join(OsUtil.dtk_local_folder, ".connection")
 	  	DIRECT_ACCESS = File.join(OsUtil.dtk_local_folder, ".add_direct_access")
+	  	NODE_SSH_CREDENTIALS = File.join(OsUtil.dtk_local_folder, "ssh_credentials.yaml")
 
 			require 'fileutils'
 			FileUtils.mkdir(OsUtil.dtk_local_folder) unless File.directory?(OsUtil.dtk_local_folder)
 
-	    def self.CONFIG_FILE
-	    	CONFIG_FILE
-	    end
-
-	    def self.CRED_FILE
-	    	CRED_FILE
-	    end
-
 			def self.check_config_exists
 				exists = true
 				if !File.exists?(CONFIG_FILE)

data/lib/core.rb

@@ -14,6 +14,8 @@ dtk_require_from_base('util/os_util')
 dtk_require_from_base('util/ssh_util')
 dtk_require_from_base('util/common_util')
 dtk_require_from_base('util/permission_util')
+dtk_require_from_base('util/remote_dependency_util')
+
 dtk_require("config/configuration")
 
 def top_level_execute(entity_name, method_name, context_params=nil, options_args=nil, shell_execute=false)
@@ -231,8 +233,8 @@ module DTK
       include ParseFile
       dtk_require_from_base('configurator')
 
-      CONFIG_FILE = ::DTK::Client::Configurator.CONFIG_FILE
-      CRED_FILE = ::DTK::Client::Configurator.CRED_FILE
+      CONFIG_FILE = ::DTK::Client::Configurator::CONFIG_FILE
+      CRED_FILE = ::DTK::Client::Configurator::CRED_FILE
       
       REQUIRED_KEYS = [:server_host]
 

data/lib/domain/response.rb

@@ -116,14 +116,25 @@ module DTK
       end
 
       def get_custom_labels(label, type)
-        mappings = {
+        mappings = {}
+
+        mappings["module"] = {
           "id" => "ID:",
           "display_name" => "NAME:",
           "versions" => "VERSION(S):",
           "remote_repos" => "LINKED REMOTE(S):",
           "dsl_parsed" => "DSL PARSED:"
         }
-        mappings[label]
+
+        mappings["target"] = {
+          "id" => "ID:",
+          "display_name" => "NAME:",
+          "type" => "TYPE:",
+          "iaas_type" => "PROVIDER_TYPE:",
+          "provider_name" => "PROVIDER_NAME:"
+        }
+
+        mappings[type][label] if mappings[type]
       end
 
       def array_to_string(array_data)

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.5.14"
+  VERSION="0.5.15"
 end