emasser 1.0.0 → 1.0.6

data/emasser.gemspec

@@ -6,32 +6,36 @@ Gem::Specification.new do |spec|
   spec.name = 'emasser'
   spec.version = Emasser::VERSION
   spec.authors = ['Amndeep Singh Mann', 'George Dias', 'Kyle Fagan', 'Robert Clark', 'Aaron Lippold']
-  spec.email = ['saf@mitre.org']
+  spec.email = ['saf@groups.mitre.org']
+  spec.licenses = ['Apache-2.0']
 
   spec.summary = 'Provide an automated capability for invoving eMASS API endpoints'
-  spec.description = 'emasser can be used as a gem or used from the command line to access eMASS via thei API.'
+  spec.description = 'emasser can be used as a gem or used from the command line (CL) to access eMASS endpoints via their API.'
   spec.homepage = 'https://saf.mitre.org'
   spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(emass_client|test|spec|features)/}) }
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  # References: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry
+  spec.metadata = { "github_repo" => "ssh://github.com/mitre/emasser" }
 
-  spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'colorize'
-  spec.add_runtime_dependency 'dotenv'
-  spec.add_runtime_dependency 'rubyzip'
-  spec.add_runtime_dependency 'swagger_client'
+  spec.add_runtime_dependency 'activesupport', '~> 6.1.4'
+  spec.add_runtime_dependency 'colorize', '~> 0.8.1'
+  spec.add_runtime_dependency 'dotenv', '~> 2.7.6'
+  spec.add_runtime_dependency 'rubyzip', '~> 2.3.2'
+  spec.add_runtime_dependency 'thor', '~> 1.1.0'
+  spec.add_runtime_dependency 'emass_client', '~> 1.0', '!= 1.0.3'
 
-  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'bundler-audit', '~> 0.7'
-  spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'rspec', '~>3.10.0'
-  spec.add_development_dependency 'yaml', '~>0.2.0'
+  spec.add_development_dependency 'byebug', '~> 11.1.3'
+  spec.add_development_dependency 'rspec', '~> 3.10.0'
+  spec.add_development_dependency 'yaml', '~> 0.2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.7'
   spec.add_development_dependency 'rubocop-minitest', '~> 0.10'

data/lib/emasser/cli.rb

@@ -16,6 +16,18 @@ module Emasser
     elsif ARGV[0].to_s.include? 'del'
       require 'emasser/delete'
       register(Emasser::Delete, 'delete', 'delete [RESOURCE]', 'Deletes resources')
+    elsif (ARGV[0].to_s.include? '-v') || (ARGV[0].to_s.include? '-V')
+      puts "emasser version: #{Emasser::VERSION}".green
+      exit
+    elsif ARGV[0].to_s.include? 'hello'
+      user_name = ENV.fetch('USERNAME', 'rookie')
+      puts "Hello #{user_name} - enjoy using emasser version #{Emasser::VERSION}!".cyan
+      exit
+    end
+
+    def help
+      puts 'Emasser commands:'.yellow
+      puts '  emasser [get, put, post, delete, -v, or -V]'.yellow
     end
 
     def self.exit_on_failure?

data/lib/emasser/configuration.rb

@@ -8,26 +8,41 @@ module Emasser
     def self.raise_unless_present(env)
       ENV.fetch(env) { raise Emasser::ConfigurationMissingError.new(env) }
     rescue Emasser::ConfigurationMissingError => e
-      puts e.message.red
-      puts 'See emasser environment variables requirements in emasser CLI Features'
+      if (ARGV[0].to_s.include? '-v') || (ARGV[0].to_s.include? '-V')
+        puts "emasser version: #{Emasser::VERSION}".green
+      else
+        puts "\n", e.message.red
+        puts 'Create a .env file containing required variables, place it in the root directory where the emasser command is executed'.yellow
+        puts 'Required environment variables are:'.yellow
+        puts '  export EMASSER_API_KEY_API_KEY=<API key>'.green
+        puts '  export EMASSER_API_KEY_USER_UID=<unique identifier of the eMASS user EMASSER_API_KEY_API_KEY belongs to>'.green
+        puts '  export EMASSER_HOST=<FQDN of the eMASS server>'.green
+        puts '  export EMASSER_KEY_FILE_PATH=<path to your emass key in PEM format>'.green
+        puts '  export EMASSER_CERT_FILE_PATH=<path to your emass certficate in PEM format>'.green
+        puts '  export EMASSER_KEY_PASSWORD=<password for the key given in EMASSER_KEY_FILE_PATH>'.green, "\n"
+        puts 'See emasser environment variables requirements in emasser CLI Features for more information (https://mitre.github.io/emasser/docs/features.html).', "\n"
+      end
       exit
     end
     # rubocop: enable Style/RaiseArgs
 
     # rubocop: disable Style/TernaryParentheses, Style/IfWithBooleanLiteralBranches
-    SwaggerClient.configure do |config|
+    EmassClient.configure do |config|
+      # Required env variables
       config.api_key['api-key'] = raise_unless_present('EMASSER_API_KEY_API_KEY')
       config.api_key['user-uid'] = raise_unless_present('EMASSER_API_KEY_USER_UID')
       config.scheme = 'https'
       config.base_path = '/'
+      config.server_index = nil
       config.host = raise_unless_present('EMASSER_HOST')
       config.key_file = raise_unless_present('EMASSER_KEY_FILE_PATH')
       config.cert_file = raise_unless_present('EMASSER_CERT_FILE_PATH')
       config.key_password = raise_unless_present('EMASSER_KEY_PASSWORD')
-      config.client_side_validation = (raise_unless_present('EMASSER_CLIENT_SIDE_VALIDATION') == 'false') ? false : true
-      config.verify_ssl = (raise_unless_present('EMASSER_VERIFY_SSL') == 'false') ? false : true
-      config.verify_ssl_host = (raise_unless_present('EMASSER_VERIFY_SSL_HOST') == 'false') ? false : true
-      config.debugging = (ENV.fetch('EMASSER_DEBUGGING', false) == 'true') ? true : false
+      # Optional env variables
+      config.client_side_validation = (ENV.fetch('EMASSER_CLIENT_SIDE_VALIDATION', 'true').eql? 'true') ? true : false
+      config.verify_ssl = (ENV.fetch('EMASSER_VERIFY_SSL', 'true').eql? 'true') ? true : false
+      config.verify_ssl_host = (ENV.fetch('EMASSER_VERIFY_SSL_HOST', 'true').eql? 'true') ? true : false
+      config.debugging = (ENV.fetch('EMASSER_DEBUGGING', 'false') == 'false') ? false : true
     end
     # rubocop: enable Style/TernaryParentheses, Style/IfWithBooleanLiteralBranches
   end

data/lib/emasser/constants.rb

@@ -5,14 +5,22 @@ module Emasser
     include_package: false,
     include_ditpr_metrics: false,
     include_decommissioned: false,
-    return_type: 'SystemResponse' # This is used by swagger client only to format output
+    debug_return_type: 'SystemResponse' # This is used by swagger client only to format output
   }.freeze
 
   GET_SYSTEM_RETURN_TYPE = {
-    return_type: 'SystemResponse'
+    debug_return_type: 'SystemResponse'
   }.freeze
 
   GET_ARTIFACTS_RETURN_TYPE = {
-    return_type: 'String'
+    debug_return_type: 'String'
+  }.freeze
+
+  GET_WORKFLOWINSTANCES_RETURN_TYPE = {
+    debug_return_type: 'Object'
+  }.freeze
+
+  DEL_MILESTONES_RETURN_TYPE = {
+    debug_return_type: 'Object'
   }.freeze
 end

data/lib/emasser/delete.rb

@@ -47,7 +47,7 @@ module Emasser
     end
 
     # Delete a POAM -----------------------------------------------------------
-    desc 'remove', 'Add one or many POA&M items in a system'
+    desc 'remove', 'Delete one or many POA&M items in a system'
     long_desc Help.text(:poam_del_mapper)
 
     # Required parameters/fields
@@ -55,13 +55,13 @@ module Emasser
     option :poamId,   type: :numeric, required: true, desc: 'A numeric value representing the poam identification'
 
     def remove
-      body = SwaggerClient::DeletePoam.new
+      body = EmassClient::PoamGet.new
       body.poam_id = options[:poamId]
       body_array = Array.new(1, body)
 
-      result = SwaggerClient::POAMApi.new.delete_poam(body_array, options[:systemId])
+      result = EmassClient::POAMApi.new.delete_poam(options[:systemId], body_array)
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling POAMApi->delete_poam'.red
       puts to_output_hash(e)
     end
@@ -88,16 +88,18 @@ module Emasser
                          desc: 'A numeric value representing the milestone identification'
 
     def remove
-      body = SwaggerClient::DeleteMilestone.new
+      body = EmassClient::MilestonesGet.new
       body.milestone_id = options[:milestoneId]
       body_array = Array.new(1, body)
 
-      result = SwaggerClient::MilestonesApi.new.delete_milestone(body_array, options[:systemId], options[:poamId])
-      # The server returns an empty object upon successfully deleting a milestone.
+      # Getting an empty return when utilizing the default return type - using 'Object' as return type
+      opts = Emasser::DEL_MILESTONES_RETURN_TYPE
+
+      result = EmassClient::MilestonesApi.new.delete_milestone(options[:systemId], options[:poamId], body_array, opts)
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling MilestonesApi->delete_milestone'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
   end
 
@@ -110,7 +112,7 @@ module Emasser
       true
     end
 
-    desc 'remove', 'Remove one or many artifacts in a system'
+    desc 'remove', 'Delete one or many artifacts in a system'
     long_desc Help.text(:artifact_del_mapper)
 
     # Required parameters/fields
@@ -125,9 +127,9 @@ module Emasser
         body_array << obj
       end
 
-      result = SwaggerClient::ArtifactsApi.new.delete_artifact(body_array, options[:systemId])
+      result = EmassClient::ArtifactsApi.new.delete_artifact(options[:systemId], body_array)
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling ArtifactsApi->delete_artifact'.red
       puts to_output_hash(e)
     end

data/lib/emasser/get.rb

@@ -40,9 +40,9 @@ module Emasser
     desc 'connection', 'Test connection to the API'
 
     def connection
-      result = SwaggerClient::TestApi.new.test_connection
+      result = EmassClient::TestApi.new.test_connection
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling TestApi->test_connection'.red
       puts to_output_hash(e)
     end
@@ -58,9 +58,8 @@ module Emasser
       true
     end
 
-    desc 'id [--system-name [SYSTEM_NAME]] [--system-owner [SYSTEM_OWNER]]',
+    desc 'id [--system_name [SYSTEM_NAME]] [--system_owner [SYSTEM_OWNER]]',
          'Attempts to provide system ID of a system with name [NAME] and owner [SYSTEM_OWNER]'
-    # desc 'id', 'Get a system ID given "name" or "owner"'
 
     # Required parameters/fields
     option :system_name
@@ -73,26 +72,29 @@ module Emasser
       end
 
       begin
-        results = SwaggerClient::SystemsApi.new.get_systems.data
+        results = EmassClient::SystemsApi.new.get_systems
         results = filter_systems(results, options[:system_name], options[:system_owner])
         results.each { |result| puts "#{result[:systemId]} - #{result[:systemOwner]} - #{result[:name]}" }
-      rescue SwaggerClient::ApiError => e
+      rescue EmassClient::ApiError => e
         puts 'Exception when calling SystemsApi->get_systems'
-        puts to_output_hash(e)
+        puts to_output_hash(e).yellow
       end
     end
 
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     no_commands do
       def filter_systems(results, system_name = nil, system_owner = nil)
+        results = results.to_body if results.respond_to?(:to_body)
         if system_owner.nil?
-          results.filter { |result| result[:name].eql?(system_name) }
+          results[:data].filter { |result| result[:name].eql?(system_name) }
         elsif system_name.nil?
-          results.filter { |result| result[:systemOwner].eql?(system_owner) }
+          results[:data].filter { |result| result[:systemOwner].eql?(system_owner) }
         else
-          results.filter { |result| result[:name].eql?(system_name) && result[:systemOwner].eql?(system_owner) }
+          results[:data].filter { |result| result[:name].eql?(system_name) && result[:systemOwner].eql?(system_owner) }
         end
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     desc "byId \[options\]", 'Retrieve a system - filtered by [options] params'
     option :systemId, type: :numeric, required: true,
@@ -107,11 +109,11 @@ module Emasser
 
       begin
         # Get system information matching provided parameters
-        result = SwaggerClient::SystemsApi.new.get_system(options[:systemId], optional_options)
+        result = EmassClient::SystemsApi.new.get_system(options[:systemId], optional_options)
         puts to_output_hash(result).green
-      rescue SwaggerClient::ApiError => e
-        puts 'Exception when calling SystemsApi->get_systems'.red
-        puts to_output_hash(e)
+      rescue EmassClient::ApiError => e
+        puts 'Exception when calling SystemsApi->get_system'.red
+        puts to_output_hash(e).yellow
       end
     end
   end
@@ -144,11 +146,11 @@ module Emasser
 
       begin
         # Get system information matching provided parameters
-        result = SwaggerClient::SystemsApi.new.get_systems(optional_options)
+        result = EmassClient::SystemsApi.new.get_systems(optional_options)
         puts to_output_hash(result).green
-      rescue SwaggerClient::ApiError => e
+      rescue EmassClient::ApiError => e
         puts 'Exception when calling SystemsApi->get_systems'.red
-        puts to_output_hash(e)
+        puts to_output_hash(e).yellow
       end
     end
   end
@@ -170,11 +172,11 @@ module Emasser
     desc 'all', 'Retrieves all available system roles'
 
     def all
-      result = SwaggerClient::SystemRolesApi.new.get_system_roles
+      result = EmassClient::SystemRolesApi.new.get_system_roles
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling SystemRolesApi->get_system_roles'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
 
     desc "byCategory \[options\]", 'Retrieves role(s) - filtered by [options] params'
@@ -184,7 +186,7 @@ module Emasser
                           enum: ['AO', 'Auditor', 'Artifact Manager', 'C&A Team', 'IAO',
                                  'ISSO', 'PM/IAM', 'SCA', 'User Rep', 'Validator']
     # Optional parameters/fields
-    option :policy, type: :string, required: false, enum: %w[diacap rmf reporting]
+    option :policy, type: :string, required: false, default: 'rmf', enum: %w[diacap rmf reporting]
     option :includeDecommissioned, type: :boolean, required: false, desc: 'BOOLEAN - true or false.'
 
     def byCategory
@@ -192,12 +194,12 @@ module Emasser
       optional_options = to_input_hash(optional_options_keys, options)
 
       begin
-        result = SwaggerClient::SystemRolesApi.new.get_system_roles_by_category_id(options[:roleCategory],
-                                                                                   options[:role], optional_options)
+        result = EmassClient::SystemRolesApi.new.get_system_roles_by_category_id(options[:roleCategory],
+                                                                                 options[:role], optional_options)
         puts to_output_hash(result).green
-      rescue SwaggerClient::ApiError => e
+      rescue EmassClient::ApiError => e
         puts 'Exception when calling SystemRolesApi->get_system_by_role_category_id'.red
-        puts to_output_hash(e)
+        puts to_output_hash(e).yellow
       end
     end
   end
@@ -226,11 +228,11 @@ module Emasser
       optional_options = to_input_hash(optional_options_keys, options)
 
       begin
-        result = SwaggerClient::ControlsApi.new.get_system_controls(options[:systemId], optional_options)
+        result = EmassClient::ControlsApi.new.get_system_controls(options[:systemId], optional_options)
         puts to_output_hash(result).green
-      rescue SwaggerClient::ApiError => e
+      rescue EmassClient::ApiError => e
         puts 'Exception when calling ControlsApi->get_system_controls'.red
-        puts to_output_hash(e)
+        puts to_output_hash(e).yellow
       end
     end
   end
@@ -259,11 +261,11 @@ module Emasser
       optional_options = to_input_hash(optional_options_keys, options)
 
       begin
-        result = SwaggerClient::TestResultsApi.new.get_system_test_results(options[:systemId], optional_options)
+        result = EmassClient::TestResultsApi.new.get_system_test_results(options[:systemId], optional_options)
         puts to_output_hash(result).green
-      rescue SwaggerClient::ApiError => e
+      rescue EmassClient::ApiError => e
         puts 'Exception when calling TestResultsApi->get_system_test_results'.red
-        puts to_output_hash(e)
+        puts to_output_hash(e).yellow
       end
     end
   end
@@ -289,8 +291,8 @@ module Emasser
                                           desc: 'The schedule completion start date - Unix time format.'
     option :scheduledCompletionDateEnd,   type: :numeric,  required: false,
                                           desc: 'The scheduled completion end date - Unix time format.'
-    option :controlAcronyms, type: :string,  required: false, desc: 'The system acronym(s) e.g "AC-1, AC-2"'
-    option :ccis,            type: :string,  required: false, desc: 'The system CCIS string numerical value'
+    option :controlAcronyms, type: :string,  required: false, desc: 'The system acronym(s) e.g "AC-1" or "AC-1, AC-2"'
+    option :ccis,            type: :string,  required: false, desc: 'The system CCIS string numerical value e.g "000123" or "000123,000069"'
     option :systemOnly,      type: :boolean, required: false, default: false, desc: 'BOOLEAN - true or false.'
 
     def forSystem
@@ -298,11 +300,11 @@ module Emasser
       optional_options = to_input_hash(optional_options_keys, options)
 
       begin
-        result = SwaggerClient::POAMApi.new.get_system_poams(options[:systemId], optional_options)
+        result = EmassClient::POAMApi.new.get_system_poams(options[:systemId], optional_options)
         puts to_output_hash(result).green
-      rescue SwaggerClient::ApiError => e
+      rescue EmassClient::ApiError => e
         puts 'Exception when calling POAMApi->get_system_poams'.red
-        puts to_output_hash(e)
+        puts to_output_hash(e).yellow
       end
     end
 
@@ -315,11 +317,11 @@ module Emasser
                       desc: 'A numeric value representing the poam identification'
 
     def byPoamId
-      result = SwaggerClient::POAMApi.new.get_system_poams_by_poam_id(options[:systemId], options[:poamId])
+      result = EmassClient::POAMApi.new.get_system_poams_by_poam_id(options[:systemId], options[:poamId])
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling POAMApi->get_system_poams_by_poam_id'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
   end
 
@@ -351,12 +353,12 @@ module Emasser
 
       begin
         # Get milestones in one or many poa&m items in a system
-        result = SwaggerClient::MilestonesApi.new.get_system_milestones_by_poam_id(options[:systemId],
-                                                                                   options[:poamId], optional_options)
+        result = EmassClient::MilestonesApi.new.get_system_milestones_by_poam_id(options[:systemId],
+                                                                                 options[:poamId], optional_options)
         puts to_output_hash(result).green
-      rescue SwaggerClient::ApiError => e
+      rescue EmassClient::ApiError => e
         puts 'Exception when calling MilestonesApi->get_system_milestones_by_poam_id'.red
-        puts to_output_hash(e)
+        puts to_output_hash(e).yellow
       end
     end
 
@@ -371,13 +373,13 @@ module Emasser
                          desc: 'A numeric value representing the milestone identification'
 
     def byMilestoneId
-      result = SwaggerClient::MilestonesApi.new.get_system_milestones_by_poam_id_and_milestone_id(
+      result = EmassClient::MilestonesApi.new.get_system_milestones_by_poam_id_and_milestone_id(
         options[:systemId], options[:poamId], options[:milestoneId]
       )
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling MilestonesApi->get_system_milestones_by_poam_id_and_milestone_id'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
   end
 
@@ -393,7 +395,7 @@ module Emasser
       true
     end
 
-    desc 'system', 'Get all system artifacts for a system Id'
+    desc 'forSystem', 'Get all system artifacts for a system Id'
     # Required parameters/fields
     option :systemId, type: :numeric, required: true,
                       desc: 'A numeric value representing the system identification'
@@ -409,12 +411,12 @@ module Emasser
 
       begin
         # Get one or many artifacts in a system
-        result = SwaggerClient::ArtifactsApi.new.get_system_artifacts(options[:systemId],
-                                                                      optional_options)
+        result = EmassClient::ArtifactsApi.new.get_system_artifacts(options[:systemId],
+                                                                    optional_options)
         puts to_output_hash(result).green
-      rescue SwaggerClient::ApiError => e
+      rescue EmassClient::ApiError => e
         puts 'Exception when calling ArtifactsApi->get_system_artifacts'.red
-        puts to_output_hash(e)
+        puts to_output_hash(e).yellow
       end
     end
 
@@ -433,11 +435,11 @@ module Emasser
       optional_options = to_input_hash(optional_options_keys, options)
       optional_options.merge!(Emasser::GET_ARTIFACTS_RETURN_TYPE)
 
-      result = SwaggerClient::ArtifactsExportApi.new.get_system_artifacts_export(
+      result = EmassClient::ArtifactsExportApi.new.get_system_artifacts_export(
         options[:systemId], options[:filename], optional_options
       )
       if options[:compress]
-        p result.green
+        pp result
       else
         begin
           puts JSON.pretty_generate(JSON.parse(result)).green
@@ -445,9 +447,9 @@ module Emasser
           puts result.red
         end
       end
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling ArtifactsApi->get_system_artifacts_export'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
   end
 
@@ -479,11 +481,11 @@ module Emasser
 
       begin
         # Get location of one or many controls in CAC
-        result = SwaggerClient::CACApi.new.get_system_cac(options[:systemId], optional_options)
+        result = EmassClient::CACApi.new.get_system_cac(options[:systemId], optional_options)
         puts to_output_hash(result).green
-      rescue SwaggerClient::ApiError => e
+      rescue EmassClient::ApiError => e
         puts 'Exception when calling ApprovalChainApi->get_system_cac'.red
-        puts to_output_hash(e)
+        puts to_output_hash(e).yellow
       end
     end
   end
@@ -510,11 +512,11 @@ module Emasser
 
     def package
       # Get location of system package in PAC
-      result = SwaggerClient::PACApi.new.get_system_pac(options[:systemId])
+      result = EmassClient::PACApi.new.get_system_pac(options[:systemId])
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling ApprovalChainApi->get_system_'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
   end
 
@@ -535,11 +537,11 @@ module Emasser
     option :sinceDate, type: :string, required: true, desc: 'The CMMC date. Unix date format'
 
     def assessments
-      result = SwaggerClient::CMMCAssessmentsApi.new.get_cmmc_assessments(options[:sinceDate])
+      result = EmassClient::CMMCAssessmentsApi.new.get_cmmc_assessments(options[:sinceDate])
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling ApprovalChainApi->get_cmmc_assessments'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
   end
 
@@ -565,11 +567,11 @@ module Emasser
       optional_options_keys = optional_options(@_initializer).keys
       optional_options = to_input_hash(optional_options_keys, options)
 
-      result = SwaggerClient::WorkflowDefinitionsApi.new.get_workflow_definitions(optional_options)
+      result = EmassClient::WorkflowDefinitionsApi.new.get_workflow_definitions(optional_options)
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling ApprovalChainApi->get_workflow_definitions'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
   end
 
@@ -577,17 +579,14 @@ module Emasser
   # active and historical workflows for a system.
   #
   # Endpoints:
-  #    /api/systems/{systemId}/workflow-instances                      - Get workflow instances in a system
-  #    /api/systems/{systemId}/workflow-instances/{workflowInstanceId} - Get workflow instance by ID in a system
+  #    /api/workflows/instances                      - Get workflow instances in a site
+  #    /api/workflows/instances/{workflowInstanceId} - Get workflow instance by ID
   class WorkflowInstances < SubCommandBase
     def self.exit_on_failure?
       true
     end
 
-    desc 'forSystem', 'Get workflow instances in a system'
-    # Required parameters/fields
-    option :systemId, type: :numeric, required: true,
-                      desc: 'A numeric value representing the system identification'
+    desc 'all', 'Get workflow instances in a site'
 
     # Optional parameters/fields
     option :includeComments, type: :boolean, required: false, default: false, desc: 'BOOLEAN - true or false.'
@@ -595,36 +594,32 @@ module Emasser
     option :sinceDate, type: :string, required: false, desc: 'The workflow instance date. Unix date format'
     option :status, type: :string, required: false, enum: %w[active inactive all]
 
-    def forSystem
+    def all
       optional_options_keys = optional_options(@_initializer).keys
       optional_options = to_input_hash(optional_options_keys, options)
 
-      result = SwaggerClient::WorkflowInstancesApi.new.get_system_workflow_instances(
-        options[:systemId], optional_options
-      )
+      result = EmassClient::WorkflowInstancesApi.new.get_system_workflow_instances(optional_options)
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling ApprovalChainApi->get_system_workflow_instances'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
 
     # Workflow by workflowInstanceId ---------------------------------------------------------
-    desc 'byWorkflowInstanceId', 'Get workflow instance by ID in a system'
+    desc 'byInstanceId', 'Get workflow instance by ID'
 
     # Required parameters/fields
-    option :systemId, type: :numeric, required: true,
-                      desc: 'A numeric value representing the system identification'
     option :workflowInstanceId, type: :numeric, required: true,
                                 desc: 'A numeric value representing the workflowInstance identification'
 
-    def byWorkflowInstanceId
-      result = SwaggerClient::WorkflowInstancesApi.new.get_system_workflow_instances_by_workflow_instance_id(
-        options[:systemId], options[:workflowInstanceId]
-      )
+    def byInstanceId
+      opts = Emasser::GET_WORKFLOWINSTANCES_RETURN_TYPE
+      result = EmassClient::WorkflowInstancesApi.new
+                                                .get_system_workflow_instances_by_workflow_instance_id(options[:workflowInstanceId], opts)
       puts to_output_hash(result).green
-    rescue SwaggerClient::ApiError => e
+    rescue EmassClient::ApiError => e
       puts 'Exception when calling ApprovalChainApi->get_system_workflow_instances_by_workflow_instance_id'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
   end