From eb0200a289e43359fde58c1a88409767a51cd8ad Mon Sep 17 00:00:00 2001
From: dlorenc <dlorenc@google.com>
Date: Thu, 11 Mar 2021 09:17:53 -0600
Subject: [PATCH] Actually rename the directory correctly. (#70)

Signed-off-by: Dan Lorenc <dlorenc@google.com>
---
 cmd/cosign/{ => cli}/download.go          | 0
 cmd/cosign/{ => cli}/generate.go          | 0
 cmd/cosign/{ => cli}/generate_key_pair.go | 0
 cmd/cosign/{ => cli}/sign.go              | 0
 cmd/cosign/{ => cli}/sign_blob.go         | 0
 cmd/cosign/{ => cli}/triangulate.go       | 0
 cmd/cosign/{ => cli}/upload.go            | 0
 cmd/cosign/{ => cli}/verify.go            | 0
 cmd/cosign/{ => cli}/verify_blob.go       | 0
 cmd/{ => cosign}/main.go                  | 2 +-
 test/e2e_test.go                          | 2 +-
 11 files changed, 2 insertions(+), 2 deletions(-)
 rename cmd/cosign/{ => cli}/download.go (100%)
 rename cmd/cosign/{ => cli}/generate.go (100%)
 rename cmd/cosign/{ => cli}/generate_key_pair.go (100%)
 rename cmd/cosign/{ => cli}/sign.go (100%)
 rename cmd/cosign/{ => cli}/sign_blob.go (100%)
 rename cmd/cosign/{ => cli}/triangulate.go (100%)
 rename cmd/cosign/{ => cli}/upload.go (100%)
 rename cmd/cosign/{ => cli}/verify.go (100%)
 rename cmd/cosign/{ => cli}/verify_blob.go (100%)
 rename cmd/{ => cosign}/main.go (97%)

diff --git a/cmd/cosign/download.go b/cmd/cosign/cli/download.go
similarity index 100%
rename from cmd/cosign/download.go
rename to cmd/cosign/cli/download.go
diff --git a/cmd/cosign/generate.go b/cmd/cosign/cli/generate.go
similarity index 100%
rename from cmd/cosign/generate.go
rename to cmd/cosign/cli/generate.go
diff --git a/cmd/cosign/generate_key_pair.go b/cmd/cosign/cli/generate_key_pair.go
similarity index 100%
rename from cmd/cosign/generate_key_pair.go
rename to cmd/cosign/cli/generate_key_pair.go
diff --git a/cmd/cosign/sign.go b/cmd/cosign/cli/sign.go
similarity index 100%
rename from cmd/cosign/sign.go
rename to cmd/cosign/cli/sign.go
diff --git a/cmd/cosign/sign_blob.go b/cmd/cosign/cli/sign_blob.go
similarity index 100%
rename from cmd/cosign/sign_blob.go
rename to cmd/cosign/cli/sign_blob.go
diff --git a/cmd/cosign/triangulate.go b/cmd/cosign/cli/triangulate.go
similarity index 100%
rename from cmd/cosign/triangulate.go
rename to cmd/cosign/cli/triangulate.go
diff --git a/cmd/cosign/upload.go b/cmd/cosign/cli/upload.go
similarity index 100%
rename from cmd/cosign/upload.go
rename to cmd/cosign/cli/upload.go
diff --git a/cmd/cosign/verify.go b/cmd/cosign/cli/verify.go
similarity index 100%
rename from cmd/cosign/verify.go
rename to cmd/cosign/cli/verify.go
diff --git a/cmd/cosign/verify_blob.go b/cmd/cosign/cli/verify_blob.go
similarity index 100%
rename from cmd/cosign/verify_blob.go
rename to cmd/cosign/cli/verify_blob.go
diff --git a/cmd/main.go b/cmd/cosign/main.go
similarity index 97%
rename from cmd/main.go
rename to cmd/cosign/main.go
index a1fdffa15..8f17227e2 100644
--- a/cmd/main.go
+++ b/cmd/cosign/main.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/google/go-containerregistry/pkg/logs"
 	"github.com/peterbourgon/ff/v3/ffcli"
-	cli "github.com/sigstore/cosign/cmd/cosign"
+	"github.com/sigstore/cosign/cmd/cosign/cli"
 )
 
 var (
diff --git a/test/e2e_test.go b/test/e2e_test.go
index b60526d9d..2685cf8ff 100644
--- a/test/e2e_test.go
+++ b/test/e2e_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/google/go-containerregistry/pkg/v1/random"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
-	cli "github.com/sigstore/cosign/cmd/cosign"
+	"github.com/sigstore/cosign/cmd/cosign/cli"
 )
 
 var keyPass = []byte("hello")