's|github.com/transparency-dev/trillian-tessera/personalities/sctfe|github.com/transparency-dev/static-ct|g'

Author: phbnf

README.md

@@ -27,7 +27,7 @@ To re-generate these files, first install the right tools:
 
 Then, generate the files:
 ```bash
-cd $(go list -f '{{ .Dir }}' github.com/transparency-dev/trillian-tessera/personalities/sctfe); \
+cd $(go list -f '{{ .Dir }}' github.com/transparency-dev/static-ct); \
 go generate -x ./...  # hunts for //go:generate comments and runs them
 ```
 

cert_checker_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/google/certificate-transparency-go/x509"
 	"github.com/google/certificate-transparency-go/x509/pkix"
 	"github.com/google/certificate-transparency-go/x509util"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/testdata"
+	"github.com/transparency-dev/static-ct/testdata"
 )
 
 func wipeExtensions(cert *x509.Certificate) *x509.Certificate {

ct_server_gcp/main.go

@@ -34,10 +34,10 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/rs/cors"
 	tessera "github.com/transparency-dev/trillian-tessera"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/modules/dedup"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/storage/bbolt"
-	gcpSCTFE "github.com/transparency-dev/trillian-tessera/personalities/sctfe/storage/gcp"
+	"github.com/transparency-dev/static-ct"
+	"github.com/transparency-dev/static-ct/modules/dedup"
+	"github.com/transparency-dev/static-ct/storage/bbolt"
+	gcpSCTFE "github.com/transparency-dev/static-ct/storage/gcp"
 	gcpTessera "github.com/transparency-dev/trillian-tessera/storage/gcp"
 	"golang.org/x/mod/sumdb/note"
 	"k8s.io/klog/v2"
@@ -111,22 +111,16 @@ func main() {
 
 	// Register handlers for all the configured logs using the correct RPC
 	// client.
-	opts := sctfe.InstanceOptions{
-		Validated:          vCfg,
-		Deadline:           *rpcDeadline,
-		MetricFactory:      prometheus.MetricFactory{},
-		RequestLog:         new(sctfe.DefaultRequestLog),
-		MaskInternalErrors: *maskInternalErrors,
-		CreateStorage:      newGCPStorage,
-	}
-
-	inst, err := sctfe.SetUpInstance(ctx, opts)
+	// TODO(phboneff): setupAndRegister can probably be inlined / removed later
+	_, err = setupAndRegister(ctx,
+		*rpcDeadline,
+		vCfg,
+		corsMux,
+		*maskInternalErrors,
+	)
 	if err != nil {
 		klog.Exitf("Failed to set up log instance for %+v: %v", vCfg, err)
 	}
-	for path, handler := range inst.Handlers {
-		corsMux.Handle(path, handler)
-	}
 
 	// Return a 200 on the root, for GCE default health checking :/
 	corsMux.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
@@ -227,6 +221,26 @@ func awaitSignal(doneFn func()) {
 	doneFn()
 }
 
+func setupAndRegister(ctx context.Context, deadline time.Duration, vCfg *sctfe.ValidatedLogConfig, mux *http.ServeMux, maskInternalErrors bool) (*sctfe.Instance, error) {
+	opts := sctfe.InstanceOptions{
+		Validated:          vCfg,
+		Deadline:           deadline,
+		MetricFactory:      prometheus.MetricFactory{},
+		RequestLog:         new(sctfe.DefaultRequestLog),
+		MaskInternalErrors: maskInternalErrors,
+		CreateStorage:      newGCPStorage,
+	}
+
+	inst, err := sctfe.SetUpInstance(ctx, opts)
+	if err != nil {
+		return nil, err
+	}
+	for path, handler := range inst.Handlers {
+		mux.Handle(path, handler)
+	}
+	return inst, nil
+}
+
 func newGCPStorage(ctx context.Context, signer note.Signer) (*sctfe.CTStorage, error) {
 	gcpCfg := gcpTessera.Config{
 		ProjectID: *projectID,

handlers_test.go

@@ -36,8 +36,8 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/trillian/monitoring"
 	"github.com/transparency-dev/trillian-tessera/ctonly"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/mockstorage"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/testdata"
+	"github.com/transparency-dev/static-ct/mockstorage"
+	"github.com/transparency-dev/static-ct/testdata"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"

instance_test.go

@@ -199,7 +199,7 @@ func TestSetUpInstanceSetsValidationOpts(t *testing.T) {
 
 	signer, err := pem.ReadPrivateKeyFile("./testdata/ct-http-server.privkey.pem", "dirk")
 	if err != nil {
-		t.Fatalf(fmt.Sprintf("Can't open key: %v", err))
+		t.Fatalf("Can't open key: %v", err)
 	}
 
 	var tests = []struct {

mockstorage/gen.go

@@ -15,4 +15,4 @@
 // Package mockclient provides a mockable version of the Trillian log client API.
 package mockstorage
 
-//go:generate mockgen -package mockstorage -destination mock_ct_storage.go github.com/transparency-dev/trillian-tessera/personalities/sctfe Storage
+//go:generate mockgen -package mockstorage -destination mock_ct_storage.go github.com/transparency-dev/static-ct Storage

mockstorage/mock_ct_storage.go

@@ -3,4 +3,4 @@
 
 package sctfe
 
-//go:generate sh -c "protoc -I=. -I$(go list -f '{{ .Dir }}' github.com/google/trillian) -I$(go list -f '{{ .Dir }}' github.com/transparency-dev/trillian-tessera/personalities/sctfe) --go_out=paths=source_relative:. configpb/config.proto"
+//go:generate sh -c "protoc -I=. -I$(go list -f '{{ .Dir }}' github.com/google/trillian) -I$(go list -f '{{ .Dir }}' github.com/transparency-dev/static-ct) --go_out=paths=source_relative:. configpb/config.proto"

proto_gen.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/google/certificate-transparency-go/tls"
 	"github.com/transparency-dev/formats/log"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/modules/dedup"
+	"github.com/transparency-dev/static-ct/modules/dedup"
 	"golang.org/x/crypto/cryptobyte"
 	"golang.org/x/mod/sumdb/note"
 

serialize.go

@@ -23,7 +23,7 @@ import (
 	"github.com/google/certificate-transparency-go/x509"
 	"github.com/google/certificate-transparency-go/x509util"
 	"github.com/kylelemons/godebug/pretty"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/testdata"
+	"github.com/transparency-dev/static-ct/testdata"
 
 	ct "github.com/google/certificate-transparency-go"
 )

serialize_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/google/certificate-transparency-go/x509"
 	tessera "github.com/transparency-dev/trillian-tessera"
 	"github.com/transparency-dev/trillian-tessera/ctonly"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/modules/dedup"
+	"github.com/transparency-dev/static-ct/modules/dedup"
 	"k8s.io/klog/v2"
 )
 

storage.go

@@ -31,7 +31,7 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/modules/dedup"
+	"github.com/transparency-dev/static-ct/modules/dedup"
 
 	bolt "go.etcd.io/bbolt"
 	"k8s.io/klog/v2"

storage/bbolt/dedup.go

@@ -20,7 +20,7 @@ import (
 
 	"cloud.google.com/go/spanner"
 	"cloud.google.com/go/spanner/apiv1/spannerpb"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/modules/dedup"
+	"github.com/transparency-dev/static-ct/modules/dedup"
 	"google.golang.org/grpc/codes"
 )
 

storage/gcp/dedup.go

@@ -21,7 +21,7 @@ import (
 	"path"
 
 	gcs "cloud.google.com/go/storage"
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe"
+	"github.com/transparency-dev/static-ct"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/iterator"
 	"k8s.io/klog/v2"

storage/gcp/issuers.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/transparency-dev/trillian-tessera/personalities/sctfe/testdata"
+	"github.com/transparency-dev/static-ct/testdata"
 )
 
 var (