[release-4.15] OCPBUGS-31641: vendor: bump aws-sdk-go to support ca-west-1

[openshift-cherrypick-robot]

This is an automated cherry-pick of #395

/assign flavianmissi

[openshift-ci-robot]

@openshift-cherrypick-robot: Detected clone of Jira Issue OCPBUGS-29233 with correct target version. Will retitle the PR to link to the clone.
/retitle [release-4.15] OCPBUGS-31641: vendor: bump aws-sdk-go to support ca-west-1

In response to this:

This is an automated cherry-pick of #395

/assign flavianmissi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci-robot]

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-31641, which is invalid:

• expected dependent Jira Issue OCPBUGS-29233 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

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.

In response to this:

This is an automated cherry-pick of #395

/assign flavianmissi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[flavianmissi]

/cherry-pick release-4.14

[openshift-cherrypick-robot]

@flavianmissi: once the present PR merges, I will cherry-pick it on top of release-4.14 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[wewang58]

Pre-merge tested, image registry is available
/label qe-approved

[wewang58]

/label cherry-pick-approved

[wewang58]

/jira refresh

[openshift-ci-robot]

@wewang58: This pull request references Jira Issue OCPBUGS-31641, which is invalid:

• expected dependent Jira Issue OCPBUGS-29233 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

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.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[wewang58]

/jira refresh

[openshift-ci-robot]

@wewang58: This pull request references Jira Issue OCPBUGS-31641, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.z) matches configured target version for branch (4.15.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note text is set and does not match the template
• dependent bug Jira Issue OCPBUGS-29233 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-29233 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
• bug has dependents

Requesting review from QA contact:
/cc @wewang58

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[flavianmissi]

I want there to be a nightly build and payload tests to run against master before we merge this, so I'm going to approve but will hold for the moment.
/lgtm
/label backport-risk-assessed
/hold

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flavianmissi, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [flavianmissi]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci]

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[flavianmissi]

/hold cancel

[openshift-ci-robot]

@openshift-cherrypick-robot: Jira Issue OCPBUGS-31641: All pull requests linked via external trackers have merged:

• openshift/cluster-image-registry-operator#1014
• openshift/image-registry#396

Jira Issue OCPBUGS-31641 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #395

/assign flavianmissi

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-cherrypick-robot]

@flavianmissi: #396 failed to apply on top of branch "release-4.14":

Applying: vendor: bump aws-sdk-go to support ca-west-1
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/aws/aws-sdk-go/aws/config.go
A	vendor/github.com/aws/aws-sdk-go/aws/credentials/ssocreds/token_provider.go
M	vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/token_provider.go
M	vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
M	vendor/github.com/aws/aws-sdk-go/aws/session/session.go
M	vendor/github.com/aws/aws-sdk-go/aws/session/shared_config.go
M	vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go
M	vendor/github.com/aws/aws-sdk-go/aws/version.go
M	vendor/github.com/aws/aws-sdk-go/service/s3/api.go
A	vendor/github.com/aws/aws-sdk-go/service/ssooidc/api.go
A	vendor/github.com/aws/aws-sdk-go/service/ssooidc/doc.go
A	vendor/github.com/aws/aws-sdk-go/service/ssooidc/errors.go
A	vendor/github.com/aws/aws-sdk-go/service/ssooidc/service.go
M	vendor/github.com/aws/aws-sdk-go/service/sts/api.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
Removing vendor/golang.org/x/sys/internal/unsafeheader/unsafeheader.go
Removing vendor/golang.org/x/net/http2/Makefile
Removing vendor/golang.org/x/net/http2/Dockerfile
Auto-merging vendor/github.com/aws/aws-sdk-go/service/sts/api.go
CONFLICT (content): Merge conflict in vendor/github.com/aws/aws-sdk-go/service/sts/api.go
CONFLICT (modify/delete): vendor/github.com/aws/aws-sdk-go/service/ssooidc/errors.go deleted in HEAD and modified in vendor: bump aws-sdk-go to support ca-west-1. Version vendor: bump aws-sdk-go to support ca-west-1 of vendor/github.com/aws/aws-sdk-go/service/ssooidc/errors.go left in tree.
CONFLICT (modify/delete): vendor/github.com/aws/aws-sdk-go/service/ssooidc/doc.go deleted in HEAD and modified in vendor: bump aws-sdk-go to support ca-west-1. Version vendor: bump aws-sdk-go to support ca-west-1 of vendor/github.com/aws/aws-sdk-go/service/ssooidc/doc.go left in tree.
CONFLICT (modify/delete): vendor/github.com/aws/aws-sdk-go/service/ssooidc/api.go deleted in HEAD and modified in vendor: bump aws-sdk-go to support ca-west-1. Version vendor: bump aws-sdk-go to support ca-west-1 of vendor/github.com/aws/aws-sdk-go/service/ssooidc/api.go left in tree.
Auto-merging vendor/github.com/aws/aws-sdk-go/service/sso/service.go
CONFLICT (content): Merge conflict in vendor/github.com/aws/aws-sdk-go/service/sso/service.go
Auto-merging vendor/github.com/aws/aws-sdk-go/service/s3/api.go
CONFLICT (content): Merge conflict in vendor/github.com/aws/aws-sdk-go/service/s3/api.go
Auto-merging vendor/github.com/aws/aws-sdk-go/aws/version.go
CONFLICT (content): Merge conflict in vendor/github.com/aws/aws-sdk-go/aws/version.go
Auto-merging vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go
Auto-merging vendor/github.com/aws/aws-sdk-go/aws/session/shared_config.go
Auto-merging vendor/github.com/aws/aws-sdk-go/aws/session/session.go
CONFLICT (content): Merge conflict in vendor/github.com/aws/aws-sdk-go/aws/session/session.go
Auto-merging vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
CONFLICT (content): Merge conflict in vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
Auto-merging vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/token_provider.go
CONFLICT (content): Merge conflict in vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/token_provider.go
CONFLICT (modify/delete): vendor/github.com/aws/aws-sdk-go/aws/credentials/ssocreds/token_provider.go deleted in HEAD and modified in vendor: bump aws-sdk-go to support ca-west-1. Version vendor: bump aws-sdk-go to support ca-west-1 of vendor/github.com/aws/aws-sdk-go/aws/credentials/ssocreds/token_provider.go left in tree.
Auto-merging vendor/github.com/aws/aws-sdk-go/aws/config.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 vendor: bump aws-sdk-go to support ca-west-1
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".

In response to this:

/cherry-pick release-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-enterprise-registry-container-v4.15.0-202404220846.p0.g0a844cb.assembly.stream.el9 for distgit openshift-enterprise-registry.
All builds following this will include this PR.

[openshift-merge-robot]

Fix included in accepted release 4.15.0-0.nightly-2024-04-23-013140