Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-23797: Fix CVE-2023-47108 #524

Merged
merged 1 commit into from
Dec 7, 2023
Merged

OCPBUGS-23797: Fix CVE-2023-47108 #524

merged 1 commit into from
Dec 7, 2023

Conversation

suleymanakbas91
Copy link
Contributor

No description provided.

@suleymanakbas91
fix: CVE-2023-47108
de928bd 
Signed-off-by: Suleyman Akbas <[email protected]>
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 7, 2023
@openshift-ci-robot
Copy link

@suleymanakbas91: This pull request references Jira Issue OCPBUGS-23797, which is invalid:

  • expected the bug to target the "4.15.0" version, but no target version was set

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:

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.

@suleymanakbas91
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 7, 2023
@openshift-ci-robot
Copy link

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @radeore

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 kubernetes/test-infra repository.

@openshift-ci openshift-ci bot requested a review from radeore December 7, 2023 12:06
@openshift-ci openshift-ci bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 7, 2023
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: suleymanakbas91

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:

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-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 7, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #524 (de928bd) into main (c509dba) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #524   +/-   ##
=======================================
  Coverage   82.10%   82.10%           
=======================================
  Files          24       24           
  Lines        1788     1788           
=======================================
  Hits         1468     1468           
  Misses        219      219           
  Partials      101      101

@suleymanakbas91
Copy link
Contributor Author

/retest

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 7, 2023

@suleymanakbas91: 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.

@jakobmoellerdev
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit 726f857 into openshift:main Dec 7, 2023
@openshift-ci-robot
Copy link

@suleymanakbas91: Jira Issue OCPBUGS-23797: All pull requests linked via external trackers have merged:

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

In response to this:

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.

@suleymanakbas91 suleymanakbas91 deleted the otelgrpc branch December 7, 2023 17:03
@suleymanakbas91
Copy link
Contributor Author

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link

@suleymanakbas91: #524 failed to apply on top of branch "release-4.14":

Applying: fix: CVE-2023-47108
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
A	vendor/github.com/felixge/httpsnoop/.travis.yml
A	vendor/github.com/felixge/httpsnoop/Makefile
A	vendor/github.com/felixge/httpsnoop/README.md
A	vendor/github.com/felixge/httpsnoop/capture_metrics.go
A	vendor/github.com/felixge/httpsnoop/wrap_generated_gteq_1.8.go
A	vendor/github.com/felixge/httpsnoop/wrap_generated_lt_1.8.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/config.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/doc.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/metadata_supplier.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/stats_handler.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/version.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/common.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/config.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/handler.go
A	vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/version.go
A	vendor/go.opentelemetry.io/otel/.gitignore
A	vendor/go.opentelemetry.io/otel/.golangci.yml
A	vendor/go.opentelemetry.io/otel/CHANGELOG.md
A	vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
A	vendor/go.opentelemetry.io/otel/Makefile
A	vendor/go.opentelemetry.io/otel/README.md
A	vendor/go.opentelemetry.io/otel/baggage/baggage.go
A	vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/README.md
A	vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/exporter.go
A	vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/client.go
A	vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go
A	vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options.go
A	vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/options.go
A	vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/version.go
A	vendor/go.opentelemetry.io/otel/internal/global/instruments.go
A	vendor/go.opentelemetry.io/otel/internal/global/trace.go
A	vendor/go.opentelemetry.io/otel/metric/doc.go
A	vendor/go.opentelemetry.io/otel/metric/instrument.go
A	vendor/go.opentelemetry.io/otel/metric/syncfloat64.go
A	vendor/go.opentelemetry.io/otel/metric/syncint64.go
A	vendor/go.opentelemetry.io/otel/propagation/trace_context.go
A	vendor/go.opentelemetry.io/otel/requirements.txt
A	vendor/go.opentelemetry.io/otel/sdk/resource/auto.go
A	vendor/go.opentelemetry.io/otel/sdk/resource/env.go
A	vendor/go.opentelemetry.io/otel/sdk/resource/os.go
A	vendor/go.opentelemetry.io/otel/sdk/resource/process.go
A	vendor/go.opentelemetry.io/otel/sdk/trace/provider.go
A	vendor/go.opentelemetry.io/otel/sdk/trace/sampling.go
A	vendor/go.opentelemetry.io/otel/sdk/trace/span.go
A	vendor/go.opentelemetry.io/otel/sdk/trace/tracer.go
A	vendor/go.opentelemetry.io/otel/sdk/version.go
A	vendor/go.opentelemetry.io/otel/trace/config.go
A	vendor/go.opentelemetry.io/otel/trace/doc.go
A	vendor/go.opentelemetry.io/otel/trace/noop.go
A	vendor/go.opentelemetry.io/otel/trace/trace.go
A	vendor/go.opentelemetry.io/otel/trace/tracestate.go
A	vendor/go.opentelemetry.io/otel/version.go
A	vendor/go.opentelemetry.io/otel/versions.yaml
A	vendor/golang.org/x/crypto/hkdf/hkdf.go
A	vendor/golang.org/x/crypto/internal/alias/alias.go
A	vendor/golang.org/x/crypto/internal/alias/alias_purego.go
A	vendor/golang.org/x/crypto/internal/poly1305/bits_compat.go
A	vendor/golang.org/x/crypto/internal/poly1305/bits_go1.13.go
A	vendor/golang.org/x/crypto/internal/poly1305/mac_noasm.go
A	vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.go
A	vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.s
A	vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.go
A	vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s
A	vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.go
A	vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.s
A	vendor/golang.org/x/crypto/salsa20/salsa/salsa20_amd64.go
A	vendor/golang.org/x/crypto/salsa20/salsa/salsa20_amd64.s
A	vendor/golang.org/x/crypto/salsa20/salsa/salsa20_noasm.go
A	vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s
A	vendor/golang.org/x/sys/cpu/cpu_aix.go
A	vendor/golang.org/x/sys/cpu/cpu_arm64.s
A	vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go
A	vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go
A	vendor/golang.org/x/sys/cpu/cpu_gc_x86.go
A	vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go
A	vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go
A	vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c
A	vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go
A	vendor/golang.org/x/sys/cpu/cpu_linux.go
A	vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go
A	vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go
A	vendor/golang.org/x/sys/cpu/cpu_linux_ppc64x.go
A	vendor/golang.org/x/sys/cpu/cpu_loong64.go
A	vendor/golang.org/x/sys/cpu/cpu_mips64x.go
A	vendor/golang.org/x/sys/cpu/cpu_mipsx.go
A	vendor/golang.org/x/sys/cpu/cpu_other_arm.go
A	vendor/golang.org/x/sys/cpu/cpu_other_arm64.go
A	vendor/golang.org/x/sys/cpu/cpu_other_mips64x.go
A	vendor/golang.org/x/sys/cpu/cpu_other_ppc64x.go
A	vendor/golang.org/x/sys/cpu/cpu_other_riscv64.go
A	vendor/golang.org/x/sys/cpu/cpu_ppc64x.go
A	vendor/golang.org/x/sys/cpu/cpu_riscv64.go
A	vendor/golang.org/x/sys/cpu/cpu_s390x.s
A	vendor/golang.org/x/sys/cpu/cpu_wasm.go
A	vendor/golang.org/x/sys/cpu/cpu_x86.go
A	vendor/golang.org/x/sys/cpu/cpu_x86.s
A	vendor/golang.org/x/sys/cpu/endian_big.go
A	vendor/golang.org/x/sys/cpu/endian_little.go
A	vendor/golang.org/x/sys/cpu/proc_cpuinfo_linux.go
A	vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go
A	vendor/golang.org/x/sys/cpu/syscall_aix_gccgo.go
A	vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go
A	vendor/golang.org/x/sys/windows/registry/key.go
A	vendor/golang.org/x/sys/windows/registry/mksyscall.go
A	vendor/golang.org/x/sys/windows/registry/syscall.go
A	vendor/golang.org/x/sys/windows/registry/value.go
A	vendor/golang.org/x/text/message/catalog/go19.go
A	vendor/golang.org/x/text/message/catalog/gopre19.go
A	vendor/golang.org/x/text/width/tables10.0.0.go
A	vendor/golang.org/x/text/width/tables11.0.0.go
A	vendor/golang.org/x/text/width/tables12.0.0.go
A	vendor/golang.org/x/text/width/tables13.0.0.go
A	vendor/golang.org/x/text/width/tables15.0.0.go
A	vendor/golang.org/x/text/width/tables9.0.0.go
M	vendor/google.golang.org/grpc/README.md
M	vendor/google.golang.org/grpc/attributes/attributes.go
M	vendor/google.golang.org/grpc/balancer/balancer.go
M	vendor/google.golang.org/grpc/clientconn.go
M	vendor/google.golang.org/grpc/dialoptions.go
M	vendor/google.golang.org/grpc/encoding/encoding.go
M	vendor/google.golang.org/grpc/health/grpc_health_v1/health_grpc.pb.go
M	vendor/google.golang.org/grpc/internal/internal.go
M	vendor/google.golang.org/grpc/internal/status/status.go
M	vendor/google.golang.org/grpc/internal/transport/handler_server.go
M	vendor/google.golang.org/grpc/internal/transport/http2_client.go
M	vendor/google.golang.org/grpc/internal/transport/http2_server.go
M	vendor/google.golang.org/grpc/internal/transport/http_util.go
M	vendor/google.golang.org/grpc/internal/transport/transport.go
A	vendor/google.golang.org/grpc/resolver/manual/manual.go.git/rebase-apply/patch:2085: trailing whitespace.
lint-markdown: 
.git/rebase-apply/patch:10884: trailing whitespace.
not git grep "\(import \|^\s*\)\"google.golang.org/grpc/interop/grpc_testing" -- "*.go" 
.git/rebase-apply/patch:7592: new blank line at EOF.
+
.git/rebase-apply/patch:7687: new blank line at EOF.
+
.git/rebase-apply/patch:7782: new blank line at EOF.
+
warning: squelched 4 whitespace errors
warning: 9 lines add whitespace errors.

M	vendor/google.golang.org/grpc/server.go
M	vendor/google.golang.org/grpc/tap/tap.go
M	vendor/google.golang.org/grpc/version.go
M	vendor/google.golang.org/grpc/vet.sh
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/google.golang.org/protobuf/internal/impl/codec_map_go112.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/internal/impl/codec_map_go112.go
Auto-merging vendor/google.golang.org/protobuf/internal/flags/proto_legacy_enable.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/internal/flags/proto_legacy_enable.go
Auto-merging vendor/google.golang.org/protobuf/internal/flags/proto_legacy_disable.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/internal/flags/proto_legacy_disable.go
Auto-merging vendor/google.golang.org/protobuf/internal/errors/is_go113.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/internal/errors/is_go113.go
Auto-merging vendor/google.golang.org/protobuf/encoding/prototext/doc.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/protobuf/encoding/prototext/doc.go
Auto-merging vendor/google.golang.org/grpc/vet.sh
Auto-merging vendor/google.golang.org/grpc/version.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/version.go
Auto-merging vendor/google.golang.org/grpc/tap/tap.go
Auto-merging vendor/google.golang.org/grpc/server.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/server.go
CONFLICT (modify/delete): vendor/google.golang.org/grpc/resolver/manual/manual.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/google.golang.org/grpc/resolver/manual/manual.go left in tree.
Auto-merging vendor/google.golang.org/grpc/internal/transport/transport.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http_util.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/transport/http_util.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http2_server.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/transport/http2_server.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/http2_client.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/transport/http2_client.go
Auto-merging vendor/google.golang.org/grpc/internal/transport/handler_server.go
Auto-merging vendor/google.golang.org/grpc/internal/status/status.go
Auto-merging vendor/google.golang.org/grpc/internal/internal.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/internal/internal.go
Auto-merging vendor/google.golang.org/grpc/health/grpc_health_v1/health_grpc.pb.go
Auto-merging vendor/google.golang.org/grpc/encoding/encoding.go
Auto-merging vendor/google.golang.org/grpc/dialoptions.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/dialoptions.go
Auto-merging vendor/google.golang.org/grpc/clientconn.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/clientconn.go
Auto-merging vendor/google.golang.org/grpc/balancer/balancer.go
Auto-merging vendor/google.golang.org/grpc/attributes/attributes.go
CONFLICT (content): Merge conflict in vendor/google.golang.org/grpc/attributes/attributes.go
Auto-merging vendor/google.golang.org/grpc/README.md
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables9.0.0.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/text/width/tables9.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables15.0.0.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/text/width/tables15.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables13.0.0.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/text/width/tables13.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables12.0.0.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/text/width/tables12.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables11.0.0.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/text/width/tables11.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/width/tables10.0.0.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/text/width/tables10.0.0.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/message/catalog/gopre19.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/text/message/catalog/gopre19.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/text/message/catalog/go19.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/text/message/catalog/go19.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/windows/registry/value.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/windows/registry/value.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/windows/registry/syscall.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/windows/registry/syscall.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/windows/registry/mksyscall.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/windows/registry/mksyscall.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/windows/registry/key.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/windows/registry/key.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/syscall_aix_ppc64_gc.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/syscall_aix_gccgo.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/syscall_aix_gccgo.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/runtime_auxv_go121.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/proc_cpuinfo_linux.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/proc_cpuinfo_linux.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/endian_little.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/endian_little.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/endian_big.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/endian_big.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_x86.s deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_x86.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_x86.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_x86.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_wasm.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_wasm.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_s390x.s deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_s390x.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_ppc64x.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_ppc64x.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_other_riscv64.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_other_riscv64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_other_ppc64x.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_other_ppc64x.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_other_arm64.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_other_arm64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_other_arm.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_other_arm.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_mips64x.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_mips64x.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_loong64.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_loong64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_linux_ppc64x.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_linux_ppc64x.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_linux_noinit.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_linux_mips64x.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_linux.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_linux.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_gccgo_s390x.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_gccgo_arm64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_gc_x86.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_gc_x86.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_gc_s390x.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_arm64.s deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_arm64.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/cpu_aix.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/cpu_aix.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/sys/cpu/asm_aix_ppc64.s left in tree.
Removing vendor/golang.org/x/net/http2/not_go118.go
Removing vendor/golang.org/x/net/http2/not_go115.go
Removing vendor/golang.org/x/net/http2/not_go111.go
Removing vendor/golang.org/x/net/http2/go118.go
Removing vendor/golang.org/x/net/http2/go115.go
Removing vendor/golang.org/x/net/http2/go111.go
CONFLICT (modify/delete): vendor/golang.org/x/crypto/salsa20/salsa/salsa20_noasm.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/salsa20/salsa/salsa20_noasm.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/salsa20/salsa/salsa20_amd64.s deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/salsa20/salsa/salsa20_amd64.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/salsa20/salsa/salsa20_amd64.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/salsa20/salsa/salsa20_amd64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.s deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/poly1305/sum_s390x.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.s deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.s left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/poly1305/sum_amd64.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/bits_go1.13.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/poly1305/bits_go1.13.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/poly1305/bits_compat.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/poly1305/bits_compat.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/alias/alias_purego.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/alias/alias_purego.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/internal/alias/alias.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/internal/alias/alias.go left in tree.
CONFLICT (modify/delete): vendor/golang.org/x/crypto/hkdf/hkdf.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/golang.org/x/crypto/hkdf/hkdf.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/versions.yaml deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/versions.yaml left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/tracestate.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/trace/tracestate.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/trace.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/trace/trace.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/noop.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/trace/noop.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/doc.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/trace/doc.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/trace/config.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/trace/config.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/sdk/trace/tracer.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/sdk/trace/tracer.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/sdk/trace/span.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/sdk/trace/span.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/sdk/trace/sampling.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/sdk/trace/sampling.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/sdk/trace/provider.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/sdk/trace/provider.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/sdk/resource/process.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/sdk/resource/process.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/sdk/resource/os.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/sdk/resource/os.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/sdk/resource/env.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/sdk/resource/env.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/sdk/resource/auto.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/sdk/resource/auto.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/requirements.txt deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/requirements.txt left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/propagation/trace_context.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/propagation/trace_context.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/syncint64.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/metric/syncint64.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/syncfloat64.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/metric/syncfloat64.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/instrument.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/metric/instrument.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/metric/doc.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/metric/doc.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/internal/global/trace.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/internal/global/trace.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/internal/global/instruments.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/internal/global/instruments.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/options.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/options.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig/envconfig.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/client.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/client.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/exporter.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/exporter.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/baggage/baggage.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/baggage/baggage.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/README.md deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/README.md left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/Makefile deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/Makefile left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/CONTRIBUTING.md deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/CONTRIBUTING.md left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/CHANGELOG.md deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/CHANGELOG.md left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/.golangci.yml deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/.golangci.yml left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/.gitignore deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/otel/.gitignore left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/version.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/version.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/handler.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/handler.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/config.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/config.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/common.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/common.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/version.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/version.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/stats_handler.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/stats_handler.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/metadata_supplier.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/metadata_supplier.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/doc.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/doc.go left in tree.
CONFLICT (modify/delete): vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/config.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/config.go left in tree.
Auto-merging vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
CONFLICT (content): Merge conflict in vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
Removing vendor/github.com/google/uuid/.travis.yml
Auto-merging vendor/github.com/go-openapi/swag/pre_go18.go
CONFLICT (content): Merge conflict in vendor/github.com/go-openapi/swag/pre_go18.go
Auto-merging vendor/github.com/go-openapi/swag/post_go18.go
CONFLICT (content): Merge conflict in vendor/github.com/go-openapi/swag/post_go18.go
CONFLICT (modify/delete): vendor/github.com/felixge/httpsnoop/wrap_generated_lt_1.8.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/github.com/felixge/httpsnoop/wrap_generated_lt_1.8.go left in tree.
CONFLICT (modify/delete): vendor/github.com/felixge/httpsnoop/wrap_generated_gteq_1.8.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/github.com/felixge/httpsnoop/wrap_generated_gteq_1.8.go left in tree.
CONFLICT (modify/delete): vendor/github.com/felixge/httpsnoop/capture_metrics.go deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/github.com/felixge/httpsnoop/capture_metrics.go left in tree.
CONFLICT (modify/delete): vendor/github.com/felixge/httpsnoop/README.md deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/github.com/felixge/httpsnoop/README.md left in tree.
CONFLICT (modify/delete): vendor/github.com/felixge/httpsnoop/Makefile deleted in HEAD and modified in fix: CVE-2023-47108. Version fix: CVE-2023-47108 of vendor/github.com/felixge/httpsnoop/Makefile left in tree.
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: CVE-2023-47108
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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@radeore radeore Awaiting requested review from radeore

@jeff-roche jeff-roche Awaiting requested review from jeff-roche

@jerpeter1 jerpeter1 Awaiting requested review from jerpeter1

Assignees

@jakobmoellerdev jakobmoellerdev

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@suleymanakbas91 @openshift-ci-robot @codecov-commenter @jakobmoellerdev @openshift-cherrypick-robot