emasser 1.0.3 → 3.4.0

data/emasser.gemspec

@@ -6,11 +6,11 @@ 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')
 
@@ -21,13 +21,15 @@ Gem::Specification.new do |spec|
   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', '~> 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'
+  spec.add_runtime_dependency 'emass_client', '~> 3.0'
 
   spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'bundler-audit', '~> 0.7'

data/lib/emasser/cli.rb

@@ -20,8 +20,8 @@ module Emasser
       puts "emasser version: #{Emasser::VERSION}".green
       exit
     elsif ARGV[0].to_s.include? 'hello'
-      user_name = ENV['USERNAME'] || 'rookie'
-      puts "Hello #{user_name} - enjoy using emasser!".cyan
+      user_name = ENV.fetch('USERNAME', 'rookie')
+      puts "Hello #{user_name} - enjoy using emasser version #{Emasser::VERSION}!".cyan
       exit
     end
 

data/lib/emasser/configuration.rb

@@ -33,6 +33,7 @@ module Emasser
       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')

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

@@ -55,11 +55,11 @@ module Emasser
     option :poamId,   type: :numeric, required: true, desc: 'A numeric value representing the poam identification'
 
     def remove
-      body = EmassClient::DeletePoam.new
+      body = EmassClient::PoamGet.new
       body.poam_id = options[:poamId]
       body_array = Array.new(1, body)
 
-      result = EmassClient::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 EmassClient::ApiError => e
       puts 'Exception when calling POAMApi->delete_poam'.red
@@ -88,16 +88,18 @@ module Emasser
                          desc: 'A numeric value representing the milestone identification'
 
     def remove
-      body = EmassClient::DeleteMilestone.new
+      body = EmassClient::MilestonesGet.new
       body.milestone_id = options[:milestoneId]
       body_array = Array.new(1, body)
 
-      result = EmassClient::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 EmassClient::ApiError => e
       puts 'Exception when calling MilestonesApi->delete_milestone'.red
-      puts to_output_hash(e)
+      puts to_output_hash(e).yellow
     end
   end
 
@@ -125,7 +127,7 @@ module Emasser
         body_array << obj
       end
 
-      result = EmassClient::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 EmassClient::ApiError => e
       puts 'Exception when calling ArtifactsApi->delete_artifact'.red