[WIP]Add test for ocpbugs-60628 #1914
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
WalkthroughAdds extensive extended test infrastructure and utilities for OpenShift/Kubernetes e2e tests, introduces a comprehensive CLI wrapper, numerous helper modules (pods, nodes, SAR, templates, logging, provider config), a new extended test, removes a trivial prior test, and updates go.mod with many dependency bumps and replacements. Changes
Estimated code review effort🎯 4 (Complex) | ⏱️ ~75 minutes Pre-merge checks and finishing touches❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✨ Finishing touches
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: wangke19 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
wangke19
force-pushed
the
ocpbugs-60628-test
branch
from
e0f5dcd to
33b1d97
Compare
This commit updates various dependencies in go.mod, go.sum, and the vendor directory.
wangke19
force-pushed
the
ocpbugs-60628-test
branch
from
33b1d97 to
6b2a50f
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 8
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
Cache: Disabled due to data retention organization setting
Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting
⛔ Files ignored due to path filters (281)
go.sumis excluded by!**/*.sumvendor/github.com/JeffAshton/win_pdh/AUTHORSis excluded by!vendor/**,!**/vendor/**vendor/github.com/JeffAshton/win_pdh/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/JeffAshton/win_pdh/README.mdownis excluded by!vendor/**,!**/vendor/**vendor/github.com/JeffAshton/win_pdh/pdh.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/.gitattributesis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/.gitignoreis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/.golangci.ymlis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/CODEOWNERSis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/SECURITY.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/backup.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/ea.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/file.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/fileinfo.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/hvsock.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/internal/fs/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/internal/fs/fs.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/internal/fs/security.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/internal/fs/zsyscall_windows.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/internal/socket/rawaddr.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/internal/socket/socket.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/internal/socket/zsyscall_windows.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/internal/stringbuffer/wstring.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/pipe.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/pkg/guid/guid.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/pkg/guid/guid_nonwindows.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/pkg/guid/guid_windows.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/pkg/guid/variant_string.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/privilege.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/reparse.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/sd.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/syscall.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/go-winio/zsyscall_windows.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/.gitattributesis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/.gitignoreis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/CODEOWNERSis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/SECURITY.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/errors.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/hns_v1.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/hnsaccelnet.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/hnsglobals.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/hnssupport.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hns.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hnsaccelnet.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hnsendpoint.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hnserrors.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hnsfuncs.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hnsglobals.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hnsnetwork.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hnspolicy.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hnspolicylist.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/hnssupport.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/namespace.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/hns/zsyscall_windows.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/interop/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/interop/interop.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/Microsoft/hnslib/internal/interop/zsyscall_windows.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/armon/circbuf/.gitignoreis excluded by!vendor/**,!**/vendor/**vendor/github.com/armon/circbuf/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/armon/circbuf/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/armon/circbuf/circbuf.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/container-storage-interface/spec/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/container-storage-interface/spec/lib/go/csi/csi.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/containers/v1/containers.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/containers/v1/containers.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/containers/v1/containers_grpc.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/containers/v1/containers_ttrpc.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/containers/v1/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/tasks/v1/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/tasks/v1/tasks.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/tasks/v1/tasks.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/tasks/v1/tasks_grpc.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/tasks/v1/tasks_ttrpc.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/version/v1/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/version/v1/version.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/version/v1/version.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/version/v1/version_grpc.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/services/version/v1/version_ttrpc.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/descriptor.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/descriptor.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/event.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/event.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/fieldpath.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/fieldpath.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/introspection.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/introspection.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/metrics.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/metrics.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/mount.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/mount.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/platform.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/platform.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/platform_helpers.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/sandbox.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/sandbox.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/task/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/task/task.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/containerd/api/types/task/task.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/errdefs/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/errdefs/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/errdefs/errors.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/errdefs/pkg/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/errdefs/pkg/errgrpc/grpc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/errdefs/pkg/internal/cause/cause.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/errdefs/pkg/internal/types/collapsible.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/errdefs/resolve.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/log/.golangci.ymlis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/log/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/log/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/log/context.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/.gitattributesis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/.gitignoreis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/.golangci.ymlis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/Makefileis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/PROTOCOL.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/Protobuild.tomlis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/channel.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/client.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/codec.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/config.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/errors.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/handshake.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/interceptor.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/metadata.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/request.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/request.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/server.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/services.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/stream.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/stream_server.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/test.protois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/ttrpc/unixcreds_linux.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/typeurl/v2/.gitignoreis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/typeurl/v2/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/typeurl/v2/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/typeurl/v2/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/typeurl/v2/types.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/containerd/typeurl/v2/types_gogo.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/coreos/go-systemd/v22/dbus/dbus.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/coreos/go-systemd/v22/dbus/methods.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/coreos/go-systemd/v22/dbus/properties.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/coreos/go-systemd/v22/dbus/set.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/coreos/go-systemd/v22/dbus/subscription.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/coreos/go-systemd/v22/dbus/subscription_set.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/CHANGELOG.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/VERSIONis excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_go120.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/gocompat_errors_unsupported.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_go121.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/gocompat_generics_unsupported.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/join.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/lookup_linux.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/mkdir_linux.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/open_linux.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/openat2_linux.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/openat_linux.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/procfs_linux.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/cyphar/filepath-securejoin/vfs.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/.gitattributesis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/.gitignoreis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/.golangci.ymlis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/CODE-OF-CONDUCT.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/CONTRIBUTING.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/GOVERNANCE.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/MAINTAINERSis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/Makefileis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/SECURITY.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/distribution-logo.svgis excluded by!**/*.svg,!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/helpers.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/normalize.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/reference.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/regexp.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/distribution/reference/sort.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/docker/go-units/CONTRIBUTING.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/docker/go-units/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/docker/go-units/MAINTAINERSis excluded by!vendor/**,!**/vendor/**vendor/github.com/docker/go-units/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/docker/go-units/circle.ymlis excluded by!vendor/**,!**/vendor/**vendor/github.com/docker/go-units/duration.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/docker/go-units/size.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/docker/go-units/ulimit.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/euank/go-kmsg-parser/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/euank/go-kmsg-parser/kmsgparser/kmsgparser.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/euank/go-kmsg-parser/kmsgparser/log.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/CONTRIBUTING.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/MAINTAINERSis excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/README.mdis excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/auth.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/auth_anonymous.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/auth_external.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/auth_sha1.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/call.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/conn.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/conn_darwin.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/conn_other.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/conn_unix.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/conn_windows.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/dbus.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/decoder.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/default_handler.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/doc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/encoder.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/escape.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/export.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/homedir.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/match.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/message.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/object.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/sequence.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/sequential_handler.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/server_interfaces.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/sig.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_darwin.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_generic.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_nonce_tcp.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_tcp.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_unix.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_unixcred_dragonfly.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_unixcred_linux.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_unixcred_netbsd.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_unixcred_openbsd.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/transport_zos.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/variant.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/variant_lexer.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/godbus/dbus/v5/variant_parser.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.gois excluded by!**/*.pb.go,!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/AUTHORSis excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/LICENSEis excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/cache/memory/memory.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/collector/collector_manager.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/collector/config.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/collector/fakes.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/collector/generic_collector.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/collector/prometheus_collector.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/collector/types.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/collector/util.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/common/container_hints.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/common/fsHandler.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/common/helpers.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/common/inotify_watcher.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/container.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/client.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/containers/containers.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/factory.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/grpc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/handler.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/identifiers/validate.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/install/install.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/namespaces/context.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/namespaces/grpc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/namespaces/store.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/namespaces/ttrpc.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/pkg/dialer/dialer.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/pkg/dialer/dialer_unix.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/pkg/dialer/dialer_windows.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/containerd/plugin.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/crio/client.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/crio/factory.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/crio/handler.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/crio/install/install.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/google/cadvisor/container/crio/plugin.gois excluded by!vendor/**,!**/vendor/**
📒 Files selected for processing (19)
go.mod(7 hunks)test/extended/ckao.go(1 hunks)test/extended/main.go(0 hunks)test/extended/util/assert.go(1 hunks)test/extended/util/client.go(1 hunks)test/extended/util/clusters.go(1 hunks)test/extended/util/framework.go(1 hunks)test/extended/util/gomega_helpers.go(1 hunks)test/extended/util/gwrapper.go(1 hunks)test/extended/util/logext/log.go(1 hunks)test/extended/util/nodes.go(1 hunks)test/extended/util/oc_copy.go(1 hunks)test/extended/util/pods.go(1 hunks)test/extended/util/provider/config.go(1 hunks)test/extended/util/provider/provider.go(1 hunks)test/extended/util/resource_op.go(1 hunks)test/extended/util/sar.go(1 hunks)test/extended/util/template.go(1 hunks)test/extended/util/test.go(1 hunks)
💤 Files with no reviewable changes (1)
- test/extended/main.go
🧰 Additional context used
🪛 OSV Scanner (2.2.3)
go.mod
[HIGH] 137-137: go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful 0.42.0: Memory exhaustion in go.opentelemetry.io/contrib/instrumentation
(GO-2023-2113)
[HIGH] 137-137: go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful 0.42.0: OpenTelemetry-Go Contrib vulnerable to denial of service in otelhttp due to unbound cardinality metrics
Comment on lines
+137
to
+145
| go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect | ||
| go.opentelemetry.io/otel v1.33.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect | ||
| go.opentelemetry.io/otel v1.35.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect | ||
| go.opentelemetry.io/otel/metric v1.33.0 // indirect | ||
| go.opentelemetry.io/otel/sdk v1.33.0 // indirect | ||
| go.opentelemetry.io/otel/trace v1.33.0 // indirect | ||
| go.opentelemetry.io/otel/metric v1.35.0 // indirect | ||
| go.opentelemetry.io/otel/sdk v1.35.0 // indirect | ||
| go.opentelemetry.io/otel/trace v1.35.0 // indirect |
There was a problem hiding this comment.
High-severity vuln: upgrade go.opentelemetry.io/contrib/.../otelrestful
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/[email protected] is flagged by OSV (GO-2023-2113 / GHSA-rcjv-mgp8-qvmr) for a DoS/memory-exhaustion issue. Please bump this dependency to a patched release (per the advisory) or drop it before we merge. Based on static analysis hints.
🧰 Tools
🪛 OSV Scanner (2.2.3)
[HIGH] 137-137: go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful 0.42.0: Memory exhaustion in go.opentelemetry.io/contrib/instrumentation
(GO-2023-2113)
[HIGH] 137-137: go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful 0.42.0: OpenTelemetry-Go Contrib vulnerable to denial of service in otelhttp due to unbound cardinality metrics
🤖 Prompt for AI Agents
In go.mod around lines 137-145 the indirect dependency
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful
is pinned at v0.42.0 which is flagged for a DoS/memory-exhaustion vulnerability;
update this module to a patched release (per the OSV/GHSA advisory) or remove it
if unused. To fix, bump the otelrestful version to the advised patched version
(or the latest safe release), then run go get <module>@<patched-version> and go
mod tidy to update go.sum; if the dependency is not required, remove the import
or exclude it and re-run go mod tidy and run your dependency/audit tooling to
verify the vulnerability is resolved.
Comment on lines
+101
to
+141
| o.Consistently(func() bool { | ||
| s, _ := kc.CoreV1().Secrets(ns).Get(ctx, secretName, metav1.GetOptions{}) | ||
| ann := s.Annotations | ||
| _, comp := ann["auth.openshift.io/component"] | ||
| _, desc := ann["auth.openshift.io/description"] | ||
| dataNow := base64.StdEncoding.EncodeToString(s.Data["tls.crt"]) | ||
| return !comp && !desc && dataNow == dataBefore | ||
| }, 2*time.Minute, 10*time.Second).Should(o.BeTrue()) | ||
|
|
||
| // --- Scenario B | ||
| g.By("Scenario B: operator up, metadata restored without cert rotation") | ||
| scaleDeployment(oc, "openshift-kube-apiserver-operator", "openshift-kube-apiserver-operator", 1) | ||
|
|
||
| o.Eventually(func() bool { | ||
| s, _ := kc.CoreV1().Secrets(ns).Get(ctx, secretName, metav1.GetOptions{}) | ||
| ann := s.Annotations | ||
| comp := ann["auth.openshift.io/component"] != "" | ||
| desc := ann["auth.openshift.io/description"] != "" | ||
| dataNow := base64.StdEncoding.EncodeToString(s.Data["tls.crt"]) | ||
| return comp && desc && dataNow == dataBefore | ||
| }, 3*time.Minute, 10*time.Second).Should(o.BeTrue()) | ||
|
|
||
| // --- Scenario C | ||
| g.By("Scenario C: operator down, expired not-after triggers sidecar rotation") | ||
| scaleDeployment(oc, "openshift-kube-apiserver-operator", "openshift-kube-apiserver-operator", 0) | ||
| past := "2000-01-01T00:00:00Z" | ||
| patchAnnotationsOnSecret(oc, ns, secretName, map[string]*string{ | ||
| "auth.openshift.io/not-after": &past, | ||
| }) | ||
|
|
||
| o.Eventually(func() bool { | ||
| s, _ := kc.CoreV1().Secrets(ns).Get(ctx, secretName, metav1.GetOptions{}) | ||
| dataNow := base64.StdEncoding.EncodeToString(s.Data["tls.crt"]) | ||
| ann := s.Annotations | ||
| na := ann["auth.openshift.io/not-after"] | ||
| if na == "" { | ||
| return false | ||
| } | ||
| // content rotated | ||
| return dataNow != dataBefore | ||
| }, 3*time.Minute, 10*time.Second).Should(o.BeTrue()) |
There was a problem hiding this comment.
Handle secret Get errors before dereferencing the result
All three polling blocks ignore the error returned by kc.CoreV1().Secrets(...).Get. If that call transiently fails (network hiccup, API temporarily returning NotFound), s is nil and s.Annotations will panic, aborting the test instead of retrying. Ensure we check the error before touching the secret (and apply the same fix to the Scenario B and Scenario C loops).
- o.Consistently(func() bool {
- s, _ := kc.CoreV1().Secrets(ns).Get(ctx, secretName, metav1.GetOptions{})
+ o.Consistently(func() bool {
+ s, err := kc.CoreV1().Secrets(ns).Get(ctx, secretName, metav1.GetOptions{})
+ if err != nil {
+ return false
+ }
ann := s.Annotations- o.Eventually(func() bool {
- s, _ := kc.CoreV1().Secrets(ns).Get(ctx, secretName, metav1.GetOptions{})
+ o.Eventually(func() bool {
+ s, err := kc.CoreV1().Secrets(ns).Get(ctx, secretName, metav1.GetOptions{})
+ if err != nil {
+ return false
+ }- o.Eventually(func() bool {
- s, _ := kc.CoreV1().Secrets(ns).Get(ctx, secretName, metav1.GetOptions{})
+ o.Eventually(func() bool {
+ s, err := kc.CoreV1().Secrets(ns).Get(ctx, secretName, metav1.GetOptions{})
+ if err != nil {
+ return false
+ }🤖 Prompt for AI Agents
In test/extended/ckao.go around lines 101 to 141, each o.Consistently/Eventually
polling lambda ignores the error returned by kc.CoreV1().Secrets(...).Get and
dereferences s (s.Annotations/s.Data) which can panic if Get fails or returns
nil; update each lambda (Scenario A, B, and C) to check the returned error and
that s != nil before accessing s.Annotations or s.Data, and if err != nil or s
== nil return false (so the poll retries) rather than dereferencing; preserve
the existing return conditions when no error is present.
Comment on lines
+153
to
+161
| f, err := os.CreateTemp("", "configfile") | ||
| if err != nil { | ||
| e2e.Failf("failure creating temporal kubeconfig file for user %s. %v", name, err) | ||
| } | ||
| c.configPath = f.Name() | ||
| err = clientcmd.WriteToFile(*kubeConfig, c.configPath) | ||
| if err != nil { | ||
| e2e.Failf("failure writing temporal kubeconfig file for user %s. %v", name, err) | ||
| } |
There was a problem hiding this comment.
Close the temp kubeconfig before reuse
We create a temp kubeconfig but never close its file descriptor. Because SetupProject calls ChangeUser for every test, this leaks one FD per spec until Go’s finalizer eventually runs, and large suites will easily hit “too many open files”. Close the handle before writing.
f, err := os.CreateTemp("", "configfile")
if err != nil {
e2e.Failf("failure creating temporal kubeconfig file for user %s. %v", name, err)
}
c.configPath = f.Name()
- err = clientcmd.WriteToFile(*kubeConfig, c.configPath)
- if err != nil {
- e2e.Failf("failure writing temporal kubeconfig file for user %s. %v", name, err)
- }
+ if err := f.Close(); err != nil {
+ e2e.Failf("failure closing temporal kubeconfig file for user %s. %v", name, err)
+ }
+ if err := clientcmd.WriteToFile(*kubeConfig, c.configPath); err != nil {
+ e2e.Failf("failure writing temporal kubeconfig file for user %s. %v", name, err)
+ }🤖 Prompt for AI Agents
In test/extended/util/client.go around lines 153 to 161, the code creates a temp
kubeconfig file but never closes its file descriptor before calling
clientcmd.WriteToFile, leaking FDs across tests; update the code to close the
temp file handle (call f.Close()) before calling WriteToFile and handle any
close error (fail the test or log the error) so the descriptor is released prior
to reuse.
Comment on lines
+639
to
+673
| // This function also override the default 'stdout' to redirect all output | ||
| // to a buffer and prepare the global flags such as namespace and config path. | ||
| func (c *CLI) Run(commands ...string) *CLI { | ||
| in, out, errout := &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{} | ||
| nc := &CLI{ | ||
| execPath: c.execPath, | ||
| verb: commands[0], | ||
| kubeFramework: c.KubeFramework(), | ||
| adminConfigPath: c.adminConfigPath, | ||
| configPath: c.configPath, | ||
| showInfo: c.showInfo, | ||
| guestConfigPath: c.guestConfigPath, | ||
| user: c.user, | ||
| globalArgs: commands, | ||
| } | ||
| if !c.withoutKubeconf { | ||
| if c.asGuestKubeconf { | ||
| if c.guestConfigPath != "" { | ||
| nc.globalArgs = append([]string{fmt.Sprintf("--kubeconfig=%s", c.guestConfigPath)}, nc.globalArgs...) | ||
| } else { | ||
| e2e.Failf("want to use guest cluster kubeconfig, but it is not set, so please use oc.SetGuestKubeconf to set it firstly") | ||
| } | ||
| } else { | ||
| nc.globalArgs = append([]string{fmt.Sprintf("--kubeconfig=%s", c.configPath)}, nc.globalArgs...) | ||
| } | ||
| } | ||
| if c.asGuestKubeconf && !c.withoutNamespace { | ||
| e2e.Failf("you are doing something in ns of guest cluster, please use WithoutNamespace and set ns in Args, for example, oc.AsGuestKubeconf().WithoutNamespace().Run(\"get\").Args(\"pods\", \"-n\", \"guestclusterns\").Output()") | ||
| } | ||
| if !c.withoutNamespace { | ||
| nc.globalArgs = append([]string{fmt.Sprintf("--namespace=%s", c.Namespace())}, nc.globalArgs...) | ||
| } | ||
| nc.stdin, nc.stdout, nc.stderr = in, out, errout | ||
| return nc.setOutput(c.stdout) | ||
| } |
There was a problem hiding this comment.
Run drops the verb when Args isn’t called
Run() never seeds finalArgs, so oc.Run("whoami").Output() (and any call that relies only on the verb or arguments passed via Run) executes plain oc with no subcommand. That’s a hard functional bug.
if !c.withoutNamespace {
nc.globalArgs = append([]string{fmt.Sprintf("--namespace=%s", c.Namespace())}, nc.globalArgs...)
}
- nc.stdin, nc.stdout, nc.stderr = in, out, errout
- return nc.setOutput(c.stdout)
+ nc.stdin, nc.stdout, nc.stderr = in, out, errout
+ nc.finalArgs = slices.Clone(nc.globalArgs)
+ return nc.setOutput(c.stdout)📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| // This function also override the default 'stdout' to redirect all output | |
| // to a buffer and prepare the global flags such as namespace and config path. | |
| func (c *CLI) Run(commands ...string) *CLI { | |
| in, out, errout := &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{} | |
| nc := &CLI{ | |
| execPath: c.execPath, | |
| verb: commands[0], | |
| kubeFramework: c.KubeFramework(), | |
| adminConfigPath: c.adminConfigPath, | |
| configPath: c.configPath, | |
| showInfo: c.showInfo, | |
| guestConfigPath: c.guestConfigPath, | |
| user: c.user, | |
| globalArgs: commands, | |
| } | |
| if !c.withoutKubeconf { | |
| if c.asGuestKubeconf { | |
| if c.guestConfigPath != "" { | |
| nc.globalArgs = append([]string{fmt.Sprintf("--kubeconfig=%s", c.guestConfigPath)}, nc.globalArgs...) | |
| } else { | |
| e2e.Failf("want to use guest cluster kubeconfig, but it is not set, so please use oc.SetGuestKubeconf to set it firstly") | |
| } | |
| } else { | |
| nc.globalArgs = append([]string{fmt.Sprintf("--kubeconfig=%s", c.configPath)}, nc.globalArgs...) | |
| } | |
| } | |
| if c.asGuestKubeconf && !c.withoutNamespace { | |
| e2e.Failf("you are doing something in ns of guest cluster, please use WithoutNamespace and set ns in Args, for example, oc.AsGuestKubeconf().WithoutNamespace().Run(\"get\").Args(\"pods\", \"-n\", \"guestclusterns\").Output()") | |
| } | |
| if !c.withoutNamespace { | |
| nc.globalArgs = append([]string{fmt.Sprintf("--namespace=%s", c.Namespace())}, nc.globalArgs...) | |
| } | |
| nc.stdin, nc.stdout, nc.stderr = in, out, errout | |
| return nc.setOutput(c.stdout) | |
| } | |
| // This function also override the default 'stdout' to redirect all output | |
| // to a buffer and prepare the global flags such as namespace and config path. | |
| func (c *CLI) Run(commands ...string) *CLI { | |
| in, out, errout := &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{} | |
| nc := &CLI{ | |
| execPath: c.execPath, | |
| verb: commands[0], | |
| kubeFramework: c.KubeFramework(), | |
| adminConfigPath: c.adminConfigPath, | |
| configPath: c.configPath, | |
| showInfo: c.showInfo, | |
| guestConfigPath: c.guestConfigPath, | |
| user: c.user, | |
| globalArgs: commands, | |
| } | |
| if !c.withoutKubeconf { | |
| if c.asGuestKubeconf { | |
| if c.guestConfigPath != "" { | |
| nc.globalArgs = append([]string{fmt.Sprintf("--kubeconfig=%s", c.guestConfigPath)}, nc.globalArgs...) | |
| } else { | |
| e2e.Failf("want to use guest cluster kubeconfig, but it is not set, so please use oc.SetGuestKubeconf to set it firstly") | |
| } | |
| } else { | |
| nc.globalArgs = append([]string{fmt.Sprintf("--kubeconfig=%s", c.configPath)}, nc.globalArgs...) | |
| } | |
| } | |
| if c.asGuestKubeconf && !c.withoutNamespace { | |
| e2e.Failf("you are doing something in ns of guest cluster, please use WithoutNamespace and set ns in Args, for example, oc.AsGuestKubeconf().WithoutNamespace().Run(\"get\").Args(\"pods\", \"-n\", \"guestclusterns\").Output()") | |
| } | |
| if !c.withoutNamespace { | |
| nc.globalArgs = append([]string{fmt.Sprintf("--namespace=%s", c.Namespace())}, nc.globalArgs...) | |
| } | |
| nc.stdin, nc.stdout, nc.stderr = in, out, errout | |
| nc.finalArgs = slices.Clone(nc.globalArgs) | |
| return nc.setOutput(c.stdout) | |
| } |
🤖 Prompt for AI Agents
In test/extended/util/client.go around lines 639 to 673, Run currently sets
nc.verb = commands[0] but does not ensure the verb is present in nc.globalArgs
so calls like oc.Run("whoami").Output() end up invoking just "oc" with no
subcommand; fix by ensuring the verb is seeded into nc.globalArgs when building
nc (i.e., initialize nc.globalArgs to include commands[0] as the first element,
followed by any additional command tokens, instead of only using commands as-is)
so that invocations that rely solely on the verb execute the subcommand
correctly.
Comment on lines
+88
to
+95
| defaultNodeSelector, getNodeSelectorErr := oc.AsAdmin().WithoutNamespace().Run("get").Args("scheduler", "cluster", "-o=jsonpath={.spec.defaultNodeSelector}").Output() | ||
| if getNodeSelectorErr != nil && strings.Contains(defaultNodeSelector, `the server doesn't have a resource type`) { | ||
| e2e.Logf("WARNING: The scheduler API is not supported on the test cluster") | ||
| return false | ||
| } | ||
| o.Expect(getNodeSelectorErr).NotTo(o.HaveOccurred(), "Fail to get cluster scheduler defaultNodeSelector got error: %v\n", getNodeSelectorErr) | ||
| return !strings.EqualFold(defaultNodeSelector, "") | ||
| } |
There was a problem hiding this comment.
Fix scheduler API fallback check
When oc get scheduler cluster hits a cluster that doesn’t expose the scheduler API, the error text lives in getNodeSelectorErr, not in the (empty) defaultNodeSelector output. The current guard never fires, so we fall through to the Expect and fail every time on clusters without that API. Please test the error string instead so we actually return false in this scenario.
- defaultNodeSelector, getNodeSelectorErr := oc.AsAdmin().WithoutNamespace().Run("get").Args("scheduler", "cluster", "-o=jsonpath={.spec.defaultNodeSelector}").Output()
- if getNodeSelectorErr != nil && strings.Contains(defaultNodeSelector, `the server doesn't have a resource type`) {
+ defaultNodeSelector, getNodeSelectorErr := oc.AsAdmin().WithoutNamespace().Run("get").Args("scheduler", "cluster", "-o=jsonpath={.spec.defaultNodeSelector}").Output()
+ if getNodeSelectorErr != nil && strings.Contains(getNodeSelectorErr.Error(), `the server doesn't have a resource type`) {
e2e.Logf("WARNING: The scheduler API is not supported on the test cluster")
return false
}
o.Expect(getNodeSelectorErr).NotTo(o.HaveOccurred(), "Fail to get cluster scheduler defaultNodeSelector got error: %v\n", getNodeSelectorErr)📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| defaultNodeSelector, getNodeSelectorErr := oc.AsAdmin().WithoutNamespace().Run("get").Args("scheduler", "cluster", "-o=jsonpath={.spec.defaultNodeSelector}").Output() | |
| if getNodeSelectorErr != nil && strings.Contains(defaultNodeSelector, `the server doesn't have a resource type`) { | |
| e2e.Logf("WARNING: The scheduler API is not supported on the test cluster") | |
| return false | |
| } | |
| o.Expect(getNodeSelectorErr).NotTo(o.HaveOccurred(), "Fail to get cluster scheduler defaultNodeSelector got error: %v\n", getNodeSelectorErr) | |
| return !strings.EqualFold(defaultNodeSelector, "") | |
| } | |
| defaultNodeSelector, getNodeSelectorErr := oc.AsAdmin().WithoutNamespace().Run("get").Args("scheduler", "cluster", "-o=jsonpath={.spec.defaultNodeSelector}").Output() | |
| if getNodeSelectorErr != nil && strings.Contains(getNodeSelectorErr.Error(), `the server doesn't have a resource type`) { | |
| e2e.Logf("WARNING: The scheduler API is not supported on the test cluster") | |
| return false | |
| } | |
| o.Expect(getNodeSelectorErr).NotTo(o.HaveOccurred(), "Fail to get cluster scheduler defaultNodeSelector got error: %v\n", getNodeSelectorErr) | |
| return !strings.EqualFold(defaultNodeSelector, "") | |
| } |
🤖 Prompt for AI Agents
In test/extended/util/nodes.go around lines 88-95, the guard checking for a
scheduler-API-missing condition inspects the (empty) defaultNodeSelector string
instead of the error; update the logic to test the error object (e.g., if
getNodeSelectorErr != nil && strings.Contains(getNodeSelectorErr.Error(), "the
server doesn't have a resource type") { log and return false }) and ensure the
Expect(...) call is only executed when getNodeSelectorErr is nil (so we don't
call Expect on clusters that lack the scheduler API).
Comment on lines
+75
to
+86
| var filterCmd = "" | ||
| if filter != "" { | ||
| filterCmd = " | grep -i " + filter | ||
| } | ||
| var filteredLogs []byte | ||
| var errCmd error | ||
| if combined { | ||
| filteredLogs, errCmd = exec.Command("bash", "-c", "cat "+podLogs+filterCmd).CombinedOutput() | ||
| } else { | ||
| filteredLogs, errCmd = exec.Command("bash", "-c", "cat "+podLogs+filterCmd).Output() | ||
| } | ||
| return string(filteredLogs), errCmd |
There was a problem hiding this comment.
Stop shelling out with unescaped filter
bash -c "cat … | grep -i <filter>" lets the caller inject arbitrary shell syntax (spaces, quotes, ;, etc.) and even breaks for perfectly valid multi-word filters. Build the command without invoking a shell so every argument is kept literal.
- var filterCmd = ""
- if filter != "" {
- filterCmd = " | grep -i " + filter
- }
- var filteredLogs []byte
- var errCmd error
- if combined {
- filteredLogs, errCmd = exec.Command("bash", "-c", "cat "+podLogs+filterCmd).CombinedOutput()
- } else {
- filteredLogs, errCmd = exec.Command("bash", "-c", "cat "+podLogs+filterCmd).Output()
- }
- return string(filteredLogs), errCmd
+ var cmd *exec.Cmd
+ if filter == "" {
+ cmd = exec.Command("cat", podLogs)
+ } else {
+ cmd = exec.Command("grep", "-i", "--", filter, podLogs)
+ }
+ if combined {
+ filteredLogs, errCmd := cmd.CombinedOutput()
+ return string(filteredLogs), errCmd
+ }
+ filteredLogs, errCmd := cmd.Output()
+ return string(filteredLogs), errCmd📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| var filterCmd = "" | |
| if filter != "" { | |
| filterCmd = " | grep -i " + filter | |
| } | |
| var filteredLogs []byte | |
| var errCmd error | |
| if combined { | |
| filteredLogs, errCmd = exec.Command("bash", "-c", "cat "+podLogs+filterCmd).CombinedOutput() | |
| } else { | |
| filteredLogs, errCmd = exec.Command("bash", "-c", "cat "+podLogs+filterCmd).Output() | |
| } | |
| return string(filteredLogs), errCmd | |
| var cmd *exec.Cmd | |
| if filter == "" { | |
| cmd = exec.Command("cat", podLogs) | |
| } else { | |
| cmd = exec.Command("grep", "-i", "--", filter, podLogs) | |
| } | |
| if combined { | |
| filteredLogs, errCmd := cmd.CombinedOutput() | |
| return string(filteredLogs), errCmd | |
| } | |
| filteredLogs, errCmd := cmd.Output() | |
| return string(filteredLogs), errCmd |
🤖 Prompt for AI Agents
In test/extended/util/pods.go around lines 75-86, stop invoking bash -c with an
unescaped filter (which allows shell injection); instead read the podLogs file
with os.ReadFile (return the read error if any) and if filter is non-empty
perform a case-insensitive line-by-line filter in Go (e.g., strings.ToLower on
line and filter, include matching lines, join with "\n"), then return the
resulting string and nil error; this removes the need to shell out and preserves
literal filter content safely.
Comment on lines
+35
to
+52
| providerInfo := &ClusterConfiguration{} | ||
| if err := json.Unmarshal([]byte(envVar), &providerInfo); err != nil { | ||
| return fmt.Errorf("provider must be a JSON object with the 'type' key at a minimum: %v", err) | ||
| } | ||
|
|
||
| // update context with loaded config | ||
| context.Provider = providerInfo.ProviderName | ||
| context.CloudConfig = e2e.CloudConfig{ | ||
| ProjectID: providerInfo.ProjectID, | ||
| Region: providerInfo.Region, | ||
| Zone: providerInfo.Zone, | ||
| Zones: providerInfo.Zones, | ||
| NumNodes: providerInfo.NumNodes, | ||
| MultiMaster: providerInfo.MultiMaster, | ||
| MultiZone: providerInfo.MultiZone, | ||
| ConfigFile: providerInfo.ConfigFile, | ||
| } | ||
| return nil |
There was a problem hiding this comment.
Reject null or missing-type provider configs to avoid panics
If TEST_PROVIDER is the valid JSON literal null, json.Unmarshal leaves providerInfo as nil, and the subsequent providerInfo.ProviderName dereference panics before we can report a useful error. Likewise, a JSON object without "type" silently yields an empty provider name. Guard both cases so we fail fast with a clear message instead of crashing.
- providerInfo := &ClusterConfiguration{}
- if err := json.Unmarshal([]byte(envVar), &providerInfo); err != nil {
+ providerInfo := &ClusterConfiguration{}
+ if err := json.Unmarshal([]byte(envVar), providerInfo); err != nil {
return fmt.Errorf("provider must be a JSON object with the 'type' key at a minimum: %v", err)
}
+ if providerInfo == nil {
+ return fmt.Errorf("provider must be a non-null JSON object with the 'type' key at a minimum")
+ }
+ if providerInfo.ProviderName == "" {
+ return fmt.Errorf("provider configuration must include a non-empty \"type\" field")
+ }
// update context with loaded config
context.Provider = providerInfo.ProviderName📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| providerInfo := &ClusterConfiguration{} | |
| if err := json.Unmarshal([]byte(envVar), &providerInfo); err != nil { | |
| return fmt.Errorf("provider must be a JSON object with the 'type' key at a minimum: %v", err) | |
| } | |
| // update context with loaded config | |
| context.Provider = providerInfo.ProviderName | |
| context.CloudConfig = e2e.CloudConfig{ | |
| ProjectID: providerInfo.ProjectID, | |
| Region: providerInfo.Region, | |
| Zone: providerInfo.Zone, | |
| Zones: providerInfo.Zones, | |
| NumNodes: providerInfo.NumNodes, | |
| MultiMaster: providerInfo.MultiMaster, | |
| MultiZone: providerInfo.MultiZone, | |
| ConfigFile: providerInfo.ConfigFile, | |
| } | |
| return nil | |
| providerInfo := &ClusterConfiguration{} | |
| if err := json.Unmarshal([]byte(envVar), providerInfo); err != nil { | |
| return fmt.Errorf("provider must be a JSON object with the 'type' key at a minimum: %v", err) | |
| } | |
| if providerInfo == nil { | |
| return fmt.Errorf("provider must be a non-null JSON object with the 'type' key at a minimum") | |
| } | |
| if providerInfo.ProviderName == "" { | |
| return fmt.Errorf("provider configuration must include a non-empty \"type\" field") | |
| } | |
| // update context with loaded config | |
| context.Provider = providerInfo.ProviderName | |
| context.CloudConfig = e2e.CloudConfig{ | |
| ProjectID: providerInfo.ProjectID, | |
| Region: providerInfo.Region, | |
| Zone: providerInfo.Zone, | |
| Zones: providerInfo.Zones, | |
| NumNodes: providerInfo.NumNodes, | |
| MultiMaster: providerInfo.MultiMaster, | |
| MultiZone: providerInfo.MultiZone, | |
| ConfigFile: providerInfo.ConfigFile, | |
| } | |
| return nil |
🤖 Prompt for AI Agents
In test/extended/util/provider/provider.go around lines 35 to 52, guard against
JSON null and missing provider type: ensure json.Unmarshal writes into the
ClusterConfiguration value (not a pointer-to-pointer), then after unmarshalling
check if providerInfo is nil or providerInfo.ProviderName is empty and return a
clear error (e.g. "TEST_PROVIDER must be a non-null JSON object containing a
non-empty 'type' field") instead of proceeding to dereference and panic; update
the error paths accordingly so the function fails fast with that message.
Comment on lines
+39
to
+40
| cargs = append(cargs, resourceKindAndName, "-o=jsonpath={.metadata.labels."+labelName+"}") | ||
| return oc.AsAdmin().WithoutNamespace().Run("get").Args(cargs...).Output() |
There was a problem hiding this comment.
Quote label keys in JSONPath
Label keys like app.kubernetes.io/name include dots, so .metadata.labels.app.kubernetes.io/name is parsed as nested fields and fails. Use bracket notation so the entire key is treated literally.
- cargs = append(cargs, resourceKindAndName, "-o=jsonpath={.metadata.labels."+labelName+"}")
+ cargs = append(cargs, resourceKindAndName, "-o=jsonpath={.metadata.labels['"+labelName+"']}")📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| cargs = append(cargs, resourceKindAndName, "-o=jsonpath={.metadata.labels."+labelName+"}") | |
| return oc.AsAdmin().WithoutNamespace().Run("get").Args(cargs...).Output() | |
| cargs = append(cargs, resourceKindAndName, "-o=jsonpath={.metadata.labels['"+labelName+"']}") | |
| return oc.AsAdmin().WithoutNamespace().Run("get").Args(cargs...).Output() |
🤖 Prompt for AI Agents
In test/extended/util/resource_op.go around lines 39-40, the JSONPath output
uses dot notation for label keys which fails for keys with dots; change the
JSONPath to use bracket notation so the entire label key is treated literally:
construct the -o=jsonpath argument as {.metadata.labels['<labelName>']} (i.e.
"-o=jsonpath={.metadata.labels['"+labelName+"']}") making sure the quotes are
placed/escaped correctly when building the string.
|
@wangke19: The following tests failed, say
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-sigs/prow repository. I understand the commands that are listed here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.