Move the KMS integration imports into the binary entrypoints (sigstor…

…e#1744) * Move the KMS integration imports into the binary entrypoints Related: sigstore/sigstore#384 Related: sigstore/sigstore#386 Signed-off-by: Matt Moore <[email protected]> * Remove the fake import Signed-off-by: Matt Moore <[email protected]>
mlieberman85 · May 6, 2022 · 3e45ffd · 3e45ffd
1 parent 6ccaeaa
commit 3e45ffd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 (