xapixctl 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ba3cb0a95f481dfd6568282c75d0bc4a2db36a03c4b8a177401deac61b04eaa
-  data.tar.gz: f5cd613fdcb2c9a204b224b6504348c4840fe45fd3506bea904bb26d5367793a
+  metadata.gz: afb1bf2d6f83193e0b5d1341fbfc1177c7c76802a2aa0cdef748f3d9eb0e7d11
+  data.tar.gz: 742c9ce8f28477d6bf922196c1d0d192ec1648db7fbe1cc73a1aba673c307f2d
 SHA512:
-  metadata.gz: c0635abac3da2424e0109306eec1795dac8ae2cf9cb81aa4f8769ef397f5e70f4b5db7095b2820f0a49f7902d2d3e75df86b2128622fdaa10bb3082dea38ddab
-  data.tar.gz: f14855a202d934303acf771987686dcf395c0842a870a309283bbd080c1ebd32c0c1178e1a0df2256352c575920e4116010953a4e6d2a8833e178f27838f5e85
+  metadata.gz: 87ecb583e67e5210f5cc9c2333d519e6bc160b7e0d8eb5236c407825acca54fc0dd1bfac178d2f0abef4becd29e5cc4b46bdc1d6e0c4ffcda79ab969a2d5846f
+  data.tar.gz: 5ee3f1ef369eb548117d7e277884348ea9cc4885f650bae9c3bb4191a72e7f4d3261ceb05b97f53ca2ee04c2a917fbd2937e96d024b4e4a690d3a0fe37926d80

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    xapixctl (1.2.2)
+    xapixctl (1.2.3)
       activesupport (>= 5.2.3, < 6.0.0)
+      hashdiff (>= 1.0.1, < 1.2.0)
       rest-client (>= 2.1.0, < 3.0.0)
       thor (>= 1.0.0, < 1.2.0)
 

data/lib/xapixctl/sync_cli.rb

@@ -2,6 +2,7 @@
 
 require 'xapixctl/base_cli'
 require 'pathname'
+require 'hashdiff'
 
 module Xapixctl
   class SyncCli < BaseCli
@@ -10,7 +11,7 @@ module Xapixctl
 
     desc "to-dir DIRECTORY", "Syncs resources in project to directory"
     long_desc <<-LONGDESC
-      `xapixctl sync to-dir DIRECTORY` will export all resources of a given project and remove any additional resources from the directory.
+      `xapixctl sync to-dir DIRECTORY -p org/prj` will export all resources of a given project and remove any additional resources from the directory.
 
       With --no-credentials you can exclude all credentials from getting exported.
 
@@ -24,7 +25,7 @@ module Xapixctl
       \x5> $ xapixctl sync to-dir ./project_dir -p xapix/some-project --exclude-types=ApiPublishing ApiPublishingRole Credential
     LONGDESC
     def to_dir(dir)
-      sync_path = SyncPath.new(dir, prj_connection.resource_types_for_export, excluded_types)
+      sync_path = SyncPath.new(shell, dir, prj_connection.resource_types_for_export, excluded_types)
 
       res_details = prj_connection.project_resource
       sync_path.write_file(generate_readme(res_details), 'README.md')
@@ -43,7 +44,7 @@ module Xapixctl
 
     desc "from-dir DIRECTORY", "Syncs resources in project from directory"
     long_desc <<-LONGDESC
-      `xapixctl sync from-dir project dir` will import all resources into the given project from the directory and remove any additional resources which are not present in the directory.
+      `xapixctl sync from-dir DIRECTORY -p org/prj` will import all resources into the given project from the directory and remove any additional resources which are not present in the directory.
 
       With --no-credentials you can exclude all credentials from getting exported.
 
@@ -55,10 +56,10 @@ module Xapixctl
       \x5> $ xapixctl sync from-dir ./project_dir -p xapix/some-project --exclude-types=ApiPublishing ApiPublishingRole Credential
     LONGDESC
     def from_dir(dir)
-      sync_path = SyncPath.new(dir, prj_connection.resource_types_for_export, excluded_types)
+      sync_path = SyncPath.new(shell, dir, prj_connection.resource_types_for_export, excluded_types)
 
       sync_path.load_resource('project') do |desc|
-        puts "applying #{desc['kind']} #{desc.dig('metadata', 'id')} to #{prj_connection.project}"
+        say "applying #{desc['kind']} #{desc.dig('metadata', 'id')} to #{prj_connection.project}"
         desc['metadata']['id'] = prj_connection.project
         prj_connection.organization.apply(desc)
       end
@@ -68,7 +69,7 @@ module Xapixctl
         res_path = sync_path.resource_path(type)
         updated_resource_ids = []
         res_path.load_resources do |desc|
-          puts "applying #{desc['kind']} #{desc.dig('metadata', 'id')}"
+          say "applying #{desc['kind']} #{desc.dig('metadata', 'id')}"
           updated_resource_ids += prj_connection.apply(desc)
         end
         outdated_resources[type] = prj_connection.resource_ids(type) - updated_resource_ids
@@ -76,16 +77,90 @@ module Xapixctl
 
       outdated_resources.each do |type, resource_ids|
         resource_ids.each do |resource_id|
-          puts "removing #{type} #{resource_id}"
+          say "removing #{type} #{resource_id}"
           prj_connection.delete(type, resource_id)
         end
       end
     end
 
+    desc "diff DIRECTORY", "List resource which differ between project and directory"
+    long_desc <<-LONGDESC
+      `xapixctl sync diff DIRECTORY -p org/prj` will list the resources which are different between the given project and the given directory.
+
+      With --no-credentials you can exclude all credentials from getting exported.
+
+      With --exclude-types you can specify any resource types besides Project you'd like to exclude.
+
+      When only listing changed resources, the first character in a line indicates the status of the resource:
+      \x5 = - no changes
+      \x5 ~ - changed
+      \x5 ^ - in remote project
+      \x5 v - in directory
+
+      Examples:
+      \x5> $ xapixctl sync diff ./project_dir -p xapix/some-project
+      \x5> $ xapixctl sync diff ./project_dir -p xapix/some-project --no-credentials
+      \x5> $ xapixctl sync diff ./project_dir -p xapix/some-project --exclude-types=ApiPublishing ApiPublishingRole Credential
+    LONGDESC
+    option :details, desc: "Include detailed differences", type: :boolean, default: false
+    def diff(dir)
+      sync_path = SyncPath.new(shell, dir, prj_connection.resource_types_for_export, excluded_types)
+
+      sync_path.load_resource('project') do |desc|
+        desc['metadata']['id'] = prj_connection.project
+        res_details = prj_connection.project_resource
+        show_diff(desc, res_details)
+      end
+
+      sync_path.types_to_sync.each do |type|
+        res_path = sync_path.resource_path(type)
+        local_resource_ids = []
+        remote_resource_ids = prj_connection.resource_ids(type)
+        res_path.load_resources do |desc|
+          resource_id = desc['metadata']['id']
+          local_resource_ids << resource_id
+          if remote_resource_ids.include?(resource_id)
+            res_details = prj_connection.resource(type, desc['metadata']['id'])
+            show_diff(desc, res_details)
+          else
+            say "v #{type} #{resource_id}"
+          end
+        end
+        (remote_resource_ids - local_resource_ids).each do |resource_id|
+          say "^ #{type} #{resource_id}"
+        end
+      end
+    end
+
     private
 
+    def show_diff(local, remote)
+      kind, id = local['kind'], local['metadata']['id']
+      local, remote = local.slice('definition'), remote.slice('definition')
+      changed = local != remote
+      status = changed ? "~" : "="
+      say "#{status} #{kind} #{id}"
+      return unless changed && options[:details]
+      shell.indent do
+        Hashdiff.diff(local, remote).each do |change|
+          status = change[0].tr('+-', '^v')
+          key = change[1]
+          say "#{status} #{key}"
+          shell.indent do
+            case status
+            when "~" then say "^ #{change[3]}"; say "v #{change[2]}"
+            else say "#{status} #{change[2]}" if change[2]
+            end
+          end
+        end
+      end
+    end
+
     class ResourcePath
-      def initialize(path)
+      delegate :say, to: :@shell
+
+      def initialize(shell, path)
+        @shell = shell
         @path = path
         @resource_files = []
       end
@@ -98,7 +173,7 @@ module Xapixctl
         end
         file = @path.join(filename)
         file.write(content)
-        puts "updated #{file}..."
+        say "updated #{file}..."
         file
       end
 
@@ -119,7 +194,7 @@ module Xapixctl
       def remove_outdated_resources
         (@path.glob('*.yaml') - @resource_files).each do |outdated_file|
           outdated_file.delete
-          puts "removed #{outdated_file}"
+          say "removed #{outdated_file}"
         end
       end
     end
@@ -127,8 +202,8 @@ module Xapixctl
     class SyncPath < ResourcePath
       attr_reader :types_to_sync
 
-      def initialize(dir, all_types, excluded_types)
-        super(Pathname.new(dir))
+      def initialize(shell, dir, all_types, excluded_types)
+        super(shell, Pathname.new(dir))
         @all_types = all_types
         @excluded_types_file = @path.join('.excluded_types')
         @excluded_types = excluded_types || []
@@ -136,11 +211,11 @@ module Xapixctl
         @excluded_types &= @all_types
         @excluded_types.sort!
         @types_to_sync = @all_types - @excluded_types
-        puts "Resource types excluded from sync: #{@excluded_types.join(', ')}" if @excluded_types.any?
+        say "Resource types excluded from sync: #{@excluded_types.join(', ')}" if @excluded_types.any?
       end
 
       def resource_path(type)
-        ResourcePath.new(@path.join(type.underscore))
+        ResourcePath.new(@shell, @path.join(type.underscore))
       end
 
       def update_excluded_types_file
@@ -149,7 +224,7 @@ module Xapixctl
     end
 
     def excluded_types
-      excluded = options[:exclude_types]
+      excluded = options[:exclude_types] || []
       excluded += ['Credential'] unless options[:credentials]
       excluded
     end

data/lib/xapixctl/titan_cli.rb

@@ -31,6 +31,10 @@ module Xapixctl
       connector_refs = import_swagger(File.basename(url.path), schema)
       say "\n== Onboarding Connectors", :bold
       connectors = match_connectors_to_action(connector_refs)
+      if connectors.empty?
+        warn "\nNo valid connectors for ML service detected, not building service."
+        exit 1
+      end
       say "\n== Building Service", :bold
       service_doc = build_service(schema.dig('info', 'title'), connectors)
       res = prj_connection.apply(service_doc)
@@ -81,7 +85,8 @@ module Xapixctl
         say "\n#{connector['kind']} #{connector.dig('definition', 'name')} -> "
         if action
           say "#{action} action"
-          [action, update_connector_with_preview(connector)]
+          updated_connector = update_connector_with_preview(connector)
+          [action, updated_connector] if updated_connector
         else
           say "no action type detected, ignoring"
           nil
@@ -100,7 +105,7 @@ module Xapixctl
         res = prj_connection.accept_data_source_preview(connector.dig('metadata', 'id'))
         return res.dig('data_source', 'resource_description')
       end
-      connector
+      nil
     end
 
     def extract_schema(data_sample)
@@ -206,10 +211,10 @@ module Xapixctl
           name: 'Result',
           inputs: ['predict'],
           formulas: [{
-            ref: "#prediction.raw",
+            ref: "#prediction.percent",
             formula: "IF(.predict.status = 200, ROUND(100*coerce.to-float(.predict.body), 2))"
           }, {
-            ref: "#prediction.percent",
+            ref: "#prediction.raw",
             formula: "IF(.predict.status = 200, coerce.to-float(.predict.body))"
           }, {
             ref: "#success",
@@ -219,7 +224,7 @@ module Xapixctl
             formula: "IF(.predict.status <> 200, 'Model not trained!')"
           }],
           parameter_sample: {
-            "prediction" => { "percent" => 51, "raw" => 0.5112131 },
+            "prediction" => { "percent" => 51.12, "raw" => 0.5112131 },
             "success" => true,
             "error" => nil
           }

data/lib/xapixctl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xapixctl
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/xapixctl.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.6'
 
   spec.add_dependency "activesupport", ">= 5.2.3", "< 6.0.0"
+  spec.add_dependency "hashdiff", ">= 1.0.1", "< 1.2.0"
   spec.add_dependency "rest-client", ">= 2.1.0", "< 3.0.0"
   spec.add_dependency "thor", ">= 1.0.0", "< 1.2.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xapixctl
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Michael Reinsch
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement