Makes ACME EAB key algo warning value unexported

Signed-off-by: irbekrm <irbekrm@gmail.com>
Art4Tech · May 11, 2021 · 6cb57c4 · 6cb57c4
1 parent f46aad2
commit 6cb57c4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/pkg/api/util/BUILD.bazel b/pkg/api/util/BUILD.bazel
@@ -8,7 +8,6 @@ go_library(
         "issuers.go",
         "names.go",
         "usages.go",
-        "warnings.go",
     ],
     importpath = "github.com/jetstack/cert-manager/pkg/api/util",
     visibility = ["//visibility:public"],

diff --git a/pkg/internal/apis/certmanager/validation/BUILD.bazel b/pkg/internal/apis/certmanager/validation/BUILD.bazel
@@ -9,6 +9,7 @@ go_library(
         "clusterissuer.go",
         "issuer.go",
         "register.go",
+        "warnings.go",
     ],
     importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/certmanager/validation",
     visibility = ["//visibility:public"],
@@ -42,7 +43,6 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/api/util:go_default_library",
         "//pkg/apis/certmanager/v1:go_default_library",
         "//pkg/internal/api/validation:go_default_library",
         "//pkg/internal/apis/acme:go_default_library",

diff --git a/pkg/internal/apis/certmanager/validation/issuer.go b/pkg/internal/apis/certmanager/validation/issuer.go
@@ -26,7 +26,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	apiutil "github.com/jetstack/cert-manager/pkg/api/util"
 	"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"
@@ -123,7 +122,7 @@ func ValidateACMEIssuerConfig(iss *cmacme.ACMEIssuer, fldPath *field.Path) (fiel
 		el = append(el, ValidateSecretKeySelector(&eab.Key, eabFldPath.Child("keySecretRef"))...)
 
 		if len(eab.KeyAlgorithm) != 0 {
-			warnings = append(warnings, apiutil.DeprecatedACMEEABKeyAlgorithmField)
+			warnings = append(warnings, deprecatedACMEEABKeyAlgorithmField)
 		}
 	}
 

diff --git a/pkg/internal/apis/certmanager/validation/issuer_test.go b/pkg/internal/apis/certmanager/validation/issuer_test.go
@@ -25,7 +25,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
-	apiutil "github.com/jetstack/cert-manager/pkg/api/util"
 	"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"
@@ -205,7 +204,7 @@ func TestValidateACMEIssuerConfig(t *testing.T) {
 					},
 				},
 			},
-			warnings: validation.WarningList{apiutil.DeprecatedACMEEABKeyAlgorithmField},
+			warnings: validation.WarningList{deprecatedACMEEABKeyAlgorithmField},
 		},
 		"acme solver with missing http01 config type": {
 			spec: &cmacme.ACMEIssuer{

diff --git a/pkg/api/util/warnings.go → ...l/apis/certmanager/validation/warnings.go b/pkg/api/util/warnings.go → ...l/apis/certmanager/validation/warnings.go
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package validation
 
 // Warning values thrown by validating webhook
 // https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/
 const (
-	// DeprecatedACMEEABKeyAlgorithmField is raised when the deprecated keyAlgorithm field for an ACME issuer's external account binding (EAB) is set.
-	DeprecatedACMEEABKeyAlgorithmField = "ACME issuer spec field 'externalAccount.keyAlgorithm' is deprecated. The value of this field will be ignored."
+	// deprecatedACMEEABKeyAlgorithmField is raised when the deprecated keyAlgorithm field for an ACME issuer's external account binding (EAB) is set.
+	deprecatedACMEEABKeyAlgorithmField = "ACME issuer spec field 'externalAccount.keyAlgorithm' is deprecated. The value of this field will be ignored."
 )