abide_dev_utils 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 220a0a755c0e337d22a853e106935f4355564e51a759eb93967e3aeba5a9f020
-  data.tar.gz: e0272122e07a4e53d3efa71486de5dc7a0229ca0d22214b3311c94df0c90100b
+  metadata.gz: 0216511efe504da6597b81a7b494975377b8afe013697e37f9985467a6a4fa14
+  data.tar.gz: '08265323331b31cb17e875b951ce89dfcb83bbb9649c0df97513cff26355f713'
 SHA512:
-  metadata.gz: c7710f102655653f4181694c8dd076acff1dfd8040120c54157bc77a89f3db4a892854d2110ac4a47974ead2fdc23c3b3028c4459aa9e7bf75145e71fcebad0b
-  data.tar.gz: a5d0d101010f6ba4129346c4c4447f433b5a61e36e9000c3dab653a1709b78ff08203ec2dd014e61489d09eb2a78badfb51e233d8cbe33d85c903c3654cae90f
+  metadata.gz: 9cbd439058affe3311587d81d4dfe75191abe9f9fb1a1f8c964c2a8187f02cf9057943e4bacd5aaeb1676c936cccdd5e196b9d4a0822ed0c725d06fe0c46f0d3
+  data.tar.gz: f01c66b8079d9d257de1158f4a1f9f529b2e9e31c8eb04a19fa21fee63f34b2fa018b8e3bba8eefce2bf90d20f23249e27a83126f54057232aef6bd7658cbe0a

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    abide_dev_utils (0.16.0)
+    abide_dev_utils (0.17.0)
       cmdparse (~> 3.0)
       facterdb (>= 1.21)
       google-cloud-storage (~> 1.34)
       hashdiff (~> 1.0)
       jira-ruby (~> 2.2)
       nokogiri (~> 1.13)
-      puppet (>= 6.23)
+      puppet (>= 7.0.0)
       puppet-strings (>= 2.7)
       ruby-progressbar (~> 1.11)
       selenium-webdriver (~> 4.0.0.beta4)
@@ -17,7 +17,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.6)
-    activesupport (7.0.4.3)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -29,15 +29,15 @@ GEM
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-http (0.56.6)
+    async-http (0.60.2)
       async (>= 1.25)
       async-io (>= 1.28)
       async-pool (>= 0.2)
-      protocol-http (~> 0.22.0)
-      protocol-http1 (~> 0.14.0)
-      protocol-http2 (~> 0.14.0)
-      traces (~> 0.4.0)
-    async-http-faraday (0.11.0)
+      protocol-http (~> 0.24.0)
+      protocol-http1 (~> 0.15.0)
+      protocol-http2 (~> 0.15.0)
+      traces (>= 0.10.0)
+    async-http-faraday (0.12.0)
       async-http (~> 0.42)
       faraday
     async-io (1.33.0)
@@ -69,7 +69,7 @@ GEM
     faraday-http-cache (2.3.0)
       faraday (>= 0.8)
     faraday-net_http (2.0.3)
-    fast_gettext (1.8.0)
+    fast_gettext (2.3.0)
     fiber-local (1.0.0)
     gem-release (2.2.2)
     github_changelog_generator (1.16.4)
@@ -120,7 +120,7 @@ GEM
     hiera (3.12.0)
     hocon (1.4.0)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jgrep (1.5.4)
     jira-ruby (2.3.0)
@@ -133,12 +133,16 @@ GEM
     memoist (0.16.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.18.0)
+    minitest (5.19.0)
     multi_json (1.15.0)
     multipart-post (2.3.0)
     nio4r (2.5.8)
+    nokogiri (1.15.2-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.15.2-x86_64-linux)
+      racc (~> 1.4)
     oauth (0.6.2)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
@@ -150,16 +154,27 @@ GEM
     parser (3.1.2.0)
       ast (~> 2.4.1)
     protocol-hpack (1.4.2)
-    protocol-http (0.22.6)
-    protocol-http1 (0.14.4)
+    protocol-http (0.24.7)
+    protocol-http1 (0.15.1)
       protocol-http (~> 0.22)
-    protocol-http2 (0.14.2)
+    protocol-http2 (0.15.1)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.7)
+    puppet (7.24.0)
+      concurrent-ruby (~> 1.0, < 1.2.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (>= 1.1, < 3)
+      hiera (>= 3.2.1, < 4)
+      locale (~> 2.1)
+      multi_json (~> 1.10)
+      puppet-resource_api (~> 1.5)
+      scanf (~> 1.0)
+      semantic_puppet (~> 1.0)
     puppet (7.24.0-universal-darwin)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0, < 1.2.0)
@@ -241,7 +256,7 @@ GEM
       version_gem (~> 1.1, >= 1.1.1)
     thor (1.2.2)
     timers (4.3.3)
-    traces (0.4.1)
+    traces (0.11.1)
     trailblazer-option (0.1.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -252,6 +267,7 @@ GEM
     yard (0.9.34)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-linux
@@ -260,7 +276,7 @@ DEPENDENCIES
   abide_dev_utils!
   bundler
   console
-  fast_gettext (~> 1.8)
+  fast_gettext (>= 2.0)
   gem-release
   github_changelog_generator
   pry
@@ -273,4 +289,4 @@ DEPENDENCIES
   rubocop-rspec (~> 2.1)
 
 BUNDLED WITH
-   2.3.9
+   2.4.19

data/abide_dev_utils.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   # Prod dependencies
   spec.add_dependency 'nokogiri', '~> 1.13'
   spec.add_dependency 'cmdparse', '~> 3.0'
-  spec.add_dependency 'puppet', '>= 6.23'
+  spec.add_dependency 'puppet', '>= 7.0.0'
   spec.add_dependency 'puppet-strings', '>= 2.7'
   spec.add_dependency 'jira-ruby', '~> 2.2'
   spec.add_dependency 'ruby-progressbar', '~> 1.11'
@@ -56,7 +56,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-ast', '~> 1.4'
   spec.add_development_dependency 'rubocop-performance', '~> 1.9'
   spec.add_development_dependency 'rubocop-i18n', '~> 3.0'
-  spec.add_development_dependency 'fast_gettext', '~> 1.8'
+  spec.add_development_dependency 'fast_gettext', '>= 2.0'
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/abide_dev_utils/cem/generate/reference.rb

@@ -382,7 +382,12 @@ module AbideDevUtils
             # @valid_level is populated in verify_profile_and_level_selections from the fact that we've given
             # the generator a list of levels we want to use. If we didn't give it a list of levels, then we
             # want to use all of the levels that the control supports from @control.
-            @md.add_ul('Supported Levels:')
+            if @framework == 'stig'
+              @md.add_ul('Supported MAC Levels:')
+            else
+              @md.add_ul('Supported Levels:')
+            end
+
             if @valid_level.empty?
               @control.levels.each do |l|
                 @md.add_ul(@md.code(l), indent: 1)
@@ -400,7 +405,12 @@ module AbideDevUtils
             # @valid_profile is populated in verify_profile_and_level_selections from the fact that we've given
             # the generator a list of profiles we want to use. If we didn't give it a list of profiles, then we
             # want to use all of the profiles that the control supports from @control.
-            @md.add_ul('Supported Profiles:')
+            if @framework == 'stig'
+              @md.add_ul('Supported Confidentiality:')
+            else
+              @md.add_ul('Supported Profiles:')
+            end
+
             if @valid_profile.empty?
               @control.profiles.each do |l|
                 @md.add_ul(@md.code(l), indent: 1)
@@ -413,7 +423,7 @@ module AbideDevUtils
           end
 
           def control_alternate_ids_builder
-            return if @framework == 'stig'
+            # return if @framework == 'stig'
 
             @md.add_ul('Alternate Config IDs:')
             @control.alternate_ids.each do |l|
@@ -459,7 +469,7 @@ module AbideDevUtils
 
             @control.title.nil? ? out_str.unshift("    #{@control.id.dump}:") : out_str.unshift("    #{@control.title.dump}:")
             out_str.unshift('  control_configs:')
-            out_str.unshift("#{@module_name}::config:")
+            out_str.unshift("#{@module_name.split('-').last}::config:")
             @md.add_ul('Hiera Configuration Example:')
             @md.add_code_block(out_str.join("\n"), language: 'yaml')
           rescue StandardError => e

data/lib/abide_dev_utils/cli/jira.rb

@@ -6,9 +6,6 @@ require 'abide_dev_utils/jira'
 
 module Abide
   module CLI
-    CONFIG = AbideDevUtils::Config
-    JIRA = AbideDevUtils::Jira
-
     class JiraCommand < CmdParse::Command
       CMD_NAME = 'jira'
       CMD_SHORT = 'Commands related to Jira tickets'
@@ -38,11 +35,9 @@ module Abide
       end
 
       def execute
-        client = JIRA.client
-        myself = JIRA.myself(client)
-        return if myself.attrs['name'].empty?
+        return if AbideDevUtils::Jira.client.myself.attrs['displayName'].empty?
 
-        Abide::CLI::OUTPUT.simple("Successfully authenticated user #{myself.attrs['name']}!")
+        Abide::CLI::OUTPUT.simple("Successfully authenticated user #{AbideDevUtils::Jira.client.myself.attrs['displayName']}!")
       end
     end
 
@@ -59,8 +54,7 @@ module Abide
       end
 
       def execute(issue)
-        client = JIRA.client(options: {})
-        issue = client.Issue.find(issue)
+        issue = AbideDevUtils::Jira.client.find(:issue, issue)
         console = @data[:file].nil?
         out_json = issue.attrs.select { |_, v| !v.nil? || !v.empty? }
         Abide::CLI::OUTPUT.json(out_json, console: console, file: @data[:file])
@@ -83,13 +77,15 @@ module Abide
       end
 
       def execute(project, summary, *subtasks)
-        client = JIRA.client(options: {})
-        issue = JIRA.new_issue(client, project, summary)
+        issue = AbideDevUtils::Jira.client.create(:issue, project: project, summary: summary)
         Abide::CLI::OUTPUT.simple("Successfully created #{issue.attrs['key']}")
         return if subtasks.nil? || subtasks.empty?
 
         Abide::CLI::OUTPUT.simple('Creatings subtasks...')
-        JIRA.bulk_new_subtask(client, JIRA.issue(client, issue.attrs['key']), subtasks) unless subtasks.empty?
+        subtasks.each do |sum|
+          subtask = AbideDevUtils::Jira.client.create(:subtask, parent: issue, summary: sum)
+          Abide::CLI::OUTPUT.simple("Successfully created #{subtask.attrs['key']}")
+        end
       end
     end
 
@@ -107,11 +103,8 @@ module Abide
 
       def execute(report, project)
         Abide::CLI::VALIDATE.file(report)
-        @data[:dry_run] = false if @data[:dry_run].nil?
-        client = JIRA.client(options: {})
-        proj = JIRA.project(client, project)
         File.open(report) do |f|
-          JIRA.new_issues_from_coverage(client, proj, JSON.parse(f.read), dry_run: @data[:dry_run])
+          AbideDevUtils::Jira.new_issues_from_coverage(project, JSON.parse(f.read), dry_run: @data[:dry_run])
         end
       end
     end
@@ -127,14 +120,30 @@ module Abide
         argument_desc(PATH: 'An XCCDF file', PROJECT: 'A Jira project')
         options.on('-d', '--dry-run', 'Print to console instead of saving objects') { |_| @data[:dry_run] = true }
         options.on('-e [EPIC]', '--epic [EPIC]', 'If given, tasks will be created and assigned to this epic. Takes form <PROJECT>-<NUM>') { |e| @data[:epic] = e }
+        options.on('-l [LEVEL]', '--level [LEVEL]', 'Only create tasks for rules belonging to the matching level. Takes a string that is treated as RegExp') do |x|
+          @data[:level] = x
+        end
+        options.on('-p [PROFILE]', '--profile [PROFILE]', 'Only create tasks for rules belonging to the matching profile. Takes a string that is treated as RegExp') do |x|
+          @data[:profile] = x
+        end
       end
 
       def execute(path, project)
         Abide::CLI::VALIDATE.file(path)
-        @data[:dry_run] = false if @data[:dry_run].nil?
-        client = JIRA.client(options: {})
-        proj = JIRA.project(client, project)
-        JIRA.new_issues_from_xccdf(client, proj, path, epic: @data[:epic], dry_run: @data[:dry_run])
+        # Each control gets assigned labels based on the levels and profiles it supports.
+        # Those labels all take the form "level_<level>_<profile>". This allows us to
+        # filter the controls we want to create tasks for by level and profile.
+        @data[:label_include] = nil
+        @data[:label_include] = "level_#{@data[:level]}_" if @data[:level]
+        @data[:label_include] = "#{@data[:label_include]}#{@data[:profile]}" if @data[:profile]
+        Abide::CLI::Output.simple "Label include: #{@data[:label_include]}"
+        AbideDevUtils::Jira.new_issues_from_xccdf(
+          project,
+          path,
+          epic: @data[:epic],
+          dry_run: @data[:dry_run],
+          label_include: @data[:label_include],
+        )
       end
     end
 
@@ -167,17 +176,15 @@ module Abide
       def execute(path1, path2, project)
         Abide::CLI::VALIDATE.file(path1)
         Abide::CLI::VALIDATE.file(path2)
-        @data[:dry_run] = false if @data[:dry_run].nil?
-        client = JIRA.client(options: {})
-        proj = JIRA.project(client, project)
-        JIRA.new_issues_from_xccdf_diff(client,
-                                        proj,
-                                        path1,
-                                        path2,
-                                        epic: @data[:epic],
-                                        dry_run: @data[:dry_run],
-                                        auto_approve: @data[:auto_approve],
-                                        diff_opts: @data[:diff_opts])
+        AbideDevUtils::Jira.new_issues_from_xccdf_diff(
+          project,
+          path1,
+          path2,
+          epic: @data[:epic],
+          dry_run: @data[:dry_run],
+          auto_approve: @data[:auto_approve],
+          diff_opts: @data[:diff_opts],
+        )
       end
     end
   end

data/lib/abide_dev_utils/jira/client.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require_relative 'client_builder'
+require_relative 'dry_run'
+require_relative 'finder'
+require_relative 'helper'
+require_relative 'issue_builder'
+require_relative '../config'
+require_relative '../errors/jira'
+
+module AbideDevUtils
+  module Jira
+    class Client
+      extend DryRun
+
+      dry_run :create, :find, :myself
+
+      attr_accessor :default_project
+      attr_reader :config
+
+      def initialize(dry_run: false, **options)
+        @dry_run = dry_run
+        @options = options
+        @config = AbideDevUtils::Config.config_section('jira')
+        @default_project = @config[:default_project]
+        @client = nil
+        @finder = nil
+        @issue_builder = nil
+        @helper = nil
+      end
+
+      def myself
+        @myself ||= finder.myself
+      end
+
+      def find(type, id)
+        raise ArgumentError, "Invalid type #{type}" unless finder.respond_to?(type.to_sym)
+
+        finder.send(type.to_sym, id)
+      end
+
+      def create(type, **fields)
+        issue_builder.create(type, **fields)
+      end
+
+      def helper
+        @helper ||= Helper.new(self, dry_run: @dry_run)
+      end
+
+      private
+
+      def client
+        @client ||= ClientBuilder.new(@config, **@options).build
+      end
+
+      def finder
+        @finder ||= Finder.new(client)
+      end
+
+      def issue_builder
+        @issue_builder ||= IssueBuilder.new(client, finder)
+      end
+    end
+  end
+end

data/lib/abide_dev_utils/jira/client_builder.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'jira-ruby'
+require_relative '../prompt'
+
+module AbideDevUtils
+  module Jira
+    class ClientBuilder
+      def initialize(config, **options)
+        @options = options
+        @config = config
+      end
+
+      def username
+        find_option_value(:username)
+      end
+
+      def username=(username)
+        @options[:username] = username
+      end
+
+      def password
+        if find_option_value(:password)
+          '********'
+        else
+          nil
+        end
+      end
+
+      def password=(password)
+        @options[:password] = password
+      end
+
+      def site
+        find_option_value(:site)
+      end
+
+      def site=(site)
+        @options[:site] = site
+      end
+
+      def context_path
+        find_option_value(:context_path, default: '')
+      end
+
+      def context_path=(context_path)
+        @options[:context_path] = context_path
+      end
+
+      def auth_type
+        find_option_value(:auth_type, default: :basic)
+      end
+
+      def auth_type=(auth_type)
+        @options[:auth_type] = auth_type
+      end
+
+      def http_debug
+        find_option_value(:http_debug, default: false)
+      end
+
+      def http_debug=(http_debug)
+        @options[:http_debug] = http_debug
+      end
+
+      def build
+        JIRA::Client.new({
+          username: find_option_value(:username, prompt: true),
+          password: find_option_value(:password, prompt: true),
+          site: find_option_value(:site, prompt: 'Jira site URL'),
+          context_path: find_option_value(:context_path, default: ''),
+          auth_type: find_option_value(:auth_type, default: :basic),
+          http_debug: find_option_value(:http_debug, default: false),
+        })
+      end
+
+      private
+
+      def find_option_value(key, default: nil, prompt: nil)
+        if prompt
+          find_option_value_or_prompt(key, prompt)
+        else
+          find_option_value_or_default(key, default)
+        end
+      end
+
+      def find_option_val(key)
+        @options[key] || @config[key] || ENV["JIRA_#{key.to_s.upcase}"]
+      end
+
+      def find_option_value_or_prompt(key, prompt = 'Enter value')
+        case key
+        when /password/i
+          find_option_val(key) || AbideDevUtils::Prompt.password
+        when /username/i
+          find_option_val(key) || AbideDevUtils::Prompt.username
+        else
+          find_option_val(key) || AbideDevUtils::Prompt.single_line(prompt)
+        end
+      end
+
+      def find_option_value_or_default(key, default)
+        find_option_val(key) || default
+      end
+    end
+  end
+end

data/lib/abide_dev_utils/jira/dry_run.rb

@@ -0,0 +1,133 @@
+# frozen_string_literal: true
+
+require_relative '../output'
+
+module AbideDevUtils
+  module Jira
+    module DryRun
+      def dry_run(*method_names)
+        method_names.each do |method_name|
+          proxy = Module.new do
+            define_method(method_name) do |*args, **kwargs|
+              if !!@dry_run
+                case method_name
+                when %r{^create}
+                  AbideDevUtils::Output.simple("DRY RUN: #{self.class.name}##{method_name}(#{args[0]}, #{args[1].map { |k, v| "#{k}: #{v.inspect}" }.join(', ')})")
+                  sleep 0.1
+                  return DummyIssue.new if args[0].match?(%r{^issue$})
+                  return DummySubtask.new if args[0].match?(%r{^subtask$})
+                when %r{^find}
+                  AbideDevUtils::Output.simple("DRY RUN: #{self.class.name}##{method_name}(#{args[0]}, #{args[1].inspect})")
+                  return DummyIssue.new if args[0].match?(%r{^issue$})
+                  return DummySubtask.new if args[0].match?(%r{^subtask$})
+                  return DummyProject.new if args[0].match?(%r{^project$})
+
+                  "Dummy #{args[0].capitalize}"
+                else
+                  AbideDevUtils::Output.simple("DRY RUN: #{self.class.name}##{method_name}(#{args.map(&:inspect).join(', ')})")
+                end
+              else
+                super(*args, **kwargs)
+              end
+            end
+          end
+          self.prepend(proxy)
+        end
+      end
+
+      def dry_run_simple(*method_names)
+        method_names.each do |method_name|
+          proxy = Module.new do
+            define_method(method_name) do |*args, **kwargs|
+              return if !!@dry_run
+
+              super(*args, **kwargs)
+            end
+          end
+          self.prepend(proxy)
+        end
+      end
+
+      def dry_run_return_true(*method_names)
+        method_names.each do |method_name|
+          proxy = Module.new do
+            define_method(method_name) do |*args, **kwargs|
+              return true if !!@dry_run
+
+              super(*args, **kwargs)
+            end
+          end
+          self.prepend(proxy)
+        end
+      end
+
+      def dry_run_return_false(*method_names)
+        method_names.each do |method_name|
+          proxy = Module.new do
+            define_method(method_name) do |*args, **kwargs|
+              return false if !!@dry_run
+
+              super(*args, **kwargs)
+            end
+          end
+          self.prepend(proxy)
+        end
+      end
+
+      class Dummy
+        attr_reader :dummy
+
+        def initialize
+          @dummy = true
+        end
+      end
+
+      class DummyIssue < Dummy
+        attr_reader :summary, :key
+
+        def initialize
+          super
+          @summary = 'Dummy Issue'
+          @key = 'DUM-111'
+        end
+
+        def attrs
+          {
+            'fields' => {
+              'project' => 'dummy',
+              'priority' => 'dummy',
+            },
+          }
+        end
+      end
+
+      class DummySubtask < DummyIssue
+        def initialize
+          super
+          @summary = 'Dummy Subtask'
+          @key = 'DUM-222'
+        end
+
+        def attrs
+          {
+            'fields' => {
+              'project' => 'dummy',
+              'priority' => 'dummy',
+              'parent' => DummyIssue.new,
+            },
+          }
+        end
+      end
+
+      class DummyProject < Dummy
+        attr_reader :key, :issues
+
+        def initialize
+          super
+          @key = 'DUM'
+          @issues = [DummyIssue.new, DummySubtask.new]
+        end
+      end
+    end
+  end
+end

data/lib/abide_dev_utils/jira/finder.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_relative '../errors/jira'
+
+module AbideDevUtils
+  module Jira
+    class Finder
+      def initialize(client)
+        @client = client
+      end
+
+      def myself
+        client.User.myself
+      end
+
+      # @param id [String] The project key or ID
+      def project(id)
+        return id if id.is_a?(client.Project.target_class)
+
+        client.Project.find(id)
+      end
+
+      # @param id [String] The issue key  or summary
+      def issue(id)
+        return id if id.is_a?(client.Issue.target_class)
+
+        client.Issue.find(id)
+      rescue URI::InvalidURIError
+        iss = client.Issue.all.find { |i| i.summary == id }
+        raise AbideDevUtils::Errors::Jira::FindIssueError, id if iss.nil?
+
+        iss
+      end
+
+      # @param id [String] The issuetype ID or name
+      def issuetype(id)
+        return id if id.is_a?(client.Issuetype.target_class)
+
+        if id.match?(%r{^\d+$})
+          client.Issuetype.find(id)
+        else
+          client.Issuetype.all.find { |i| i.name == id }
+        end
+      end
+
+      # @param id [String] The priority ID or name
+      def priority(id)
+        return id if id.is_a?(client.Priority.target_class)
+
+        if id.match?(%r{^\d+$})
+          client.Priority.find(id)
+        else
+          client.Priority.all.find { |i| i.name == id }
+        end
+      end
+
+      private
+
+      attr_reader :client
+    end
+  end
+end

data/lib/abide_dev_utils/jira/helper.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'dry_run'
+
+module AbideDevUtils
+  module Jira
+    class Helper
+      extend DryRun
+
+      dry_run_simple :add_issue_label
+      dry_run_return_false :summary_exist?
+
+      def initialize(client, dry_run: false)
+        @client = client
+        @dry_run = dry_run
+      end
+
+      # @param project [JIRA::Resource::Project, String]
+      def all_project_issues_attrs(project)
+        project = @client.find(:project, project)
+        project.issues.collect(&:attrs)
+      end
+
+      # @param issue [JIRA::Resource::Issue, String]
+      # @param label [String]
+      def add_issue_label(issue, label)
+        issue = @client.find(:issue, issue)
+        return if issue.labels.include?(label)
+
+        issue.labels << label
+        issue.save
+      end
+
+      # @param summary [String]
+      # @param issue_attrs [Array<Hash>]
+      def summary_exist?(summary, issue_attrs)
+        issue_attrs.any? { |attrs| attrs['fields'].key?('summary') && attrs['fields']['summary'] == summary }
+      end
+    end
+  end
+end

data/lib/abide_dev_utils/jira/issue_builder.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require_relative '../errors/jira'
+
+module AbideDevUtils
+  module Jira
+    class IssueBuilder
+      CUSTOM_FIELDS = {
+        'epic_link' => 'customfield_10014',
+        'epic_name' => 'customfield_10011',
+      }.freeze
+
+      FIELD_DEFAULTS = {
+        'issuetype' => 'Task',
+        'priority' => 'Medium',
+        'labels' => ['abide_dev_utils'],
+      }.freeze
+
+      REQUIRED_FIELDS = %w[project summary].freeze
+
+      def initialize(client, finder)
+        @client = client
+        @finder = finder
+      end
+
+      def can_create?(type)
+        respond_to?("create_#{type}".to_sym, true)
+      end
+
+      def create(type, **fields)
+        type = type.to_s.downcase.to_sym
+        raise ArgumentError, "Invalid type \"#{type}\"; no method \"create_#{type}\"" unless can_create?(type)
+
+        fields = process_fields(fields)
+        send("create_#{type}".to_sym, **fields)
+      end
+
+      private
+
+      attr_reader :client
+
+      def create_issue(**fields)
+        iss = client.Issue.build
+        iss.save({ 'fields' => fields })
+        iss
+      rescue StandardError => e
+        raise AbideDevUtils::Errors::Jira::CreateIssueError, e
+      end
+
+      def create_subtask(**fields)
+        fields['parent'] = find_if_not_type(:issue, client.Issue.target_class, fields['parent'])
+        issue_fields = fields['parent'].attrs['fields']
+        fields['project'] = issue_fields['project']
+        fields['issuetype'] = find_if_not_type(:issuetype, client.Issuetype.target_class, 'Sub-task')
+        fields['priority'] = issue_fields['priority']
+        iss = client.Issue.build
+        iss.save({ 'fields' => fields })
+        iss
+      rescue StandardError => e
+        raise AbideDevUtils::Errors::Jira::CreateSubtaskError, e
+      end
+
+      def process_fields(fields)
+        fields = fields.dup
+        normalize_field_keys!(fields)
+        validate_required_fields!(fields)
+        normalize_field_values(fields)
+      end
+
+      def validate_required_fields!(fields)
+        missing = REQUIRED_FIELDS.reject { |f| fields.key?(f) }
+        raise "Missing required field(s) \"#{missing}\"; present fields: \"#{fields.keys}\"" unless missing.empty?
+      end
+
+      def normalize_field_keys!(fields)
+        fields.transform_keys! { |k| k.to_s.downcase }
+        fields.transform_keys! { |k| CUSTOM_FIELDS[k] || k }
+      end
+
+      def normalize_field_values(fields)
+        fields = FIELD_DEFAULTS.merge(fields).map do |k, v|
+          v = case k
+              when 'labels'
+                v.is_a?(Array) ? v : [v]
+              when 'issuetype'
+                find_if_not_type(:issuetype, client.Issuetype.target_class, v)
+              when 'parent'
+                find_if_not_type(:issue, client.Issue.target_class, v)
+              when 'priority'
+                find_if_not_type(:priority, client.Priority.target_class, v)
+              when 'epic_link', CUSTOM_FIELDS['epic_link']
+                find_if_not_type(:issue, client.Issue.target_class, v)&.key || v
+              when 'project'
+                find_if_not_type(:project, client.Project.target_class, v)
+              else
+                v
+              end
+          [k, v]
+        end
+        fields.to_h
+      end
+
+      def find_if_not_type(typesym, typeklass, obj)
+        return obj if obj.is_a?(typeklass)
+
+        @finder.send(typesym, obj)
+      end
+    end
+  end
+end

data/lib/abide_dev_utils/jira.rb

@@ -5,6 +5,7 @@ require 'abide_dev_utils/output'
 require 'abide_dev_utils/prompt'
 require 'abide_dev_utils/config'
 require 'abide_dev_utils/errors/jira'
+require_relative 'jira/client'
 
 module AbideDevUtils
   module Jira
@@ -14,195 +15,58 @@ module AbideDevUtils
     UPD_EPIC_SUMMARY_PREFIX = '::BENCHMARK UPDATE::'
     PROGRESS_BAR_FORMAT = '%a %e %P% Created: %c of %C'
 
-    def self.project(client, project)
-      client.Project.find(project)
-    end
-
-    def self.issue(client, issue)
-      client.Issue.find(issue)
-    rescue URI::InvalidURIError
-      iss = client.Issue.all.find { |i| i.summary == issue }
-      raise ERRORS::FindIssueError, issue unless iss
-
-      iss
-    end
-
-    def self.myself(client)
-      client.User.myself
-    end
-
-    def self.issuetype(client, id)
-      if id.match?(%r{^\d+$})
-        client.Issuetype.find(id)
-      else
-        client.Issuetype.all.find { |i| i.name == id }
-      end
-    end
-
-    def self.priority(client, id)
-      if id.match?(%r{^\d+$})
-        client.Priority.find(id)
-      else
-        client.Priority.all.find { |i| i.name == id }
-      end
-    end
-
-    def self.all_project_issues_attrs(project)
-      raw_issues = project.issues
-      raw_issues.collect(&:attrs)
-    end
-
-    def self.add_issue_label(iss, label, dry_run: false)
-      return if dry_run || iss.labels.include?(label)
-
-      iss.labels << profile_summary
-      iss.save
-    end
-
-    def self.new_issue(client, project, summary, description: nil, labels: ['abide_dev_utils'], epic: nil, dry_run: false)
-      if dry_run
-        sleep(0.2)
-        return Dummy.new(summary)
-      end
-      fields = {}
-      fields['summary'] = summary
-      fields['project'] = project(client, project)
-      fields['reporter'] = myself(client)
-      fields['issuetype'] = issuetype(client, 'Task')
-      fields['priority'] = priority(client, '6')
-      fields['description'] = description if description
-      fields['labels'] = labels
-      epic = issue(client, epic) if epic && !epic.is_a?(JIRA::Resource::Issue)
-      fields['customfield_10006'] = epic.key if epic # Epic_Link
-      iss = client.Issue.build
-      raise ERRORS::CreateIssueError, iss.attrs unless iss.save({ 'fields' => fields })
-
-      iss
-    end
-
-    def self.new_epic(client, project, summary, dry_run: false)
-      AbideDevUtils::Output.simple("#{dr_prefix(dry_run)}Creating epic '#{summary}'")
-      if dry_run
-        sleep(0.2)
-        return Dummy.new(summary)
-      end
-      fields = {
-        'summary' => summary,
-        'project' => project(client, project),
-        'reporter' => myself(client),
-        'issuetype' => issuetype(client, 'Epic'),
-        'customfield_10007' => summary, # Epic Name
-      }
-      iss = client.Issue.build
-      raise ERRORS::CreateEpicError, iss.attrs unless iss.save({ 'fields' => fields })
-
-      iss
-    end
-
-    # This should probably be threaded in the future
-    def self.bulk_new_issue(client, project, summaries, dry_run: false)
-      summaries.each { |s| new_issue(client, project, s, dry_run: dry_run) }
-    end
-
-    def self.new_subtask(client, issue, summary, dry_run: false)
-      if dry_run
-        sleep(0.2)
-        return Dummy.new
-      end
-      issue_fields = issue.attrs['fields']
-      fields = {}
-      fields['parent'] = issue
-      fields['summary'] = summary
-      fields['project'] = issue_fields['project']
-      fields['reporter'] = myself(client)
-      fields['issuetype'] = issuetype(client, '5')
-      fields['priority'] = issue_fields['priority']
-      subtask = client.Issue.build
-      raise ERRORS::CreateSubtaskError, subtask.attrs unless subtask.save({ 'fields' => fields })
-
-      subtask
-    end
-
-    def self.bulk_new_subtask(client, issue, summaries, dry_run: false)
-      summaries.each do |s|
-        new_subtask(client, issue, s, dry_run: dry_run)
-      end
-    end
-
-    def self.client(options: {})
-      opts = merge_options(options)
-      return client_from_prompts if opts.empty?
-
-      opts[:username] = AbideDevUtils::Prompt.username if opts[:username].nil?
-      opts[:password] = AbideDevUtils::Prompt.password if opts[:password].nil?
-      opts[:site] = AbideDevUtils::Prompt.single_line('Jira URL') if opts[:site].nil?
-      opts[:context_path] = '' if opts[:context_path].nil?
-      opts[:auth_type] = :basic if opts[:auth_type].nil?
-      JIRA::Client.new(opts)
-    end
-
-    def self.client_from_prompts(http_debug: false)
-      options = {}
-      options[:username] = AbideDevUtils::Prompt.username
-      options[:password] = AbideDevUtils::Prompt.password
-      options[:site] = AbideDevUtils::Prompt.single_line('Jira URL')
-      options[:context_path] = ''
-      options[:auth_type] = :basic
-      options[:http_debug] = http_debug
-      JIRA::Client.new(options)
-    end
+    def self.client(memo: true, dry_run: false, **options)
+      return AbideDevUtils::Jira::Client.new(dry_run: dry_run, **options) unless memo
 
-    def self.project_from_prompts(http_debug: false)
-      client = client_from_prompts(http_debug)
-      project = AbideDevUtils::Prompt.single_line('Project').upcase
-      client.Project.find(project)
+      @client ||= AbideDevUtils::Jira::Client.new(dry_run: dry_run, **options)
     end
 
     def self.new_issues_from_coverage(client, project, report, dry_run: false)
       dr_prefix = dry_run ? 'DRY RUN: ' : ''
-      i_attrs = all_project_issues_attrs(project)
+      client(dry_run: dry_run) # Initializes the client if needed
+      i_attrs = client.helper.all_project_issues_attrs(project)
       rep_sums = summaries_from_coverage_report(report)
       rep_sums.each do |k, v|
-        next if summary_exist?(k, i_attrs)
+        next if client.helper.summary_exist?(k, i_attrs)
 
-        parent = new_issue(client, project.attrs['key'], k.to_s, dry_run: dry_run)
-        AbideDevUtils::Output.simple("#{dr_prefix}Created parent issue #{k}")
-        parent_issue = issue(client, parent.attrs['key']) unless parent.respond_to?(:dummy)
+        AbideDevUtils::Output.simple("#{dr_prefix}Creating parent issue #{k}...")
+        parent = client.create(:issue, project: project, summary: k.to_s)
         AbideDevUtils::Output.simple("#{dr_prefix}Creating subtasks, this can take a while...")
         progress = AbideDevUtils::Output.progress(title: "#{dr_prefix}Creating Subtasks", total: nil)
         v.each do |s|
-          next if summary_exist?(s, i_attrs)
+          next if client.helper.summary_exist?(s, i_attrs)
 
           progress.title = "#{dr_prefix}#{s}"
-          new_subtask(client, parent_issue, s, dry_run: dry_run)
+          client.create(:subtask, parent: parent, summary: s)
           progress.increment
         end
       end
     end
 
-    def self.new_issues_from_xccdf(client, project, xccdf_path, epic: nil, dry_run: false)
-      i_attrs = all_project_issues_attrs(project)
+    def self.new_issues_from_xccdf(project, xccdf_path, epic: nil, dry_run: false, label_include: nil)
+      client(dry_run: dry_run) # Initializes the client if needed
+      i_attrs = client.helper.all_project_issues_attrs(project)
       xccdf = AbideDevUtils::XCCDF::Benchmark.new(xccdf_path)
       # We need to get the actual epic Issue object, or create it if it doesn't exist
       epic = if epic.nil?
                new_epic_summary = "#{COV_PARENT_SUMMARY_PREFIX}#{xccdf.title}"
-               if summary_exist?(new_epic_summary, i_attrs)
-                 issue(client, new_epic_summary)
+               if client.helper.summary_exist?(new_epic_summary, i_attrs)
+                 client.find(:issue, new_epic_summary)
                else
                  unless AbideDevUtils::Prompt.yes_no("#{dr_prefix(dry_run)}Create new epic '#{new_epic_summary}'?")
                    AbideDevUtils::Output.simple("#{dr_prefix(dry_run)}Aborting")
                    exit(0)
                  end
-                 new_epic(client, project.key, new_epic_summary, dry_run: dry_run)
+                 client.create(:issue, project: project, summary: new_epic_summary, issuetype: 'Epic', epic_name: new_epic_summary)
                end
              else
-               issue(client, epic)
+               client.find(:issue, epic)
              end
       # Now we need to find out which issues we need to create for the benchmark
       # The profiles that the control belongs to will be added as an issue label
       to_create = {}
       summaries_from_xccdf(xccdf).each do |profile_summary, control_summaries|
-        control_summaries.reject { |s| summary_exist?(s, i_attrs) }.each do |control_summary|
+        control_summaries.reject { |s| client.helper.summary_exist?(s, i_attrs) }.each do |control_summary|
           if to_create.key?(control_summary)
             to_create[control_summary] << profile_summary.split.join('_').downcase
           else
@@ -211,6 +75,13 @@ module AbideDevUtils
         end
       end
 
+      # If we have a label_include, we need to filter out any controls that don't have that label
+      unless label_include.nil?
+        to_create = to_create.select do |_control_summary, labels|
+          labels.any? { |l| l.match?(label_include) }
+        end
+      end
+
       unless AbideDevUtils::Prompt.yes_no("#{dr_prefix(dry_run)}Create #{to_create.keys.count} new Jira issues?")
         AbideDevUtils::Output.simple("#{dr_prefix(dry_run)}Aborting")
         exit(0)
@@ -222,31 +93,32 @@ module AbideDevUtils
       to_create.each do |control_summary, labels|
         abrev = control_summary.length > 40 ? control_summary[0..60] : control_summary
         progress.log("#{dr_prefix(dry_run)}Creating #{abrev}...")
-        new_issue(client, project.key, control_summary, labels: labels, epic: epic, dry_run: dry_run)
+        client.create(:issue, project: project, summary: control_summary, labels: labels, epic_link: epic)
         progress.increment
       end
       progress.finish
       AbideDevUtils::Output.simple("#{dr_prefix(dry_run)}Done creating tasks in Epic '#{epic.summary}'")
     end
 
-    def self.new_issues_from_xccdf_diff(client, project, xccdf1_path, xccdf2_path, epic: nil, dry_run: false, auto_approve: false, diff_opts: {})
+    def self.new_issues_from_xccdf_diff(project, xccdf1_path, xccdf2_path, epic: nil, dry_run: false, auto_approve: false, diff_opts: {})
       require 'abide_dev_utils/xccdf/diff'
       diff = AbideDevUtils::XCCDF::Diff::BenchmarkDiff.new(xccdf1_path, xccdf2_path, diff_opts)
-      i_attrs = all_project_issues_attrs(project)
+      client(dry_run: dry_run) # Initializes the client if needed
+      i_attrs = client.helper.all_project_issues_attrs(project)
       # We need to get the actual epic Issue object, or create it if it doesn't exist
       epic = if epic.nil?
-               new_epic_summary = "#{UPD_EPIC_SUMMARY_PREFIX}#{diff.this.title}: v#{diff.this.version} -> #{diff.other.version}"
-               if summary_exist?(new_epic_summary, i_attrs)
-                 issue(client, new_epic_summary)
+               new_epic_summary = "#{COV_PARENT_SUMMARY_PREFIX}#{xccdf.title}"
+               if client.helper.summary_exist?(new_epic_summary, i_attrs)
+                 client.find(:issue, new_epic_summary)
                else
-                 unless AbideDevUtils::Prompt.yes_no("#{dr_prefix(dry_run)}Create new epic '#{new_epic_summary}'?", auto_approve: auto_approve)
+                 unless AbideDevUtils::Prompt.yes_no("#{dr_prefix(dry_run)}Create new epic '#{new_epic_summary}'?")
                    AbideDevUtils::Output.simple("#{dr_prefix(dry_run)}Aborting")
                    exit(0)
                  end
-                 new_epic(client, project.key, new_epic_summary, dry_run: dry_run)
+                 client.create(:issue, project: project, summary: new_epic_summary, issuetype: 'Epic', epic_name: new_epic_summary)
                end
              else
-               issue(client, epic)
+               client.find(:issue, epic)
              end
       to_create = {}
       diff.diff[:rules].each do |key, val|
@@ -288,7 +160,7 @@ module AbideDevUtils
                                                 format: PROGRESS_BAR_FORMAT)
       approved_create.each do |summary, description|
         progress.log("#{dr_prefix(dry_run)}Creating #{summary}...")
-        new_issue(client, project.key, summary, description: description, labels: [], epic: epic, dry_run: dry_run)
+        client.create(:issue, project: project, summary: summary, description: description, labels: [], epic_link: epic)
         progress.increment
       end
       progress.finish

data/lib/abide_dev_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AbideDevUtils
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abide_dev_utils
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - abide-team
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.23'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.23'
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: puppet-strings
   requirement: !ruby/object:Gem::Requirement
@@ -322,16 +322,16 @@ dependencies:
   name: fast_gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 description: Provides a CLI with helpful utilities for developing compliance Puppet
   code
 email:
@@ -404,6 +404,12 @@ files:
 - lib/abide_dev_utils/files.rb
 - lib/abide_dev_utils/gcloud.rb
 - lib/abide_dev_utils/jira.rb
+- lib/abide_dev_utils/jira/client.rb
+- lib/abide_dev_utils/jira/client_builder.rb
+- lib/abide_dev_utils/jira/dry_run.rb
+- lib/abide_dev_utils/jira/finder.rb
+- lib/abide_dev_utils/jira/helper.rb
+- lib/abide_dev_utils/jira/issue_builder.rb
 - lib/abide_dev_utils/markdown.rb
 - lib/abide_dev_utils/mixins.rb
 - lib/abide_dev_utils/output.rb
@@ -448,7 +454,7 @@ metadata:
   homepage_uri: https://github.com/puppetlabs/abide_dev_utils
   source_code_uri: https://github.com/puppetlabs/abide_dev_utils
   changelog_uri: https://github.com/puppetlabs/abide_dev_utils
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -463,8 +469,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.18
+signing_key:
 specification_version: 4
 summary: Helper utilities for developing compliance Puppet code
 test_files: []