dtk-client 0.9.1 → 0.10.0

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

@@ -0,0 +1,128 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class CommitAndPush < self
+      # Commits and pushes from service instance directory
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+
+          response = rest_get("#{BaseRoute}/#{service_instance}/repo_info")
+
+          push_args = {
+            :service_instance => service_instance,
+            :commit_message   => args[:commit_message] || default_commit_message(service_instance),
+            :branch           => response.required(:branch, :name),
+            :repo_url         => response.required(:repo, :url)
+          }
+
+          response = ClientModuleDir::GitRepo.commit_and_push_to_service_repo(push_args)
+          commit_sha = response.required(:head_sha)
+
+          response = rest_post("#{BaseRoute}/#{service_instance}/update_from_repo", :commit_sha => commit_sha)
+          process_response(response, :service_instance => service_instance, :args => push_args)
+          nil
+        end
+      end
+
+      private
+
+      def self.default_commit_message(service_instance)
+        "Updating changes to service instance '#{service_instance}'"
+      end
+
+      def self.head_commit_sha(service_instance)
+        raise Error, "Need to write"
+      end
+
+      def self.process_response(response, opts = {})
+        print_msgs_of_type(:error_msgs, response)
+        print_msgs_of_type(:warning_msgs, response)
+        print_msgs_of_type(:info_msgs, response)
+
+        pull_repo_updates?(response, opts)
+        process_backup_files(response, opts)
+        process_semantic_diffs(response)
+      end
+
+      def self.pull_repo_updates?(response, opts = {})
+        ClientModuleDir::GitRepo.pull_from_service_repo(opts[:args]) if response.data(:repo_updated)
+      end
+
+      # TODO: DTK-2663: This is fine for now, but in 0.10.1 want to move logic that writes files to be in
+      # a new method we write in ClientModuleDir::GitRepo.add_file
+      def self.process_backup_files(response, opts = {})
+        backup_files = response.data(:backup_files) || {}
+        return if backup_files.empty?
+
+        service_instance_name = opts[:service_instance]
+        final_path = "#{OsUtil.dtk_local_folder}/service/#{service_instance_name}"
+        all_backup_file_paths = backup_files.keys
+
+        if File.exists?(file_path = "#{final_path}/.gitignore")
+         has_backup = false
+         file = File.open(file_path, "r") do |f|
+           f.each_line do |line|
+             unless all_backup_file_paths.include?(line.strip)
+               write = File.open(file_path, "a")
+               write << line
+             end
+           end
+         end
+        else
+         File.open(".gitignore", "w") do |f|
+          all_backup_file_paths.each {|el| f.puts("#{el}\n")}
+         end
+        end
+
+        backup_files.each_pair do |file_path, content|
+          File.open("#{final_path}/#{file_path}", "a") {|f| f.write(content)}
+          File.open("#{final_path}/dtk.service.yaml", "w") {|f| f.write(content)}
+          # TODO: DTK-2663; write code that saves the content given by 'content' under 'file_path' which is a path relative to the service instance module. 
+        end
+        response = ClientModuleDir::GitRepo.commit_and_push_to_service_repo(opts[:args]) 
+
+        # TODO: DTK-2663; write code that creates or updates .gitignore so that each file in all_backup_file_paths is aline in gitignore
+        # TODO: write code that commits these changes to the service instance module.  
+      end
+
+      def self.process_semantic_diffs(response)
+        semantic_diffs = response.data(:semantic_diffs) || {}
+        return if semantic_diffs.empty?
+        # TODO: DTK-2663; cleanup so pretty printed'
+        OsUtil.print_info("\nDiffs that were pushed:")
+        # TODO: get rid of use of STDOUT
+        STDOUT << hash_to_yaml(semantic_diffs).gsub("---\n", "")
+      end
+
+      PRINT_FN = {
+        :info_msgs    => lambda { |msg| OsUtil.print_info(msg) },
+        :warning_msgs => lambda { |msg| OsUtil.print_warning(msg) },
+        :error_msgs => lambda { |msg| OsUtil.print_error(msg) }
+      }
+      def self.print_msgs_of_type(msg_type, response)
+        msgs = response.data(msg_type) || []
+        unless msgs.empty?
+          print_fn = PRINT_FN[msg_type]
+          msgs.each { |msg| print_fn.call(msg) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class Converge < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+
+          post_body = PostBody.new(
+            :service_instance => service_instance
+          )
+
+          violations = find_violations(service_instance)
+          return violations if violations
+
+          rest_post("#{BaseRoute}/#{service_instance}/converge", post_body)
+        end
+      end
+
+      private
+
+      def self.find_violations(service_instance)
+        violations_response = rest_get("#{BaseRoute}/#{service_instance}/violations")
+
+        if violations_response.data and violations_response.data.size > 0
+          OsUtil.print_error("The following violations were found; they must be corrected before workspace can be converged")
+          return violations_response.set_render_as_table!
+        end
+
+        nil
+      end
+    end
+  end
+end

data/lib/{util/common_util.rb → client/operation/service/create_workspace.rb}

@@ -15,21 +15,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module DTK
-  module Client
-    module CommonUtil
-      class << self
-        def substract_array_once(array1, array2, substract_from_back = false)
-          # we substract from reverse if flag set
-          array1 = array1.reverse if substract_from_back
+module DTK::Client
+  class Operation::Service
+    class CreateWorkspace < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          post_body = PostBody.new(
+            :workspace_name? => args[:workspace_name],
+            :target_service? => args[:target_service]
+          )
+          response = rest_post("#{BaseRoute}/create_workspace", post_body)
 
-          array2.each do |element|
-            if index = array1.index(element)
-              array1.delete_at(index)
-            end
-          end
+          workspace_name = response.required(:workspace, :name)
+          ClientModuleDir.create_service_dir(workspace_name)
 
-          substract_from_back ? array1.reverse : array1
+          response
         end
       end
     end

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

@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class Destroy < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+
+          unless args[:skip_prompt]
+            return false unless Console.prompt_yes_no("Are you sure you want to destroy the infrastructure associated with '#{service_instance}' and delete this service instance from the server?", :add_options => true)
+          end
+
+          post_body = PostBody.new(:service_instance => service_instance)
+          rest_post("#{BaseRoute}/delete", post_body)
+
+          ClientModuleDir.purge_service_instance_dir(args[:directory_path]) if args[:purge]
+
+          OsUtil.print_info("DTK module '#{service_instance}' has been deleted successfully.")
+        end
+      end
+
+    end
+  end
+end
+
+

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

@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class Edit < self
+      def self.execute(args = Args.new)
+        ret = nil
+        wrap_operation(args) do |args|
+          service_instance   = args.required(:service_instance)
+          absolute_file_path = args.required(:absolute_file_path)
+          push_after_edit    = args[:push_after_edit]
+          commit_message     = args[:commit_message]
+
+          response = Pull.execute(:service_instance => service_instance)
+          repo = response.required(:repo)
+
+          OsUtil.edit(absolute_file_path)
+          return ret unless push_after_edit and repo.changed?
+
+          commit_message ||= Internal.prompt_for_commit_message
+
+          # TODO: do commit
+
+          Push.execute(:service_instance => service_instance)
+          ret
+        end
+      end
+
+      module Internal
+        def self.prompt_for_commit_message
+          commit_msg = OsUtil.user_input("Commit message")
+          commit_msg.gsub!(/\"/,'') unless commit_msg.count('"') % 2 ==0
+          commit_msg
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class Exec < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          action           = args.required(:action)
+          action_params    = args[:action_params]
+
+          # parse params and return format { 'p_name1' => 'p_value1' , 'p_name2' => 'p_value2' }
+          task_params = parse_params?(action_params)||{}
+
+          # match if sent node/component
+          if task_action_match = action.match(/(^[\w\-\:]*)\/(.*)/)
+            node, action = $1, $2
+            task_params.merge!("node" => node)
+          end
+          
+          post_body = PostBody.new(
+            :task_params? => task_params
+          )
+          response = rest_post("#{BaseRoute}/#{service_instance}/#{action}", post_body)
+
+          if confirmation_message = response.data(:confirmation_message)
+            unless Console.prompt_yes_no("Service instance has been stopped, do you want to start it?", :add_options => true)
+              return Response::Ok.new(:empty_workflow => true) 
+            end
+
+            response = rest_post("#{BaseRoute}/#{service_instance}/#{action}", post_body.merge!(:start_assembly => true, :skip_violations => true))
+          end
+
+          if response.data(:empty_workflow)
+            OsUtil.print_warning("There are no steps in the workflow to execute")
+            return Response::Ok.new('empty_workflow' => true) 
+          end
+
+          response
+        end
+      end
+
+      private
+
+      def self.parse_params?(params_string)
+        if params_string
+          params_string.split(',').inject(Hash.new) do |h,av|
+            av_split = av.split('=')
+            unless av_split.size == 2
+              raise Error::Usage, "The parameter string (#{params_string}) is ill-formed"
+            end
+            h.merge(av_split[0] => av_split[1])
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class List < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          query_string_hash = QueryStringHash.new(
+            :detail_level => 'nodes',
+            :include_namespaces => true
+          )
+          rest_get("#{BaseRoute}/list", query_string_hash)
+        end.set_render_as_table!
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class ListActions < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          type = args[:type]
+
+          query_string_hash = QueryStringHash.new(
+            :type? => type
+          )
+          rest_get("#{BaseRoute}/#{service_instance}/actions", query_string_hash)
+        end.set_render_as_table!
+      end
+    end
+  end
+end

data/lib/{commands/thor/dependency.rb → client/operation/service/list_attributes.rb}

@@ -16,19 +16,23 @@
 # limitations under the License.
 #
 module DTK::Client
-  class Dependency < CommandBaseThor
-    desc "add-component COMPONENT-ID OTHER-COMPONENT-ID","Add before/require constraint"
-    def add_component(context_params)
-      component_id, other_component_id = context_params.retrieve_arguments([:option_1!,:option_2!],method_argument_names)
-      post_body = {
-        :component_id => component_id,
-        :other_component_id => other_component_id,
-        :type =>  "required by"
-      }
-      response = post rest_url("dependency/add_component_dependency"), post_body
-      @@invalidate_map << :component_template
+  class Operation::Service
+    class ListAttributes < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          links            = args[:links]
+          node             = args[:node]
+          component        = args[:component]
 
-      return response
+          query_string_hash = QueryStringHash.new(
+            :links?           => links,
+            :node_id?         => node,
+            :component_id?    => component
+          )
+          rest_get("#{BaseRoute}/#{service_instance}/attributes", query_string_hash)
+        end.set_render_as_table!
+      end
     end
   end
 end

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

@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class ListComponentLinks < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          rest_get("#{BaseRoute}/#{service_instance}/component_links")
+        end.set_render_as_table!
+      end
+    end
+  end
+end

data/lib/{commands/common/thor/pull_clone_changes.rb → client/operation/service/list_components.rb}

@@ -15,14 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-dtk_require_common_commands('thor/common')
 module DTK::Client
-  module PullCloneChangesMixin
-    def pull_clone_changes?(module_type,module_id,version=nil,opts={})
-      module_name, module_namespace,repo_url,branch,not_ok_response = workspace_branch_info(module_type,module_id,version,opts)
-      return not_ok_response if not_ok_response
-      opts_pull = opts.merge(:local_branch => branch,:namespace => module_namespace)
-      Helper(:git_repo).pull_changes(module_type,module_name,opts_pull)
+  class Operation::Service
+    class ListComponents < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          dependencies = args[:dependencies]
+
+          query_string_hash = QueryStringHash.new(
+            :dependencies? => dependencies
+          )
+          rest_get("#{BaseRoute}/#{service_instance}/components", query_string_hash)
+        end.set_render_as_table!
+      end
     end
   end
 end

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

@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class ListDependentModules < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          rest_get("#{BaseRoute}/#{service_instance}/dependent_modules")
+        end.set_render_as_table!
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class ListNodes < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          rest_get("#{BaseRoute}/#{service_instance}/nodes")
+        end.set_render_as_table!
+      end
+    end
+  end
+end

data/lib/{commands/thor/project.rb → client/operation/service/list_violations.rb}

@@ -16,19 +16,14 @@
 # limitations under the License.
 #
 module DTK::Client
-  class Project < CommandBaseThor
-
-    def self.pretty_print_cols()
-      PPColumns.get(:project)
+  class Operation::Service
+    class ListViolations < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          rest_get("#{BaseRoute}/#{service_instance}/violations")
+        end.set_render_as_table!
+      end
     end
-
-    desc "list","List projects"
-    def list(context_params)
-      search_hash = SearchHash.new()
-      search_hash.cols = pretty_print_cols()
-      post rest_url("project/list"), search_hash.post_body_hash()
-    end
-    
   end
 end
-

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

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2010-2016 dtk contributors
+#
+# This file is part of the dtk project.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module DTK::Client
+  class Operation::Service
+    class Pull < self
+      def self.execute(args = Args.new)
+        wrap_operation(args) do |args|
+          service_instance = args.required(:service_instance)
+          response = rest_get("#{BaseRoute}/#{service_instance}/repo_info")
+
+          pull_args = {
+            :service_instance => service_instance,
+            :repo_url         => response.required(:repo, :url),
+            :branch           => response.required(:branch, :name)
+          }
+          ClientModuleDir::GitRepo.pull_from_service_repo(pull_args)
+        end
+
+      end
+    end
+  end
+end