Skip to content

Commit 8cec51f

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #742 from bradmwilliams/jira-lifecycle-plugin-bump
Bumping to the latest/greatest jira-lifecycle-plugin
2 parents 7282818 + 1ad1bc1 commit 8cec51f

5 files changed

Lines changed: 63 additions & 53 deletions

File tree

‎go.mod‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/hashicorp/go-retryablehttp v0.7.7
2929
github.com/hashicorp/golang-lru v1.0.2
3030
github.com/opencontainers/go-digest v1.0.0
31-
github.com/openshift-eng/jira-lifecycle-plugin v0.0.0-20240710130641-608a3c0b33ae
31+
github.com/openshift-eng/jira-lifecycle-plugin v0.0.0-20260316124234-fc8cf3e48910
3232
github.com/openshift/api v0.0.0-20260226052804-beff70de904a
3333
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
3434
github.com/openshift/ci-tools v0.0.0-20240710031808-de122ac79fa9
@@ -45,8 +45,8 @@ require (
4545
google.golang.org/api v0.233.0
4646
gopkg.in/fsnotify.v1 v1.4.7
4747
gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5
48-
k8s.io/api v0.34.1
49-
k8s.io/apimachinery v0.34.1
48+
k8s.io/api v0.34.2
49+
k8s.io/apimachinery v0.34.2
5050
k8s.io/client-go v0.34.1
5151
k8s.io/code-generator v0.34.1
5252
k8s.io/component-base v0.34.1
@@ -101,7 +101,6 @@ require (
101101
go.yaml.in/yaml/v2 v2.4.2 // indirect
102102
go.yaml.in/yaml/v3 v3.0.4 // indirect
103103
golang.org/x/crypto v0.45.0 // indirect
104-
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
105104
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
106105
sigs.k8s.io/randfill v1.0.0 // indirect
107106
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,8 @@ github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
508508
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
509509
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
510510
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
511-
github.com/openshift-eng/jira-lifecycle-plugin v0.0.0-20240710130641-608a3c0b33ae h1:QfwPnBBiomFBXpqO3FXtpShG4qUJve+fA4nRIGuL66M=
512-
github.com/openshift-eng/jira-lifecycle-plugin v0.0.0-20240710130641-608a3c0b33ae/go.mod h1:musOQCo+YGU+82k+N9jD00WPjvzVfCVOUY+Abd/MWog=
511+
github.com/openshift-eng/jira-lifecycle-plugin v0.0.0-20260316124234-fc8cf3e48910 h1:XWX/qAavEuGSLde++EMfytZIRk8e8H/Q6aHCN1qP4Yw=
512+
github.com/openshift-eng/jira-lifecycle-plugin v0.0.0-20260316124234-fc8cf3e48910/go.mod h1:gRqwjo3Gioar0vk/ZNz/7K3+yTRyVJRacI2glJ46KaY=
513513
github.com/openshift/api v0.0.0-20260226052804-beff70de904a h1:3mBAecolw1crGJR1pUk4YVmFbwt6upeyALOsu6L0MCE=
514514
github.com/openshift/api v0.0.0-20260226052804-beff70de904a/go.mod h1:ZYAxo9t1AALeEotN07tNzIvqqqWSxcZIqMUKnY/xCeQ=
515515
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee h1:+Sp5GGnjHDhT/a/nQ1xdp43UscBMr7G5wxsYotyhzJ4=
@@ -1143,13 +1143,13 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
11431143
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
11441144
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
11451145
k8s.io/api v0.19.13/go.mod h1:xNpkpfCFYnVjbmKqIInsBPqUROkHefMc42rUA92XkdU=
1146-
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
1147-
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
1146+
k8s.io/api v0.34.2 h1:fsSUNZhV+bnL6Aqrp6O7lMTy6o5x2C4XLjnh//8SLYY=
1147+
k8s.io/api v0.34.2/go.mod h1:MMBPaWlED2a8w4RSeanD76f7opUoypY8TFYkSM+3XHw=
11481148
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
11491149
k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
11501150
k8s.io/apimachinery v0.19.13/go.mod h1:RMyblyny2ZcDQ/oVE+lC31u7XTHUaSXEK2IhgtwGxfc=
1151-
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
1152-
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
1151+
k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4=
1152+
k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
11531153
k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA=
11541154
k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0=
11551155
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=

‎pkg/jira/jira_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func TestGetPRS(t *testing.T) {
131131
}
132132

133133
func TestIssueTargetReleaseCheck(t *testing.T) {
134-
issueJSON := "{\n \"id\":\"0000\",\n\"key\":\"OCPBUGS-0000\",\n\"fields\":{\n \"customfield_12319940\": [\n{\n\"name\": \"4.11.Z\"\n}\n]\n}\n}"
134+
issueJSON := "{\n \"id\":\"0000\",\n\"key\":\"OCPBUGS-0000\",\n\"fields\":{\n \"customfield_10855\": [\n{\n\"name\": \"4.11.Z\"\n}\n]\n}\n}"
135135

136136
var issue jira.Issue
137137
err := json.Unmarshal([]byte(issueJSON), &issue)
@@ -950,13 +950,13 @@ const (
950950
"description": "Status ON_QA",
951951
"name": "ON_QA"
952952
},
953-
"customfield_12315948": {
953+
"customfield_10470": {
954954
"name": "qa_contact@redhat.com",
955955
"key": "qa_contact",
956956
"emailAddress": "qa_contact@redhat.com",
957957
"displayName": "Jack Smith"
958958
},
959-
"customfield_12319940": [
959+
"customfield_10855": [
960960
{
961961
"self": "https://issues.redhat.com/rest/api/2/version/12390168",
962962
"id": "12390168",
@@ -979,13 +979,13 @@ const (
979979
"description": "Issue is verified",
980980
"name": "Verified"
981981
},
982-
"customfield_12315948": {
982+
"customfield_10470": {
983983
"name": "qa_contact@redhat.com",
984984
"key": "qa_contact",
985985
"emailAddress": "qa_contact@redhat.com",
986986
"displayName": "Jack Smith"
987987
},
988-
"customfield_12319940": [
988+
"customfield_10855": [
989989
{
990990
"self": "https://issues.redhat.com/rest/api/2/version/12390168",
991991
"id": "12390168",
@@ -1008,13 +1008,13 @@ const (
10081008
"description": "Issue is verified",
10091009
"name": "Verified"
10101010
},
1011-
"customfield_12315948": {
1011+
"customfield_10470": {
10121012
"name": "qa_contact@redhat.com",
10131013
"key": "qa_contact",
10141014
"emailAddress": "qa_contact@redhat.com",
10151015
"displayName": "Jack Smith"
10161016
},
1017-
"customfield_12319940": [
1017+
"customfield_10855": [
10181018
{
10191019
"self": "https://issues.redhat.com/rest/api/2/version/12390168",
10201020
"id": "12390168",
@@ -1066,13 +1066,13 @@ const (
10661066
"description": "Issue is in progress",
10671067
"name": "In Progress"
10681068
},
1069-
"customfield_12315948": {
1069+
"customfield_10470": {
10701070
"name": "qa_contact@redhat.com",
10711071
"key": "qa_contact",
10721072
"emailAddress": "qa_contact@redhat.com",
10731073
"displayName": "Jack Smith"
10741074
},
1075-
"customfield_12319940": [
1075+
"customfield_10855": [
10761076
{
10771077
"self": "https://issues.redhat.com/rest/api/2/version/12390168",
10781078
"id": "12390168",
@@ -1095,13 +1095,13 @@ const (
10951095
"description": "Status MODIFIED",
10961096
"name": "MODIFIED"
10971097
},
1098-
"customfield_12315948": {
1098+
"customfield_10470": {
10991099
"name": "qa_contact@redhat.com",
11001100
"key": "qa_contact",
11011101
"emailAddress": "qa_contact@redhat.com",
11021102
"displayName": "Jack Smith"
11031103
},
1104-
"customfield_12319940": [
1104+
"customfield_10855": [
11051105
{
11061106
"self": "https://issues.redhat.com/rest/api/2/version/12390168",
11071107
"id": "12390168",

‎vendor/github.com/openshift-eng/jira-lifecycle-plugin/pkg/helpers/helpers.go‎

Lines changed: 39 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -670,8 +670,8 @@ github.com/munnerz/goautoneg
670670
# github.com/opencontainers/go-digest v1.0.0
671671
## explicit; go 1.13
672672
github.com/opencontainers/go-digest
673-
# github.com/openshift-eng/jira-lifecycle-plugin v0.0.0-20240710130641-608a3c0b33ae
674-
## explicit; go 1.21
673+
# github.com/openshift-eng/jira-lifecycle-plugin v0.0.0-20260316124234-fc8cf3e48910
674+
## explicit; go 1.25.5
675675
github.com/openshift-eng/jira-lifecycle-plugin/pkg/helpers
676676
# github.com/openshift/api v0.0.0-20260226052804-beff70de904a
677677
## explicit; go 1.24.0
@@ -1173,8 +1173,6 @@ golang.org/x/tools/internal/stdlib
11731173
golang.org/x/tools/internal/typeparams
11741174
golang.org/x/tools/internal/typesinternal
11751175
golang.org/x/tools/internal/versions
1176-
# golang.org/x/tools/go/expect v0.1.1-deprecated
1177-
## explicit; go 1.23.0
11781176
# golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
11791177
## explicit; go 1.18
11801178
golang.org/x/xerrors
@@ -1445,7 +1443,7 @@ gopkg.in/yaml.v2
14451443
# gopkg.in/yaml.v3 v3.0.1
14461444
## explicit
14471445
gopkg.in/yaml.v3
1448-
# k8s.io/api v0.34.1
1446+
# k8s.io/api v0.34.2
14491447
## explicit; go 1.24.0
14501448
k8s.io/api/admission/v1
14511449
k8s.io/api/admission/v1beta1
@@ -1507,7 +1505,7 @@ k8s.io/api/storage/v1
15071505
k8s.io/api/storage/v1alpha1
15081506
k8s.io/api/storage/v1beta1
15091507
k8s.io/api/storagemigration/v1alpha1
1510-
# k8s.io/apimachinery v0.34.1
1508+
# k8s.io/apimachinery v0.34.2
15111509
## explicit; go 1.24.0
15121510
k8s.io/apimachinery/pkg/api/equality
15131511
k8s.io/apimachinery/pkg/api/errors

0 commit comments

Comments
 (0)