From e7dea9f2a25feff3cfc077f6571493aa5d949ea0 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Thu, 21 Oct 2021 12:21:47 +0100 Subject: [PATCH] Replace all references to pkg/internal with internal Signed-off-by: James Munnelly --- BUILD.bazel | 2 +- hack/update-codegen.sh | 62 +++++++++---------- internal/BUILD.bazel | 14 ++--- internal/api/mutation/BUILD.bazel | 4 +- internal/api/mutation/registry_test.go | 4 +- internal/api/validation/BUILD.bazel | 4 +- internal/api/validation/registry_test.go | 4 +- internal/apis/acme/BUILD.bazel | 18 +++--- internal/apis/acme/fuzzer/BUILD.bazel | 4 +- internal/apis/acme/fuzzer/fuzzer.go | 2 +- internal/apis/acme/install/BUILD.bazel | 20 +++--- internal/apis/acme/install/install.go | 16 ++--- internal/apis/acme/install/pruning_test.go | 2 +- internal/apis/acme/install/roundtrip_test.go | 2 +- internal/apis/acme/types_challenge.go | 2 +- internal/apis/acme/types_issuer.go | 2 +- internal/apis/acme/types_order.go | 2 +- internal/apis/acme/v1/BUILD.bazel | 8 +-- internal/apis/acme/v1/doc.go | 2 +- .../apis/acme/v1/zz_generated.conversion.go | 6 +- internal/apis/acme/v1alpha2/BUILD.bazel | 8 +-- internal/apis/acme/v1alpha2/conversion.go | 2 +- internal/apis/acme/v1alpha2/doc.go | 2 +- .../acme/v1alpha2/zz_generated.conversion.go | 6 +- internal/apis/acme/v1alpha3/BUILD.bazel | 8 +-- internal/apis/acme/v1alpha3/conversion.go | 2 +- internal/apis/acme/v1alpha3/doc.go | 2 +- .../acme/v1alpha3/zz_generated.conversion.go | 6 +- internal/apis/acme/v1beta1/BUILD.bazel | 8 +-- internal/apis/acme/v1beta1/doc.go | 2 +- .../acme/v1beta1/zz_generated.conversion.go | 6 +- internal/apis/acme/validation/BUILD.bazel | 10 +-- internal/apis/acme/validation/challenge.go | 4 +- .../apis/acme/validation/challenge_test.go | 4 +- internal/apis/acme/validation/deprecation.go | 2 +- internal/apis/acme/validation/order.go | 4 +- internal/apis/acme/validation/order_test.go | 4 +- internal/apis/acme/validation/register.go | 4 +- internal/apis/acme/zz_generated.deepcopy.go | 2 +- internal/apis/certmanager/BUILD.bazel | 22 +++---- internal/apis/certmanager/fuzzer/BUILD.bazel | 6 +- internal/apis/certmanager/fuzzer/fuzzer.go | 4 +- internal/apis/certmanager/generic_issuer.go | 2 +- .../apis/certmanager/identity/BUILD.bazel | 12 ++-- .../identity/certificaterequests/BUILD.bazel | 10 +-- .../certificaterequests.go | 4 +- .../certificaterequests_test.go | 4 +- .../apis/certmanager/identity/identity.go | 8 +-- internal/apis/certmanager/install/BUILD.bazel | 24 +++---- internal/apis/certmanager/install/install.go | 20 +++--- .../apis/certmanager/install/pruning_test.go | 2 +- .../certmanager/install/roundtrip_test.go | 2 +- .../apis/certmanager/types_certificate.go | 2 +- .../certmanager/types_certificaterequest.go | 2 +- internal/apis/certmanager/types_issuer.go | 4 +- internal/apis/certmanager/v1/BUILD.bazel | 12 ++-- internal/apis/certmanager/v1/conversion.go | 2 +- internal/apis/certmanager/v1/doc.go | 2 +- .../certmanager/v1/zz_generated.conversion.go | 10 +-- .../apis/certmanager/v1alpha2/BUILD.bazel | 12 ++-- .../apis/certmanager/v1alpha2/conversion.go | 2 +- internal/apis/certmanager/v1alpha2/doc.go | 2 +- .../v1alpha2/zz_generated.conversion.go | 10 +-- .../apis/certmanager/v1alpha3/BUILD.bazel | 12 ++-- .../apis/certmanager/v1alpha3/conversion.go | 2 +- internal/apis/certmanager/v1alpha3/doc.go | 2 +- .../v1alpha3/zz_generated.conversion.go | 10 +-- internal/apis/certmanager/v1beta1/BUILD.bazel | 12 ++-- internal/apis/certmanager/v1beta1/doc.go | 2 +- .../v1beta1/zz_generated.conversion.go | 10 +-- .../apis/certmanager/validation/BUILD.bazel | 30 ++++----- .../certmanager/validation/certificate.go | 6 +- .../validation/certificate_for_issuer.go | 2 +- .../validation/certificate_for_issuer_test.go | 4 +- .../validation/certificate_test.go | 6 +- .../validation/certificaterequest.go | 6 +- .../validation/certificaterequest_test.go | 12 ++-- .../certmanager/validation/clusterissuer.go | 4 +- .../validation/clusterissuer_test.go | 4 +- .../certmanager/validation/deprecation.go | 2 +- .../apis/certmanager/validation/issuer.go | 10 +-- .../certmanager/validation/issuer_test.go | 8 +-- .../validation/plugins/BUILD.bazel | 10 +-- .../validation/plugins/approval.go | 4 +- .../validation/plugins/approval_test.go | 4 +- .../apis/certmanager/validation/register.go | 4 +- .../certmanager/validation/util/BUILD.bazel | 4 +- .../certmanager/validation/util/conditions.go | 2 +- .../apis/certmanager/zz_generated.deepcopy.go | 4 +- internal/apis/meta/BUILD.bazel | 8 +-- internal/apis/meta/fuzzer/BUILD.bazel | 2 +- internal/apis/meta/install/BUILD.bazel | 8 +-- internal/apis/meta/install/install.go | 4 +- internal/apis/meta/install/roundtrip_test.go | 2 +- internal/apis/meta/v1/BUILD.bazel | 4 +- internal/apis/meta/v1/doc.go | 2 +- .../apis/meta/v1/zz_generated.conversion.go | 2 +- internal/ingress/BUILD.bazel | 2 +- internal/vault/BUILD.bazel | 6 +- internal/vault/fake/BUILD.bazel | 2 +- internal/vault/vault_test.go | 2 +- pkg/controller/acmechallenges/BUILD.bazel | 2 +- pkg/controller/acmechallenges/controller.go | 2 +- pkg/controller/certificate-shim/BUILD.bazel | 2 +- .../certificate-shim/ingresses/BUILD.bazel | 2 +- .../certificate-shim/ingresses/controller.go | 2 +- pkg/controller/certificate-shim/sync.go | 2 +- .../certificaterequests/vault/BUILD.bazel | 6 +- .../certificaterequests/vault/vault.go | 2 +- .../certificaterequests/vault/vault_test.go | 4 +- .../vault/BUILD.bazel | 6 +- .../certificatesigningrequests/vault/vault.go | 2 +- .../vault/vault_test.go | 4 +- pkg/ctl/BUILD.bazel | 6 +- pkg/ctl/scheme.go | 6 +- pkg/issuer/acme/dns/rfc2136/BUILD.bazel | 2 +- pkg/issuer/acme/dns/rfc2136/rfc2136.go | 2 +- pkg/issuer/acme/http/BUILD.bazel | 2 +- pkg/issuer/acme/http/http.go | 2 +- pkg/issuer/vault/BUILD.bazel | 2 +- pkg/issuer/vault/setup.go | 2 +- pkg/webhook/BUILD.bazel | 10 +-- pkg/webhook/authority/BUILD.bazel | 2 +- pkg/webhook/authority/authority.go | 2 +- pkg/webhook/handlers/BUILD.bazel | 10 +-- pkg/webhook/handlers/mutation.go | 2 +- pkg/webhook/handlers/mutation_test.go | 2 +- .../apis/testgroup/install/BUILD.bazel | 2 +- .../apis/testgroup/install/install.go | 2 +- .../testdata/apis/testgroup/v2/BUILD.bazel | 2 +- .../testdata/apis/testgroup/v2/register.go | 2 +- .../testdata/apis/testgroup/v2/validation.go | 2 +- .../apis/testgroup/validation/BUILD.bazel | 4 +- .../apis/testgroup/validation/register.go | 2 +- .../apis/testgroup/validation/validation.go | 2 +- .../testgroup/validation/validation_test.go | 2 +- pkg/webhook/handlers/validation.go | 4 +- pkg/webhook/handlers/validation_test.go | 2 +- pkg/webhook/scheme.go | 10 +-- 139 files changed, 395 insertions(+), 395 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index ae589aab3..4a0d656e7 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -66,6 +66,7 @@ filegroup( "//deploy:all-srcs", "//devel:all-srcs", "//hack:all-srcs", + "//internal:all-srcs", "//pkg/acme:all-srcs", "//pkg/api:all-srcs", "//pkg/apis:all-srcs", @@ -82,7 +83,6 @@ filegroup( "//pkg/controller:all-srcs", "//pkg/ctl:all-srcs", "//pkg/feature:all-srcs", - "//pkg/internal:all-srcs", "//pkg/issuer:all-srcs", "//pkg/logs:all-srcs", "//pkg/metrics:all-srcs", diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index cefdb323c..0c44fd365 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -65,14 +65,14 @@ deepcopy_inputs=( pkg/apis/certmanager/v1alpha3 \ pkg/apis/certmanager/v1beta1 \ pkg/apis/certmanager/v1 \ - pkg/internal/apis/certmanager \ + internal/apis/certmanager \ pkg/apis/acme/v1alpha2 \ pkg/apis/acme/v1alpha3 \ pkg/apis/acme/v1beta1 \ pkg/apis/acme/v1 \ - pkg/internal/apis/acme \ + internal/apis/acme \ pkg/apis/meta/v1 \ - pkg/internal/apis/meta \ + internal/apis/meta \ pkg/webhook/handlers/testdata/apis/testgroup/v2 \ pkg/webhook/handlers/testdata/apis/testgroup/v1 \ pkg/webhook/handlers/testdata/apis/testgroup \ @@ -95,30 +95,30 @@ client_inputs=( # Generate defaulting functions to be used by the mutating webhook defaulter_inputs=( - pkg/internal/apis/certmanager/v1alpha2 \ - pkg/internal/apis/certmanager/v1alpha3 \ - pkg/internal/apis/certmanager/v1beta1 \ - pkg/internal/apis/certmanager/v1 \ - pkg/internal/apis/acme/v1alpha2 \ - pkg/internal/apis/acme/v1alpha3 \ - pkg/internal/apis/acme/v1beta1 \ - pkg/internal/apis/acme/v1 \ - pkg/internal/apis/meta/v1 \ + internal/apis/certmanager/v1alpha2 \ + internal/apis/certmanager/v1alpha3 \ + internal/apis/certmanager/v1beta1 \ + internal/apis/certmanager/v1 \ + internal/apis/acme/v1alpha2 \ + internal/apis/acme/v1alpha3 \ + internal/apis/acme/v1beta1 \ + internal/apis/acme/v1 \ + internal/apis/meta/v1 \ pkg/webhook/handlers/testdata/apis/testgroup/v2 \ pkg/webhook/handlers/testdata/apis/testgroup/v1 \ ) # Generate conversion functions to be used by the conversion webhook conversion_inputs=( - pkg/internal/apis/certmanager/v1alpha2 \ - pkg/internal/apis/certmanager/v1alpha3 \ - pkg/internal/apis/certmanager/v1beta1 \ - pkg/internal/apis/certmanager/v1 \ - pkg/internal/apis/acme/v1alpha2 \ - pkg/internal/apis/acme/v1alpha3 \ - pkg/internal/apis/acme/v1beta1 \ - pkg/internal/apis/acme/v1 \ - pkg/internal/apis/meta/v1 \ + internal/apis/certmanager/v1alpha2 \ + internal/apis/certmanager/v1alpha3 \ + internal/apis/certmanager/v1beta1 \ + internal/apis/certmanager/v1 \ + internal/apis/acme/v1alpha2 \ + internal/apis/acme/v1alpha3 \ + internal/apis/acme/v1beta1 \ + internal/apis/acme/v1 \ + internal/apis/meta/v1 \ pkg/webhook/handlers/testdata/apis/testgroup/v2 \ pkg/webhook/handlers/testdata/apis/testgroup/v1 \ ) @@ -256,7 +256,7 @@ gen-informers() { } gen-defaulters() { - clean pkg/internal/apis 'zz_generated.defaults.go' + clean internal/apis 'zz_generated.defaults.go' clean pkg/webhook/handlers/testdata/apis 'zz_generated.defaults.go' echo "Generating defaulting functions..." >&2 prefixed_inputs=( "${defaulter_inputs[@]/#/$module_name/}" ) @@ -276,36 +276,36 @@ gen-defaulters() { # generated. This bug should get resolved in # https://github.com/kubernetes/kubernetes/issues/101567 gen-conversions() { - clean pkg/internal/apis 'zz_generated.conversion.go' + clean internal/apis 'zz_generated.conversion.go' clean pkg/webhook/handlers/testdata/apis 'zz_generated.conversion.go' echo "Generating conversion functions..." >&2 # meta api "$conversiongen" --go-header-file hack/boilerplate/boilerplate.generatego.txt \ - --input-dirs github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1 \ + --input-dirs github.com/jetstack/cert-manager/internal/apis/meta/v1 \ -O zz_generated.conversion # Workaround (see: https://github.com/kubernetes/kubernetes/issues/101567). - remove_go_autogen_tags "pkg/internal/apis/meta/v1/zz_generated.conversion.go" + remove_go_autogen_tags "internal/apis/meta/v1/zz_generated.conversion.go" # acme and certmanager apis for v in v1alpha2 v1alpha3 v1beta1 v1 do "$conversiongen" --go-header-file hack/boilerplate/boilerplate.generatego.txt \ - --input-dirs "github.com/jetstack/cert-manager/pkg/internal/apis/acme/$v" \ + --input-dirs "github.com/jetstack/cert-manager/internal/apis/acme/$v" \ -O zz_generated.conversion \ - --extra-dirs github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1 + --extra-dirs github.com/jetstack/cert-manager/internal/apis/meta/v1 # Workaround (see: https://github.com/kubernetes/kubernetes/issues/101567) - remove_go_autogen_tags "pkg/internal/apis/acme/$v/zz_generated.conversion.go" + remove_go_autogen_tags "internal/apis/acme/$v/zz_generated.conversion.go" "$conversiongen" --go-header-file hack/boilerplate/boilerplate.generatego.txt \ - --input-dirs "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/$v" \ + --input-dirs "github.com/jetstack/cert-manager/internal/apis/certmanager/$v" \ -O zz_generated.conversion \ - --extra-dirs "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1,github.com/jetstack/cert-manager/pkg/internal/apis/acme/$v" + --extra-dirs "github.com/jetstack/cert-manager/internal/apis/meta/v1,github.com/jetstack/cert-manager/internal/apis/acme/$v" # Workaround (see: https://github.com/kubernetes/kubernetes/issues/101567) - remove_go_autogen_tags "pkg/internal/apis/certmanager/$v/zz_generated.conversion.go" + remove_go_autogen_tags "internal/apis/certmanager/$v/zz_generated.conversion.go" done # test apis diff --git a/internal/BUILD.bazel b/internal/BUILD.bazel index e68946587..5f55442e9 100644 --- a/internal/BUILD.bazel +++ b/internal/BUILD.bazel @@ -9,13 +9,13 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/internal/api/mutation:all-srcs", - "//pkg/internal/api/validation:all-srcs", - "//pkg/internal/apis/acme:all-srcs", - "//pkg/internal/apis/certmanager:all-srcs", - "//pkg/internal/apis/meta:all-srcs", - "//pkg/internal/ingress:all-srcs", - "//pkg/internal/vault:all-srcs", + "//internal/api/mutation:all-srcs", + "//internal/api/validation:all-srcs", + "//internal/apis/acme:all-srcs", + "//internal/apis/certmanager:all-srcs", + "//internal/apis/meta:all-srcs", + "//internal/ingress:all-srcs", + "//internal/vault:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/internal/api/mutation/BUILD.bazel b/internal/api/mutation/BUILD.bazel index 0be6a7ae6..95c8929af 100644 --- a/internal/api/mutation/BUILD.bazel +++ b/internal/api/mutation/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["registry.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/api/mutation", + importpath = "github.com/jetstack/cert-manager/internal/api/mutation", visibility = ["//pkg:__subpackages__"], deps = [ "@io_k8s_api//admission/v1:go_default_library", @@ -34,8 +34,8 @@ go_test( srcs = ["registry_test.go"], deps = [ ":go_default_library", + "//internal/apis/certmanager:go_default_library", "//pkg/apis/certmanager:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", "//pkg/webhook:go_default_library", "//test/unit/gen:go_default_library", "@io_k8s_api//admission/v1:go_default_library", diff --git a/internal/api/mutation/registry_test.go b/internal/api/mutation/registry_test.go index 33312ea94..2aceb4e78 100644 --- a/internal/api/mutation/registry_test.go +++ b/internal/api/mutation/registry_test.go @@ -25,9 +25,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "github.com/jetstack/cert-manager/internal/api/mutation" + cminternal "github.com/jetstack/cert-manager/internal/apis/certmanager" "github.com/jetstack/cert-manager/pkg/apis/certmanager" - "github.com/jetstack/cert-manager/pkg/internal/api/mutation" - cminternal "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" "github.com/jetstack/cert-manager/pkg/webhook" "github.com/jetstack/cert-manager/test/unit/gen" ) diff --git a/internal/api/validation/BUILD.bazel b/internal/api/validation/BUILD.bazel index fb5af0436..312fe57fb 100644 --- a/internal/api/validation/BUILD.bazel +++ b/internal/api/validation/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "registry.go", "warning.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/api/validation", + importpath = "github.com/jetstack/cert-manager/internal/api/validation", visibility = ["//pkg:__subpackages__"], deps = [ "@io_k8s_api//admission/v1:go_default_library", @@ -21,8 +21,8 @@ go_test( srcs = ["registry_test.go"], deps = [ ":go_default_library", + "//internal/apis/certmanager:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", "//pkg/webhook:go_default_library", "@io_k8s_api//admission/v1:go_default_library", "@io_k8s_api//core/v1:go_default_library", diff --git a/internal/api/validation/registry_test.go b/internal/api/validation/registry_test.go index bc19066b8..9ae1fd4da 100644 --- a/internal/api/validation/registry_test.go +++ b/internal/api/validation/registry_test.go @@ -27,9 +27,9 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/jetstack/cert-manager/internal/api/validation" + cmapiinternal "github.com/jetstack/cert-manager/internal/apis/certmanager" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmapiinternal "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" "github.com/jetstack/cert-manager/pkg/webhook" ) diff --git a/internal/apis/acme/BUILD.bazel b/internal/apis/acme/BUILD.bazel index 3c224bb17..710280678 100644 --- a/internal/apis/acme/BUILD.bazel +++ b/internal/apis/acme/BUILD.bazel @@ -10,11 +10,11 @@ go_library( "types_order.go", "zz_generated.deepcopy.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/acme", + importpath = "github.com/jetstack/cert-manager/internal/apis/acme", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/meta:go_default_library", "//pkg/apis/acme:go_default_library", - "//pkg/internal/apis/meta:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", @@ -34,13 +34,13 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/internal/apis/acme/fuzzer:all-srcs", - "//pkg/internal/apis/acme/install:all-srcs", - "//pkg/internal/apis/acme/v1:all-srcs", - "//pkg/internal/apis/acme/v1alpha2:all-srcs", - "//pkg/internal/apis/acme/v1alpha3:all-srcs", - "//pkg/internal/apis/acme/v1beta1:all-srcs", - "//pkg/internal/apis/acme/validation:all-srcs", + "//internal/apis/acme/fuzzer:all-srcs", + "//internal/apis/acme/install:all-srcs", + "//internal/apis/acme/v1:all-srcs", + "//internal/apis/acme/v1alpha2:all-srcs", + "//internal/apis/acme/v1alpha3:all-srcs", + "//internal/apis/acme/v1beta1:all-srcs", + "//internal/apis/acme/validation:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/internal/apis/acme/fuzzer/BUILD.bazel b/internal/apis/acme/fuzzer/BUILD.bazel index 38296ef40..bc9c6aad2 100644 --- a/internal/apis/acme/fuzzer/BUILD.bazel +++ b/internal/apis/acme/fuzzer/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["fuzzer.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/acme/fuzzer", + importpath = "github.com/jetstack/cert-manager/internal/apis/acme/fuzzer", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", - "//pkg/internal/apis/acme:go_default_library", "@com_github_google_gofuzz//:go_default_library", "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime/serializer:go_default_library", diff --git a/internal/apis/acme/fuzzer/fuzzer.go b/internal/apis/acme/fuzzer/fuzzer.go index 8cf797bf0..e5d20c453 100644 --- a/internal/apis/acme/fuzzer/fuzzer.go +++ b/internal/apis/acme/fuzzer/fuzzer.go @@ -21,8 +21,8 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" + "github.com/jetstack/cert-manager/internal/apis/acme" v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" - "github.com/jetstack/cert-manager/pkg/internal/apis/acme" ) // Funcs returns the fuzzer functions for the apps api group. diff --git a/internal/apis/acme/install/BUILD.bazel b/internal/apis/acme/install/BUILD.bazel index 84aba18fd..786f19181 100644 --- a/internal/apis/acme/install/BUILD.bazel +++ b/internal/apis/acme/install/BUILD.bazel @@ -3,17 +3,17 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["install.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/acme/install", + importpath = "github.com/jetstack/cert-manager/internal/apis/acme/install", visibility = ["//visibility:public"], deps = [ - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/acme/v1:go_default_library", - "//pkg/internal/apis/acme/v1alpha2:go_default_library", - "//pkg/internal/apis/acme/v1alpha3:go_default_library", - "//pkg/internal/apis/acme/v1beta1:go_default_library", - "//pkg/internal/apis/acme/validation:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", + "//internal/api/validation:go_default_library", + "//internal/apis/acme:go_default_library", + "//internal/apis/acme/v1:go_default_library", + "//internal/apis/acme/v1alpha2:go_default_library", + "//internal/apis/acme/v1alpha3:go_default_library", + "//internal/apis/acme/v1beta1:go_default_library", + "//internal/apis/acme/validation:go_default_library", + "//internal/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", "@io_k8s_apimachinery//pkg/util/runtime:go_default_library", ], @@ -44,9 +44,9 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//internal/apis/acme/fuzzer:go_default_library", "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/internal/apis/acme/fuzzer:go_default_library", "@com_github_munnerz_crd_schema_fuzz//:go_default_library", "@io_k8s_apimachinery//pkg/api/apitesting/roundtrip:go_default_library", ], diff --git a/internal/apis/acme/install/install.go b/internal/apis/acme/install/install.go index 5d4a7cd59..45dfdb842 100644 --- a/internal/apis/acme/install/install.go +++ b/internal/apis/acme/install/install.go @@ -22,14 +22,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1" - "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1alpha2" - "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1alpha3" - "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1beta1" - acmevalidation "github.com/jetstack/cert-manager/pkg/internal/apis/acme/validation" - cmmetav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" + "github.com/jetstack/cert-manager/internal/api/validation" + "github.com/jetstack/cert-manager/internal/apis/acme" + cmapi "github.com/jetstack/cert-manager/internal/apis/acme/v1" + "github.com/jetstack/cert-manager/internal/apis/acme/v1alpha2" + "github.com/jetstack/cert-manager/internal/apis/acme/v1alpha3" + "github.com/jetstack/cert-manager/internal/apis/acme/v1beta1" + acmevalidation "github.com/jetstack/cert-manager/internal/apis/acme/validation" + cmmetav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" ) // Install registers the API group and adds types to a scheme diff --git a/internal/apis/acme/install/pruning_test.go b/internal/apis/acme/install/pruning_test.go index 2bad743dc..9c82bdb00 100644 --- a/internal/apis/acme/install/pruning_test.go +++ b/internal/apis/acme/install/pruning_test.go @@ -21,9 +21,9 @@ import ( crdfuzz "github.com/munnerz/crd-schema-fuzz" + acmefuzzer "github.com/jetstack/cert-manager/internal/apis/acme/fuzzer" "github.com/jetstack/cert-manager/pkg/api" apitesting "github.com/jetstack/cert-manager/pkg/api/testing" - acmefuzzer "github.com/jetstack/cert-manager/pkg/internal/apis/acme/fuzzer" ) func TestPruneTypes(t *testing.T) { diff --git a/internal/apis/acme/install/roundtrip_test.go b/internal/apis/acme/install/roundtrip_test.go index f86e280b3..c634f2f00 100644 --- a/internal/apis/acme/install/roundtrip_test.go +++ b/internal/apis/acme/install/roundtrip_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" - acmefuzzer "github.com/jetstack/cert-manager/pkg/internal/apis/acme/fuzzer" + acmefuzzer "github.com/jetstack/cert-manager/internal/apis/acme/fuzzer" ) func TestRoundTripTypes(t *testing.T) { diff --git a/internal/apis/acme/types_challenge.go b/internal/apis/acme/types_challenge.go index 301053df6..825511e2a 100644 --- a/internal/apis/acme/types_challenge.go +++ b/internal/apis/acme/types_challenge.go @@ -19,7 +19,7 @@ package acme import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/internal/apis/acme/types_issuer.go b/internal/apis/acme/types_issuer.go index 86254318e..0b231aec1 100644 --- a/internal/apis/acme/types_issuer.go +++ b/internal/apis/acme/types_issuer.go @@ -20,7 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" ) // ACMEIssuer contains the specification for an ACME issuer. diff --git a/internal/apis/acme/types_order.go b/internal/apis/acme/types_order.go index dd66f6039..eb62398f0 100644 --- a/internal/apis/acme/types_order.go +++ b/internal/apis/acme/types_order.go @@ -19,7 +19,7 @@ package acme import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/internal/apis/acme/v1/BUILD.bazel b/internal/apis/acme/v1/BUILD.bazel index dc749ec33..796e7f79e 100644 --- a/internal/apis/acme/v1/BUILD.bazel +++ b/internal/apis/acme/v1/BUILD.bazel @@ -9,15 +9,15 @@ go_library( "zz_generated.conversion.go", "zz_generated.defaults.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1", + importpath = "github.com/jetstack/cert-manager/internal/apis/acme/v1", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", + "//internal/apis/meta:go_default_library", + "//internal/apis/meta/v1:go_default_library", "//pkg/apis/acme:go_default_library", "//pkg/apis/acme/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/meta:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/internal/apis/acme/v1/doc.go b/internal/apis/acme/v1/doc.go index 1bdb92f9b..1892fc7d8 100644 --- a/internal/apis/acme/v1/doc.go +++ b/internal/apis/acme/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=github.com/jetstack/cert-manager/pkg/internal/apis/acme +// +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/acme // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/acme/v1 // +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen-input=../../../../apis/acme/v1 diff --git a/internal/apis/acme/v1/zz_generated.conversion.go b/internal/apis/acme/v1/zz_generated.conversion.go index 2cb10e8a8..8972292a9 100644 --- a/internal/apis/acme/v1/zz_generated.conversion.go +++ b/internal/apis/acme/v1/zz_generated.conversion.go @@ -24,11 +24,11 @@ package v1 import ( unsafe "unsafe" + acme "github.com/jetstack/cert-manager/internal/apis/acme" + meta "github.com/jetstack/cert-manager/internal/apis/meta" + metav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" v1 "github.com/jetstack/cert-manager/pkg/apis/acme/v1" apismetav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - acme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" - metav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/apis/acme/v1alpha2/BUILD.bazel b/internal/apis/acme/v1alpha2/BUILD.bazel index b0d311dc5..9f069f5fd 100644 --- a/internal/apis/acme/v1alpha2/BUILD.bazel +++ b/internal/apis/acme/v1alpha2/BUILD.bazel @@ -10,15 +10,15 @@ go_library( "zz_generated.conversion.go", "zz_generated.defaults.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1alpha2", + importpath = "github.com/jetstack/cert-manager/internal/apis/acme/v1alpha2", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", + "//internal/apis/meta:go_default_library", + "//internal/apis/meta/v1:go_default_library", "//pkg/apis/acme:go_default_library", "//pkg/apis/acme/v1alpha2:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/meta:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/internal/apis/acme/v1alpha2/conversion.go b/internal/apis/acme/v1alpha2/conversion.go index 3708f9a16..b3bbae61c 100644 --- a/internal/apis/acme/v1alpha2/conversion.go +++ b/internal/apis/acme/v1alpha2/conversion.go @@ -19,8 +19,8 @@ package v1alpha2 import ( "k8s.io/apimachinery/pkg/conversion" + "github.com/jetstack/cert-manager/internal/apis/acme" "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha2" - "github.com/jetstack/cert-manager/pkg/internal/apis/acme" ) func Convert_v1alpha2_ChallengeSpec_To_acme_ChallengeSpec(in *v1alpha2.ChallengeSpec, out *acme.ChallengeSpec, s conversion.Scope) error { diff --git a/internal/apis/acme/v1alpha2/doc.go b/internal/apis/acme/v1alpha2/doc.go index f907758a9..b8cc98c0a 100644 --- a/internal/apis/acme/v1alpha2/doc.go +++ b/internal/apis/acme/v1alpha2/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=github.com/jetstack/cert-manager/pkg/internal/apis/acme +// +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/acme // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha2 // +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen-input=../../../../apis/acme/v1alpha2 diff --git a/internal/apis/acme/v1alpha2/zz_generated.conversion.go b/internal/apis/acme/v1alpha2/zz_generated.conversion.go index 8d224b0fa..59aadca0f 100644 --- a/internal/apis/acme/v1alpha2/zz_generated.conversion.go +++ b/internal/apis/acme/v1alpha2/zz_generated.conversion.go @@ -24,11 +24,11 @@ package v1alpha2 import ( unsafe "unsafe" + acme "github.com/jetstack/cert-manager/internal/apis/acme" + meta "github.com/jetstack/cert-manager/internal/apis/meta" + metav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" v1alpha2 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha2" apismetav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - acme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" - metav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" v1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/apis/acme/v1alpha3/BUILD.bazel b/internal/apis/acme/v1alpha3/BUILD.bazel index eb676ddbe..c5098fb53 100644 --- a/internal/apis/acme/v1alpha3/BUILD.bazel +++ b/internal/apis/acme/v1alpha3/BUILD.bazel @@ -10,15 +10,15 @@ go_library( "zz_generated.conversion.go", "zz_generated.defaults.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1alpha3", + importpath = "github.com/jetstack/cert-manager/internal/apis/acme/v1alpha3", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", + "//internal/apis/meta:go_default_library", + "//internal/apis/meta/v1:go_default_library", "//pkg/apis/acme:go_default_library", "//pkg/apis/acme/v1alpha3:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/meta:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/internal/apis/acme/v1alpha3/conversion.go b/internal/apis/acme/v1alpha3/conversion.go index 807185971..b98ba4432 100644 --- a/internal/apis/acme/v1alpha3/conversion.go +++ b/internal/apis/acme/v1alpha3/conversion.go @@ -19,8 +19,8 @@ package v1alpha3 import ( "k8s.io/apimachinery/pkg/conversion" + "github.com/jetstack/cert-manager/internal/apis/acme" "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha3" - "github.com/jetstack/cert-manager/pkg/internal/apis/acme" ) func Convert_v1alpha3_ChallengeSpec_To_acme_ChallengeSpec(in *v1alpha3.ChallengeSpec, out *acme.ChallengeSpec, s conversion.Scope) error { diff --git a/internal/apis/acme/v1alpha3/doc.go b/internal/apis/acme/v1alpha3/doc.go index 257c836e3..4c7e610a3 100644 --- a/internal/apis/acme/v1alpha3/doc.go +++ b/internal/apis/acme/v1alpha3/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=github.com/jetstack/cert-manager/pkg/internal/apis/acme +// +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/acme // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha3 // +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen-input=../../../../apis/acme/v1alpha3 diff --git a/internal/apis/acme/v1alpha3/zz_generated.conversion.go b/internal/apis/acme/v1alpha3/zz_generated.conversion.go index 8cbf0fe0f..93fa976af 100644 --- a/internal/apis/acme/v1alpha3/zz_generated.conversion.go +++ b/internal/apis/acme/v1alpha3/zz_generated.conversion.go @@ -24,11 +24,11 @@ package v1alpha3 import ( unsafe "unsafe" + acme "github.com/jetstack/cert-manager/internal/apis/acme" + meta "github.com/jetstack/cert-manager/internal/apis/meta" + metav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" v1alpha3 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha3" apismetav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - acme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" - metav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" v1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/apis/acme/v1beta1/BUILD.bazel b/internal/apis/acme/v1beta1/BUILD.bazel index 2bf759b38..efacdc606 100644 --- a/internal/apis/acme/v1beta1/BUILD.bazel +++ b/internal/apis/acme/v1beta1/BUILD.bazel @@ -9,15 +9,15 @@ go_library( "zz_generated.conversion.go", "zz_generated.defaults.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1beta1", + importpath = "github.com/jetstack/cert-manager/internal/apis/acme/v1beta1", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", + "//internal/apis/meta:go_default_library", + "//internal/apis/meta/v1:go_default_library", "//pkg/apis/acme:go_default_library", "//pkg/apis/acme/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/meta:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/internal/apis/acme/v1beta1/doc.go b/internal/apis/acme/v1beta1/doc.go index 85d6466ec..aa7520877 100644 --- a/internal/apis/acme/v1beta1/doc.go +++ b/internal/apis/acme/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=github.com/jetstack/cert-manager/pkg/internal/apis/acme +// +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/acme // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/acme/v1beta1 // +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen-input=../../../../apis/acme/v1beta1 diff --git a/internal/apis/acme/v1beta1/zz_generated.conversion.go b/internal/apis/acme/v1beta1/zz_generated.conversion.go index e894c4bc4..14417072d 100644 --- a/internal/apis/acme/v1beta1/zz_generated.conversion.go +++ b/internal/apis/acme/v1beta1/zz_generated.conversion.go @@ -24,11 +24,11 @@ package v1beta1 import ( unsafe "unsafe" + acme "github.com/jetstack/cert-manager/internal/apis/acme" + meta "github.com/jetstack/cert-manager/internal/apis/meta" + metav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" v1beta1 "github.com/jetstack/cert-manager/pkg/apis/acme/v1beta1" apismetav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - acme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" - metav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" v1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" pkgapismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/apis/acme/validation/BUILD.bazel b/internal/apis/acme/validation/BUILD.bazel index 06d537cdc..c8c63aa51 100644 --- a/internal/apis/acme/validation/BUILD.bazel +++ b/internal/apis/acme/validation/BUILD.bazel @@ -8,15 +8,15 @@ go_library( "order.go", "register.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/acme/validation", + importpath = "github.com/jetstack/cert-manager/internal/apis/acme/validation", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/api/validation:go_default_library", + "//internal/apis/acme:go_default_library", "//pkg/apis/acme/v1:go_default_library", "//pkg/apis/acme/v1alpha2:go_default_library", "//pkg/apis/acme/v1alpha3:go_default_library", "//pkg/apis/acme/v1beta1:go_default_library", - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/acme:go_default_library", "@io_k8s_api//admission/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", @@ -33,12 +33,12 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//internal/api/validation:go_default_library", + "//internal/apis/acme:go_default_library", "//pkg/apis/acme/v1:go_default_library", "//pkg/apis/acme/v1alpha2:go_default_library", "//pkg/apis/acme/v1alpha3:go_default_library", "//pkg/apis/acme/v1beta1:go_default_library", - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/acme:go_default_library", "@io_k8s_api//admission/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/util/validation/field:go_default_library", diff --git a/internal/apis/acme/validation/challenge.go b/internal/apis/acme/validation/challenge.go index 09e6c3b6c..f3e924b3b 100644 --- a/internal/apis/acme/validation/challenge.go +++ b/internal/apis/acme/validation/challenge.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" + "github.com/jetstack/cert-manager/internal/api/validation" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" ) func ValidateChallengeUpdate(a *admissionv1.AdmissionRequest, oldObj, newObj runtime.Object) (field.ErrorList, validation.WarningList) { diff --git a/internal/apis/acme/validation/challenge_test.go b/internal/apis/acme/validation/challenge_test.go index 186ee1cff..0c3267222 100644 --- a/internal/apis/acme/validation/challenge_test.go +++ b/internal/apis/acme/validation/challenge_test.go @@ -25,12 +25,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/jetstack/cert-manager/internal/api/validation" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" cmacmev1 "github.com/jetstack/cert-manager/pkg/apis/acme/v1" cmacmev1alpha2 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha2" cmacmev1alpha3 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha3" cmacmev1beta1 "github.com/jetstack/cert-manager/pkg/apis/acme/v1beta1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" ) func TestValidateChallengeUpdate(t *testing.T) { diff --git a/internal/apis/acme/validation/deprecation.go b/internal/apis/acme/validation/deprecation.go index fbb43c233..f5ec21dec 100644 --- a/internal/apis/acme/validation/deprecation.go +++ b/internal/apis/acme/validation/deprecation.go @@ -22,11 +22,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "github.com/jetstack/cert-manager/internal/api/validation" cmacme "github.com/jetstack/cert-manager/pkg/apis/acme/v1" cmacmev1alpha2 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha2" cmacmev1alpha3 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha3" cmacmev1beta1 "github.com/jetstack/cert-manager/pkg/apis/acme/v1beta1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" ) // This file holds temporary functionality for cert-manager v1.4 API deprecation. diff --git a/internal/apis/acme/validation/order.go b/internal/apis/acme/validation/order.go index 968519ab0..c32a8888e 100644 --- a/internal/apis/acme/validation/order.go +++ b/internal/apis/acme/validation/order.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" + "github.com/jetstack/cert-manager/internal/api/validation" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" ) func ValidateOrderUpdate(a *admissionv1.AdmissionRequest, oldObj, newObj runtime.Object) (field.ErrorList, validation.WarningList) { diff --git a/internal/apis/acme/validation/order_test.go b/internal/apis/acme/validation/order_test.go index 8f7291ed2..4cb68f609 100644 --- a/internal/apis/acme/validation/order_test.go +++ b/internal/apis/acme/validation/order_test.go @@ -27,12 +27,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/jetstack/cert-manager/internal/api/validation" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" cmacmev1 "github.com/jetstack/cert-manager/pkg/apis/acme/v1" cmacmev1alpha2 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha2" cmacmev1alpha3 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha3" cmacmev1beta1 "github.com/jetstack/cert-manager/pkg/apis/acme/v1beta1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" ) type testValue string diff --git a/internal/apis/acme/validation/register.go b/internal/apis/acme/validation/register.go index b5ca648ab..685db98d2 100644 --- a/internal/apis/acme/validation/register.go +++ b/internal/apis/acme/validation/register.go @@ -17,8 +17,8 @@ limitations under the License. package validation import ( - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" + "github.com/jetstack/cert-manager/internal/api/validation" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" ) func AddToValidationRegistry(reg *validation.Registry) error { diff --git a/internal/apis/acme/zz_generated.deepcopy.go b/internal/apis/acme/zz_generated.deepcopy.go index a251ec66b..70d15101a 100644 --- a/internal/apis/acme/zz_generated.deepcopy.go +++ b/internal/apis/acme/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package acme import ( - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + meta "github.com/jetstack/cert-manager/internal/apis/meta" v1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/apis/certmanager/BUILD.bazel b/internal/apis/certmanager/BUILD.bazel index 8a1961c9c..e36567d0b 100644 --- a/internal/apis/certmanager/BUILD.bazel +++ b/internal/apis/certmanager/BUILD.bazel @@ -12,12 +12,12 @@ go_library( "types_issuer.go", "zz_generated.deepcopy.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", + "//internal/apis/meta:go_default_library", "//pkg/apis/certmanager:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/meta:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", @@ -35,14 +35,14 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/internal/apis/certmanager/fuzzer:all-srcs", - "//pkg/internal/apis/certmanager/identity:all-srcs", - "//pkg/internal/apis/certmanager/install:all-srcs", - "//pkg/internal/apis/certmanager/v1:all-srcs", - "//pkg/internal/apis/certmanager/v1alpha2:all-srcs", - "//pkg/internal/apis/certmanager/v1alpha3:all-srcs", - "//pkg/internal/apis/certmanager/v1beta1:all-srcs", - "//pkg/internal/apis/certmanager/validation:all-srcs", + "//internal/apis/certmanager/fuzzer:all-srcs", + "//internal/apis/certmanager/identity:all-srcs", + "//internal/apis/certmanager/install:all-srcs", + "//internal/apis/certmanager/v1:all-srcs", + "//internal/apis/certmanager/v1alpha2:all-srcs", + "//internal/apis/certmanager/v1alpha3:all-srcs", + "//internal/apis/certmanager/v1beta1:all-srcs", + "//internal/apis/certmanager/validation:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/internal/apis/certmanager/fuzzer/BUILD.bazel b/internal/apis/certmanager/fuzzer/BUILD.bazel index 7524d31e9..53a882a16 100644 --- a/internal/apis/certmanager/fuzzer/BUILD.bazel +++ b/internal/apis/certmanager/fuzzer/BUILD.bazel @@ -3,12 +3,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["fuzzer.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/fuzzer", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/fuzzer", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme/fuzzer:go_default_library", + "//internal/apis/certmanager:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", - "//pkg/internal/apis/acme/fuzzer:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", "@com_github_google_gofuzz//:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime/serializer:go_default_library", diff --git a/internal/apis/certmanager/fuzzer/fuzzer.go b/internal/apis/certmanager/fuzzer/fuzzer.go index b440f5cc2..bd1d20d09 100644 --- a/internal/apis/certmanager/fuzzer/fuzzer.go +++ b/internal/apis/certmanager/fuzzer/fuzzer.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" + acmefuzzer "github.com/jetstack/cert-manager/internal/apis/acme/fuzzer" + "github.com/jetstack/cert-manager/internal/apis/certmanager" v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" - acmefuzzer "github.com/jetstack/cert-manager/pkg/internal/apis/acme/fuzzer" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" ) // Funcs returns the fuzzer functions for the apps api group. diff --git a/internal/apis/certmanager/generic_issuer.go b/internal/apis/certmanager/generic_issuer.go index 5375b78d6..ba5d0443a 100644 --- a/internal/apis/certmanager/generic_issuer.go +++ b/internal/apis/certmanager/generic_issuer.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" ) type GenericIssuer interface { diff --git a/internal/apis/certmanager/identity/BUILD.bazel b/internal/apis/certmanager/identity/BUILD.bazel index 3a65c1e48..463d55fb6 100644 --- a/internal/apis/certmanager/identity/BUILD.bazel +++ b/internal/apis/certmanager/identity/BUILD.bazel @@ -3,13 +3,13 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["identity.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/identity", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/identity", visibility = ["//pkg:__subpackages__"], deps = [ - "//pkg/internal/api/mutation:go_default_library", - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/certmanager/identity/certificaterequests:go_default_library", + "//internal/api/mutation:go_default_library", + "//internal/api/validation:go_default_library", + "//internal/apis/certmanager:go_default_library", + "//internal/apis/certmanager/identity/certificaterequests:go_default_library", ], ) @@ -24,7 +24,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/internal/apis/certmanager/identity/certificaterequests:all-srcs", + "//internal/apis/certmanager/identity/certificaterequests:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/internal/apis/certmanager/identity/certificaterequests/BUILD.bazel b/internal/apis/certmanager/identity/certificaterequests/BUILD.bazel index 11d30eeb1..348d1fff0 100644 --- a/internal/apis/certmanager/identity/certificaterequests/BUILD.bazel +++ b/internal/apis/certmanager/identity/certificaterequests/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["certificaterequests.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/identity/certificaterequests", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/identity/certificaterequests", visibility = ["//pkg:__subpackages__"], deps = [ - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", + "//internal/api/validation:go_default_library", + "//internal/apis/certmanager:go_default_library", "//pkg/util:go_default_library", "@io_k8s_api//admission/v1:go_default_library", "@io_k8s_api//authentication/v1:go_default_library", @@ -35,8 +35,8 @@ go_test( srcs = ["certificaterequests_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", + "//internal/api/validation:go_default_library", + "//internal/apis/certmanager:go_default_library", "@io_k8s_api//admission/v1:go_default_library", "@io_k8s_api//authentication/v1:go_default_library", "@io_k8s_apimachinery//pkg/util/validation/field:go_default_library", diff --git a/internal/apis/certmanager/identity/certificaterequests/certificaterequests.go b/internal/apis/certmanager/identity/certificaterequests/certificaterequests.go index 2238b380a..8fd08c908 100644 --- a/internal/apis/certmanager/identity/certificaterequests/certificaterequests.go +++ b/internal/apis/certmanager/identity/certificaterequests/certificaterequests.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" + "github.com/jetstack/cert-manager/internal/api/validation" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" "github.com/jetstack/cert-manager/pkg/util" ) diff --git a/internal/apis/certmanager/identity/certificaterequests/certificaterequests_test.go b/internal/apis/certmanager/identity/certificaterequests/certificaterequests_test.go index ade8d07f2..b393ee3be 100644 --- a/internal/apis/certmanager/identity/certificaterequests/certificaterequests_test.go +++ b/internal/apis/certmanager/identity/certificaterequests/certificaterequests_test.go @@ -24,8 +24,8 @@ import ( authenticationv1 "k8s.io/api/authentication/v1" "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" + "github.com/jetstack/cert-manager/internal/api/validation" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" ) func TestValidateCreate(t *testing.T) { diff --git a/internal/apis/certmanager/identity/identity.go b/internal/apis/certmanager/identity/identity.go index 0a2876e7a..fd13d53de 100644 --- a/internal/apis/certmanager/identity/identity.go +++ b/internal/apis/certmanager/identity/identity.go @@ -17,10 +17,10 @@ limitations under the License. package identity import ( - "github.com/jetstack/cert-manager/pkg/internal/api/mutation" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/identity/certificaterequests" + "github.com/jetstack/cert-manager/internal/api/mutation" + "github.com/jetstack/cert-manager/internal/api/validation" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" + "github.com/jetstack/cert-manager/internal/apis/certmanager/identity/certificaterequests" ) func AddToValidationRegistry(reg *validation.Registry) error { diff --git a/internal/apis/certmanager/install/BUILD.bazel b/internal/apis/certmanager/install/BUILD.bazel index 298195e09..5e2f5c375 100644 --- a/internal/apis/certmanager/install/BUILD.bazel +++ b/internal/apis/certmanager/install/BUILD.bazel @@ -3,19 +3,19 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["install.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/install", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/install", visibility = ["//visibility:public"], deps = [ - "//pkg/internal/api/mutation:go_default_library", - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/certmanager/identity:go_default_library", - "//pkg/internal/apis/certmanager/v1:go_default_library", - "//pkg/internal/apis/certmanager/v1alpha2:go_default_library", - "//pkg/internal/apis/certmanager/v1alpha3:go_default_library", - "//pkg/internal/apis/certmanager/v1beta1:go_default_library", - "//pkg/internal/apis/certmanager/validation:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", + "//internal/api/mutation:go_default_library", + "//internal/api/validation:go_default_library", + "//internal/apis/certmanager:go_default_library", + "//internal/apis/certmanager/identity:go_default_library", + "//internal/apis/certmanager/v1:go_default_library", + "//internal/apis/certmanager/v1alpha2:go_default_library", + "//internal/apis/certmanager/v1alpha3:go_default_library", + "//internal/apis/certmanager/v1beta1:go_default_library", + "//internal/apis/certmanager/validation:go_default_library", + "//internal/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", "@io_k8s_apimachinery//pkg/util/runtime:go_default_library", ], @@ -46,9 +46,9 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//internal/apis/certmanager/fuzzer:go_default_library", "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/internal/apis/certmanager/fuzzer:go_default_library", "@com_github_munnerz_crd_schema_fuzz//:go_default_library", "@io_k8s_apimachinery//pkg/api/apitesting/roundtrip:go_default_library", ], diff --git a/internal/apis/certmanager/install/install.go b/internal/apis/certmanager/install/install.go index ebfb74403..af02001ba 100644 --- a/internal/apis/certmanager/install/install.go +++ b/internal/apis/certmanager/install/install.go @@ -22,16 +22,16 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "github.com/jetstack/cert-manager/pkg/internal/api/mutation" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - cmidentity "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/identity" - v1 "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1alpha2" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1alpha3" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1beta1" - cmvalidation "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/validation" - cmmetav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" + "github.com/jetstack/cert-manager/internal/api/mutation" + "github.com/jetstack/cert-manager/internal/api/validation" + "github.com/jetstack/cert-manager/internal/apis/certmanager" + cmidentity "github.com/jetstack/cert-manager/internal/apis/certmanager/identity" + v1 "github.com/jetstack/cert-manager/internal/apis/certmanager/v1" + "github.com/jetstack/cert-manager/internal/apis/certmanager/v1alpha2" + "github.com/jetstack/cert-manager/internal/apis/certmanager/v1alpha3" + "github.com/jetstack/cert-manager/internal/apis/certmanager/v1beta1" + cmvalidation "github.com/jetstack/cert-manager/internal/apis/certmanager/validation" + cmmetav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" ) // Install registers the API group and adds types to a scheme diff --git a/internal/apis/certmanager/install/pruning_test.go b/internal/apis/certmanager/install/pruning_test.go index c87f3d0d2..ab8c39ae3 100644 --- a/internal/apis/certmanager/install/pruning_test.go +++ b/internal/apis/certmanager/install/pruning_test.go @@ -21,9 +21,9 @@ import ( crdfuzz "github.com/munnerz/crd-schema-fuzz" + cmfuzzer "github.com/jetstack/cert-manager/internal/apis/certmanager/fuzzer" "github.com/jetstack/cert-manager/pkg/api" apitesting "github.com/jetstack/cert-manager/pkg/api/testing" - cmfuzzer "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/fuzzer" ) func TestPruneTypes(t *testing.T) { diff --git a/internal/apis/certmanager/install/roundtrip_test.go b/internal/apis/certmanager/install/roundtrip_test.go index 60cef2d28..518ebabbc 100644 --- a/internal/apis/certmanager/install/roundtrip_test.go +++ b/internal/apis/certmanager/install/roundtrip_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" - cmfuzzer "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/fuzzer" + cmfuzzer "github.com/jetstack/cert-manager/internal/apis/certmanager/fuzzer" ) func TestRoundTripTypes(t *testing.T) { diff --git a/internal/apis/certmanager/types_certificate.go b/internal/apis/certmanager/types_certificate.go index 9b53dd40e..7587c50b1 100644 --- a/internal/apis/certmanager/types_certificate.go +++ b/internal/apis/certmanager/types_certificate.go @@ -19,7 +19,7 @@ package certmanager import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/internal/apis/certmanager/types_certificaterequest.go b/internal/apis/certmanager/types_certificaterequest.go index 7de08f7cb..3f5f5ebb6 100644 --- a/internal/apis/certmanager/types_certificaterequest.go +++ b/internal/apis/certmanager/types_certificaterequest.go @@ -19,7 +19,7 @@ package certmanager import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" ) const ( diff --git a/internal/apis/certmanager/types_issuer.go b/internal/apis/certmanager/types_issuer.go index 36d5867aa..f6e7ef26b 100644 --- a/internal/apis/certmanager/types_issuer.go +++ b/internal/apis/certmanager/types_issuer.go @@ -19,8 +19,8 @@ package certmanager import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/internal/apis/certmanager/v1/BUILD.bazel b/internal/apis/certmanager/v1/BUILD.bazel index 70d09aa5e..05d405109 100644 --- a/internal/apis/certmanager/v1/BUILD.bazel +++ b/internal/apis/certmanager/v1/BUILD.bazel @@ -10,18 +10,18 @@ go_library( "zz_generated.conversion.go", "zz_generated.defaults.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/v1", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", + "//internal/apis/acme/v1:go_default_library", + "//internal/apis/certmanager:go_default_library", + "//internal/apis/meta:go_default_library", + "//internal/apis/meta/v1:go_default_library", "//pkg/apis/acme/v1:go_default_library", "//pkg/apis/certmanager:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/acme/v1:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/meta:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/conversion:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", diff --git a/internal/apis/certmanager/v1/conversion.go b/internal/apis/certmanager/v1/conversion.go index c00665f8b..31b744ebe 100644 --- a/internal/apis/certmanager/v1/conversion.go +++ b/internal/apis/certmanager/v1/conversion.go @@ -21,8 +21,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" + certmanager "github.com/jetstack/cert-manager/internal/apis/certmanager" v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" - certmanager "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" ) // Convert_v1_CertificateSpec_To_certmanager_CertificateSpec diff --git a/internal/apis/certmanager/v1/doc.go b/internal/apis/certmanager/v1/doc.go index d9c555195..2b0910298 100644 --- a/internal/apis/certmanager/v1/doc.go +++ b/internal/apis/certmanager/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=github.com/jetstack/cert-manager/pkg/internal/apis/certmanager +// +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/certmanager // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/certmanager/v1 // +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen-input=../../../../apis/certmanager/v1 diff --git a/internal/apis/certmanager/v1/zz_generated.conversion.go b/internal/apis/certmanager/v1/zz_generated.conversion.go index 98951a54d..f007a5603 100644 --- a/internal/apis/certmanager/v1/zz_generated.conversion.go +++ b/internal/apis/certmanager/v1/zz_generated.conversion.go @@ -24,14 +24,14 @@ package v1 import ( unsafe "unsafe" + acme "github.com/jetstack/cert-manager/internal/apis/acme" + acmev1 "github.com/jetstack/cert-manager/internal/apis/acme/v1" + certmanager "github.com/jetstack/cert-manager/internal/apis/certmanager" + meta "github.com/jetstack/cert-manager/internal/apis/meta" + internalapismetav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" apisacmev1 "github.com/jetstack/cert-manager/pkg/apis/acme/v1" v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" apismetav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - acme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - acmev1 "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1" - certmanager "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" - internalapismetav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/apis/certmanager/v1alpha2/BUILD.bazel b/internal/apis/certmanager/v1alpha2/BUILD.bazel index e60caeca0..ab98edf9d 100644 --- a/internal/apis/certmanager/v1alpha2/BUILD.bazel +++ b/internal/apis/certmanager/v1alpha2/BUILD.bazel @@ -10,18 +10,18 @@ go_library( "zz_generated.conversion.go", "zz_generated.defaults.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1alpha2", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/v1alpha2", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", + "//internal/apis/acme/v1alpha2:go_default_library", + "//internal/apis/certmanager:go_default_library", + "//internal/apis/meta:go_default_library", + "//internal/apis/meta/v1:go_default_library", "//pkg/apis/acme/v1alpha2:go_default_library", "//pkg/apis/certmanager:go_default_library", "//pkg/apis/certmanager/v1alpha2:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/acme/v1alpha2:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/meta:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/conversion:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", diff --git a/internal/apis/certmanager/v1alpha2/conversion.go b/internal/apis/certmanager/v1alpha2/conversion.go index ae61ec872..f028b793e 100644 --- a/internal/apis/certmanager/v1alpha2/conversion.go +++ b/internal/apis/certmanager/v1alpha2/conversion.go @@ -19,8 +19,8 @@ package v1alpha2 import ( "k8s.io/apimachinery/pkg/conversion" + "github.com/jetstack/cert-manager/internal/apis/certmanager" "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" ) func Convert_v1alpha2_CertificateSpec_To_certmanager_CertificateSpec(in *v1alpha2.CertificateSpec, out *certmanager.CertificateSpec, s conversion.Scope) error { diff --git a/internal/apis/certmanager/v1alpha2/doc.go b/internal/apis/certmanager/v1alpha2/doc.go index 3e34c3388..0773f25f7 100644 --- a/internal/apis/certmanager/v1alpha2/doc.go +++ b/internal/apis/certmanager/v1alpha2/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=github.com/jetstack/cert-manager/pkg/internal/apis/certmanager +// +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/certmanager // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2 // +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen-input=../../../../apis/certmanager/v1alpha2 diff --git a/internal/apis/certmanager/v1alpha2/zz_generated.conversion.go b/internal/apis/certmanager/v1alpha2/zz_generated.conversion.go index 4b4e4f6ee..07a9e29b6 100644 --- a/internal/apis/certmanager/v1alpha2/zz_generated.conversion.go +++ b/internal/apis/certmanager/v1alpha2/zz_generated.conversion.go @@ -24,14 +24,14 @@ package v1alpha2 import ( unsafe "unsafe" + acme "github.com/jetstack/cert-manager/internal/apis/acme" + acmev1alpha2 "github.com/jetstack/cert-manager/internal/apis/acme/v1alpha2" + certmanager "github.com/jetstack/cert-manager/internal/apis/certmanager" + meta "github.com/jetstack/cert-manager/internal/apis/meta" + apismetav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" apisacmev1alpha2 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha2" v1alpha2 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2" metav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - acme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - acmev1alpha2 "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1alpha2" - certmanager "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" - apismetav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/apis/certmanager/v1alpha3/BUILD.bazel b/internal/apis/certmanager/v1alpha3/BUILD.bazel index 6a79f3959..eb2ead1bc 100644 --- a/internal/apis/certmanager/v1alpha3/BUILD.bazel +++ b/internal/apis/certmanager/v1alpha3/BUILD.bazel @@ -10,18 +10,18 @@ go_library( "zz_generated.conversion.go", "zz_generated.defaults.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1alpha3", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/v1alpha3", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", + "//internal/apis/acme/v1alpha3:go_default_library", + "//internal/apis/certmanager:go_default_library", + "//internal/apis/meta:go_default_library", + "//internal/apis/meta/v1:go_default_library", "//pkg/apis/acme/v1alpha3:go_default_library", "//pkg/apis/certmanager:go_default_library", "//pkg/apis/certmanager/v1alpha3:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/acme/v1alpha3:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/meta:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/conversion:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", diff --git a/internal/apis/certmanager/v1alpha3/conversion.go b/internal/apis/certmanager/v1alpha3/conversion.go index f50865ba8..a09b96505 100644 --- a/internal/apis/certmanager/v1alpha3/conversion.go +++ b/internal/apis/certmanager/v1alpha3/conversion.go @@ -19,8 +19,8 @@ package v1alpha3 import ( "k8s.io/apimachinery/pkg/conversion" + "github.com/jetstack/cert-manager/internal/apis/certmanager" "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha3" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" ) func Convert_v1alpha3_CertificateSpec_To_certmanager_CertificateSpec(in *v1alpha3.CertificateSpec, out *certmanager.CertificateSpec, s conversion.Scope) error { diff --git a/internal/apis/certmanager/v1alpha3/doc.go b/internal/apis/certmanager/v1alpha3/doc.go index b01493660..f7b585de7 100644 --- a/internal/apis/certmanager/v1alpha3/doc.go +++ b/internal/apis/certmanager/v1alpha3/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=github.com/jetstack/cert-manager/pkg/internal/apis/certmanager +// +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/certmanager // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha3 // +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen-input=../../../../apis/certmanager/v1alpha3 diff --git a/internal/apis/certmanager/v1alpha3/zz_generated.conversion.go b/internal/apis/certmanager/v1alpha3/zz_generated.conversion.go index 4b91a3ecf..a3d3e3c6f 100644 --- a/internal/apis/certmanager/v1alpha3/zz_generated.conversion.go +++ b/internal/apis/certmanager/v1alpha3/zz_generated.conversion.go @@ -24,14 +24,14 @@ package v1alpha3 import ( unsafe "unsafe" + acme "github.com/jetstack/cert-manager/internal/apis/acme" + acmev1alpha3 "github.com/jetstack/cert-manager/internal/apis/acme/v1alpha3" + certmanager "github.com/jetstack/cert-manager/internal/apis/certmanager" + meta "github.com/jetstack/cert-manager/internal/apis/meta" + apismetav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" apisacmev1alpha3 "github.com/jetstack/cert-manager/pkg/apis/acme/v1alpha3" v1alpha3 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha3" metav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - acme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - acmev1alpha3 "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1alpha3" - certmanager "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" - apismetav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/apis/certmanager/v1beta1/BUILD.bazel b/internal/apis/certmanager/v1beta1/BUILD.bazel index 002c870d6..77cdec85f 100644 --- a/internal/apis/certmanager/v1beta1/BUILD.bazel +++ b/internal/apis/certmanager/v1beta1/BUILD.bazel @@ -9,18 +9,18 @@ go_library( "zz_generated.conversion.go", "zz_generated.defaults.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1beta1", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/v1beta1", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/acme:go_default_library", + "//internal/apis/acme/v1beta1:go_default_library", + "//internal/apis/certmanager:go_default_library", + "//internal/apis/meta:go_default_library", + "//internal/apis/meta/v1:go_default_library", "//pkg/apis/acme/v1beta1:go_default_library", "//pkg/apis/certmanager:go_default_library", "//pkg/apis/certmanager/v1beta1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/acme/v1beta1:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/meta:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/conversion:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", diff --git a/internal/apis/certmanager/v1beta1/doc.go b/internal/apis/certmanager/v1beta1/doc.go index e4dd5c151..a935ab1f9 100644 --- a/internal/apis/certmanager/v1beta1/doc.go +++ b/internal/apis/certmanager/v1beta1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=github.com/jetstack/cert-manager/pkg/internal/apis/certmanager +// +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/certmanager // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/certmanager/v1beta1 // +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen-input=../../../../apis/certmanager/v1beta1 diff --git a/internal/apis/certmanager/v1beta1/zz_generated.conversion.go b/internal/apis/certmanager/v1beta1/zz_generated.conversion.go index fa0ada42a..ee3ecc359 100644 --- a/internal/apis/certmanager/v1beta1/zz_generated.conversion.go +++ b/internal/apis/certmanager/v1beta1/zz_generated.conversion.go @@ -24,14 +24,14 @@ package v1beta1 import ( unsafe "unsafe" + acme "github.com/jetstack/cert-manager/internal/apis/acme" + acmev1beta1 "github.com/jetstack/cert-manager/internal/apis/acme/v1beta1" + certmanager "github.com/jetstack/cert-manager/internal/apis/certmanager" + meta "github.com/jetstack/cert-manager/internal/apis/meta" + apismetav1 "github.com/jetstack/cert-manager/internal/apis/meta/v1" apisacmev1beta1 "github.com/jetstack/cert-manager/pkg/apis/acme/v1beta1" v1beta1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1beta1" metav1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - acme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - acmev1beta1 "github.com/jetstack/cert-manager/pkg/internal/apis/acme/v1beta1" - certmanager "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" - apismetav1 "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/apis/certmanager/validation/BUILD.bazel b/internal/apis/certmanager/validation/BUILD.bazel index 0f6af108b..1e569ee76 100644 --- a/internal/apis/certmanager/validation/BUILD.bazel +++ b/internal/apis/certmanager/validation/BUILD.bazel @@ -12,9 +12,14 @@ go_library( "register.go", "warnings.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/validation", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/validation", visibility = ["//visibility:public"], deps = [ + "//internal/api/validation:go_default_library", + "//internal/apis/acme:go_default_library", + "//internal/apis/certmanager:go_default_library", + "//internal/apis/certmanager/validation/util:go_default_library", + "//internal/apis/meta:go_default_library", "//pkg/api/util:go_default_library", "//pkg/apis/acme:go_default_library", "//pkg/apis/certmanager:go_default_library", @@ -22,11 +27,6 @@ go_library( "//pkg/apis/certmanager/v1alpha2:go_default_library", "//pkg/apis/certmanager/v1alpha3:go_default_library", "//pkg/apis/certmanager/v1beta1:go_default_library", - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/certmanager/validation/util:go_default_library", - "//pkg/internal/apis/meta:go_default_library", "//pkg/util:go_default_library", "//pkg/util/pki:go_default_library", "@com_github_kr_pretty//:go_default_library", @@ -52,17 +52,17 @@ go_test( ], embed = [":go_default_library"], deps = [ + "//internal/api/validation:go_default_library", + "//internal/apis/acme:go_default_library", + "//internal/apis/certmanager:go_default_library", + "//internal/apis/certmanager/v1alpha2:go_default_library", + "//internal/apis/certmanager/v1alpha3:go_default_library", + "//internal/apis/certmanager/v1beta1:go_default_library", + "//internal/apis/meta:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/apis/certmanager/v1alpha2:go_default_library", "//pkg/apis/certmanager/v1alpha3:go_default_library", "//pkg/apis/certmanager/v1beta1:go_default_library", - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/acme:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/certmanager/v1alpha2:go_default_library", - "//pkg/internal/apis/certmanager/v1alpha3:go_default_library", - "//pkg/internal/apis/certmanager/v1beta1:go_default_library", - "//pkg/internal/apis/meta:go_default_library", "//pkg/util/pki:go_default_library", "//test/unit/gen:go_default_library", "@com_github_stretchr_testify//assert:go_default_library", @@ -84,8 +84,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/internal/apis/certmanager/validation/plugins:all-srcs", - "//pkg/internal/apis/certmanager/validation/util:all-srcs", + "//internal/apis/certmanager/validation/plugins:all-srcs", + "//internal/apis/certmanager/validation/util:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/internal/apis/certmanager/validation/certificate.go b/internal/apis/certmanager/validation/certificate.go index b439eb737..69e969703 100644 --- a/internal/apis/certmanager/validation/certificate.go +++ b/internal/apis/certmanager/validation/certificate.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/jetstack/cert-manager/internal/api/validation" + internalcmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" "github.com/jetstack/cert-manager/pkg/api/util" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - internalcmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" ) // Validation functions for cert-manager Certificate types diff --git a/internal/apis/certmanager/validation/certificate_for_issuer.go b/internal/apis/certmanager/validation/certificate_for_issuer.go index 23ac5fc14..51a824182 100644 --- a/internal/apis/certmanager/validation/certificate_for_issuer.go +++ b/internal/apis/certmanager/validation/certificate_for_issuer.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" ) func ValidateCertificateForIssuer(crt *cmapi.Certificate, issuerObj cmapi.GenericIssuer) field.ErrorList { diff --git a/internal/apis/certmanager/validation/certificate_for_issuer_test.go b/internal/apis/certmanager/validation/certificate_for_issuer_test.go index 54d0f2968..904ae649e 100644 --- a/internal/apis/certmanager/validation/certificate_for_issuer_test.go +++ b/internal/apis/certmanager/validation/certificate_for_issuer_test.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" "github.com/jetstack/cert-manager/test/unit/gen" ) diff --git a/internal/apis/certmanager/validation/certificate_test.go b/internal/apis/certmanager/validation/certificate_test.go index 6d04e5d73..34e8ce3f5 100644 --- a/internal/apis/certmanager/validation/certificate_test.go +++ b/internal/apis/certmanager/validation/certificate_test.go @@ -26,13 +26,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/jetstack/cert-manager/internal/api/validation" + internalcmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" cmapiv1alpha2 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2" cmapiv1alpha3 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha3" cmapiv1beta1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1beta1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - internalcmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" "github.com/stretchr/testify/assert" ) diff --git a/internal/apis/certmanager/validation/certificaterequest.go b/internal/apis/certmanager/validation/certificaterequest.go index 6842fa975..2ed5df670 100644 --- a/internal/apis/certmanager/validation/certificaterequest.go +++ b/internal/apis/certmanager/validation/certificaterequest.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/jetstack/cert-manager/internal/api/validation" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" "github.com/jetstack/cert-manager/pkg/apis/acme" "github.com/jetstack/cert-manager/pkg/apis/certmanager" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" "github.com/jetstack/cert-manager/pkg/util" "github.com/jetstack/cert-manager/pkg/util/pki" ) diff --git a/internal/apis/certmanager/validation/certificaterequest_test.go b/internal/apis/certmanager/validation/certificaterequest_test.go index 958163f94..f3222b114 100644 --- a/internal/apis/certmanager/validation/certificaterequest_test.go +++ b/internal/apis/certmanager/validation/certificaterequest_test.go @@ -27,13 +27,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/jetstack/cert-manager/internal/api/validation" + cminternal "github.com/jetstack/cert-manager/internal/apis/certmanager" + cmapiv1alpha2 "github.com/jetstack/cert-manager/internal/apis/certmanager/v1alpha2" + cmapiv1alpha3 "github.com/jetstack/cert-manager/internal/apis/certmanager/v1alpha3" + cmapiv1beta1 "github.com/jetstack/cert-manager/internal/apis/certmanager/v1beta1" + cminternalmeta "github.com/jetstack/cert-manager/internal/apis/meta" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cminternal "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - cmapiv1alpha2 "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1alpha2" - cmapiv1alpha3 "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1alpha3" - cmapiv1beta1 "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/v1beta1" - cminternalmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" utilpki "github.com/jetstack/cert-manager/pkg/util/pki" "github.com/jetstack/cert-manager/test/unit/gen" ) diff --git a/internal/apis/certmanager/validation/clusterissuer.go b/internal/apis/certmanager/validation/clusterissuer.go index 745914317..802490489 100644 --- a/internal/apis/certmanager/validation/clusterissuer.go +++ b/internal/apis/certmanager/validation/clusterissuer.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" + "github.com/jetstack/cert-manager/internal/api/validation" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" ) // Validation functions for cert-manager ClusterIssuer types. diff --git a/internal/apis/certmanager/validation/clusterissuer_test.go b/internal/apis/certmanager/validation/clusterissuer_test.go index 3286b5f31..968734e06 100644 --- a/internal/apis/certmanager/validation/clusterissuer_test.go +++ b/internal/apis/certmanager/validation/clusterissuer_test.go @@ -25,12 +25,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/jetstack/cert-manager/internal/api/validation" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" cmapiv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" cmapiv1alpha2 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2" cmapiv1alpha3 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha3" cmapiv1beta1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1beta1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" ) func TestValidateClusterIssuer(t *testing.T) { diff --git a/internal/apis/certmanager/validation/deprecation.go b/internal/apis/certmanager/validation/deprecation.go index 91bab13a6..a4764da35 100644 --- a/internal/apis/certmanager/validation/deprecation.go +++ b/internal/apis/certmanager/validation/deprecation.go @@ -22,11 +22,11 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "github.com/jetstack/cert-manager/internal/api/validation" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" cmapiv1alpha2 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2" cmapiv1alpha3 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha3" cmapiv1beta1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1beta1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" ) // This file holds temporary functionality for cert-manager v1.4 API deprecation. diff --git a/internal/apis/certmanager/validation/issuer.go b/internal/apis/certmanager/validation/issuer.go index c65ccb7b3..9cf0ed6fc 100644 --- a/internal/apis/certmanager/validation/issuer.go +++ b/internal/apis/certmanager/validation/issuer.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/validation/util" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + "github.com/jetstack/cert-manager/internal/api/validation" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" + "github.com/jetstack/cert-manager/internal/apis/certmanager" + "github.com/jetstack/cert-manager/internal/apis/certmanager/validation/util" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" ) // Validation functions for cert-manager Issuer types. diff --git a/internal/apis/certmanager/validation/issuer_test.go b/internal/apis/certmanager/validation/issuer_test.go index 4abd6eac6..af0dc5de5 100644 --- a/internal/apis/certmanager/validation/issuer_test.go +++ b/internal/apis/certmanager/validation/issuer_test.go @@ -28,14 +28,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" + "github.com/jetstack/cert-manager/internal/api/validation" + cmacme "github.com/jetstack/cert-manager/internal/apis/acme" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" cmapiv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" cmapiv1alpha2 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2" cmapiv1alpha3 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha3" cmapiv1beta1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1beta1" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmacme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" ) var ( diff --git a/internal/apis/certmanager/validation/plugins/BUILD.bazel b/internal/apis/certmanager/validation/plugins/BUILD.bazel index e18f055d8..bc6bbc0fb 100644 --- a/internal/apis/certmanager/validation/plugins/BUILD.bazel +++ b/internal/apis/certmanager/validation/plugins/BUILD.bazel @@ -6,13 +6,13 @@ go_library( "approval.go", "plugins.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/validation/plugins", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/validation/plugins", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/certmanager:go_default_library", + "//internal/apis/certmanager/validation/util:go_default_library", "//pkg/apis/certmanager:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/certmanager/validation/util:go_default_library", "@io_k8s_api//admission/v1:go_default_library", "@io_k8s_api//authorization/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", @@ -30,8 +30,8 @@ go_test( srcs = ["approval_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/internal/apis/certmanager:go_default_library", - "//pkg/internal/apis/meta:go_default_library", + "//internal/apis/certmanager:go_default_library", + "//internal/apis/meta:go_default_library", "//pkg/webhook:go_default_library", "//test/unit/discovery:go_default_library", "@io_k8s_api//admission/v1:go_default_library", diff --git a/internal/apis/certmanager/validation/plugins/approval.go b/internal/apis/certmanager/validation/plugins/approval.go index cc1ad3ff6..322b7e89d 100644 --- a/internal/apis/certmanager/validation/plugins/approval.go +++ b/internal/apis/certmanager/validation/plugins/approval.go @@ -31,10 +31,10 @@ import ( "k8s.io/client-go/kubernetes" authzclient "k8s.io/client-go/kubernetes/typed/authorization/v1" + internalcmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" + "github.com/jetstack/cert-manager/internal/apis/certmanager/validation/util" "github.com/jetstack/cert-manager/pkg/apis/certmanager" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" - internalcmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/validation/util" ) // approval is responsible for reviewing whether users attempting to approve or diff --git a/internal/apis/certmanager/validation/plugins/approval_test.go b/internal/apis/certmanager/validation/plugins/approval_test.go index fe51fbf31..49445feb8 100644 --- a/internal/apis/certmanager/validation/plugins/approval_test.go +++ b/internal/apis/certmanager/validation/plugins/approval_test.go @@ -32,8 +32,8 @@ import ( kubefake "k8s.io/client-go/kubernetes/fake" coretesting "k8s.io/client-go/testing" - internalcmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" - internalcmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + internalcmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" + internalcmmeta "github.com/jetstack/cert-manager/internal/apis/meta" "github.com/jetstack/cert-manager/pkg/webhook" discoveryfake "github.com/jetstack/cert-manager/test/unit/discovery" ) diff --git a/internal/apis/certmanager/validation/register.go b/internal/apis/certmanager/validation/register.go index 34faf0d64..a89984547 100644 --- a/internal/apis/certmanager/validation/register.go +++ b/internal/apis/certmanager/validation/register.go @@ -17,8 +17,8 @@ limitations under the License. package validation import ( - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" + "github.com/jetstack/cert-manager/internal/api/validation" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" ) func AddToValidationRegistry(reg *validation.Registry) error { diff --git a/internal/apis/certmanager/validation/util/BUILD.bazel b/internal/apis/certmanager/validation/util/BUILD.bazel index d2c253c4c..0b771bf14 100644 --- a/internal/apis/certmanager/validation/util/BUILD.bazel +++ b/internal/apis/certmanager/validation/util/BUILD.bazel @@ -6,9 +6,9 @@ go_library( "conditions.go", "nameserver.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/validation/util", + importpath = "github.com/jetstack/cert-manager/internal/apis/certmanager/validation/util", visibility = ["//visibility:public"], - deps = ["//pkg/internal/apis/certmanager:go_default_library"], + deps = ["//internal/apis/certmanager:go_default_library"], ) filegroup( diff --git a/internal/apis/certmanager/validation/util/conditions.go b/internal/apis/certmanager/validation/util/conditions.go index 4f9612368..4345c64ac 100644 --- a/internal/apis/certmanager/validation/util/conditions.go +++ b/internal/apis/certmanager/validation/util/conditions.go @@ -17,7 +17,7 @@ limitations under the License. package util import ( - cmapi "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager" + cmapi "github.com/jetstack/cert-manager/internal/apis/certmanager" ) func GetCertificateRequestCondition(conds []cmapi.CertificateRequestCondition, conditionType cmapi.CertificateRequestConditionType) *cmapi.CertificateRequestCondition { diff --git a/internal/apis/certmanager/zz_generated.deepcopy.go b/internal/apis/certmanager/zz_generated.deepcopy.go index 00e650975..e52b1b6b2 100644 --- a/internal/apis/certmanager/zz_generated.deepcopy.go +++ b/internal/apis/certmanager/zz_generated.deepcopy.go @@ -22,8 +22,8 @@ limitations under the License. package certmanager import ( - acme "github.com/jetstack/cert-manager/pkg/internal/apis/acme" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" + acme "github.com/jetstack/cert-manager/internal/apis/acme" + meta "github.com/jetstack/cert-manager/internal/apis/meta" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/internal/apis/meta/BUILD.bazel b/internal/apis/meta/BUILD.bazel index ae560391b..4c69519fe 100644 --- a/internal/apis/meta/BUILD.bazel +++ b/internal/apis/meta/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "types.go", "zz_generated.deepcopy.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/meta", + importpath = "github.com/jetstack/cert-manager/internal/apis/meta", visibility = ["//pkg:__subpackages__"], deps = [ "//pkg/apis/meta:go_default_library", @@ -28,9 +28,9 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/internal/apis/meta/fuzzer:all-srcs", - "//pkg/internal/apis/meta/install:all-srcs", - "//pkg/internal/apis/meta/v1:all-srcs", + "//internal/apis/meta/fuzzer:all-srcs", + "//internal/apis/meta/install:all-srcs", + "//internal/apis/meta/v1:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/internal/apis/meta/fuzzer/BUILD.bazel b/internal/apis/meta/fuzzer/BUILD.bazel index f96e3bccb..ae4f7a570 100644 --- a/internal/apis/meta/fuzzer/BUILD.bazel +++ b/internal/apis/meta/fuzzer/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["fuzzer.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/meta/fuzzer", + importpath = "github.com/jetstack/cert-manager/internal/apis/meta/fuzzer", visibility = ["//pkg:__subpackages__"], deps = ["@io_k8s_apimachinery//pkg/runtime/serializer:go_default_library"], ) diff --git a/internal/apis/meta/install/BUILD.bazel b/internal/apis/meta/install/BUILD.bazel index 30c11a6e2..97ce85599 100644 --- a/internal/apis/meta/install/BUILD.bazel +++ b/internal/apis/meta/install/BUILD.bazel @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["install.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/meta/install", + importpath = "github.com/jetstack/cert-manager/internal/apis/meta/install", visibility = ["//visibility:public"], deps = [ - "//pkg/internal/apis/meta:go_default_library", - "//pkg/internal/apis/meta/v1:go_default_library", + "//internal/apis/meta:go_default_library", + "//internal/apis/meta/v1:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", "@io_k8s_apimachinery//pkg/util/runtime:go_default_library", ], @@ -32,7 +32,7 @@ go_test( srcs = ["roundtrip_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/internal/apis/meta/fuzzer:go_default_library", + "//internal/apis/meta/fuzzer:go_default_library", "@io_k8s_apimachinery//pkg/api/apitesting/roundtrip:go_default_library", ], ) diff --git a/internal/apis/meta/install/install.go b/internal/apis/meta/install/install.go index 99150b1bd..b4ce576fd 100644 --- a/internal/apis/meta/install/install.go +++ b/internal/apis/meta/install/install.go @@ -22,8 +22,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "github.com/jetstack/cert-manager/pkg/internal/apis/meta" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1" + "github.com/jetstack/cert-manager/internal/apis/meta" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta/v1" ) // Install registers the API group and adds types to a scheme diff --git a/internal/apis/meta/install/roundtrip_test.go b/internal/apis/meta/install/roundtrip_test.go index 13675d986..b4100a0a0 100644 --- a/internal/apis/meta/install/roundtrip_test.go +++ b/internal/apis/meta/install/roundtrip_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" - metafuzzer "github.com/jetstack/cert-manager/pkg/internal/apis/meta/fuzzer" + metafuzzer "github.com/jetstack/cert-manager/internal/apis/meta/fuzzer" ) func TestRoundTripTypes(t *testing.T) { diff --git a/internal/apis/meta/v1/BUILD.bazel b/internal/apis/meta/v1/BUILD.bazel index 434de1222..3d3f0d1d3 100644 --- a/internal/apis/meta/v1/BUILD.bazel +++ b/internal/apis/meta/v1/BUILD.bazel @@ -9,12 +9,12 @@ go_library( "zz_generated.conversion.go", "zz_generated.defaults.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/meta/v1", + importpath = "github.com/jetstack/cert-manager/internal/apis/meta/v1", visibility = ["//pkg:__subpackages__"], deps = [ + "//internal/apis/meta:go_default_library", "//pkg/apis/meta:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/meta:go_default_library", "@io_k8s_apimachinery//pkg/conversion:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", "@io_k8s_apimachinery//pkg/runtime/schema:go_default_library", diff --git a/internal/apis/meta/v1/doc.go b/internal/apis/meta/v1/doc.go index 24dd1ebf9..0f486c090 100644 --- a/internal/apis/meta/v1/doc.go +++ b/internal/apis/meta/v1/doc.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// +k8s:conversion-gen=github.com/jetstack/cert-manager/pkg/internal/apis/meta +// +k8s:conversion-gen=github.com/jetstack/cert-manager/internal/apis/meta // +k8s:conversion-gen-external-types=github.com/jetstack/cert-manager/pkg/apis/meta/v1 // +k8s:defaulter-gen=TypeMeta // +k8s:defaulter-gen-input=../../../../apis/meta/v1 diff --git a/internal/apis/meta/v1/zz_generated.conversion.go b/internal/apis/meta/v1/zz_generated.conversion.go index 9490459e1..1e6acb88c 100644 --- a/internal/apis/meta/v1/zz_generated.conversion.go +++ b/internal/apis/meta/v1/zz_generated.conversion.go @@ -22,8 +22,8 @@ limitations under the License. package v1 import ( + meta "github.com/jetstack/cert-manager/internal/apis/meta" v1 "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - meta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/internal/ingress/BUILD.bazel b/internal/ingress/BUILD.bazel index cc61fb136..9b0c4b767 100644 --- a/internal/ingress/BUILD.bazel +++ b/internal/ingress/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "v1.go", "v1beta1.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/ingress", + importpath = "github.com/jetstack/cert-manager/internal/ingress", visibility = ["//visibility:public"], deps = [ "//pkg/controller:go_default_library", diff --git a/internal/vault/BUILD.bazel b/internal/vault/BUILD.bazel index 2f7831e01..4ad26ab42 100644 --- a/internal/vault/BUILD.bazel +++ b/internal/vault/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["vault.go"], - importpath = "github.com/jetstack/cert-manager/pkg/internal/vault", + importpath = "github.com/jetstack/cert-manager/internal/vault", visibility = ["//pkg:__subpackages__"], deps = [ "//pkg/apis/certmanager/v1:go_default_library", @@ -19,9 +19,9 @@ go_test( srcs = ["vault_test.go"], embed = [":go_default_library"], deps = [ + "//internal/vault/fake:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/vault/fake:go_default_library", "//pkg/util/pki:go_default_library", "//test/unit/gen:go_default_library", "//test/unit/listers:go_default_library", @@ -43,7 +43,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/internal/vault/fake:all-srcs", + "//internal/vault/fake:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/internal/vault/fake/BUILD.bazel b/internal/vault/fake/BUILD.bazel index b5ebe0c27..0804e7d6c 100644 --- a/internal/vault/fake/BUILD.bazel +++ b/internal/vault/fake/BUILD.bazel @@ -6,7 +6,7 @@ go_library( "client.go", "vault.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/vault/fake", + importpath = "github.com/jetstack/cert-manager/internal/vault/fake", visibility = ["//pkg:__subpackages__"], deps = [ "//pkg/apis/certmanager/v1:go_default_library", diff --git a/internal/vault/vault_test.go b/internal/vault/vault_test.go index b4376403a..e7102f71b 100644 --- a/internal/vault/vault_test.go +++ b/internal/vault/vault_test.go @@ -38,9 +38,9 @@ import ( "github.com/hashicorp/vault/sdk/helper/jsonutil" corev1 "k8s.io/api/core/v1" + vaultfake "github.com/jetstack/cert-manager/internal/vault/fake" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - vaultfake "github.com/jetstack/cert-manager/pkg/internal/vault/fake" "github.com/jetstack/cert-manager/pkg/util/pki" "github.com/jetstack/cert-manager/test/unit/gen" "github.com/jetstack/cert-manager/test/unit/listers" diff --git a/pkg/controller/acmechallenges/BUILD.bazel b/pkg/controller/acmechallenges/BUILD.bazel index a1ec67d85..0b2741bc1 100644 --- a/pkg/controller/acmechallenges/BUILD.bazel +++ b/pkg/controller/acmechallenges/BUILD.bazel @@ -10,6 +10,7 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/controller/acmechallenges", visibility = ["//visibility:public"], deps = [ + "//internal/ingress:go_default_library", "//pkg/acme:go_default_library", "//pkg/acme/accounts:go_default_library", "//pkg/acme/client:go_default_library", @@ -21,7 +22,6 @@ go_library( "//pkg/controller:go_default_library", "//pkg/controller/acmechallenges/scheduler:go_default_library", "//pkg/feature:go_default_library", - "//pkg/internal/ingress:go_default_library", "//pkg/issuer:go_default_library", "//pkg/issuer/acme/dns:go_default_library", "//pkg/issuer/acme/dns/util:go_default_library", diff --git a/pkg/controller/acmechallenges/controller.go b/pkg/controller/acmechallenges/controller.go index 5112d6108..9a457ce50 100644 --- a/pkg/controller/acmechallenges/controller.go +++ b/pkg/controller/acmechallenges/controller.go @@ -21,13 +21,13 @@ import ( "time" "github.com/go-logr/logr" + "github.com/jetstack/cert-manager/internal/ingress" "github.com/jetstack/cert-manager/pkg/acme/accounts" cmclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned" cmacmelisters "github.com/jetstack/cert-manager/pkg/client/listers/acme/v1" cmlisters "github.com/jetstack/cert-manager/pkg/client/listers/certmanager/v1" controllerpkg "github.com/jetstack/cert-manager/pkg/controller" "github.com/jetstack/cert-manager/pkg/controller/acmechallenges/scheduler" - "github.com/jetstack/cert-manager/pkg/internal/ingress" "github.com/jetstack/cert-manager/pkg/issuer" "github.com/jetstack/cert-manager/pkg/issuer/acme/dns" "github.com/jetstack/cert-manager/pkg/issuer/acme/http" diff --git a/pkg/controller/certificate-shim/BUILD.bazel b/pkg/controller/certificate-shim/BUILD.bazel index fddd18941..cb48e1d81 100644 --- a/pkg/controller/certificate-shim/BUILD.bazel +++ b/pkg/controller/certificate-shim/BUILD.bazel @@ -9,6 +9,7 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/controller/certificate-shim", visibility = ["//visibility:public"], deps = [ + "//internal/ingress:go_default_library", "//pkg/api/util:go_default_library", "//pkg/apis/acme/v1:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", @@ -16,7 +17,6 @@ go_library( "//pkg/client/clientset/versioned:go_default_library", "//pkg/client/listers/certmanager/v1:go_default_library", "//pkg/controller:go_default_library", - "//pkg/internal/ingress:go_default_library", "//pkg/logs:go_default_library", "@com_github_go_logr_logr//:go_default_library", "@io_k8s_api//core/v1:go_default_library", diff --git a/pkg/controller/certificate-shim/ingresses/BUILD.bazel b/pkg/controller/certificate-shim/ingresses/BUILD.bazel index b30d0e7c0..365436dbd 100644 --- a/pkg/controller/certificate-shim/ingresses/BUILD.bazel +++ b/pkg/controller/certificate-shim/ingresses/BUILD.bazel @@ -6,10 +6,10 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/controller/certificate-shim/ingresses", visibility = ["//visibility:public"], deps = [ + "//internal/ingress:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/certificate-shim:go_default_library", - "//pkg/internal/ingress:go_default_library", "//pkg/logs:go_default_library", "@io_k8s_apimachinery//pkg/api/errors:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/pkg/controller/certificate-shim/ingresses/controller.go b/pkg/controller/certificate-shim/ingresses/controller.go index 8d513ff0f..a01f04086 100644 --- a/pkg/controller/certificate-shim/ingresses/controller.go +++ b/pkg/controller/certificate-shim/ingresses/controller.go @@ -26,10 +26,10 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" + "github.com/jetstack/cert-manager/internal/ingress" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" controllerpkg "github.com/jetstack/cert-manager/pkg/controller" shimhelper "github.com/jetstack/cert-manager/pkg/controller/certificate-shim" - "github.com/jetstack/cert-manager/pkg/internal/ingress" logf "github.com/jetstack/cert-manager/pkg/logs" ) diff --git a/pkg/controller/certificate-shim/sync.go b/pkg/controller/certificate-shim/sync.go index a37293b8d..0ec576e47 100644 --- a/pkg/controller/certificate-shim/sync.go +++ b/pkg/controller/certificate-shim/sync.go @@ -35,13 +35,13 @@ import ( "k8s.io/client-go/tools/record" "github.com/go-logr/logr" + ingress "github.com/jetstack/cert-manager/internal/ingress" cmacme "github.com/jetstack/cert-manager/pkg/apis/acme/v1" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" clientset "github.com/jetstack/cert-manager/pkg/client/clientset/versioned" cmlisters "github.com/jetstack/cert-manager/pkg/client/listers/certmanager/v1" "github.com/jetstack/cert-manager/pkg/controller" - ingress "github.com/jetstack/cert-manager/pkg/internal/ingress" logf "github.com/jetstack/cert-manager/pkg/logs" "k8s.io/apimachinery/pkg/util/validation/field" gwapi "sigs.k8s.io/gateway-api/apis/v1alpha1" diff --git a/pkg/controller/certificaterequests/vault/BUILD.bazel b/pkg/controller/certificaterequests/vault/BUILD.bazel index df03d284f..c2382c31e 100644 --- a/pkg/controller/certificaterequests/vault/BUILD.bazel +++ b/pkg/controller/certificaterequests/vault/BUILD.bazel @@ -6,12 +6,12 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/vault", visibility = ["//visibility:public"], deps = [ + "//internal/vault:go_default_library", "//pkg/api/util:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/certificaterequests:go_default_library", "//pkg/controller/certificaterequests/util:go_default_library", - "//pkg/internal/vault:go_default_library", "//pkg/issuer:go_default_library", "//pkg/logs:go_default_library", "@io_k8s_apimachinery//pkg/api/errors:go_default_library", @@ -38,14 +38,14 @@ go_test( srcs = ["vault_test.go"], embed = [":go_default_library"], deps = [ + "//internal/vault:go_default_library", + "//internal/vault/fake:go_default_library", "//pkg/api/util:go_default_library", "//pkg/apis/certmanager:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/controller/certificaterequests:go_default_library", "//pkg/controller/test:go_default_library", - "//pkg/internal/vault:go_default_library", - "//pkg/internal/vault/fake:go_default_library", "//pkg/util/pki:go_default_library", "//test/unit/gen:go_default_library", "@io_k8s_api//core/v1:go_default_library", diff --git a/pkg/controller/certificaterequests/vault/vault.go b/pkg/controller/certificaterequests/vault/vault.go index fd5a8c787..7a0669cca 100644 --- a/pkg/controller/certificaterequests/vault/vault.go +++ b/pkg/controller/certificaterequests/vault/vault.go @@ -22,12 +22,12 @@ import ( k8sErrors "k8s.io/apimachinery/pkg/api/errors" corelisters "k8s.io/client-go/listers/core/v1" + vaultinternal "github.com/jetstack/cert-manager/internal/vault" apiutil "github.com/jetstack/cert-manager/pkg/api/util" v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" controllerpkg "github.com/jetstack/cert-manager/pkg/controller" "github.com/jetstack/cert-manager/pkg/controller/certificaterequests" crutil "github.com/jetstack/cert-manager/pkg/controller/certificaterequests/util" - vaultinternal "github.com/jetstack/cert-manager/pkg/internal/vault" "github.com/jetstack/cert-manager/pkg/issuer" logf "github.com/jetstack/cert-manager/pkg/logs" ) diff --git a/pkg/controller/certificaterequests/vault/vault_test.go b/pkg/controller/certificaterequests/vault/vault_test.go index 25c8adf16..704ed93e0 100644 --- a/pkg/controller/certificaterequests/vault/vault_test.go +++ b/pkg/controller/certificaterequests/vault/vault_test.go @@ -37,14 +37,14 @@ import ( coretesting "k8s.io/client-go/testing" fakeclock "k8s.io/utils/clock/testing" + internalvault "github.com/jetstack/cert-manager/internal/vault" + fakevault "github.com/jetstack/cert-manager/internal/vault/fake" apiutil "github.com/jetstack/cert-manager/pkg/api/util" "github.com/jetstack/cert-manager/pkg/apis/certmanager" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" "github.com/jetstack/cert-manager/pkg/controller/certificaterequests" testpkg "github.com/jetstack/cert-manager/pkg/controller/test" - internalvault "github.com/jetstack/cert-manager/pkg/internal/vault" - fakevault "github.com/jetstack/cert-manager/pkg/internal/vault/fake" "github.com/jetstack/cert-manager/pkg/util/pki" "github.com/jetstack/cert-manager/test/unit/gen" ) diff --git a/pkg/controller/certificatesigningrequests/vault/BUILD.bazel b/pkg/controller/certificatesigningrequests/vault/BUILD.bazel index 6ae7823ab..30e48b616 100644 --- a/pkg/controller/certificatesigningrequests/vault/BUILD.bazel +++ b/pkg/controller/certificatesigningrequests/vault/BUILD.bazel @@ -6,12 +6,12 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/controller/certificatesigningrequests/vault", visibility = ["//visibility:public"], deps = [ + "//internal/vault:go_default_library", "//pkg/api/util:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/certificatesigningrequests:go_default_library", "//pkg/controller/certificatesigningrequests/util:go_default_library", - "//pkg/internal/vault:go_default_library", "//pkg/logs:go_default_library", "//pkg/util/pki:go_default_library", "@io_k8s_api//certificates/v1:go_default_library", @@ -29,6 +29,8 @@ go_test( srcs = ["vault_test.go"], embed = [":go_default_library"], deps = [ + "//internal/vault:go_default_library", + "//internal/vault/fake:go_default_library", "//pkg/api/util:go_default_library", "//pkg/apis/certmanager:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", @@ -36,8 +38,6 @@ go_test( "//pkg/controller/certificatesigningrequests:go_default_library", "//pkg/controller/certificatesigningrequests/util:go_default_library", "//pkg/controller/test:go_default_library", - "//pkg/internal/vault:go_default_library", - "//pkg/internal/vault/fake:go_default_library", "//test/unit/gen:go_default_library", "@io_k8s_api//authorization/v1:go_default_library", "@io_k8s_api//certificates/v1:go_default_library", diff --git a/pkg/controller/certificatesigningrequests/vault/vault.go b/pkg/controller/certificatesigningrequests/vault/vault.go index fef78cbd9..7faf6c860 100644 --- a/pkg/controller/certificatesigningrequests/vault/vault.go +++ b/pkg/controller/certificatesigningrequests/vault/vault.go @@ -30,12 +30,12 @@ import ( corelisters "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/record" + internalvault "github.com/jetstack/cert-manager/internal/vault" apiutil "github.com/jetstack/cert-manager/pkg/api/util" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" controllerpkg "github.com/jetstack/cert-manager/pkg/controller" "github.com/jetstack/cert-manager/pkg/controller/certificatesigningrequests" "github.com/jetstack/cert-manager/pkg/controller/certificatesigningrequests/util" - internalvault "github.com/jetstack/cert-manager/pkg/internal/vault" logf "github.com/jetstack/cert-manager/pkg/logs" "github.com/jetstack/cert-manager/pkg/util/pki" ) diff --git a/pkg/controller/certificatesigningrequests/vault/vault_test.go b/pkg/controller/certificatesigningrequests/vault/vault_test.go index 93cd36a0f..ee260fdc7 100644 --- a/pkg/controller/certificatesigningrequests/vault/vault_test.go +++ b/pkg/controller/certificatesigningrequests/vault/vault_test.go @@ -34,6 +34,8 @@ import ( coretesting "k8s.io/client-go/testing" fakeclock "k8s.io/utils/clock/testing" + internalvault "github.com/jetstack/cert-manager/internal/vault" + fakevault "github.com/jetstack/cert-manager/internal/vault/fake" apiutil "github.com/jetstack/cert-manager/pkg/api/util" "github.com/jetstack/cert-manager/pkg/apis/certmanager" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" @@ -41,8 +43,6 @@ import ( "github.com/jetstack/cert-manager/pkg/controller/certificatesigningrequests" "github.com/jetstack/cert-manager/pkg/controller/certificatesigningrequests/util" testpkg "github.com/jetstack/cert-manager/pkg/controller/test" - internalvault "github.com/jetstack/cert-manager/pkg/internal/vault" - fakevault "github.com/jetstack/cert-manager/pkg/internal/vault/fake" "github.com/jetstack/cert-manager/test/unit/gen" ) diff --git a/pkg/ctl/BUILD.bazel b/pkg/ctl/BUILD.bazel index 8e4904a37..8bf4fda56 100644 --- a/pkg/ctl/BUILD.bazel +++ b/pkg/ctl/BUILD.bazel @@ -6,9 +6,9 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/ctl", visibility = ["//visibility:public"], deps = [ - "//pkg/internal/apis/acme/install:go_default_library", - "//pkg/internal/apis/certmanager/install:go_default_library", - "//pkg/internal/apis/meta/install:go_default_library", + "//internal/apis/acme/install:go_default_library", + "//internal/apis/certmanager/install:go_default_library", + "//internal/apis/meta/install:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/internalversion:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/pkg/ctl/scheme.go b/pkg/ctl/scheme.go index 05f9e0358..b4e0e68e1 100644 --- a/pkg/ctl/scheme.go +++ b/pkg/ctl/scheme.go @@ -30,9 +30,9 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" kscheme "k8s.io/client-go/kubernetes/scheme" - acmeinstall "github.com/jetstack/cert-manager/pkg/internal/apis/acme/install" - cminstall "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/install" - metainstall "github.com/jetstack/cert-manager/pkg/internal/apis/meta/install" + acmeinstall "github.com/jetstack/cert-manager/internal/apis/acme/install" + cminstall "github.com/jetstack/cert-manager/internal/apis/certmanager/install" + metainstall "github.com/jetstack/cert-manager/internal/apis/meta/install" ) // Define a Scheme that has all cert-manager API types registered, including diff --git a/pkg/issuer/acme/dns/rfc2136/BUILD.bazel b/pkg/issuer/acme/dns/rfc2136/BUILD.bazel index 4a9d850e1..712154a13 100644 --- a/pkg/issuer/acme/dns/rfc2136/BUILD.bazel +++ b/pkg/issuer/acme/dns/rfc2136/BUILD.bazel @@ -9,10 +9,10 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/issuer/acme/dns/rfc2136", visibility = ["//visibility:public"], deps = [ + "//internal/apis/certmanager/validation/util:go_default_library", "//pkg/acme/webhook/apis/acme/v1alpha1:go_default_library", "//pkg/apis/acme/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", - "//pkg/internal/apis/certmanager/validation/util:go_default_library", "//pkg/logs:go_default_library", "@com_github_miekg_dns//:go_default_library", "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1:go_default_library", diff --git a/pkg/issuer/acme/dns/rfc2136/rfc2136.go b/pkg/issuer/acme/dns/rfc2136/rfc2136.go index 38b24d73a..c4b687e69 100644 --- a/pkg/issuer/acme/dns/rfc2136/rfc2136.go +++ b/pkg/issuer/acme/dns/rfc2136/rfc2136.go @@ -30,7 +30,7 @@ import ( "github.com/miekg/dns" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/validation/util" + "github.com/jetstack/cert-manager/internal/apis/certmanager/validation/util" ) var defaultPort = "53" diff --git a/pkg/issuer/acme/http/BUILD.bazel b/pkg/issuer/acme/http/BUILD.bazel index 4b9442599..fcb747ccc 100644 --- a/pkg/issuer/acme/http/BUILD.bazel +++ b/pkg/issuer/acme/http/BUILD.bazel @@ -12,10 +12,10 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/issuer/acme/http", visibility = ["//visibility:public"], deps = [ + "//internal/ingress:go_default_library", "//pkg/apis/acme/v1:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/controller:go_default_library", - "//pkg/internal/ingress:go_default_library", "//pkg/issuer/acme/http/solver:go_default_library", "//pkg/logs:go_default_library", "//pkg/util:go_default_library", diff --git a/pkg/issuer/acme/http/http.go b/pkg/issuer/acme/http/http.go index 1721c25bb..c17707cf3 100644 --- a/pkg/issuer/acme/http/http.go +++ b/pkg/issuer/acme/http/http.go @@ -33,10 +33,10 @@ import ( k8snet "k8s.io/utils/net" gwapilisters "sigs.k8s.io/gateway-api/pkg/client/listers/apis/v1alpha1" + "github.com/jetstack/cert-manager/internal/ingress" cmacme "github.com/jetstack/cert-manager/pkg/apis/acme/v1" v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" "github.com/jetstack/cert-manager/pkg/controller" - "github.com/jetstack/cert-manager/pkg/internal/ingress" "github.com/jetstack/cert-manager/pkg/issuer/acme/http/solver" logf "github.com/jetstack/cert-manager/pkg/logs" pkgutil "github.com/jetstack/cert-manager/pkg/util" diff --git a/pkg/issuer/vault/BUILD.bazel b/pkg/issuer/vault/BUILD.bazel index e682364b4..486f854e3 100644 --- a/pkg/issuer/vault/BUILD.bazel +++ b/pkg/issuer/vault/BUILD.bazel @@ -9,11 +9,11 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/issuer/vault", visibility = ["//visibility:public"], deps = [ + "//internal/vault:go_default_library", "//pkg/api/util:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/apis/meta/v1:go_default_library", "//pkg/controller:go_default_library", - "//pkg/internal/vault:go_default_library", "//pkg/issuer:go_default_library", "//pkg/logs:go_default_library", "@io_k8s_client_go//listers/core/v1:go_default_library", diff --git a/pkg/issuer/vault/setup.go b/pkg/issuer/vault/setup.go index 235d70e38..bf30012e4 100644 --- a/pkg/issuer/vault/setup.go +++ b/pkg/issuer/vault/setup.go @@ -20,10 +20,10 @@ import ( "context" "fmt" + vaultinternal "github.com/jetstack/cert-manager/internal/vault" apiutil "github.com/jetstack/cert-manager/pkg/api/util" v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1" - vaultinternal "github.com/jetstack/cert-manager/pkg/internal/vault" logf "github.com/jetstack/cert-manager/pkg/logs" ) diff --git a/pkg/webhook/BUILD.bazel b/pkg/webhook/BUILD.bazel index 22e4fbe26..894cc84b5 100644 --- a/pkg/webhook/BUILD.bazel +++ b/pkg/webhook/BUILD.bazel @@ -6,11 +6,11 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/webhook", visibility = ["//visibility:public"], deps = [ - "//pkg/internal/api/mutation:go_default_library", - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/acme/install:go_default_library", - "//pkg/internal/apis/certmanager/install:go_default_library", - "//pkg/internal/apis/meta/install:go_default_library", + "//internal/api/mutation:go_default_library", + "//internal/api/validation:go_default_library", + "//internal/apis/acme/install:go_default_library", + "//internal/apis/certmanager/install:go_default_library", + "//internal/apis/meta/install:go_default_library", "@io_k8s_apimachinery//pkg/runtime:go_default_library", ], ) diff --git a/pkg/webhook/authority/BUILD.bazel b/pkg/webhook/authority/BUILD.bazel index 7b7aee7e0..40c0bb093 100644 --- a/pkg/webhook/authority/BUILD.bazel +++ b/pkg/webhook/authority/BUILD.bazel @@ -7,8 +7,8 @@ go_library( visibility = ["//visibility:public"], deps = [ "//cmd/util:go_default_library", + "//internal/apis/meta:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", - "//pkg/internal/apis/meta:go_default_library", "//pkg/logs:go_default_library", "//pkg/util/pki:go_default_library", "@com_github_go_logr_logr//:go_default_library", diff --git a/pkg/webhook/authority/authority.go b/pkg/webhook/authority/authority.go index e81094371..131a8d442 100644 --- a/pkg/webhook/authority/authority.go +++ b/pkg/webhook/authority/authority.go @@ -45,8 +45,8 @@ import ( "k8s.io/client-go/tools/cache" "github.com/jetstack/cert-manager/cmd/util" + cmmeta "github.com/jetstack/cert-manager/internal/apis/meta" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" - cmmeta "github.com/jetstack/cert-manager/pkg/internal/apis/meta" "github.com/jetstack/cert-manager/pkg/util/pki" ) diff --git a/pkg/webhook/handlers/BUILD.bazel b/pkg/webhook/handlers/BUILD.bazel index 4deff9b30..599177592 100644 --- a/pkg/webhook/handlers/BUILD.bazel +++ b/pkg/webhook/handlers/BUILD.bazel @@ -11,9 +11,9 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/webhook/handlers", visibility = ["//visibility:public"], deps = [ - "//pkg/internal/api/mutation:go_default_library", - "//pkg/internal/api/validation:go_default_library", - "//pkg/internal/apis/certmanager/validation/plugins:go_default_library", + "//internal/api/mutation:go_default_library", + "//internal/api/validation:go_default_library", + "//internal/apis/certmanager/validation/plugins:go_default_library", "//pkg/logs:go_default_library", "@com_github_go_logr_logr//:go_default_library", "@io_k8s_api//admission/v1:go_default_library", @@ -38,8 +38,8 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/internal/api/mutation:go_default_library", - "//pkg/internal/api/validation:go_default_library", + "//internal/api/mutation:go_default_library", + "//internal/api/validation:go_default_library", "//pkg/logs:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup/install:go_default_library", diff --git a/pkg/webhook/handlers/mutation.go b/pkg/webhook/handlers/mutation.go index f4167d32f..67eb438d4 100644 --- a/pkg/webhook/handlers/mutation.go +++ b/pkg/webhook/handlers/mutation.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" - "github.com/jetstack/cert-manager/pkg/internal/api/mutation" + "github.com/jetstack/cert-manager/internal/api/mutation" logf "github.com/jetstack/cert-manager/pkg/logs" ) diff --git a/pkg/webhook/handlers/mutation_test.go b/pkg/webhook/handlers/mutation_test.go index 16eb276aa..d9e188bf4 100644 --- a/pkg/webhook/handlers/mutation_test.go +++ b/pkg/webhook/handlers/mutation_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/klog/v2/klogr" "k8s.io/utils/diff" - "github.com/jetstack/cert-manager/pkg/internal/api/mutation" + "github.com/jetstack/cert-manager/internal/api/mutation" "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/install" ) diff --git a/pkg/webhook/handlers/testdata/apis/testgroup/install/BUILD.bazel b/pkg/webhook/handlers/testdata/apis/testgroup/install/BUILD.bazel index a831aec56..541e06e2a 100644 --- a/pkg/webhook/handlers/testdata/apis/testgroup/install/BUILD.bazel +++ b/pkg/webhook/handlers/testdata/apis/testgroup/install/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/install", visibility = ["//visibility:public"], deps = [ - "//pkg/internal/api/validation:go_default_library", + "//internal/api/validation:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup/v1:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup/v2:go_default_library", diff --git a/pkg/webhook/handlers/testdata/apis/testgroup/install/install.go b/pkg/webhook/handlers/testdata/apis/testgroup/install/install.go index 1de99edb5..509ab07d9 100644 --- a/pkg/webhook/handlers/testdata/apis/testgroup/install/install.go +++ b/pkg/webhook/handlers/testdata/apis/testgroup/install/install.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" + "github.com/jetstack/cert-manager/internal/api/validation" "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup" v1 "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/v1" v2 "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/v2" diff --git a/pkg/webhook/handlers/testdata/apis/testgroup/v2/BUILD.bazel b/pkg/webhook/handlers/testdata/apis/testgroup/v2/BUILD.bazel index e3f04b332..7ee189f54 100644 --- a/pkg/webhook/handlers/testdata/apis/testgroup/v2/BUILD.bazel +++ b/pkg/webhook/handlers/testdata/apis/testgroup/v2/BUILD.bazel @@ -16,7 +16,7 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/v2", visibility = ["//visibility:public"], deps = [ - "//pkg/internal/api/validation:go_default_library", + "//internal/api/validation:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup:go_default_library", "@io_k8s_api//admission/v1:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", diff --git a/pkg/webhook/handlers/testdata/apis/testgroup/v2/register.go b/pkg/webhook/handlers/testdata/apis/testgroup/v2/register.go index ccd704beb..ff05205fd 100644 --- a/pkg/webhook/handlers/testdata/apis/testgroup/v2/register.go +++ b/pkg/webhook/handlers/testdata/apis/testgroup/v2/register.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" + "github.com/jetstack/cert-manager/internal/api/validation" "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup" ) diff --git a/pkg/webhook/handlers/testdata/apis/testgroup/v2/validation.go b/pkg/webhook/handlers/testdata/apis/testgroup/v2/validation.go index cafc017e1..0d53007b1 100644 --- a/pkg/webhook/handlers/testdata/apis/testgroup/v2/validation.go +++ b/pkg/webhook/handlers/testdata/apis/testgroup/v2/validation.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" + "github.com/jetstack/cert-manager/internal/api/validation" ) func ValidateTestType(_ *admissionv1.AdmissionRequest, obj runtime.Object) (field.ErrorList, validation.WarningList) { diff --git a/pkg/webhook/handlers/testdata/apis/testgroup/validation/BUILD.bazel b/pkg/webhook/handlers/testdata/apis/testgroup/validation/BUILD.bazel index e63b67131..5d62e3aac 100644 --- a/pkg/webhook/handlers/testdata/apis/testgroup/validation/BUILD.bazel +++ b/pkg/webhook/handlers/testdata/apis/testgroup/validation/BUILD.bazel @@ -9,7 +9,7 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/validation", visibility = ["//visibility:public"], deps = [ - "//pkg/internal/api/validation:go_default_library", + "//internal/api/validation:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup/v1:go_default_library", "@io_k8s_api//admission/v1:go_default_library", @@ -23,7 +23,7 @@ go_test( srcs = ["validation_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/internal/api/validation:go_default_library", + "//internal/api/validation:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup:go_default_library", "//pkg/webhook/handlers/testdata/apis/testgroup/v1:go_default_library", "@io_k8s_apimachinery//pkg/util/validation/field:go_default_library", diff --git a/pkg/webhook/handlers/testdata/apis/testgroup/validation/register.go b/pkg/webhook/handlers/testdata/apis/testgroup/validation/register.go index 708b3eb04..63a36f9b0 100644 --- a/pkg/webhook/handlers/testdata/apis/testgroup/validation/register.go +++ b/pkg/webhook/handlers/testdata/apis/testgroup/validation/register.go @@ -17,7 +17,7 @@ limitations under the License. package validation import ( - "github.com/jetstack/cert-manager/pkg/internal/api/validation" + "github.com/jetstack/cert-manager/internal/api/validation" "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup" ) diff --git a/pkg/webhook/handlers/testdata/apis/testgroup/validation/validation.go b/pkg/webhook/handlers/testdata/apis/testgroup/validation/validation.go index 60819548a..ea7f42a5b 100644 --- a/pkg/webhook/handlers/testdata/apis/testgroup/validation/validation.go +++ b/pkg/webhook/handlers/testdata/apis/testgroup/validation/validation.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" + "github.com/jetstack/cert-manager/internal/api/validation" "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup" v1 "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/v1" ) diff --git a/pkg/webhook/handlers/testdata/apis/testgroup/validation/validation_test.go b/pkg/webhook/handlers/testdata/apis/testgroup/validation/validation_test.go index cee07d399..1ccb1fc84 100644 --- a/pkg/webhook/handlers/testdata/apis/testgroup/validation/validation_test.go +++ b/pkg/webhook/handlers/testdata/apis/testgroup/validation/validation_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" + "github.com/jetstack/cert-manager/internal/api/validation" "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup" v1 "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/v1" ) diff --git a/pkg/webhook/handlers/validation.go b/pkg/webhook/handlers/validation.go index f416f6d6b..39452778f 100644 --- a/pkg/webhook/handlers/validation.go +++ b/pkg/webhook/handlers/validation.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/client-go/kubernetes" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/validation/plugins" + "github.com/jetstack/cert-manager/internal/api/validation" + "github.com/jetstack/cert-manager/internal/apis/certmanager/validation/plugins" ) type registryBackedValidator struct { diff --git a/pkg/webhook/handlers/validation_test.go b/pkg/webhook/handlers/validation_test.go index ac94cbf21..ff3227160 100644 --- a/pkg/webhook/handlers/validation_test.go +++ b/pkg/webhook/handlers/validation_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" + "github.com/jetstack/cert-manager/internal/api/validation" logf "github.com/jetstack/cert-manager/pkg/logs" "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/install" v1 "github.com/jetstack/cert-manager/pkg/webhook/handlers/testdata/apis/testgroup/v1" diff --git a/pkg/webhook/scheme.go b/pkg/webhook/scheme.go index ad7269913..421963016 100644 --- a/pkg/webhook/scheme.go +++ b/pkg/webhook/scheme.go @@ -19,11 +19,11 @@ package webhook import ( "k8s.io/apimachinery/pkg/runtime" - "github.com/jetstack/cert-manager/pkg/internal/api/mutation" - "github.com/jetstack/cert-manager/pkg/internal/api/validation" - acmeinstall "github.com/jetstack/cert-manager/pkg/internal/apis/acme/install" - cminstall "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/install" - metainstall "github.com/jetstack/cert-manager/pkg/internal/apis/meta/install" + "github.com/jetstack/cert-manager/internal/api/mutation" + "github.com/jetstack/cert-manager/internal/api/validation" + acmeinstall "github.com/jetstack/cert-manager/internal/apis/acme/install" + cminstall "github.com/jetstack/cert-manager/internal/apis/certmanager/install" + metainstall "github.com/jetstack/cert-manager/internal/apis/meta/install" ) // Define a Scheme that has all cert-manager API types registered, including