Rename the directories for rekor-cli and rekor-server.

This makes the binaries "go installable" by their canonical names.

Signed-off-by: Dan Lorenc <dlorenc@google.com>

Author: Dan Lorenc

.gitignore

@@ -2,7 +2,8 @@
 .vscode/*
 /cli
 logid
-rekor-cli
-rekor-server
+/rekor-cli
+/rekor-server
+/tests/rekor-server
 /server
 swagger

Dockerfile

@@ -9,14 +9,14 @@ RUN go mod download
 # Add source code
 ADD ./ $APP_ROOT/src/
 
-RUN go build ./cmd/server
-RUN CGO_ENABLED=0 go build -gcflags "all=-N -l" -o server_debug ./cmd/server
+RUN go build ./cmd/rekor-server
+RUN CGO_ENABLED=0 go build -gcflags "all=-N -l" -o rekor-server_debug ./cmd/rekor-server
 
 # Multi-Stage production build
 FROM golang:1.16.2 as deploy
 
 # Retrieve the binary from the previous stage
-COPY --from=builder /opt/app-root/src/server /usr/local/bin/rekor-server
+COPY --from=builder /opt/app-root/src/rekor-server /usr/local/bin/rekor-server
 
 # Set the binary as the entrypoint of the container
 CMD ["rekor-server", "serve"]
@@ -26,4 +26,4 @@ FROM deploy as debug
 RUN go get github.com/go-delve/delve/cmd/dlv
 
 # overwrite server and include debugger
-COPY --from=builder /opt/app-root/src/server_debug /usr/local/bin/rekor-server
+COPY --from=builder /opt/app-root/src/rekor-server_debug /usr/local/bin/rekor-server

Makefile

@@ -21,10 +21,10 @@ gosec:
 	$(GOBIN)/gosec ./...
 
 cli: $(SRCS)
-	go build ./cmd/cli
+	go build ./cmd/rekor-cli
 
 server: $(SRCS)
-	go build ./cmd/server
+	go build ./cmd/rekor-server
 
 test:
 	go test ./...

cmd/cli/app/format/wrap.go cmd/rekor-cli/app/format/wrap.gocmd/cli/app/format/wrap.go renamed to cmd/rekor-cli/app/format/wrap.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/go-openapi/runtime"
-	"github.com/sigstore/rekor/cmd/cli/app/format"
+	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
 	"github.com/sigstore/rekor/pkg/generated/client/entries"
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/log"

cmd/cli/app/get.go cmd/rekor-cli/app/get.gocmd/cli/app/get.go renamed to cmd/rekor-cli/app/get.go

@@ -27,15 +27,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/sigstore/rekor/cmd/cli/app/state"
+	"github.com/sigstore/rekor/cmd/rekor-cli/app/state"
 
 	"github.com/google/trillian"
 	tclient "github.com/google/trillian/client"
 	tcrypto "github.com/google/trillian/crypto"
 	"github.com/google/trillian/merkle/logverifier"
 	rfc6962 "github.com/google/trillian/merkle/rfc6962/hasher"
 
-	"github.com/sigstore/rekor/cmd/cli/app/format"
+	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
 	"github.com/sigstore/rekor/pkg/generated/client/tlog"
 	"github.com/sigstore/rekor/pkg/log"
 	"github.com/spf13/cobra"

cmd/cli/app/log_info.go cmd/rekor-cli/app/log_info.gocmd/cli/app/log_info.go renamed to cmd/rekor-cli/app/log_info.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/sigstore/rekor/cmd/cli/app/format"
+	"github.com/sigstore/rekor/cmd/rekor-cli/app/format"
 	"github.com/sigstore/rekor/pkg/generated/client/tlog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"