Closed devguyio closed 2 weeks ago
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
The bug has been updated to refer to the pull request using the external bug tracker.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
The bug has been updated to refer to the pull request using the external bug tracker.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
/jira refresh
@sjenning: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
/jira refresh
@sjenning: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
/jira refresh
@sjenning: This pull request references Jira Issue OCPBUGS-38726, which is valid. The bug has been moved to the POST state.
@devguyio: all tests passed!
Full PR test history. Your PR dashboard.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is valid.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is valid.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
/jira refresh
@devguyio: This pull request references Jira Issue OCPBUGS-38726, which is valid.
/area ci-tooling
/approve /lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: devguyio, sjenning
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@devguyio: Jira Issue OCPBUGS-38726: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-38726 has been moved to the MODIFIED state.
/cherry-pick release-4.15 release-4.14
@devguyio: #4611 failed to apply on top of branch "release-4.15":
Applying: fix: bump github.com/IBM/go-sdk-core/v5
Using index info to reconstruct a base tree...
M go.mod
M go.sum
M vendor/github.com/IBM/go-sdk-core/v5/core/request_builder.go
A vendor/github.com/IBM/go-sdk-core/v5/core/sdk_problem_utils.go
M vendor/github.com/IBM/go-sdk-core/v5/core/version.go
M vendor/github.com/hashicorp/go-retryablehttp/CHANGELOG.md
M vendor/github.com/hashicorp/go-retryablehttp/client.go
M vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/github.com/hashicorp/go-retryablehttp/client.go
Auto-merging vendor/github.com/hashicorp/go-retryablehttp/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/hashicorp/go-retryablehttp/CHANGELOG.md
Auto-merging vendor/github.com/IBM/go-sdk-core/v5/core/version.go
CONFLICT (content): Merge conflict in vendor/github.com/IBM/go-sdk-core/v5/core/version.go
CONFLICT (modify/delete): vendor/github.com/IBM/go-sdk-core/v5/core/sdk_problem_utils.go deleted in HEAD and modified in fix: bump github.com/IBM/go-sdk-core/v5. Version fix: bump github.com/IBM/go-sdk-core/v5 of vendor/github.com/IBM/go-sdk-core/v5/core/sdk_problem_utils.go left in tree.
Auto-merging vendor/github.com/IBM/go-sdk-core/v5/core/request_builder.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: bump github.com/IBM/go-sdk-core/v5
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
CONFLICT (content): Merge conflict in go.sum Auto-merging go.mod CONFLICT (content): Merge conflict in go.mod
Of course! Duh! My bad 🤦🏽 !
Fix included in accepted release 4.16.0-0.nightly-2024-08-28-181245
What this PR does / why we need it:
go-sdk-core v5.17.4 bumps github.com/hashicorp/go-retryablehttp v5.17.2 which is a vulnerable dependecy.
See-also: CVE-2024-6104
Which issue(s) this PR fixes:
Fixes OCPBUGS-38726
Checklist