tefoji 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c2caf0e00b4916388f8bfb1db2b6ad61317558ed7495d2b39573670c3d7ebc1
-  data.tar.gz: 11f6804530ed3bdcdfa68ef5caeee1f34c070695646b228fa5842493a060732e
+  metadata.gz: 438ee8e0448c8a7805362ad3821f68f9c1ce6c50f06f4ad93aa1928d2a60516b
+  data.tar.gz: a6dd2a6d4f52ba6145d68889671ba6b0a95d36d34d3cf2c0a2fa9f11b426972f
 SHA512:
-  metadata.gz: ed85494595e4f21db5a8cd26f8b556e29e496481611c6a1322621c495151b94d9ea253450ca2dc0db79493bf8bb74bf0e7c0674ed54ded1974614347e9f523be
-  data.tar.gz: 4c00b11dcb3ef0179838b5bbcac8fdeb1c808905fcf6f9f3236150999cb7a2f696171ff539ad1d6653252f3eabef01664dc36785855aa1d395684d3504646d80
+  metadata.gz: 885c76aa6b283c24412fe5114397dae1375c68acce44186d421aa3be5d9e87e59e934d6d6cdb863d0bc17434bdabd3eee50c281de0bee50297ea4e1e936d0f2b
+  data.tar.gz: 434262e7a761ab55076bd4e53d679bd7a3f45154803d21409600456998bad4e49dd68742bf753ccb92e0b2556a7740e26c6cfea724393b3396fed4647e3aede1

data/lib/mixins/user_functions.rb

@@ -265,7 +265,7 @@ module UserFunctions
     condition_hash = args[1]
 
     unless condition_hash.keys.sort == %w[X Y Z].sort
-      fatal 'function "release_type" requires a hash with keys ("X", "Y", "Z") as 2nd argument. '\
+      fatal 'function "release_type" requires a hash with keys ("X", "Y", "Z") as 2nd argument. ' \
             "Got: #{condition_hash}"
     end
 
@@ -281,7 +281,7 @@ module UserFunctions
   def split(args)
     _fail_if_unset(__method__.to_s, args)
     fatal('function "split" requires exactly two arguments') unless args.size == 2
-    args[1].split(/#{args[0]}/)
+    args[1].split(%r{#{args[0]}})
   end
 
   ## Jira fields helper functions

data/lib/tefoji/cli.rb

@@ -5,12 +5,9 @@ require 'yaml'
 
 module Tefoji
   class CLI
-    DEFAULT_JIRA_URL = 'https://tickets.puppetlabs.com'
-    JIRA_TEST_URL = 'https://jira-app-test-1.ops.puppetlabs.net'
-    DEFAULT_JIRA_AUTH_FILE = "#{ENV['HOME']}/.tefoji-auth.yaml"
-    JIRA_CLOUD_URLS = [
-      'https://puppet.atlassian.net'
-    ]
+    DEFAULT_JIRA_URL = 'https://perforce.atlassian.net'
+    JIRA_TEST_URL = 'https://perforce-sandbox-903.atlassian.net'
+    DEFAULT_JIRA_AUTH_FILE = "#{Dir.home}/.tefoji-auth.yaml"
 
     DOCUMENTATION = <<~DOCOPT
       Generate Jira issues from YAML files.
@@ -24,8 +21,8 @@ module Tefoji
       Options:
       -j --jira URL             URL of the Jira instance (defaults to #{DEFAULT_JIRA_URL})
       -J --jira-test            Use the jira test environment (#{JIRA_TEST_URL})
-      -a --jira-auth=FILE       Alternate YAML file with Base64-encoded 'username:password' string
-                                  for Jira authentication
+      -a --jira-auth=FILE       Alternate YAML file with Base64-encoded 'username:application-token'
+                                string for Jira authentication
       -S --jira-save-auth       Save/overwrite Base64-encoded yaml authentication to the jira-auth
                                 file (defaults to #{DEFAULT_JIRA_AUTH_FILE}) after succesfully
                                 authenticating to the Jira server.
@@ -56,18 +53,11 @@ module Tefoji
       @user_options['jira-auth-string'] = nil
       @user_options['jira-auth-file'] = @user_options['--jira-auth'] || DEFAULT_JIRA_AUTH_FILE
 
-      @user_options['jira-cloud'] = false
-      @user_options['jira-cloud'] = true if JIRA_CLOUD_URLS.include?(@user_options['--jira'])
-
       jira_auth_file = @user_options['jira-auth-file']
       return unless File.file?(jira_auth_file)
 
       authentication = YAML.load_file(jira_auth_file)
-      if @user_options['jira-cloud'] && authentication.key?('jira-cloud-auth')
-        @user_options['jira-auth-string'] = authentication['jira-cloud-auth']
-      elsif authentication.key?('jira-auth')
-        @user_options['jira-auth-string'] = authentication['jira-auth']
-      end
+      @user_options['jira-auth-string'] = authentication['jira-auth']
     end
 
     # Iterate through issue templates, validating each. If that goes well, generate

data/lib/tefoji/declared_value.rb

@@ -37,11 +37,7 @@ module Tefoji
     end
 
     def falsey?
-      if @value.nil? || @value.empty? || @value.downcase == 'false' || @value == false
-        true
-      else
-        false
-      end
+      @value.nil? || @value.empty? || @value.downcase == 'false' || @value == false
     end
 
     def truthy?

data/lib/tefoji/jira_api.rb

@@ -2,6 +2,8 @@ require 'base64'
 require 'io/console'
 require 'json'
 require 'rest-client'
+require 'uri'
+
 RestClient.log = 'stdout'
 
 module Tefoji
@@ -35,8 +37,8 @@ module Tefoji
 
     # Depending on how user specified their authorization we want to
     # derive and store the username and the Base64-encoded
-    # 'username:password' string.
-    def authenticate(jira_base_url, requested_user = nil, jira_auth_string = nil)
+    # 'username:application-token' string.
+    def authenticate(jira_base_url, requested_user = nil, jira_auth = nil)
       @jira_base_url = jira_base_url
       @jira_base_rest_url = "#{jira_base_url}/rest/api/2"
 
@@ -45,12 +47,12 @@ module Tefoji
       # If we found an auth string, try to use it. Allow the requested_user
       # to override and send us to prompt
       decoded_auth = nil
-      unless jira_auth_string.nil?
-        auth_string_user, auth_string_password = Base64.decode64(jira_auth_string).split(':')
+      unless jira_auth.nil?
+        auth_user, auth_application_token = Base64.decode64(jira_auth).split(':')
         # Only set decoded auth if the user name in the auth string matches the
         # requested user name
-        unless requested_user && requested_user != auth_string_user
-          decoded_auth = [auth_string_user, auth_string_password]
+        unless requested_user && requested_user != auth_user
+          decoded_auth = [auth_user, auth_application_token]
         end
       end
 
@@ -63,38 +65,35 @@ module Tefoji
           print 'Enter jira user name: '
           decoded_auth[0] = $stdin.gets.chomp
         end
-        decoded_auth[1] = IO.console.getpass("Enter jira password for #{requested_user}: ")
+        decoded_auth[1] = IO.console.getpass(
+          "Enter jira application_token for #{decoded_auth[0]}: "
+        )
       end
 
       @jira_username = decoded_auth[0]
 
       # HTTP doesn't like linefeeds in the auth string, hence #strict_encode64
-      @jira_auth_string = Base64.strict_encode64(decoded_auth.join(':'))
-      @authentication_header = { 'Authorization' => "Basic #{@jira_auth_string}" }
+      @jira_auth = Base64.strict_encode64(decoded_auth.join(':'))
+      @authentication_header = { 'Authorization' => "Basic #{@jira_auth}" }
     end
 
     # Do this so we can inform the user quickly that their credentials didn't work
     # There may be a better test, but this is the one the original Winston uses
-    def test_authentication(jira_cloud)
-      get_username(@jira_username, jira_cloud)
+    def test_authentication
+      get_username(@jira_username)
     rescue RestClient::Forbidden
       fatal 'Forbidden: either the authentication is incorrect or ' \
             'Jira might be requiring a CAPTCHA response from the web interface.'
     end
 
     # Get information about user in Jira
-    def get_username(username, jira_cloud, fail_if_not_found = true)
-      search_parameters = if jira_cloud
-                            "user/search?query=#{username}"
-                          else
-                            "user?username=#{username}"
-                          end
-
+    def get_username(username, fail_if_not_found = true)
+      search_parameters = "user/search?query=#{username}"
       jira_get(search_parameters, fail_if_not_found)
     end
 
     # Save authentication YAML to the a file for reuse.
-    def save_authentication(save_file_name, jira_cloud)
+    def save_authentication(save_file_name)
       backup_file_name = "#{save_file_name}.bak"
 
       if File.readable?(save_file_name)
@@ -102,12 +101,8 @@ module Tefoji
         @logger.info "Saved #{save_file_name} to #{backup_file_name}"
       end
 
-      jira_auth_string = if jira_cloud
-                           "jira-auth: #{@jira_auth_string}\n"
-                         else
-                           "jira-cloud-auth: #{@jira_auth_string}\n"
-                         end
-      File.write(save_file_name, jira_auth_string)
+      jira_auth = "jira-auth: #{@jira_auth}\n"
+      File.write(save_file_name, jira_auth)
 
       File.chmod(0o600, save_file_name)
 
@@ -115,21 +110,21 @@ module Tefoji
     end
 
     # Create a Jira issue
-    def create_issue(issue_data, jira_cloud)
+    def create_issue(issue_data)
       request_path = 'issue'
-      jira_fields = issue_data_to_jira_fields(issue_data, jira_cloud)
+      jira_fields = issue_data_to_jira_fields(issue_data)
       jira_post(request_path, jira_fields)
     rescue RestClient::Forbidden
-      fatal "Forbidden: could not send #{request_path} request to Jira. "\
+      fatal "Forbidden: could not send #{request_path} request to Jira. " \
             'Jira may not be accepting requests.'
     rescue RestClient::BadRequest => e
       error_json = JSON.parse(e.response.body)
       errors = error_json['errors'].values.join("\n")
-      fatal "Bad Request: something went wrong with this #{request_path} request: "\
+      fatal "Bad Request: something went wrong with this #{request_path} request: " \
             "#{request_path}, #{jira_fields}\n" \
             "Errors were: #{errors}"
     rescue RestClient::Unauthorized
-      fatal "Unauthorized: could not send #{request_path} request to Jira. "\
+      fatal "Unauthorized: could not send #{request_path} request to Jira. " \
             'Did you use the correct credentials?'
     end
 
@@ -171,23 +166,42 @@ module Tefoji
     end
 
     # https://www.youtube.com/watch?v=JsntlJZ9h1U
-    def add_watcher(issue_key, watcher, jira_cloud)
+    def add_watcher(issue_key, watcher_name)
       request_path = "issue/#{issue_key}/watchers"
-      watcher = useremail_to_id(watcher) if jira_cloud
-      request_data = watcher
-      jira_post(request_path, request_data)
+      watcher_id = user_email_to_account_id(watcher_name)
+      jira_post(request_path, watcher_id)
     end
 
-    # jira cloud api calls now require an accountId rather than a username. This method will convert
-    # emails or display names to accountIds.
-    def useremail_to_id(email)
-      response = get_username(email, true, true)[0]
-      id = response['accountId']
-      if id.nil? || id.empty?
-        @logger.error "accountId not found for #{email}."
-        exit 1
+    # Jira on-prem used user names ('eric.griswold', 'tefoji', etc.) to identify users.
+    # Jira cloud requires an '@domain.extension' suffix. Handle translating from the onprem
+    # form to the cloud form.
+    # Nothe the special case of the tefoji service user.
+    def user_name_to_account_name(user_name)
+      case user_name
+      when 'tefoji'
+        'svc-tefoji-puppet-jira@perforce.com'
+      when %r{URI::MailTo::EMAIL_REGEXP}
+        user_name
+      else
+        "#{user_name.gsub(%r{@.*}, '')}@perforce.com"
       end
-      return id
+    end
+
+    # jira cloud api calls require an accountId rather than a username. This method will convert
+    # emails or display names to accountIds.
+    def user_email_to_account_id(user_email)
+      account_name = user_name_to_account_name(user_email)
+      response = get_username(account_name)
+
+      fatal "Jira account ID not found for \"#{account_name}\"" if response.empty?
+      account_id = response[0]['accountId']
+
+      @logger.debug("user account name: \"#{account_name} \" " \
+                    "converted to account ID: \"#{account_id}\"")
+
+      return account_id if account_id
+
+      fatal "Jira account ID not found for #{account_name}"
     end
 
     private
@@ -221,11 +235,10 @@ module Tefoji
       rescue RestClient::NotFound,
              SocketError,
              Errno::ECONNREFUSED => e
-        # Return False if not found rather than fail to allow for checking the existence of users.
+        # Return false if not found rather than fail to allow for checking the existence of users.
         fatal "Cannot connect to #{@jira_base_rest_url}: #{e.message}" if fail_if_not_found
         return false
       end
-
       return JSON.parse(response.body)
     end
 
@@ -243,6 +256,8 @@ module Tefoji
       end
 
       return JSON.parse(response.body) unless response.body.empty?
+
+      true
     end
 
     # Using JIRA's REST API to update the Epic Link field returns "204 No Content",
@@ -273,7 +288,7 @@ module Tefoji
     # Provide the needed translation of user-created data to required format
     # of Jira requests. This is mostly a list of fussing with the Jira field
     # names.
-    def issue_data_to_jira_fields(issue_data, jira_cloud)
+    def issue_data_to_jira_fields(issue_data)
       # Check to ensure we have what we need to create a issue
 
       unless issue_data['summary']
@@ -293,12 +308,7 @@ module Tefoji
       }
 
       set_common_jira_fields(issue_data, jira_fields)
-
-      if jira_cloud
-        set_cloud_jira_fields(issue_data, jira_fields)
-      else
-        set_onprem_jira_fields(issue_data, jira_fields)
-      end
+      set_cloud_jira_fields(issue_data, jira_fields)
 
       return { 'fields' => jira_fields }
     end
@@ -310,7 +320,7 @@ module Tefoji
       end
 
       if issue_data['labels']
-        labels = issue_data['labels'].to_a.flatten.reject { |t| t =~ /^\s*$/ }
+        labels = issue_data['labels'].to_a.flatten.reject { |t| t =~ %r{^\s*$} }
         jira_fields['labels'] = labels unless labels.empty?
       end
       if issue_data['duedate']
@@ -321,7 +331,7 @@ module Tefoji
       end
 
       if issue_data['components']
-        components = issue_data[:components].to_a.flatten.reject { |t| t =~ /^\s*$/ }
+        components = issue_data[:components].to_a.flatten.reject { |t| t =~ %r{^\s*$} }
         unless components.empty?
           jira_fields['components'] = components.map { |component| { FIELD_NAME => component } }
         end
@@ -345,21 +355,6 @@ module Tefoji
 
       # Default issue type to ISSUE_TASK if it isn't already set
       jira_fields['issuetype'] = { FIELD_NAME => ISSUE_TASK }
-
-      security = ENV['SECURITY'] || issue_data['security']
-      return unless security
-
-      case security.downcase
-      when 'confidential'
-        jira_fields['security'] = { FIELD_ID => '10002' }
-      when 'internal'
-        jira_fields['security'] = { FIELD_ID => '10001' }
-      when 'public'
-        # Nothing to do here - public is default
-      else
-        @logger.fatal "Unknown security type: #{security}"
-        exit 1
-      end
     end
 
     # There are now some funky rules for setting the 'scrum_team' (previously 'team')
@@ -383,7 +378,7 @@ module Tefoji
     end
 
     def scrum_teams_rules(issue_data, scrum_teams)
-      processed_teams = scrum_teams.to_a.flatten.reject { |t| t =~ /^\s*$/ }
+      processed_teams = scrum_teams.to_a.flatten.reject { |t| t =~ %r{^\s*$} }
       if epic?(issue_data)
         return ['components', processed_teams.map { |team| { FIELD_NAME => team } }]
       end
@@ -395,7 +390,7 @@ module Tefoji
     def set_cloud_jira_fields(issue_data, jira_fields)
       if issue_data['assignee']
         assignee = issue_data['assignee']
-        assignee = useremail_to_id(assignee)
+        assignee = user_email_to_account_id(assignee.value)
         jira_fields['assignee'] = { FIELD_ACCOUNT_ID => assignee }
       end
 
@@ -414,7 +409,7 @@ module Tefoji
         jira_fields['customfield_10052'] = { FIELD_VALUE => issue_data['team'] }
       end
       if issue_data['teams']
-        teams = issue_data['teams'].to_a.flatten.reject { |t| t =~ /^\s*$/ }
+        teams = issue_data['teams'].to_a.flatten.reject { |t| t =~ %r{^\s*$} }
         unless teams.empty?
           jira_fields['customfield_10066'] = teams.map { |team| { FIELD_VALUE => team } }
         end
@@ -451,56 +446,6 @@ module Tefoji
         jira_fields['customfield_10018'] = issue_data['epic_parent']
       end
     end
-
-    def set_onprem_jira_fields(issue_data, jira_fields)
-      if issue_data['assignee']
-        jira_fields['assignee'] = { FIELD_NAME => issue_data['assignee'] }
-      end
-
-      if issue_data['type']
-        jira_fields['issuetype'] = { FIELD_NAME => issue_data['type'] }
-        # If this is an epic, we need to add an epic name
-        if epic?(issue_data)
-          jira_fields['customfield_10007'] = issue_data['epic_name'] || issue_data['summary']
-        end
-      end
-
-      if issue_data['story_points']
-        jira_fields['customfield_10002'] = issue_data['story_points'].to_i
-      end
-
-      if issue_data['subteam']
-        jira_fields['customfield_11700'] = [issue_data['subteam']]
-      end
-      if issue_data['sprint']
-        jira_fields['customfield_10005'] = issue_data['sprint'].to_i
-      end
-      if issue_data['acceptance']
-        jira_fields['customfield_11501'] = issue_data['acceptance']
-      end
-      if issue_data['release_notes']
-        jira_fields['customfield_11100'] = { FIELD_VALUE => issue_data['release_notes'] }
-      end
-
-      # If a issue has a specified parent issue, prefer that. The parent issue *should* already
-      # be linked to the main epic. Otherwise, we need to set it to have an epic_parent. This can
-      # either be an epic linked to the main epic or the main epic itself.
-
-      if issue_data['parent']
-        unless issue_data['type'].casecmp?(ISSUE_SUB_TASK) || !issue_data['type']
-          @logger.fatal "A issue with a parent must be classified as a Sub-issue\n\n#{issue_data}"
-          exit 1
-        end
-        jira_fields['issuetype'] = { FIELD_NAME => ISSUE_SUB_TASK }
-        jira_fields['parent'] = { FIELD_KEY => issue_data['parent'] }
-      elsif issue_data['epic_parent']
-        if issue_data['type'].casecmp?(ISSUE_SUB_TASK)
-          @logger.fatal "This issue cannot be a subtask of an epic\n\n#{issue_data}"
-          exit 1
-        end
-        jira_fields['customfield_10006'] = issue_data['epic_parent']
-      end
-    end
   end
 
   class JiraMockApi < JiraApi
@@ -510,20 +455,20 @@ module Tefoji
       @summary_count = 0
     end
 
-    def authenticate(jira_base_url, username = nil, jira_auth_string = nil)
+    def authenticate(jira_base_url, username = nil, jira_auth = nil)
       @jira_base_url = jira_base_url
       @jira_base_rest_url = "#{jira_base_url}/rest/api/2"
 
       @logger.info "Using mock of Jira instance: \"#{jira_base_url}\""
 
-      if jira_auth_string.nil?
+      if jira_auth.nil?
         if username.nil?
           print 'Enter jira user name: '
           username = $stdin.gets.chomp
         end
       else
-        plain_auth_string = Base64.decode64(jira_auth_string)
-        username = plain_auth_string.split(':')[0]
+        plain_auth = Base64.decode64(jira_auth)
+        username = plain_auth.split(':')[0]
       end
 
       @jira_username = username

data/lib/tefoji.rb

@@ -30,7 +30,6 @@ module Tefoji
       @jira_auth_string = user_options['jira-auth-string']
       @jira_auth_file = user_options['jira-auth-file']
       @jira_mock = user_options['--jira-mock']
-      @jira_cloud = user_options['jira-cloud']
 
       @no_notes = user_options['--no-notes']
       @template_data = {}
@@ -270,13 +269,13 @@ module Tefoji
       @jira_api.logger = @logger
 
       @jira_api.authenticate(@jira_url, @jira_user, @jira_auth_string)
-      @jira_api.test_authentication(@jira_cloud) unless @jira_mock
+      @jira_api.test_authentication unless @jira_mock
     end
 
     # Save Jira auth data
     def save_authentication
       authenticate unless @jira_api
-      @jira_api.save_authentication(@jira_auth_file, @jira_cloud)
+      @jira_api.save_authentication(@jira_auth_file)
     end
 
     def generate_epics_with_issues(epic_key)
@@ -312,31 +311,9 @@ module Tefoji
         end
 
         epic['type'] = JiraApi::ISSUE_EPIC
-        if private_release?(epic)
-          @epic_security = 'internal'
-
-          private_description = ''
-          private_repos = epic['private_release'].value['repos']
-
-          if private_repos
-            private_description << private_release_note
-            private_description << private_repos.value.map do |repo|
-              repo.map { |k, v| "* #{k.upcase}: #{v.value}" }
-            end.join("\n")
-            private_description << "\n\n"
-          end
-
-          private_leads = epic['private_release'].value['leads']
-          if private_leads
-            leads = private_leads.value.map { |lead| "[~#{lead}]" }.join(' ')
-            private_description << "/cc #{leads} \n\n"
-          end
-
-          epic['description'].prepend(private_description)
-          epic['security'] = 'internal'
-        end
+        add_private_release(epic) if private_release?(epic)
 
-        epic_issue = @jira_api.create_issue(epic, @jira_cloud)
+        epic_issue = @jira_api.create_issue(epic)
         epic_issue['short_name'] = short_name
         @logger.info 'Epic: %16s [%s]' % [epic_issue['key'], short_name]
         @deferral_data[short_name.to_s] = {
@@ -359,6 +336,30 @@ module Tefoji
       "NOTE: THIS IS A PRIVATE RELEASE. WORK WAS DONE IN THESE PRIVATE REPOS:\n"
     end
 
+    def add_private_release(epic)
+      private_description = ''
+      private_repos = epic['private_release'].value['repos']
+
+      if private_repos
+        private_description << private_release_note
+        private_description << private_repos.value.map do |repo|
+          repo.map { |k, v| "* #{k.upcase}: #{v.value}" }
+        end.join("\n")
+        private_description << "\n\n"
+      end
+
+      private_leads = epic['private_release'].value['leads']
+      if private_leads
+        leads = private_leads.value.map do |lead|
+          "[~accountid:#{@jira_api.user_email_to_account_id(lead)}]"
+        end.join(' ')
+
+        private_description << "/cc #{leads} \n\n"
+      end
+
+      epic['description'].prepend(private_description)
+    end
+
     # Iterate through all issues in the template, creating each one in Jira.
     # Link the issues back to their epic, if required
     def generate_ordinary_issues
@@ -375,7 +376,7 @@ module Tefoji
         jira_ready_data, raw_issue_data = prepare_jira_ready_data(issue, issue_defaults)
         next if jira_ready_data.nil? || raw_issue_data.nil?
 
-        response_data = @jira_api.create_issue(jira_ready_data, @jira_cloud)
+        response_data = @jira_api.create_issue(jira_ready_data)
         jira_issue = @jira_api.retrieve_issue(response_data['self'])
         jira_issue['short_name'] = raw_issue_data['short_name']
 
@@ -584,7 +585,7 @@ module Tefoji
         issue_key = jira_issue_data['key']
         watchers = raw_issue_data[deferred_tag].value
         watchers.each do |watcher|
-          @jira_api.add_watcher(issue_key, watcher, @jira_cloud)
+          @jira_api.add_watcher(issue_key, watcher)
           @logger.info '%14s: watched by %s' % [issue_key, watcher]
         end
       end
@@ -652,10 +653,10 @@ module Tefoji
         # cannot.
         if right_value.unset?
           # Convert %{FOO} to FOO
-          environment_variable = value.gsub(/^%{(.+?)}/, '\1')
+          environment_variable = value.gsub(%r{^%{(.+?)}}, '\1')
           if environment_keys.include?(environment_variable)
-            @logger.info "Setting \"#{key}\" to \"#{ENV[environment_variable]}\" "\
-                        'from environment variable.'
+            @logger.info "Setting \"#{key}\" to \"#{ENV[environment_variable]}\" " \
+                         'from environment variable.'
             @declarations[key.to_sym] = DeclaredValue.new(ENV[environment_variable])
             next
           end
@@ -717,7 +718,7 @@ module Tefoji
     def expand_string(value)
       # Special-case where 'foo: "%{bar}"'; this allows for passing around hashes and
       # arrays without interpolation into strings
-      single_value = /\A%{(.+?)}\Z/.match(value)
+      single_value = %r{\A%{(.+?)}\Z}.match(value)
       return @declarations[single_value[1].to_sym] if single_value
 
       return value % @declarations
@@ -741,10 +742,8 @@ module Tefoji
     def conflicting_conditionals?(template)
       if template.key?('unless') && (template.key?('conditional') || template.key?('if'))
         true
-      elsif template.key?('if') && template.key?('conditional')
-        true
       else
-        false
+        template.key?('if') && template.key?('conditional')
       end
     end
 
@@ -789,7 +788,7 @@ module Tefoji
 
     def missing_expected_keys?(template_uri, template)
       expected_keys = %w[epic epics issues]
-      return false if (template.keys & expected_keys).any?
+      return false if template.keys.intersect?(expected_keys)
 
       @logger.error "Cannot find any known template keywords in \"#{template_uri}\""
       return true
@@ -906,7 +905,7 @@ module Tefoji
     def update_user_validity(username, issue_name, valid_users, invalid_users)
       if invalid_users.key?(username)
         invalid_users[username] += [issue_name]
-      elsif @jira_api.get_username(username, @jira_cloud, false)
+      elsif @jira_api.get_username(username, false)
         valid_users << username
       else
         invalid_users[username] = invalid_users.fetch(username, []) + [issue_name]

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tefoji
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
-- Puppet Labs
+- Puppet By Perforce
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +154,7 @@ description: 'From a YAML specification, create a batch of Jira issues allowing
   variable substitutions.
 
 '
-email: info@puppetlabs.com
+email: release@puppet.com
 executables:
 - tefoji
 extensions: []