tefoji 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c181a5680af5eebeab13d8a78d1e5430df0f3e7535cd9083771af8fbff6d3d06
-  data.tar.gz: 9e0e8b9dcbc36cdbc093a038bd67d4b38f56197bf25695329d78f15c273e5ace
+  metadata.gz: 2c2caf0e00b4916388f8bfb1db2b6ad61317558ed7495d2b39573670c3d7ebc1
+  data.tar.gz: 11f6804530ed3bdcdfa68ef5caeee1f34c070695646b228fa5842493a060732e
 SHA512:
-  metadata.gz: 40b84da52997e8df28012872982e3e50c2f3b18da3a2f80650d08c0f45525a3fa6803e1c9fdca9a82e6461c67882357ddc77d85125b39000176930bb6ccf3464
-  data.tar.gz: 6396ee3ff93fd5214500ebe2913d5eddce18968741532e8c7a95b4547a4ffef7251fd9cf0667a30236503b76d1468f44e650f2816ca8815e0f8d6dbaf7891593
+  metadata.gz: ed85494595e4f21db5a8cd26f8b556e29e496481611c6a1322621c495151b94d9ea253450ca2dc0db79493bf8bb74bf0e7c0674ed54ded1974614347e9f523be
+  data.tar.gz: 4c00b11dcb3ef0179838b5bbcac8fdeb1c808905fcf6f9f3236150999cb7a2f696171ff539ad1d6653252f3eabef01664dc36785855aa1d395684d3504646d80

data/lib/tefoji/jira_api.rb

@@ -329,24 +329,18 @@ module Tefoji
 
       # Backward compatiblity: translate 'team' to 'scrum_team'
       scrum_team = issue_data['scrum_team'] || issue_data['team']
+
       if scrum_team
-        if epic?(issue_data)
-          jira_fields['components'] = [{ FIELD_NAME => scrum_team }]
-        else
-          jira_fields['customfield_11500'] = { FIELD_VALUE => scrum_team }
-        end
+        field_name, field_value = scrum_team_rules(issue_data, scrum_team)
+        jira_fields[field_name] = field_value
       end
 
-      # We're only allowed multiple teams (as 'components') in epics. For ordinary
-      # issues take only the first of the list
+      # Backward compatiblity: translate 'teams' to 'scrum_teams'
       scrum_teams = issue_data['scrum_teams'] || issue_data['teams']
+
       if scrum_teams
-        processed_teams = scrum_teams.to_a.flatten.reject { |t| t =~ /^\s*$/ }
-        if epic?(issue_data)
-          jira_fields['components'] = processed_teams.map { |team| { FIELD_NAME => team } }
-        else
-          jira_fields['customfield_11500'] = { FIELD_VALUE => processed_teams.first }
-        end
+        field_name, field_value = scrum_teams_rules(issue_data, scrum_team)
+        jira_fields[field_name] = field_value
       end
 
       # Default issue type to ISSUE_TASK if it isn't already set
@@ -368,6 +362,36 @@ module Tefoji
       end
     end
 
+    # There are now some funky rules for setting the 'scrum_team' (previously 'team')
+    # and 'scrum_teams' field in different issues.
+    #
+    # For epics, put the scrum team in the 'components' field.
+    # Except for a couple of projects, put the scrum team in customfield_11500
+    # For Puppet Agent (PA) and Puppet Server (SERVER) projects, put the scrum team in
+    # customfield_14200
+    def scrum_team_rules(issue_data, scrum_team)
+      if epic?(issue_data)
+        return ['components', [{ FIELD_NAME => scrum_team }]]
+      end
+
+      customfield = 'customfield_11500'
+      if %w[PA SERVER].include?(issue_data['project'].value)
+        customfield = 'customfield_14200'
+      end
+
+      return [customfield, { FIELD_VALUE => scrum_team }]
+    end
+
+    def scrum_teams_rules(issue_data, scrum_teams)
+      processed_teams = scrum_teams.to_a.flatten.reject { |t| t =~ /^\s*$/ }
+      if epic?(issue_data)
+        return ['components', processed_teams.map { |team| { FIELD_NAME => team } }]
+      end
+
+      # For ordinary issues we can only set one team.
+      scrum_team_rules(issue_data, processed_teams.first)
+    end
+
     def set_cloud_jira_fields(issue_data, jira_fields)
       if issue_data['assignee']
         assignee = issue_data['assignee']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tefoji
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug