xapixctl 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb1bf2d6f83193e0b5d1341fbfc1177c7c76802a2aa0cdef748f3d9eb0e7d11
-  data.tar.gz: 742c9ce8f28477d6bf922196c1d0d192ec1648db7fbe1cc73a1aba673c307f2d
+  metadata.gz: 0650e8d61c4e4d43e38d195c74ad139484db57c0bd761af93ff2ea2a7a083217
+  data.tar.gz: 4878b54c4c48002b4e8d5131c62178a26ea2e4c0c12cb4b4e697ef3c43c25565
 SHA512:
-  metadata.gz: 87ecb583e67e5210f5cc9c2333d519e6bc160b7e0d8eb5236c407825acca54fc0dd1bfac178d2f0abef4becd29e5cc4b46bdc1d6e0c4ffcda79ab969a2d5846f
-  data.tar.gz: 5ee3f1ef369eb548117d7e277884348ea9cc4885f650bae9c3bb4191a72e7f4d3261ceb05b97f53ca2ee04c2a917fbd2937e96d024b4e4a690d3a0fe37926d80
+  metadata.gz: 780557e28161b7a8c8fb1fe49f209ad86000d046cc244b654009c49f3c85628607d00a18a2d8879e60e9d0f883ac4333533dfc46b06f37e52d545fa6dd5c935b
+  data.tar.gz: 72c2a0ec1a8f4bd517d97a186b63de572b03063601d4d6290ef198724a2b254c2c35e1ec97fc56e7fd0c853500c5ac286b8289c25e47d8483415345854833946

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xapixctl (1.2.3)
+    xapixctl (1.2.4)
       activesupport (>= 5.2.3, < 6.0.0)
       hashdiff (>= 1.0.1, < 1.2.0)
       rest-client (>= 2.1.0, < 3.0.0)

data/lib/xapixctl/base_cli.rb

@@ -30,11 +30,13 @@ module Xapixctl
 
     def show_deployment_status(result)
       return unless result && result['project_publication']
-      puts "deployment: #{result.dig('project_publication', 'deployment')}"
-      puts " data api: #{result.dig('project_publication', 'data_api')} (version: #{result.dig('project_publication', 'data_api_version').presence || 'n/a'})"
-      puts " user management: #{result.dig('project_publication', 'user_management')}"
-      if result.dig('project_publication', 'deployment') == 'success'
-        puts " base URL: #{result.dig('project_publication', 'base_url')}"
+      say "deployment: #{result.dig('project_publication', 'deployment')}"
+      shell.indent do
+        say "data api: #{result.dig('project_publication', 'data_api')} (version: #{result.dig('project_publication', 'data_api_version').presence || 'n/a'})"
+        say "user management: #{result.dig('project_publication', 'user_management')}"
+        if result.dig('project_publication', 'deployment') == 'success'
+          say "base URL: #{result.dig('project_publication', 'base_url')}"
+        end
       end
     end
 

data/lib/xapixctl/cli.rb

@@ -44,7 +44,7 @@ module Xapixctl
       conn = org_or_prj_connection
       resource_ids = resource_id ? [resource_id] : conn.resource_ids(resource_type)
       resource_ids.each do |res_id|
-        puts conn.resource(resource_type, res_id, format: options[:format].to_sym)
+        say conn.resource(resource_type, res_id, format: options[:format].to_sym)
       end
     end
 
@@ -89,7 +89,7 @@ module Xapixctl
     LONGDESC
     def apply
       Util.resources_from_file(options[:file]) do |desc|
-        puts "applying #{desc['kind']} #{desc.dig('metadata', 'id')}"
+        say "applying #{desc['kind']} #{desc.dig('metadata', 'id')}"
         org_or_prj_connection.apply(desc)
       end
     end
@@ -114,7 +114,7 @@ module Xapixctl
     def delete(resource_type = nil, resource_id = nil)
       if resource_type && resource_id
         org_or_prj_connection.delete(resource_type, resource_id)
-        puts "DELETED #{resource_type} #{resource_id}"
+        say "DELETED #{resource_type} #{resource_id}"
       elsif options[:file]
         Util.resources_from_file(options[:file]) do |desc|
           res_type = desc['kind']
@@ -153,20 +153,19 @@ module Xapixctl
     LONGDESC
     def logs(correlation_id)
       result = prj_connection.logs(correlation_id)
-      puts result['logs'].to_yaml
+      say result['logs'].to_yaml
     end
 
     SUPPORTED_CONTEXTS = ['Project', 'Organization'].freeze
 
     desc "api-resources", "retrieves a list of all available resource types"
     def api_resources
-      available_types = connection.available_resource_types
-      format_str = "%20.20s %20.20s %26.26s"
-      puts format_str % ['Type', 'Required Context', '']
-      available_types.sort_by { |desc| desc['type'] }.each do |desc|
-        next unless SUPPORTED_CONTEXTS.include?(desc['context'])
-        puts format_str % [desc['type'], desc['context'], PhoenixClient.supported_type?(desc['type']) ? '' : '(unsupported, update CLI)']
+      available_types = connection.available_resource_types.sort_by { |desc| desc['type'] }.filter { |desc| SUPPORTED_CONTEXTS.include?(desc['context']) }
+      table = [['Type', 'Required Context', '']]
+      table += available_types.map do |desc|
+        [desc['type'], desc['context'], PhoenixClient.supported_type?(desc['type']) ? '' : '(unsupported, update CLI)']
       end
+      print_table table, indent: 1
     end
   end
 end

data/lib/xapixctl/connector_cli.rb

@@ -20,29 +20,29 @@ module Xapixctl
         exit 1
       end
       if options[:schema_import]
-        puts "uploading to update schema import '#{options[:schema_import]}': #{spec_filename}..."
+        say "uploading to update schema import '#{options[:schema_import]}': #{spec_filename}..."
         result = prj_connection.update_schema_import(options[:schema_import], spec_filename)
-        puts "updated #{result.dig('resource', 'kind')} #{result.dig('resource', 'id')}"
+        say "updated #{result.dig('resource', 'kind')} #{result.dig('resource', 'id')}"
       else
-        puts "uploading as new import: #{spec_filename}..."
+        say "uploading as new import: #{spec_filename}..."
         result = prj_connection.add_schema_import(spec_filename)
-        puts "created #{result.dig('resource', 'kind')} #{result.dig('resource', 'id')}"
+        say "created #{result.dig('resource', 'kind')} #{result.dig('resource', 'id')}"
       end
 
       [['issues', 'import'], ['validation_issues', 'validation']].each do |key, name|
         issues = result.dig('schema_import', 'report', key)
         if issues.any?
-          puts "\n#{name} issues:"
-          issues.each { |issue| puts " - #{issue}" }
+          say "\n#{name} issues:"
+          shell.indent { issues.each { |issue| say "- #{issue}" } }
         end
       end
 
       updated_resources = result.dig('schema_import', 'updated_resources')
       if updated_resources.any?
-        puts "\nconnectors:"
-        updated_resources.each { |resource| puts " - #{resource['kind']} #{resource['id']}" }
+        say "\nconnectors:"
+        shell.indent { updated_resources.each { |resource| say "- #{resource['kind']} #{resource['id']}" } }
       else
-        puts "\nno connectors created/updated."
+        say "\nno connectors created/updated."
       end
     end
   end

data/lib/xapixctl/phoenix_client.rb

@@ -20,9 +20,9 @@ module Xapixctl
       CacheConnection
       Schema
       DataSource
-      Pipeline
       Service
       ServiceInstall
+      Pipeline
       EndpointGroup
       Endpoint
       StreamGroup
@@ -31,6 +31,7 @@ module Xapixctl
       Scheduler
       ApiPublishing
       ApiPublishingRole
+      ApiPublishingAccessRule
     ].freeze
 
     TEXT_FORMATTERS = {

data/lib/xapixctl/preview_cli.rb

@@ -18,7 +18,7 @@ module Xapixctl
       \x5> $ xapixctl preview pipeline -p xapix/some-project pipeline
     LONGDESC
     def pipeline(pipeline)
-      puts prj_connection.pipeline_preview(pipeline, format: options[:format].to_sym)
+      say prj_connection.pipeline_preview(pipeline, format: options[:format].to_sym)
     end
 
     option :format, aliases: "-f", default: 'text', enum: ['text', 'yaml', 'json'], desc: "Output format"
@@ -33,7 +33,7 @@ module Xapixctl
       \x5> $ xapixctl preview endpoint -p xapix/some-project endpoint
     LONGDESC
     def endpoint(endpoint)
-      puts prj_connection.endpoint_preview(endpoint, format: options[:format].to_sym)
+      say prj_connection.endpoint_preview(endpoint, format: options[:format].to_sym)
     end
 
     option :format, aliases: "-f", default: 'text', enum: ['text', 'yaml', 'json'], desc: "Output format"
@@ -48,7 +48,7 @@ module Xapixctl
       \x5> $ xapixctl preview stream-processor -p xapix/some-project processor
     LONGDESC
     def stream_processor(stream_processor)
-      puts prj_connection.stream_processor_preview(stream_processor, format: options[:format].to_sym)
+      say prj_connection.stream_processor_preview(stream_processor, format: options[:format].to_sym)
     end
   end
 end

data/lib/xapixctl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xapixctl
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Michael Reinsch
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport