diff --git a/bootstrapper/cmd/bootstrapper/BUILD.bazel b/bootstrapper/cmd/bootstrapper/BUILD.bazel index da8d4d9c2..6a8c61c50 100644 --- a/bootstrapper/cmd/bootstrapper/BUILD.bazel +++ b/bootstrapper/cmd/bootstrapper/BUILD.bazel @@ -44,7 +44,6 @@ go_library( "//internal/versions/components", "@com_github_spf13_afero//:afero", "@io_k8s_kubernetes//cmd/kubeadm/app/apis/kubeadm/v1beta3", - "@org_uber_go_zap//:zap", ], ) diff --git a/bootstrapper/internal/initserver/BUILD.bazel b/bootstrapper/internal/initserver/BUILD.bazel index 385108c57..009bb0594 100644 --- a/bootstrapper/internal/initserver/BUILD.bazel +++ b/bootstrapper/internal/initserver/BUILD.bazel @@ -27,7 +27,6 @@ go_library( "@org_golang_google_grpc//keepalive", "@org_golang_google_grpc//status", "@org_golang_x_crypto//bcrypt", - "@org_uber_go_zap//:zap", ], ) diff --git a/bootstrapper/internal/joinclient/BUILD.bazel b/bootstrapper/internal/joinclient/BUILD.bazel index c7d6307b5..3b8bf70b7 100644 --- a/bootstrapper/internal/joinclient/BUILD.bazel +++ b/bootstrapper/internal/joinclient/BUILD.bazel @@ -13,7 +13,6 @@ go_library( "//internal/cloud/metadata", "//internal/constants", "//internal/file", - "//internal/logger", "//internal/nodestate", "//internal/role", "//internal/versions/components", @@ -23,7 +22,6 @@ go_library( "@io_k8s_kubernetes//cmd/kubeadm/app/constants", "@io_k8s_utils//clock", "@org_golang_google_grpc//:go_default_library", - "@org_uber_go_zap//:zap", ], ) diff --git a/bootstrapper/internal/kubernetes/BUILD.bazel b/bootstrapper/internal/kubernetes/BUILD.bazel index c2255148a..d6ba14a49 100644 --- a/bootstrapper/internal/kubernetes/BUILD.bazel +++ b/bootstrapper/internal/kubernetes/BUILD.bazel @@ -17,13 +17,11 @@ go_library( "//internal/cloud/metadata", "//internal/constants", "//internal/kubernetes", - "//internal/logger", "//internal/role", "//internal/versions/components", "@io_k8s_api//core/v1:core", "@io_k8s_apimachinery//pkg/apis/meta/v1:meta", "@io_k8s_kubernetes//cmd/kubeadm/app/apis/kubeadm/v1beta3", - "@org_uber_go_zap//:zap", ], ) diff --git a/bootstrapper/internal/kubernetes/k8sapi/BUILD.bazel b/bootstrapper/internal/kubernetes/k8sapi/BUILD.bazel index 85738d500..ef87085bd 100644 --- a/bootstrapper/internal/kubernetes/k8sapi/BUILD.bazel +++ b/bootstrapper/internal/kubernetes/k8sapi/BUILD.bazel @@ -19,7 +19,6 @@ go_library( "//internal/file", "//internal/installer", "//internal/kubernetes", - "//internal/logger", "//internal/versions/components", "@com_github_coreos_go_systemd_v22//dbus", "@com_github_spf13_afero//:afero", @@ -29,7 +28,6 @@ go_library( "@io_k8s_kubelet//config/v1beta1", "@io_k8s_kubernetes//cmd/kubeadm/app/apis/kubeadm/v1beta3", "@io_k8s_kubernetes//cmd/kubeadm/app/constants", - "@org_uber_go_zap//:zap", ], ) diff --git a/cli/internal/cmd/BUILD.bazel b/cli/internal/cmd/BUILD.bazel index 5654b1dee..1029f70de 100644 --- a/cli/internal/cmd/BUILD.bazel +++ b/cli/internal/cmd/BUILD.bazel @@ -84,7 +84,6 @@ go_library( "//internal/kms/uri", # keep "//internal/license", - "//internal/logger", "//internal/maa", "//internal/retry", "//internal/semver", @@ -110,7 +109,6 @@ go_library( "@io_k8s_sigs_yaml//:yaml", "@org_golang_google_grpc//:go_default_library", "@org_golang_x_mod//semver", - "@org_uber_go_zap//zapcore", ] + select({ "@io_bazel_rules_go//go/platform:android_amd64": [ "@org_golang_x_sys//unix", diff --git a/debugd/cmd/debugd/BUILD.bazel b/debugd/cmd/debugd/BUILD.bazel index 5f4e716e4..e517ef6a9 100644 --- a/debugd/cmd/debugd/BUILD.bazel +++ b/debugd/cmd/debugd/BUILD.bazel @@ -25,7 +25,6 @@ go_library( "//internal/cloud/qemu", "//internal/logger", "@com_github_spf13_afero//:afero", - "@org_uber_go_zap//:zap", ], ) diff --git a/debugd/internal/debugd/deploy/BUILD.bazel b/debugd/internal/debugd/deploy/BUILD.bazel index 4e0cccb4f..16ba9cdf3 100644 --- a/debugd/internal/debugd/deploy/BUILD.bazel +++ b/debugd/internal/debugd/deploy/BUILD.bazel @@ -16,12 +16,10 @@ go_library( "//debugd/internal/filetransfer", "//debugd/service", "//internal/constants", - "//internal/logger", "@com_github_coreos_go_systemd_v22//dbus", "@com_github_spf13_afero//:afero", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//credentials/insecure", - "@org_uber_go_zap//:zap", ], ) diff --git a/debugd/internal/debugd/logcollector/BUILD.bazel b/debugd/internal/debugd/logcollector/BUILD.bazel index 6ecc05a71..4e0f0b089 100644 --- a/debugd/internal/debugd/logcollector/BUILD.bazel +++ b/debugd/internal/debugd/logcollector/BUILD.bazel @@ -14,7 +14,6 @@ go_library( "//debugd/internal/debugd/info", "//internal/cloud/cloudprovider", "//internal/cloud/metadata", - "//internal/logger", "//internal/versions", "@com_github_aws_aws_sdk_go_v2_config//:config", "@com_github_aws_aws_sdk_go_v2_service_secretsmanager//:secretsmanager", diff --git a/debugd/internal/debugd/metadata/BUILD.bazel b/debugd/internal/debugd/metadata/BUILD.bazel index 8cc159b11..7b57a5fb0 100644 --- a/debugd/internal/debugd/metadata/BUILD.bazel +++ b/debugd/internal/debugd/metadata/BUILD.bazel @@ -9,11 +9,7 @@ go_library( ], importpath = "github.com/edgelesssys/constellation/v2/debugd/internal/debugd/metadata", visibility = ["//debugd:__subpackages__"], - deps = [ - "//debugd/internal/debugd", - "//internal/logger", - "@org_uber_go_zap//:zap", - ], + deps = ["//debugd/internal/debugd"], ) go_test( diff --git a/debugd/internal/debugd/server/BUILD.bazel b/debugd/internal/debugd/server/BUILD.bazel index 19e646cf7..ee0de46c2 100644 --- a/debugd/internal/debugd/server/BUILD.bazel +++ b/debugd/internal/debugd/server/BUILD.bazel @@ -15,7 +15,6 @@ go_library( "//internal/logger", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//keepalive", - "@org_uber_go_zap//:zap", ], ) diff --git a/debugd/internal/filetransfer/BUILD.bazel b/debugd/internal/filetransfer/BUILD.bazel index f59b0cb82..db82609db 100644 --- a/debugd/internal/filetransfer/BUILD.bazel +++ b/debugd/internal/filetransfer/BUILD.bazel @@ -13,8 +13,6 @@ go_library( "//debugd/internal/debugd", "//debugd/internal/filetransfer/streamer", "//debugd/service", - "//internal/logger", - "@org_uber_go_zap//:zap", ], ) diff --git a/disk-mapper/cmd/BUILD.bazel b/disk-mapper/cmd/BUILD.bazel index 1d3b1d565..4db0736b3 100644 --- a/disk-mapper/cmd/BUILD.bazel +++ b/disk-mapper/cmd/BUILD.bazel @@ -30,7 +30,6 @@ go_library( "//internal/logger", "//internal/role", "@com_github_spf13_afero//:afero", - "@org_uber_go_zap//:zap", ], ) diff --git a/disk-mapper/internal/diskencryption/BUILD.bazel b/disk-mapper/internal/diskencryption/BUILD.bazel index 84acaa6c1..452c846de 100644 --- a/disk-mapper/internal/diskencryption/BUILD.bazel +++ b/disk-mapper/internal/diskencryption/BUILD.bazel @@ -5,9 +5,5 @@ go_library( srcs = ["diskencryption.go"], importpath = "github.com/edgelesssys/constellation/v2/disk-mapper/internal/diskencryption", visibility = ["//disk-mapper:__subpackages__"], - deps = [ - "//internal/cryptsetup", - "//internal/logger", - "@org_uber_go_zap//:zap", - ], + deps = ["//internal/cryptsetup"], ) diff --git a/disk-mapper/internal/recoveryserver/BUILD.bazel b/disk-mapper/internal/recoveryserver/BUILD.bazel index ce81e8c39..966b93afd 100644 --- a/disk-mapper/internal/recoveryserver/BUILD.bazel +++ b/disk-mapper/internal/recoveryserver/BUILD.bazel @@ -17,7 +17,6 @@ go_library( "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//status", - "@org_uber_go_zap//:zap", ], ) diff --git a/disk-mapper/internal/rejoinclient/BUILD.bazel b/disk-mapper/internal/rejoinclient/BUILD.bazel index b7bae0f1c..01f0c26e5 100644 --- a/disk-mapper/internal/rejoinclient/BUILD.bazel +++ b/disk-mapper/internal/rejoinclient/BUILD.bazel @@ -9,12 +9,10 @@ go_library( deps = [ "//internal/cloud/metadata", "//internal/constants", - "//internal/logger", "//internal/role", "//joinservice/joinproto", "@io_k8s_utils//clock", "@org_golang_google_grpc//:go_default_library", - "@org_uber_go_zap//:zap", ], ) diff --git a/disk-mapper/internal/setup/BUILD.bazel b/disk-mapper/internal/setup/BUILD.bazel index 035d57304..6250ff87d 100644 --- a/disk-mapper/internal/setup/BUILD.bazel +++ b/disk-mapper/internal/setup/BUILD.bazel @@ -20,10 +20,8 @@ go_library( "//internal/constants", "//internal/crypto", "//internal/file", - "//internal/logger", "//internal/nodestate", "@com_github_spf13_afero//:afero", - "@org_uber_go_zap//:zap", ], ) diff --git a/disk-mapper/internal/test/BUILD.bazel b/disk-mapper/internal/test/BUILD.bazel index 489a2b89f..cccb256c9 100644 --- a/disk-mapper/internal/test/BUILD.bazel +++ b/disk-mapper/internal/test/BUILD.bazel @@ -25,24 +25,20 @@ go_test( "@io_bazel_rules_go//go/platform:android": [ "//disk-mapper/internal/diskencryption", "//internal/cryptsetup", - "//internal/logger", "@com_github_martinjungblut_go_cryptsetup//:go-cryptsetup", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", "@io_bazel_rules_go//go/runfiles:go_default_library", "@org_uber_go_goleak//:goleak", - "@org_uber_go_zap//zapcore", ], "@io_bazel_rules_go//go/platform:linux": [ "//disk-mapper/internal/diskencryption", "//internal/cryptsetup", - "//internal/logger", "@com_github_martinjungblut_go_cryptsetup//:go-cryptsetup", "@com_github_stretchr_testify//assert", "@com_github_stretchr_testify//require", "@io_bazel_rules_go//go/runfiles:go_default_library", "@org_uber_go_goleak//:goleak", - "@org_uber_go_zap//zapcore", ], "//conditions:default": [], }), diff --git a/disk-mapper/internal/test/integration_test.go b/disk-mapper/internal/test/integration_test.go index 99f1e4d3b..845f21e21 100644 --- a/disk-mapper/internal/test/integration_test.go +++ b/disk-mapper/internal/test/integration_test.go @@ -12,13 +12,13 @@ import ( "encoding/json" "flag" "fmt" + "log/slog" "os" "os/exec" "path/filepath" "strings" "syscall" "testing" - "log/slog" "github.com/bazelbuild/rules_go/go/runfiles" "github.com/edgelesssys/constellation/v2/disk-mapper/internal/diskencryption" diff --git a/e2e/malicious-join/BUILD.bazel b/e2e/malicious-join/BUILD.bazel index 3f78a37a8..b9ae5ae7f 100644 --- a/e2e/malicious-join/BUILD.bazel +++ b/e2e/malicious-join/BUILD.bazel @@ -14,10 +14,7 @@ go_library( "//internal/attestation/variant", "//internal/cloud/cloudprovider", "//internal/grpc/dialer", - "//internal/logger", "//joinservice/joinproto", - "@org_uber_go_zap//:zap", - "@org_uber_go_zap//zapcore", ], ) diff --git a/go.mod b/go.mod index f0d26c4fd..e25a08855 100644 --- a/go.mod +++ b/go.mod @@ -126,7 +126,6 @@ require ( go.etcd.io/etcd/client/pkg/v3 v3.5.10 go.etcd.io/etcd/client/v3 v3.5.10 go.uber.org/goleak v1.3.0 - go.uber.org/zap v1.26.0 golang.org/x/crypto v0.17.0 golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 golang.org/x/mod v0.14.0 @@ -153,6 +152,8 @@ require ( sigs.k8s.io/yaml v1.4.0 ) +require go.uber.org/zap v1.26.0 // indirect + require ( cloud.google.com/go v0.110.8 // indirect cloud.google.com/go/iam v1.1.2 // indirect diff --git a/hack/bazel-deps-mirror/BUILD.bazel b/hack/bazel-deps-mirror/BUILD.bazel index 0ccbc3e61..dc31b8e3f 100644 --- a/hack/bazel-deps-mirror/BUILD.bazel +++ b/hack/bazel-deps-mirror/BUILD.bazel @@ -15,10 +15,8 @@ go_library( "//hack/bazel-deps-mirror/internal/issues", "//hack/bazel-deps-mirror/internal/mirror", "//hack/bazel-deps-mirror/internal/rules", - "//internal/logger", "@com_github_bazelbuild_buildtools//build", "@com_github_spf13_cobra//:cobra", - "@org_uber_go_zap//zapcore", ], ) diff --git a/hack/bazel-deps-mirror/internal/mirror/BUILD.bazel b/hack/bazel-deps-mirror/internal/mirror/BUILD.bazel index 88e4e4c9e..5e4b25479 100644 --- a/hack/bazel-deps-mirror/internal/mirror/BUILD.bazel +++ b/hack/bazel-deps-mirror/internal/mirror/BUILD.bazel @@ -7,7 +7,6 @@ go_library( importpath = "github.com/edgelesssys/constellation/v2/hack/bazel-deps-mirror/internal/mirror", visibility = ["//hack/bazel-deps-mirror:__subpackages__"], deps = [ - "//internal/logger", "@com_github_aws_aws_sdk_go_v2_config//:config", "@com_github_aws_aws_sdk_go_v2_feature_s3_manager//:manager", "@com_github_aws_aws_sdk_go_v2_service_s3//:s3", diff --git a/hack/cli-k8s-compatibility/BUILD.bazel b/hack/cli-k8s-compatibility/BUILD.bazel index d31d56b7d..ac7f7b835 100644 --- a/hack/cli-k8s-compatibility/BUILD.bazel +++ b/hack/cli-k8s-compatibility/BUILD.bazel @@ -8,9 +8,7 @@ go_library( deps = [ "//internal/api/versionsapi", "//internal/constants", - "//internal/logger", "//internal/versions", - "@org_uber_go_zap//zapcore", ], ) diff --git a/hack/oci-pin/BUILD.bazel b/hack/oci-pin/BUILD.bazel index 9a3603791..0ebb81901 100644 --- a/hack/oci-pin/BUILD.bazel +++ b/hack/oci-pin/BUILD.bazel @@ -14,9 +14,7 @@ go_library( "//hack/oci-pin/internal/extract", "//hack/oci-pin/internal/inject", "//hack/oci-pin/internal/sums", - "//internal/logger", "@com_github_spf13_cobra//:cobra", - "@org_uber_go_zap//zapcore", ], ) diff --git a/hack/qemu-metadata-api/BUILD.bazel b/hack/qemu-metadata-api/BUILD.bazel index 60e4f80ab..0ceebedfd 100644 --- a/hack/qemu-metadata-api/BUILD.bazel +++ b/hack/qemu-metadata-api/BUILD.bazel @@ -15,10 +15,7 @@ go_library( deps = [ "//hack/qemu-metadata-api/server", "//hack/qemu-metadata-api/virtwrapper", - "//internal/logger", "@org_libvirt_go_libvirt//:libvirt", - "@org_uber_go_zap//:zap", - "@org_uber_go_zap//zapcore", ], ) diff --git a/hack/qemu-metadata-api/server/BUILD.bazel b/hack/qemu-metadata-api/server/BUILD.bazel index 9fe06769b..5def36c03 100644 --- a/hack/qemu-metadata-api/server/BUILD.bazel +++ b/hack/qemu-metadata-api/server/BUILD.bazel @@ -12,9 +12,7 @@ go_library( deps = [ "//hack/qemu-metadata-api/virtwrapper", "//internal/cloud/metadata", - "//internal/logger", "//internal/role", - "@org_uber_go_zap//:zap", ], ) diff --git a/image/upload/internal/cmd/BUILD.bazel b/image/upload/internal/cmd/BUILD.bazel index 1bff3aa8e..c75ed2c2a 100644 --- a/image/upload/internal/cmd/BUILD.bazel +++ b/image/upload/internal/cmd/BUILD.bazel @@ -21,7 +21,6 @@ go_library( "//internal/attestation/measurements", "//internal/cloud/cloudprovider", "//internal/constants", - "//internal/logger", "//internal/osimage", "//internal/osimage/archive", "//internal/osimage/imageinfo", @@ -29,6 +28,5 @@ go_library( "//internal/osimage/nop", "//internal/osimage/uplosi", "@com_github_spf13_cobra//:cobra", - "@org_uber_go_zap//zapcore", ], ) diff --git a/internal/api/attestationconfigapi/BUILD.bazel b/internal/api/attestationconfigapi/BUILD.bazel index 037f482c9..5db942eb3 100644 --- a/internal/api/attestationconfigapi/BUILD.bazel +++ b/internal/api/attestationconfigapi/BUILD.bazel @@ -17,7 +17,6 @@ go_library( "//internal/api/fetcher", "//internal/attestation/variant", "//internal/constants", - "//internal/logger", "//internal/sigstore", "//internal/staticupload", "@com_github_aws_aws_sdk_go//aws", diff --git a/internal/api/attestationconfigapi/cli/BUILD.bazel b/internal/api/attestationconfigapi/cli/BUILD.bazel index c235cfd7c..0e9695f7b 100644 --- a/internal/api/attestationconfigapi/cli/BUILD.bazel +++ b/internal/api/attestationconfigapi/cli/BUILD.bazel @@ -25,7 +25,6 @@ go_library( "//internal/cloud/cloudprovider", "//internal/constants", "//internal/file", - "//internal/logger", "//internal/staticupload", "//internal/verify", "@com_github_aws_aws_sdk_go//aws", @@ -33,7 +32,6 @@ go_library( "@com_github_aws_aws_sdk_go_v2_service_s3//types", "@com_github_spf13_afero//:afero", "@com_github_spf13_cobra//:cobra", - "@org_uber_go_zap//:zap", ], ) diff --git a/internal/api/client/BUILD.bazel b/internal/api/client/BUILD.bazel index a77457c5a..a8fef5dd2 100644 --- a/internal/api/client/BUILD.bazel +++ b/internal/api/client/BUILD.bazel @@ -6,12 +6,10 @@ go_library( importpath = "github.com/edgelesssys/constellation/v2/internal/api/client", visibility = ["//:__subpackages__"], deps = [ - "//internal/logger", "//internal/sigstore", "//internal/staticupload", "@com_github_aws_aws_sdk_go_v2_feature_s3_manager//:manager", "@com_github_aws_aws_sdk_go_v2_service_s3//:s3", "@com_github_aws_aws_sdk_go_v2_service_s3//types", - "@org_uber_go_zap//:zap", ], ) diff --git a/internal/api/versionsapi/BUILD.bazel b/internal/api/versionsapi/BUILD.bazel index 2f792d6c1..30fb04c21 100644 --- a/internal/api/versionsapi/BUILD.bazel +++ b/internal/api/versionsapi/BUILD.bazel @@ -20,7 +20,6 @@ go_library( "//internal/api/client", "//internal/api/fetcher", "//internal/constants", - "//internal/logger", "@org_golang_x_mod//semver", ], ) diff --git a/internal/api/versionsapi/cli/BUILD.bazel b/internal/api/versionsapi/cli/BUILD.bazel index 76882ae22..ed95a30ea 100644 --- a/internal/api/versionsapi/cli/BUILD.bazel +++ b/internal/api/versionsapi/cli/BUILD.bazel @@ -15,7 +15,6 @@ go_library( "//internal/api/client", "//internal/api/versionsapi", "//internal/constants", - "//internal/logger", "@com_github_aws_aws_sdk_go_v2_config//:config", "@com_github_aws_aws_sdk_go_v2_service_ec2//:ec2", "@com_github_aws_smithy_go//:smithy-go", @@ -27,7 +26,6 @@ go_library( "@com_google_cloud_go_compute//apiv1", "@com_google_cloud_go_compute//apiv1/computepb", "@org_golang_x_mod//semver", - "@org_uber_go_zap//zapcore", ], ) diff --git a/internal/cloud/azure/BUILD.bazel b/internal/cloud/azure/BUILD.bazel index efbca7f59..ff8fbea92 100644 --- a/internal/cloud/azure/BUILD.bazel +++ b/internal/cloud/azure/BUILD.bazel @@ -15,7 +15,6 @@ go_library( "//internal/cloud/azureshared", "//internal/cloud/metadata", "//internal/constants", - "//internal/logger", "//internal/role", "@com_github_azure_azure_sdk_for_go_sdk_azcore//runtime", "@com_github_azure_azure_sdk_for_go_sdk_azidentity//:azidentity", @@ -23,7 +22,6 @@ go_library( "@com_github_azure_azure_sdk_for_go_sdk_resourcemanager_network_armnetwork_v5//:armnetwork", "@io_k8s_kubernetes//pkg/util/iptables", "@io_k8s_utils//exec", - "@org_uber_go_zap//:zap", ], ) diff --git a/internal/logger/BUILD.bazel b/internal/logger/BUILD.bazel index f1b95ba19..12ec65d9c 100644 --- a/internal/logger/BUILD.bazel +++ b/internal/logger/BUILD.bazel @@ -13,8 +13,5 @@ go_library( "@com_github_grpc_ecosystem_go_grpc_middleware_v2//interceptors/logging", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//grpclog", - "@org_uber_go_zap//:zap", - "@org_uber_go_zap//zapcore", - "@org_uber_go_zap//zaptest", ], ) diff --git a/internal/osimage/archive/BUILD.bazel b/internal/osimage/archive/BUILD.bazel index 122ceef0c..4f90c37e4 100644 --- a/internal/osimage/archive/BUILD.bazel +++ b/internal/osimage/archive/BUILD.bazel @@ -8,7 +8,6 @@ go_library( deps = [ "//internal/api/versionsapi", "//internal/constants", - "//internal/logger", "//internal/staticupload", "@com_github_aws_aws_sdk_go_v2_feature_s3_manager//:manager", "@com_github_aws_aws_sdk_go_v2_service_s3//:s3", diff --git a/internal/osimage/imageinfo/BUILD.bazel b/internal/osimage/imageinfo/BUILD.bazel index 7c9e5c386..2a13b111e 100644 --- a/internal/osimage/imageinfo/BUILD.bazel +++ b/internal/osimage/imageinfo/BUILD.bazel @@ -8,7 +8,6 @@ go_library( deps = [ "//internal/api/versionsapi", "//internal/constants", - "//internal/logger", "//internal/staticupload", "@com_github_aws_aws_sdk_go_v2_feature_s3_manager//:manager", "@com_github_aws_aws_sdk_go_v2_service_s3//:s3", diff --git a/internal/osimage/measurementsuploader/BUILD.bazel b/internal/osimage/measurementsuploader/BUILD.bazel index 5ce43727b..25183bf35 100644 --- a/internal/osimage/measurementsuploader/BUILD.bazel +++ b/internal/osimage/measurementsuploader/BUILD.bazel @@ -9,7 +9,6 @@ go_library( "//internal/api/versionsapi", "//internal/attestation/measurements", "//internal/constants", - "//internal/logger", "//internal/staticupload", "@com_github_aws_aws_sdk_go_v2_feature_s3_manager//:manager", "@com_github_aws_aws_sdk_go_v2_service_s3//:s3", diff --git a/internal/osimage/nop/BUILD.bazel b/internal/osimage/nop/BUILD.bazel index 6e5b5d915..2dcd1bc54 100644 --- a/internal/osimage/nop/BUILD.bazel +++ b/internal/osimage/nop/BUILD.bazel @@ -7,7 +7,6 @@ go_library( visibility = ["//:__subpackages__"], deps = [ "//internal/api/versionsapi", - "//internal/logger", "//internal/osimage", ], ) diff --git a/internal/osimage/uplosi/BUILD.bazel b/internal/osimage/uplosi/BUILD.bazel index ad50cd865..bbd70e880 100644 --- a/internal/osimage/uplosi/BUILD.bazel +++ b/internal/osimage/uplosi/BUILD.bazel @@ -9,7 +9,6 @@ go_library( deps = [ "//internal/api/versionsapi", "//internal/cloud/cloudprovider", - "//internal/logger", "//internal/osimage", "@com_github_burntsushi_toml//:toml", ], diff --git a/internal/staticupload/BUILD.bazel b/internal/staticupload/BUILD.bazel index 38134eb39..2e54630b6 100644 --- a/internal/staticupload/BUILD.bazel +++ b/internal/staticupload/BUILD.bazel @@ -13,7 +13,6 @@ go_library( visibility = ["//:__subpackages__"], deps = [ "//internal/constants", - "//internal/logger", "@com_github_aws_aws_sdk_go_v2_config//:config", "@com_github_aws_aws_sdk_go_v2_feature_s3_manager//:manager", "@com_github_aws_aws_sdk_go_v2_service_cloudfront//:cloudfront", diff --git a/joinservice/cmd/BUILD.bazel b/joinservice/cmd/BUILD.bazel index c55b08cc7..572e12ca8 100644 --- a/joinservice/cmd/BUILD.bazel +++ b/joinservice/cmd/BUILD.bazel @@ -29,7 +29,6 @@ go_library( "//joinservice/internal/server", "//joinservice/internal/watcher", "@com_github_spf13_afero//:afero", - "@org_uber_go_zap//:zap", ], ) diff --git a/joinservice/internal/certcache/BUILD.bazel b/joinservice/internal/certcache/BUILD.bazel index c5ba663dd..3d07b94ca 100644 --- a/joinservice/internal/certcache/BUILD.bazel +++ b/joinservice/internal/certcache/BUILD.bazel @@ -10,7 +10,6 @@ go_library( "//internal/attestation/variant", "//internal/constants", "//internal/crypto", - "//internal/logger", "//joinservice/internal/certcache/amdkds", "@com_github_google_go_sev_guest//abi", "@com_github_google_go_sev_guest//verify/trust", diff --git a/joinservice/internal/kms/BUILD.bazel b/joinservice/internal/kms/BUILD.bazel index 966f0ad11..35f6a6bbb 100644 --- a/joinservice/internal/kms/BUILD.bazel +++ b/joinservice/internal/kms/BUILD.bazel @@ -7,11 +7,9 @@ go_library( importpath = "github.com/edgelesssys/constellation/v2/joinservice/internal/kms", visibility = ["//joinservice:__subpackages__"], deps = [ - "//internal/logger", "//keyservice/keyserviceproto", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//credentials/insecure", - "@org_uber_go_zap//:zap", ], ) diff --git a/joinservice/internal/kubeadm/BUILD.bazel b/joinservice/internal/kubeadm/BUILD.bazel index 10fb69340..3bd980ac0 100644 --- a/joinservice/internal/kubeadm/BUILD.bazel +++ b/joinservice/internal/kubeadm/BUILD.bazel @@ -9,7 +9,6 @@ go_library( deps = [ "//internal/constants", "//internal/file", - "//internal/logger", "@com_github_spf13_afero//:afero", "@io_k8s_apimachinery//pkg/apis/meta/v1:meta", "@io_k8s_client_go//kubernetes", diff --git a/joinservice/internal/kubernetesca/BUILD.bazel b/joinservice/internal/kubernetesca/BUILD.bazel index 5b6edac35..9de8ec46d 100644 --- a/joinservice/internal/kubernetesca/BUILD.bazel +++ b/joinservice/internal/kubernetesca/BUILD.bazel @@ -9,7 +9,6 @@ go_library( deps = [ "//internal/crypto", "//internal/file", - "//internal/logger", "@io_k8s_kubernetes//cmd/kubeadm/app/constants", ], ) diff --git a/joinservice/internal/server/BUILD.bazel b/joinservice/internal/server/BUILD.bazel index f8ffb5dfb..409c50c0e 100644 --- a/joinservice/internal/server/BUILD.bazel +++ b/joinservice/internal/server/BUILD.bazel @@ -19,7 +19,6 @@ go_library( "@org_golang_google_grpc//codes", "@org_golang_google_grpc//credentials", "@org_golang_google_grpc//status", - "@org_uber_go_zap//:zap", ], ) diff --git a/joinservice/internal/watcher/BUILD.bazel b/joinservice/internal/watcher/BUILD.bazel index bd6366f51..6ac22574b 100644 --- a/joinservice/internal/watcher/BUILD.bazel +++ b/joinservice/internal/watcher/BUILD.bazel @@ -16,9 +16,7 @@ go_library( "//internal/config", "//internal/constants", "//internal/file", - "//internal/logger", "@com_github_fsnotify_fsnotify//:fsnotify", - "@org_uber_go_zap//:zap", ], ) diff --git a/keyservice/cmd/BUILD.bazel b/keyservice/cmd/BUILD.bazel index fdca4a724..4a64632f9 100644 --- a/keyservice/cmd/BUILD.bazel +++ b/keyservice/cmd/BUILD.bazel @@ -16,7 +16,6 @@ go_library( "//internal/logger", "//keyservice/internal/server", "@com_github_spf13_afero//:afero", - "@org_uber_go_zap//:zap", ], ) diff --git a/keyservice/internal/server/BUILD.bazel b/keyservice/internal/server/BUILD.bazel index 9e20af194..756c76f6d 100644 --- a/keyservice/internal/server/BUILD.bazel +++ b/keyservice/internal/server/BUILD.bazel @@ -15,8 +15,6 @@ go_library( "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//codes", "@org_golang_google_grpc//status", - "@org_uber_go_zap//:zap", - "@org_uber_go_zap//zapcore", ], ) diff --git a/measurement-reader/cmd/BUILD.bazel b/measurement-reader/cmd/BUILD.bazel index db81ce3d9..fca683917 100644 --- a/measurement-reader/cmd/BUILD.bazel +++ b/measurement-reader/cmd/BUILD.bazel @@ -9,12 +9,9 @@ go_library( deps = [ "//internal/attestation/variant", "//internal/constants", - "//internal/logger", "//measurement-reader/internal/sorted", "//measurement-reader/internal/tdx", "//measurement-reader/internal/tpm", - "@org_uber_go_zap//:zap", - "@org_uber_go_zap//zapcore", ], ) diff --git a/s3proxy/cmd/BUILD.bazel b/s3proxy/cmd/BUILD.bazel index a601597b6..d426ff5bb 100644 --- a/s3proxy/cmd/BUILD.bazel +++ b/s3proxy/cmd/BUILD.bazel @@ -10,7 +10,6 @@ go_library( deps = [ "//internal/logger", "//s3proxy/internal/router", - "@org_uber_go_zap//:zap", ], ) diff --git a/s3proxy/internal/kms/BUILD.bazel b/s3proxy/internal/kms/BUILD.bazel index e4d4d25b8..bb7bc1cd4 100644 --- a/s3proxy/internal/kms/BUILD.bazel +++ b/s3proxy/internal/kms/BUILD.bazel @@ -7,7 +7,6 @@ go_library( importpath = "github.com/edgelesssys/constellation/v2/s3proxy/internal/kms", visibility = ["//s3proxy:__subpackages__"], deps = [ - "//internal/logger", "//keyservice/keyserviceproto", "@org_golang_google_grpc//:go_default_library", "@org_golang_google_grpc//credentials/insecure", diff --git a/s3proxy/internal/router/BUILD.bazel b/s3proxy/internal/router/BUILD.bazel index 8768bc493..fe9cbad1f 100644 --- a/s3proxy/internal/router/BUILD.bazel +++ b/s3proxy/internal/router/BUILD.bazel @@ -11,12 +11,10 @@ go_library( importpath = "github.com/edgelesssys/constellation/v2/s3proxy/internal/router", visibility = ["//s3proxy:__subpackages__"], deps = [ - "//internal/logger", "//s3proxy/internal/crypto", "//s3proxy/internal/kms", "//s3proxy/internal/s3", "@com_github_aws_aws_sdk_go_v2_service_s3//:s3", - "@org_uber_go_zap//:zap", ], ) diff --git a/upgrade-agent/cmd/BUILD.bazel b/upgrade-agent/cmd/BUILD.bazel index ea7b3e2d3..3e8224ac7 100644 --- a/upgrade-agent/cmd/BUILD.bazel +++ b/upgrade-agent/cmd/BUILD.bazel @@ -12,7 +12,6 @@ go_library( "//internal/logger", "//upgrade-agent/internal/server", "@com_github_spf13_afero//:afero", - "@org_uber_go_zap//:zap", ], ) diff --git a/verify/cmd/BUILD.bazel b/verify/cmd/BUILD.bazel index fe9d856c2..de4c0a65b 100644 --- a/verify/cmd/BUILD.bazel +++ b/verify/cmd/BUILD.bazel @@ -13,7 +13,6 @@ go_library( "//internal/constants", "//internal/logger", "//verify/server", - "@org_uber_go_zap//:zap", ], ) diff --git a/verify/server/BUILD.bazel b/verify/server/BUILD.bazel index 37f614631..3cd658b83 100644 --- a/verify/server/BUILD.bazel +++ b/verify/server/BUILD.bazel @@ -15,8 +15,6 @@ go_library( "@org_golang_google_grpc//keepalive", "@org_golang_google_grpc//peer", "@org_golang_google_grpc//status", - "@org_uber_go_zap//:zap", - "@org_uber_go_zap//zapcore", ], )