dtk-client 0.7.1.1 → 0.7.2

data/lib/commands/thor/test_module.rb

@@ -10,7 +10,7 @@ module DTK::Client
 
     def self.valid_children()
       # [:"component-template"]
-      [:component]
+      [:component, :remotes]
     end
 
     # this includes children of children - has to be sorted by n-level access
@@ -20,6 +20,10 @@ module DTK::Client
       [:component]
     end
 
+    def self.multi_context_children()
+      [[:component], [:remotes], [:component, :remotes]]
+    end
+
     def self.valid_child?(name_of_sub_context)
       return TestModule.valid_children().include?(name_of_sub_context.to_sym)
     end
@@ -32,6 +36,19 @@ module DTK::Client
       return :test_module, "test_module/list", nil
     end
 
+    def self.override_allowed_methods()
+      return DTK::Shell::OverrideTasks.new(
+        {
+          :command_only => {
+            :remotes => [
+              ["push-remote",  "push-remote [REMOTE-NAME] [--force]",  "# Push local changes to remote git repository"],
+              ["list-remotes",  "list-remotes",  "# List git remotes for given module"],
+              ["add-remote",    "add-remote REMOTE-NAME REMOTE-URL", "# Add git remote for given module"],
+              ["remove-remote", "remove-remote REPO-NAME [-y]", "# Remove git remote for given module"]            ]
+          }
+      })
+    end
+
     desc "delete TEST-MODULE-NAME [-y] [-p]", "Delete test module and all items contained in it. Optional parameter [-p] is to delete local directory."
     method_option :force, :aliases => '-y', :type => :boolean, :default => false
     method_option :purge, :aliases => '-p', :type => :boolean, :default => false
@@ -202,7 +219,7 @@ module DTK::Client
       push_module_aux(context_params, internal_trigger)
     end
 
-    desc "TEST-MODULE-NAME/ID push-dtkn [-n NAMESPACE]", "Push changes from local copy of test module to remote repository (dtkn)."
+    desc "TEST-MODULE-NAME/ID push-dtkn [-n NAMESPACE] [--force]", "Push changes from local copy of test module to remote repository (dtkn)."
     method_option "message",:aliases => "-m" ,
       :type => :string,
       :banner => "COMMIT-MSG",
@@ -212,7 +229,7 @@ module DTK::Client
         :banner => "NAMESPACE",
         :desc => "Remote namespace"
     #hidden option for dev
-    method_option 'force-parse', :aliases => '-f', :type => :boolean, :default => false
+    method_option :force, :type => :boolean, :default => false, :aliases => '-f'
     def push_dtkn(context_params, internal_trigger=false)
       push_dtkn_module_aux(context_params, internal_trigger)
     end
@@ -225,6 +242,29 @@ module DTK::Client
       # list_diffs_module_aux(context_params)
     end
 
+    # REMOTE INTERACTION
+
+    desc "HIDE_FROM_BASE push-remote [REMOTE-NAME] [--force]", "Push local changes to remote git repository"
+    method_option :force, :type => :boolean, :default => false
+    def push_remote(context_params)
+      push_remote_module_aux(context_params)
+    end
+
+    desc "HIDE_FROM_BASE list-remotes", "List git remotes for given module"
+    def list_remotes(context_params)
+      remote_list_aux(context_params)
+    end
+
+    desc "HIDE_FROM_BASE add-remote REMOTE-NAME REMOTE-URL", "Add git remote for given module"
+    def add_remote(context_params)
+      remote_add_aux(context_params)
+    end
+
+    desc "HIDE_FROM_BASE remove-remote REPO-NAME [-y]", "Remove git remote for given module"
+    method_option :force, :aliases => '-y', :type => :boolean, :default => false
+    def remove_remote(context_params)
+      remote_remove_aux(context_params)
+    end
 
     #
     # DEVELOPMENT MODE METHODS

data/lib/commands/thor/workspace.rb

@@ -128,7 +128,8 @@ module DTK::Client
             ['list-components',"list-components","# List components."]
           ],
           :utils => [
-            ['execute-tests',"execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]","# Execute tests. --component filters execution per component, --timeout changes default execution timeout."],
+# TODO: DTK-2027 might subsume by the dtk actions; currently server changes does not support this command
+#            ['execute-tests',"execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]","# Execute tests. --component filters execution per component, --timeout changes default execution timeout."],
             ['get-netstats',"get-netstats","# Get netstats."],
             ['get-ps',"get-ps [--filter PATTERN]","# Get ps."],
             ['grep',"grep LOG-PATH NODE-ID-PATTERN GREP-PATTERN [--first]","# Grep log from multiple nodes. --first option returns first match (latest log entry)."],
@@ -382,6 +383,8 @@ module DTK::Client
       get_netstats_aux(context_params)
     end
 
+=begin
+# TODO: DTK-2027 might subsume by the dtk actions; currently server changes does not support this command
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/workspace>)
     desc "HIDE_FROM_BASE execute-tests [--component COMPONENT-NAME] [--timeout TIMEOUT]", "Execute tests. --component filters execution per component, --timeout changes default execution timeout"
     method_option :component, :type => :string, :desc => "Component name" 
@@ -389,6 +392,7 @@ module DTK::Client
     def execute_tests(context_params)
       execute_tests_aux(context_params)
     end
+=end
 
     # using HIDE_FROM_BASE to hide this command from base context (dtk:/workspace>)
     desc "HIDE_FROM_BASE get-ps [--filter PATTERN]", "Get ps"
@@ -515,10 +519,10 @@ module DTK::Client
       set_attribute_aux(context_params)
     end
 
-    desc "WORKSPACE-NAME/ID set-required-params", "Interactive dialog to set required params that are not currently set"
-    def set_required_params(context_params)
+    desc "WORKSPACE-NAME/ID set-required-attributes", "Interactive dialog to set required attributes that are not currently set"
+    def set_required_attributes(context_params)
       workspace_id = context_params.retrieve_arguments([:workspace_id!],method_argument_names)
-      set_required_params_aux(workspace_id,:assembly,:instance)
+      set_required_attributes_aux(workspace_id,:assembly,:instance)
     end
 
 #    desc "WORKSPACE-NAME/ID start [NODE-ID-PATTERN]", "Starts all workspace's nodes,  specific nodes can be selected via node id regex."

data/lib/core.rb

@@ -7,9 +7,12 @@ require 'colorize'
 require 'json'
 require 'pp'
 
+# Development Gems
 if ::DTK::Configuration.get(:development_mode)
   require 'ap'
+  require 'looksee'
 end
+
 #TODO: for testing; fix by pass in commadn line argument
 #RestClient.log = STDOUT
 

data/lib/domain/git_adapter.rb

@@ -6,7 +6,14 @@ module DTK
       attr_accessor :git_repo
 
       def initialize(repo_dir, local_branch_name = nil)
-        @git_repo = Git.init(repo_dir)
+
+        if DTK::Configuration.get(:debug_grit)
+          logger       = Logger.new(STDOUT)
+          logger.level = Logger::INFO
+          @git_repo = Git.init(repo_dir, :log => logger)
+        else
+          @git_repo = Git.init(repo_dir)
+        end
 #       If we want to log GIT interaction
 #       @git_repo = Git.init(repo_dir, :log => Logger.new(STDOUT))
         @local_branch_name = local_branch_name
@@ -98,9 +105,9 @@ module DTK
       end
 
       def add_remote(name, url)
-        unless is_there_remote?(name)
-          @git_repo.add_remote(name, url)
-        end
+        @git_repo.remove_remote(name) if is_there_remote?(name)
+
+        @git_repo.add_remote(name, url)
       end
 
       def fetch(remote = 'origin')
@@ -172,14 +179,14 @@ module DTK
         end
       end
 
-      def push(remote_branch_ref)
+      def push(remote_branch_ref, opts={})
         remote, remote_branch = remote_branch_ref.split('/')
-        push_with_remote(remote, remote_branch)
+        push_with_remote(remote, remote_branch, opts)
       end
 
-      def push_with_remote(remote, remote_branch)
+      def push_with_remote(remote, remote_branch, opts={})
         branch_for_push = "#{local_branch_name}:refs/heads/#{remote_branch||local_branch_name}"
-        @git_repo.push(remote, branch_for_push)
+        @git_repo.push(remote, branch_for_push, opts)
       end
 
       def add_file(file_rel_path, content)

data/lib/domain/response.rb

@@ -1,6 +1,7 @@
-# This is wrapper for holding rest response information as well as 
-# passing selection of ViewProcessor from Thor selection to render view 
+# This is wrapper for holding rest response information as well as
+# passing selection of ViewProcessor from Thor selection to render view
 # selection
+require 'git'
 
 module DTK
   module Client
@@ -17,16 +18,16 @@ module DTK
       end
 
       def initialize(command_class=nil,hash={})
-        super(hash)           
+        super(hash)
         @command_class     = command_class
         @skip_render       = false
         @print_error_table = false
         # default values
-        @render_view = RenderView::AUG_SIMPLE_LIST 
+        @render_view = RenderView::AUG_SIMPLE_LIST
         @render_data_type = nil
       end
 
-      def clone_me()      
+      def clone_me()
         return Marshal.load(Marshal.dump(self))
       end
 
@@ -34,21 +35,33 @@ module DTK
         begin
           results = (block ? yield : data)
           Ok.new(results)
-         rescue ErrorUsage => e
-          Error::Usage.new("message"=> e.to_s)
-         rescue => e
-          error_hash =  {
-            "message"=> e.message,
-            "backtrace" => e.backtrace,
-            "on_client" => true
-            }
-
-          if DTK::Configuration.get(:development_mode)
-            DtkLogger.instance.error_pp("Error inside wrapper DEV ONLY: #{e.message}", e.backtrace)
+
+        rescue Git::GitExecuteError => e
+          if e.message.include?('Please make sure you have the correct access rights')
+            error_msg  = "You do not have git access from this client, please add following SSH key in your git account: \n\n"
+            error_msg += SSHUtil.rsa_pub_key_content() + "\n"
+            raise DTK::Client::DtkError, error_msg
           end
+          handle_error_in_wrapper(e)
+        rescue ErrorUsage => e
+          Error::Usage.new("message"=> e.to_s)
+        rescue => e
+          handle_error_in_wrapper(e)
+        end
+      end
+
+      def self.handle_error_in_wrapper(exception)
+        error_hash =  {
+          "message"=> exception.message,
+          "backtrace" => exception.backtrace,
+          "on_client" => true
+          }
 
-          Error::Internal.new(error_hash)
+        if DTK::Configuration.get(:development_mode)
+          DtkLogger.instance.error_pp("Error inside wrapper DEV ONLY: #{exception.message}", exception.backtrace)
         end
+
+        Error::Internal.new(error_hash)
       end
 
       def get_label_for_column_name(column, type)
@@ -69,7 +82,7 @@ module DTK
             "target:" => "TARGET:"
           }
         end
-        
+
         mappings[column]
       end
 
@@ -106,19 +119,19 @@ module DTK
 
         columns.each do |column|
           STDOUT << column
-        end 
+        end
         puts "\n"
       end
 
       def render_custom_info(type)
-        puts "--- \n"     
+        puts "--- \n"
 
         unless data.empty?
           data.each do |k,v|
             label = get_custom_labels(k, type)
             v = array_to_string(v) if v.is_a?(Array)
             STDOUT << " #{label} #{v}\n" if label
-          end 
+          end
         end
 
         puts "\n"
@@ -151,10 +164,10 @@ module DTK
         array_data.each do |a|
           info << "#{a.values.first},"
         end
-        
+
         "#{info.gsub!(/,$/,'')}"
       end
-      
+
 
       def render_data(print_error_table=false)
         unless @skip_render
@@ -174,7 +187,7 @@ module DTK
 
             # sending raw data from response
             rendered_data = ViewProcessor.render(@command_class, data, @render_view, @render_data_type, nil, @print_error_table)
-            
+
             puts "\n" unless rendered_data
             return rendered_data
           else
@@ -230,14 +243,14 @@ module DTK
         def initialize(hash={})
           super(nil,{"errors" => [hash]})
         end
-        
+
         class Usage < self
           def initialize(hash_or_string={})
             hash = (hash_or_string.kind_of?(String) ? {'message' => hash_or_string} : hash_or_string)
             super({"code" => "error"}.merge(hash))
           end
         end
-      
+
         class Internal < self
           def initialize(hash={})
             super({"code" => "error"}.merge(hash).merge("internal" => true))

data/lib/dtk-client/version.rb

@@ -1,3 +1,3 @@
 module DtkClient
-  VERSION="0.7.1.1"
+  VERSION="0.7.2"
 end

data/lib/execute.rb

@@ -5,7 +5,7 @@ module DTK::Client
     dtk_require('execute/command')
     dtk_require('execute/command_processor')
     dtk_require('execute/execute_context')
-    dtk_require('execute/examples')
+    dtk_require('execute/script')
 
     extend ExecuteContext::ClassMixin
   end

data/lib/execute/command/api_call/service.rb

@@ -14,6 +14,7 @@ class DTK::Client::Execute
             :subtype               => 'instance',
             :node_id               => Required(:node),
             :component_template_id => Required(:component),
+            :namespace             => Required(:namespace),
             :idempotent            => Equal::OrDefault(true),
             :donot_update_workflow => Equal::OrDefault(false)
           }

data/lib/execute/script.rb

@@ -0,0 +1,50 @@
+class DTK::Client::Execute
+  class Script < self
+    dtk_require('script/add_tenant')
+    dtk_require('script/add_tenant_without_router')
+    def self.execute()
+      script_class().execute_script()
+    end
+  
+   private
+    Scripts = {
+      'add-tenant' => AddTenant,
+      'add-tenant-without-router' => AddTenantWithoutRouter
+    }
+
+    def self.script_class()
+      script_name = ARGV.size > 0 && ARGV[0]
+      unless script_class = script_name && Scripts[script_name]
+        legal_scripts = Scripts.keys
+           err_msg = (script_name ? "Unsupported script '#{script_name}'" : "Missing script name")
+        err_msg << "; supported scripts are (#{legal_scripts.join(',')})"
+        raise ErrorUsage.new(err_msg)
+      end
+      script_class
+    end
+
+    def self.execute_script()
+      params = ret_params_from_argv()
+      execute_with_params(params)
+    end
+    
+    module OptionParserHelper
+      require 'optparse'
+      def process_params_from_options(banner,&block)
+        OptionParser.new do |opts|
+          opts.banner = banner
+          block.call(opts)
+        end.parse!
+      end
+      
+      def show_help_and_exit(banner)
+        ARGV[0] = '--help'
+        OptionParser.new do |opts|
+          opts.banner = banner
+        end.parse!
+      end
+    end
+    extend OptionParserHelper
+  end
+end
+

data/lib/execute/script/add_tenant.rb

@@ -0,0 +1,91 @@
+class DTK::Client::Execute::Script
+  class AddTenant < self
+    def self.ret_params_from_argv()
+      banner = "Usage: dtk-execute add-tenant TENANT-NAME CATALOG-USERNAME -p PASSWORD [-s SERVICE-INSTANCE]"
+      tenant_name = catalog_username = tenant_number = nil
+      if ARGV.size > 2
+        tenant_name = ARGV[1]
+        if tenant_name =~ /^dtk([0-9]+)$/
+          tenant_number = $1
+        else
+          raise ErrorUsage.new("TENANT-NAME must be of form 'dtkNUMs', like dtk601")
+        end
+        catalog_username = ARGV[2]
+      else
+        show_help_and_exit(banner)
+      end
+
+      params = Hash.new 
+      process_params_from_options(banner) do |opts|
+        opts.on( '-p', '--password PASSWORD', "Password for tenant and catalog" ) do |pw|
+          params[:password] = pw
+        end
+        opts.on( '-s', '--service SERVICE-INSTANCE', "Name of Service instance" ) do |s|
+          params[:service_instance] = s
+        end
+      end
+
+      # TODO: use opt parser to enforce that :password option is manditory
+      unless password = params[:password]
+        raise ErrorUsage.new("Password is mandatory; use -p commnd line option")
+      end
+      service_instance = params[:service_instance] || "dtkhost#{tenant_number[0]}"
+      to_add = {
+        :tenant_name      => tenant_name,
+        :catalog_username => catalog_username,
+        :service_instance => service_instance
+      }
+      params.merge(to_add)
+    end
+
+    def self.execute_with_params(params)
+      tenant_name =  params[:tenant_name]
+      catalog_username = params[:catalog_username]
+      service = params[:service_instance]
+      password = params[:password]
+      server_node = params[:server_node_name] || 'server'
+      router_node = params[:router_node_name] || 'router'
+
+      component_with_namespace = "dtk-meta-user:dtk_tenant[#{tenant_name}]"
+      component_namespace, component = (component_with_namespace =~ /(^[^:]+):(.+$)/; [$1,$2])
+
+      av_pairs = {
+        :catalog_username => catalog_username,
+        :tenant_password  => password,
+        :catalog_password => password
+      }
+      
+      ExecuteContext(:print_results => true) do
+        result = call 'service/add_component',
+          :service               => service,
+          :node                  => server_node,
+          :component             => component,
+          :namespace             => component_namespace,
+          :donot_update_workflow => true
+        
+        av_pairs.each_pair do |a,v|
+          result = call 'service/set_attribute',
+            :service        => service,
+            :attribute_path => "#{server_node}/#{component}/#{a}",
+            :value          => v
+        end
+        
+        result = call 'service/link_components',
+          :service          => service,
+          :input_component  => "#{server_node}/#{component}",
+          :output_component => "#{server_node}/dtk_postgresql::databases"
+
+        result = call 'service/link_components',
+          :service          => service,
+          :input_component  => "#{server_node}/#{component}",
+          :output_component => "#{router_node}/dtk_nginx::vhosts_for_router"
+        
+        result = call 'service/execute_workflow',
+          :service         => service,
+          :workflow_name   => 'add_tenant',
+          :workflow_params => {'name' => tenant_name}
+        
+      end
+    end
+  end
+end