From 19279dd169a3c1b114790323d1419845687f3363 Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Tue, 12 Apr 2022 13:19:52 -0700 Subject: [PATCH] Move the KMS integration imports into the binary entrypoints (#1744) * Move the KMS integration imports into the binary entrypoints Related: https://github.com/sigstore/sigstore/issues/384 Related: https://github.com/sigstore/sigstore/issues/386 Signed-off-by: Matt Moore * Remove the fake import Signed-off-by: Matt Moore --- cmd/cosign/main.go | 6 ++++++ cmd/cosign/policy_webhook/main.go | 6 ++++++ pkg/reconciler/clusterimagepolicy/clusterimagepolicy.go | 7 ------- pkg/signature/keys.go | 6 ------ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cmd/cosign/main.go b/cmd/cosign/main.go index d6d1b89c230..00bb0b81ede 100644 --- a/cmd/cosign/main.go +++ b/cmd/cosign/main.go @@ -21,6 +21,12 @@ import ( "strings" "github.com/sigstore/cosign/cmd/cosign/cli" + + // Register the provider-specific plugins + _ "github.com/sigstore/sigstore/pkg/signature/kms/aws" + _ "github.com/sigstore/sigstore/pkg/signature/kms/azure" + _ "github.com/sigstore/sigstore/pkg/signature/kms/gcp" + _ "github.com/sigstore/sigstore/pkg/signature/kms/hashivault" ) func main() { diff --git a/cmd/cosign/policy_webhook/main.go b/cmd/cosign/policy_webhook/main.go index da136e19303..44a4700419d 100644 --- a/cmd/cosign/policy_webhook/main.go +++ b/cmd/cosign/policy_webhook/main.go @@ -34,6 +34,12 @@ import ( "github.com/sigstore/cosign/pkg/apis/cosigned/v1alpha1" "github.com/sigstore/cosign/pkg/reconciler/clusterimagepolicy" + + // Register the provider-specific plugins + _ "github.com/sigstore/sigstore/pkg/signature/kms/aws" + _ "github.com/sigstore/sigstore/pkg/signature/kms/azure" + _ "github.com/sigstore/sigstore/pkg/signature/kms/gcp" + _ "github.com/sigstore/sigstore/pkg/signature/kms/hashivault" ) func main() { diff --git a/pkg/reconciler/clusterimagepolicy/clusterimagepolicy.go b/pkg/reconciler/clusterimagepolicy/clusterimagepolicy.go index 7b95067a3af..5ccfd51cb8e 100644 --- a/pkg/reconciler/clusterimagepolicy/clusterimagepolicy.go +++ b/pkg/reconciler/clusterimagepolicy/clusterimagepolicy.go @@ -44,13 +44,6 @@ import ( sigs "github.com/sigstore/cosign/pkg/signature" "github.com/sigstore/sigstore/pkg/signature/kms" signatureoptions "github.com/sigstore/sigstore/pkg/signature/options" - - // Register the provider-specific plugins - _ "github.com/sigstore/sigstore/pkg/signature/kms/aws" - _ "github.com/sigstore/sigstore/pkg/signature/kms/azure" - _ "github.com/sigstore/sigstore/pkg/signature/kms/fake" - _ "github.com/sigstore/sigstore/pkg/signature/kms/gcp" - _ "github.com/sigstore/sigstore/pkg/signature/kms/hashivault" ) // Reconciler implements clusterimagepolicyreconciler.Interface for diff --git a/pkg/signature/keys.go b/pkg/signature/keys.go index 3fa1310354e..775be117d15 100644 --- a/pkg/signature/keys.go +++ b/pkg/signature/keys.go @@ -35,12 +35,6 @@ import ( "github.com/sigstore/sigstore/pkg/signature" "github.com/sigstore/sigstore/pkg/signature/kms" - - // Register the provider-specific plugins - _ "github.com/sigstore/sigstore/pkg/signature/kms/aws" - _ "github.com/sigstore/sigstore/pkg/signature/kms/azure" - _ "github.com/sigstore/sigstore/pkg/signature/kms/gcp" - _ "github.com/sigstore/sigstore/pkg/signature/kms/hashivault" ) var (