diff --git a/pkg/server/config_test.go b/pkg/server/config_test.go index 9f0ac45c5..381318c8d 100644 --- a/pkg/server/config_test.go +++ b/pkg/server/config_test.go @@ -45,9 +45,7 @@ func TestNewWithDelegate(t *testing.T) { t.Fatal("unable to create fake client set") } - delegateHealthzCalled := false delegateConfig.HealthzChecks = append(delegateConfig.HealthzChecks, healthz.NamedCheck("delegate-health", func(r *http.Request) error { - delegateHealthzCalled = true return fmt.Errorf("delegate failed healthcheck") })) @@ -74,9 +72,7 @@ func TestNewWithDelegate(t *testing.T) { wrappingConfig.LoopbackClientConfig = &rest.Config{} wrappingConfig.SwaggerConfig = DefaultSwaggerConfig() - wrappingHealthzCalled := false wrappingConfig.HealthzChecks = append(wrappingConfig.HealthzChecks, healthz.NamedCheck("wrapping-health", func(r *http.Request) error { - wrappingHealthzCalled = true return fmt.Errorf("wrapping failed healthcheck") })) diff --git a/pkg/storage/value/encrypt/envelope/BUILD b/pkg/storage/value/encrypt/envelope/BUILD index 30f281e4d..32456390b 100644 --- a/pkg/storage/value/encrypt/envelope/BUILD +++ b/pkg/storage/value/encrypt/envelope/BUILD @@ -27,16 +27,96 @@ go_test( name = "go_default_test", srcs = [ "envelope_test.go", - "grpc_service_unix_test.go", - ], + ] + select({ + "@io_bazel_rules_go//go/platform:android": [ + "grpc_service_unix_test.go", + ], + "@io_bazel_rules_go//go/platform:darwin": [ + "grpc_service_unix_test.go", + ], + "@io_bazel_rules_go//go/platform:dragonfly": [ + "grpc_service_unix_test.go", + ], + "@io_bazel_rules_go//go/platform:freebsd": [ + "grpc_service_unix_test.go", + ], + "@io_bazel_rules_go//go/platform:linux": [ + "grpc_service_unix_test.go", + ], + "@io_bazel_rules_go//go/platform:nacl": [ + "grpc_service_unix_test.go", + ], + "@io_bazel_rules_go//go/platform:netbsd": [ + "grpc_service_unix_test.go", + ], + "@io_bazel_rules_go//go/platform:openbsd": [ + "grpc_service_unix_test.go", + ], + "@io_bazel_rules_go//go/platform:plan9": [ + "grpc_service_unix_test.go", + ], + "@io_bazel_rules_go//go/platform:solaris": [ + "grpc_service_unix_test.go", + ], + "//conditions:default": [], + }), embed = [":go_default_library"], deps = [ - "//vendor/golang.org/x/sys/unix:go_default_library", - "//vendor/google.golang.org/grpc:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/value:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/aes:go_default_library", - "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", - ], + ] + select({ + "@io_bazel_rules_go//go/platform:android": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "@io_bazel_rules_go//go/platform:darwin": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "@io_bazel_rules_go//go/platform:dragonfly": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "@io_bazel_rules_go//go/platform:freebsd": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "@io_bazel_rules_go//go/platform:linux": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "@io_bazel_rules_go//go/platform:nacl": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "@io_bazel_rules_go//go/platform:netbsd": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "@io_bazel_rules_go//go/platform:openbsd": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "@io_bazel_rules_go//go/platform:plan9": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "@io_bazel_rules_go//go/platform:solaris": [ + "//vendor/golang.org/x/sys/unix:go_default_library", + "//vendor/google.golang.org/grpc:go_default_library", + "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library", + ], + "//conditions:default": [], + }), ) filegroup( diff --git a/pkg/storage/value/encrypt/envelope/grpc_service_unix_test.go b/pkg/storage/value/encrypt/envelope/grpc_service_unix_test.go index ecebb4da0..f1b1cdef1 100644 --- a/pkg/storage/value/encrypt/envelope/grpc_service_unix_test.go +++ b/pkg/storage/value/encrypt/envelope/grpc_service_unix_test.go @@ -1,3 +1,5 @@ +// +build !windows + /* Copyright 2017 The Kubernetes Authors. @@ -15,9 +17,6 @@ limitations under the License. */ // Package envelope transforms values for storage at rest using a Envelope provider - -// +build !windows - package envelope import (