From 60e6755f3fccaa94af3bfe098595d59eaeb742fd Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Mon, 7 Jan 2019 20:41:42 +0000 Subject: [PATCH] Move util testing package into e2e/util Signed-off-by: James Munnelly --- test/e2e/BUILD.bazel | 1 + test/e2e/suite/issuers/acme/BUILD.bazel | 2 +- .../issuers/acme/certificate/BUILD.bazel | 2 +- .../suite/issuers/acme/certificate/dns01.go | 2 +- .../suite/issuers/acme/certificate/http01.go | 2 +- test/e2e/suite/issuers/acme/issuer.go | 2 +- test/e2e/suite/issuers/ca/BUILD.bazel | 2 +- test/e2e/suite/issuers/ca/certificate.go | 2 +- test/e2e/suite/issuers/ca/clusterissuer.go | 2 +- test/e2e/suite/issuers/ca/issuer.go | 2 +- test/e2e/suite/issuers/selfsigned/BUILD.bazel | 2 +- .../suite/issuers/selfsigned/certificate.go | 2 +- test/e2e/suite/issuers/vault/BUILD.bazel | 2 +- .../issuers/vault/certificate/BUILD.bazel | 2 +- .../issuers/vault/certificate/approle.go | 2 +- .../vault/certificate/approle_custom_mount.go | 2 +- test/e2e/suite/issuers/vault/issuer.go | 2 +- test/e2e/util/BUILD.bazel | 39 +++++++++++++++++++ test/{ => e2e}/util/util.go | 8 ++-- test/util/BUILD.bazel | 26 ------------- 20 files changed, 60 insertions(+), 46 deletions(-) create mode 100644 test/e2e/util/BUILD.bazel rename test/{ => e2e}/util/util.go (98%) diff --git a/test/e2e/BUILD.bazel b/test/e2e/BUILD.bazel index 9f7110be7..93205da37 100644 --- a/test/e2e/BUILD.bazel +++ b/test/e2e/BUILD.bazel @@ -54,6 +54,7 @@ filegroup( ":package-srcs", "//test/e2e/framework:all-srcs", "//test/e2e/suite:all-srcs", + "//test/e2e/util:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/test/e2e/suite/issuers/acme/BUILD.bazel b/test/e2e/suite/issuers/acme/BUILD.bazel index e7d38bf05..a2265a446 100644 --- a/test/e2e/suite/issuers/acme/BUILD.bazel +++ b/test/e2e/suite/issuers/acme/BUILD.bazel @@ -16,7 +16,7 @@ go_library( "//test/e2e/framework/addon/pebble:go_default_library", "//test/e2e/framework/addon/tiller:go_default_library", "//test/e2e/suite/issuers/acme/certificate:go_default_library", - "//test/util:go_default_library", + "//test/e2e/util:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/e2e/suite/issuers/acme/certificate/BUILD.bazel b/test/e2e/suite/issuers/acme/certificate/BUILD.bazel index fc50d9720..3d3ee0ec7 100644 --- a/test/e2e/suite/issuers/acme/certificate/BUILD.bazel +++ b/test/e2e/suite/issuers/acme/certificate/BUILD.bazel @@ -17,7 +17,7 @@ go_library( "//test/e2e/framework/addon/pebble:go_default_library", "//test/e2e/framework/addon/tiller:go_default_library", "//test/e2e/suite/issuers/acme/dnsproviders:go_default_library", - "//test/util:go_default_library", + "//test/e2e/util:go_default_library", "//test/util/generate:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", diff --git a/test/e2e/suite/issuers/acme/certificate/dns01.go b/test/e2e/suite/issuers/acme/certificate/dns01.go index a6c95090b..a3571d5c7 100644 --- a/test/e2e/suite/issuers/acme/certificate/dns01.go +++ b/test/e2e/suite/issuers/acme/certificate/dns01.go @@ -29,7 +29,7 @@ import ( "github.com/jetstack/cert-manager/test/e2e/framework" "github.com/jetstack/cert-manager/test/e2e/framework/addon" "github.com/jetstack/cert-manager/test/e2e/suite/issuers/acme/dnsproviders" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" ) type dns01Provider interface { diff --git a/test/e2e/suite/issuers/acme/certificate/http01.go b/test/e2e/suite/issuers/acme/certificate/http01.go index 5044c5c75..c9fd8b5a8 100644 --- a/test/e2e/suite/issuers/acme/certificate/http01.go +++ b/test/e2e/suite/issuers/acme/certificate/http01.go @@ -30,7 +30,7 @@ import ( "github.com/jetstack/cert-manager/test/e2e/framework/addon" "github.com/jetstack/cert-manager/test/e2e/framework/addon/pebble" "github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" ) const invalidACMEURL = "http://not-a-real-acme-url.com" diff --git a/test/e2e/suite/issuers/acme/issuer.go b/test/e2e/suite/issuers/acme/issuer.go index fe7702eaf..3374f0b8c 100644 --- a/test/e2e/suite/issuers/acme/issuer.go +++ b/test/e2e/suite/issuers/acme/issuer.go @@ -28,7 +28,7 @@ import ( "github.com/jetstack/cert-manager/test/e2e/framework/addon" "github.com/jetstack/cert-manager/test/e2e/framework/addon/pebble" "github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" ) const invalidACMEURL = "http://not-a-real-acme-url.com" diff --git a/test/e2e/suite/issuers/ca/BUILD.bazel b/test/e2e/suite/issuers/ca/BUILD.bazel index 2e7a0cead..9e46f7d90 100644 --- a/test/e2e/suite/issuers/ca/BUILD.bazel +++ b/test/e2e/suite/issuers/ca/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "//pkg/util:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/addon:go_default_library", - "//test/util:go_default_library", + "//test/e2e/util:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/e2e/suite/issuers/ca/certificate.go b/test/e2e/suite/issuers/ca/certificate.go index e17aea04a..2df31e79c 100644 --- a/test/e2e/suite/issuers/ca/certificate.go +++ b/test/e2e/suite/issuers/ca/certificate.go @@ -24,7 +24,7 @@ import ( "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1" "github.com/jetstack/cert-manager/test/e2e/framework" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/e2e/suite/issuers/ca/clusterissuer.go b/test/e2e/suite/issuers/ca/clusterissuer.go index 509d15a22..7b276661d 100644 --- a/test/e2e/suite/issuers/ca/clusterissuer.go +++ b/test/e2e/suite/issuers/ca/clusterissuer.go @@ -24,7 +24,7 @@ import ( cmutil "github.com/jetstack/cert-manager/pkg/util" "github.com/jetstack/cert-manager/test/e2e/framework" "github.com/jetstack/cert-manager/test/e2e/framework/addon" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" ) var _ = framework.CertManagerDescribe("CA ClusterIssuer", func() { diff --git a/test/e2e/suite/issuers/ca/issuer.go b/test/e2e/suite/issuers/ca/issuer.go index a1dbb1b77..570f0cbbf 100644 --- a/test/e2e/suite/issuers/ca/issuer.go +++ b/test/e2e/suite/issuers/ca/issuer.go @@ -22,7 +22,7 @@ import ( "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1" "github.com/jetstack/cert-manager/test/e2e/framework" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" ) var _ = framework.CertManagerDescribe("CA Issuer", func() { diff --git a/test/e2e/suite/issuers/selfsigned/BUILD.bazel b/test/e2e/suite/issuers/selfsigned/BUILD.bazel index c6262c0c0..b82d5c995 100644 --- a/test/e2e/suite/issuers/selfsigned/BUILD.bazel +++ b/test/e2e/suite/issuers/selfsigned/BUILD.bazel @@ -9,7 +9,7 @@ go_library( deps = [ "//pkg/apis/certmanager/v1alpha1:go_default_library", "//test/e2e/framework:go_default_library", - "//test/util:go_default_library", + "//test/e2e/util:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/e2e/suite/issuers/selfsigned/certificate.go b/test/e2e/suite/issuers/selfsigned/certificate.go index c5d8a85fe..b7f0673c4 100644 --- a/test/e2e/suite/issuers/selfsigned/certificate.go +++ b/test/e2e/suite/issuers/selfsigned/certificate.go @@ -25,7 +25,7 @@ import ( "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1" "github.com/jetstack/cert-manager/test/e2e/framework" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/e2e/suite/issuers/vault/BUILD.bazel b/test/e2e/suite/issuers/vault/BUILD.bazel index 17a9b583c..40a7e3b31 100644 --- a/test/e2e/suite/issuers/vault/BUILD.bazel +++ b/test/e2e/suite/issuers/vault/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "//test/e2e/framework/addon/tiller:go_default_library", "//test/e2e/framework/addon/vault:go_default_library", "//test/e2e/suite/issuers/vault/certificate:go_default_library", - "//test/util:go_default_library", + "//test/e2e/util:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", ], diff --git a/test/e2e/suite/issuers/vault/certificate/BUILD.bazel b/test/e2e/suite/issuers/vault/certificate/BUILD.bazel index d8648691d..d67692d3f 100644 --- a/test/e2e/suite/issuers/vault/certificate/BUILD.bazel +++ b/test/e2e/suite/issuers/vault/certificate/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "//test/e2e/framework:go_default_library", "//test/e2e/framework/addon/tiller:go_default_library", "//test/e2e/framework/addon/vault:go_default_library", - "//test/util:go_default_library", + "//test/e2e/util:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/e2e/suite/issuers/vault/certificate/approle.go b/test/e2e/suite/issuers/vault/certificate/approle.go index d14198907..fa3335925 100644 --- a/test/e2e/suite/issuers/vault/certificate/approle.go +++ b/test/e2e/suite/issuers/vault/certificate/approle.go @@ -27,7 +27,7 @@ import ( "github.com/jetstack/cert-manager/test/e2e/framework" "github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller" vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go b/test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go index 686234b90..b4a29f7d7 100644 --- a/test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go +++ b/test/e2e/suite/issuers/vault/certificate/approle_custom_mount.go @@ -27,7 +27,7 @@ import ( "github.com/jetstack/cert-manager/test/e2e/framework" "github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller" vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" ) var _ = framework.CertManagerDescribe("Vault Certificate (AppRole with a custom mount path)", func() { diff --git a/test/e2e/suite/issuers/vault/issuer.go b/test/e2e/suite/issuers/vault/issuer.go index de411b947..c979819ca 100644 --- a/test/e2e/suite/issuers/vault/issuer.go +++ b/test/e2e/suite/issuers/vault/issuer.go @@ -27,7 +27,7 @@ import ( "github.com/jetstack/cert-manager/test/e2e/framework" "github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller" vaultaddon "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault" - "github.com/jetstack/cert-manager/test/util" + "github.com/jetstack/cert-manager/test/e2e/util" ) var _ = framework.CertManagerDescribe("Vault Issuer", func() { diff --git a/test/e2e/util/BUILD.bazel b/test/e2e/util/BUILD.bazel new file mode 100644 index 000000000..35ecd0c5e --- /dev/null +++ b/test/e2e/util/BUILD.bazel @@ -0,0 +1,39 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["util.go"], + importpath = "github.com/jetstack/cert-manager/test/e2e/util", + visibility = ["//visibility:public"], + deps = [ + "//pkg/apis/certmanager/v1alpha1:go_default_library", + "//pkg/client/clientset/versioned/scheme:go_default_library", + "//pkg/client/clientset/versioned/typed/certmanager/v1alpha1:go_default_library", + "//pkg/util:go_default_library", + "//pkg/util/pki:go_default_library", + "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", + "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", + "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//vendor/k8s.io/client-go/kubernetes:go_default_library", + "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/test/util/util.go b/test/e2e/util/util.go similarity index 98% rename from test/util/util.go rename to test/e2e/util/util.go index c8d65336a..a9c446db7 100644 --- a/test/util/util.go +++ b/test/e2e/util/util.go @@ -52,7 +52,7 @@ func CertificateOnlyValidForDomains(cert *x509.Certificate, commonName string, d } func WaitForIssuerStatusFunc(client clientset.IssuerInterface, name string, fn func(*v1alpha1.Issuer) (bool, error)) error { - return wait.PollImmediate(500*time.Millisecond, wait.ForeverTestTimeout, + return wait.PollImmediate(500*time.Millisecond, time.Minute, func() (bool, error) { issuer, err := client.Get(name, metav1.GetOptions{}) if err != nil { @@ -65,7 +65,7 @@ func WaitForIssuerStatusFunc(client clientset.IssuerInterface, name string, fn f // WaitForIssuerCondition waits for the status of the named issuer to contain // a condition whose type and status matches the supplied one. func WaitForIssuerCondition(client clientset.IssuerInterface, name string, condition v1alpha1.IssuerCondition) error { - pollErr := wait.PollImmediate(500*time.Millisecond, wait.ForeverTestTimeout, + pollErr := wait.PollImmediate(500*time.Millisecond, time.Minute, func() (bool, error) { glog.V(5).Infof("Waiting for issuer %v condition %#v", name, condition) issuer, err := client.Get(name, metav1.GetOptions{}) @@ -103,7 +103,7 @@ func wrapErrorWithIssuerStatusCondition(client clientset.IssuerInterface, pollEr // WaitForClusterIssuerCondition waits for the status of the named issuer to contain // a condition whose type and status matches the supplied one. func WaitForClusterIssuerCondition(client clientset.ClusterIssuerInterface, name string, condition v1alpha1.IssuerCondition) error { - pollErr := wait.PollImmediate(500*time.Millisecond, wait.ForeverTestTimeout, + pollErr := wait.PollImmediate(500*time.Millisecond, time.Minute, func() (bool, error) { glog.V(5).Infof("Waiting for clusterissuer %v condition %#v", name, condition) issuer, err := client.Get(name, metav1.GetOptions{}) @@ -327,7 +327,7 @@ func WaitForCertificateToExist(client clientset.CertificateInterface, name strin // WaitForCRDToNotExist waits for the CRD with the given name to no // longer exist. func WaitForCRDToNotExist(client apiextcs.CustomResourceDefinitionInterface, name string) error { - return wait.PollImmediate(500*time.Millisecond, wait.ForeverTestTimeout, + return wait.PollImmediate(500*time.Millisecond, time.Minute, func() (bool, error) { glog.V(5).Infof("Waiting for CRD %v to not exist", name) _, err := client.Get(name, metav1.GetOptions{}) diff --git a/test/util/BUILD.bazel b/test/util/BUILD.bazel index b04df76c8..2fc1ea60a 100644 --- a/test/util/BUILD.bazel +++ b/test/util/BUILD.bazel @@ -1,29 +1,3 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["util.go"], - importpath = "github.com/jetstack/cert-manager/test/util", - visibility = ["//visibility:public"], - deps = [ - "//pkg/apis/certmanager/v1alpha1:go_default_library", - "//pkg/client/clientset/versioned/scheme:go_default_library", - "//pkg/client/clientset/versioned/typed/certmanager/v1alpha1:go_default_library", - "//pkg/util:go_default_library", - "//pkg/util/pki:go_default_library", - "//vendor/github.com/golang/glog:go_default_library", - "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", - "//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", - "//vendor/k8s.io/client-go/kubernetes:go_default_library", - "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]),