get most tests to pass

api/server/shared/apitest/config.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/porter-dev/porter/api/server/shared/config"
 	"github.com/porter-dev/porter/api/server/shared/config/loader"
+	"github.com/porter-dev/porter/internal/analytics"
 	"github.com/porter-dev/porter/internal/auth/sessionstore"
 	"github.com/porter-dev/porter/internal/auth/token"
 	"github.com/porter-dev/porter/internal/logger"
@@ -49,12 +50,13 @@ func (t *TestConfigLoader) LoadConfig() (*config.Config, error) {
 	notifier := NewFakeUserNotifier()
 
 	return &config.Config{
-		Logger:       l,
-		Repo:         repo,
-		Store:        store,
-		ServerConf:   envConf.ServerConf,
-		TokenConf:    tokenConf,
-		UserNotifier: notifier,
+		Logger:          l,
+		Repo:            repo,
+		Store:           store,
+		ServerConf:      envConf.ServerConf,
+		TokenConf:       tokenConf,
+		UserNotifier:    notifier,
+		AnalyticsClient: analytics.InitializeAnalyticsSegmentClient("", l),
 	}, nil
 }
 

cli/cmd/run.go

@@ -314,7 +314,7 @@ func executeRunEphemeral(config *PorterRunSharedConfig, namespace, name, contain
 		writtenBytes, _ = pipePodLogsToStdout(config, namespace, podName, container, false)
 
 		if verbose || writtenBytes == 0 {
-			color.New(color.FgYellow).Println("Could not get logs. Pod events:\n")
+			color.New(color.FgYellow).Println("Could not get logs. Pod events:")
 			pipeEventsToStdout(config, namespace, podName, container, false)
 		}
 		return nil
@@ -360,7 +360,7 @@ func executeRunEphemeral(config *PorterRunSharedConfig, namespace, name, contain
 	}
 
 	if verbose {
-		color.New(color.FgYellow).Println("Pod events:\n")
+		color.New(color.FgYellow).Println("Pod events:")
 		pipeEventsToStdout(config, namespace, podName, container, false)
 	}
 
@@ -435,13 +435,13 @@ func handlePodAttachError(err error, config *PorterRunSharedConfig, namespace, p
 	if verbose {
 		color.New(color.FgYellow).Printf("Error: %s\n", err)
 	}
-	color.New(color.FgYellow).Println("Could not open a shell to this container. Container logs:\n")
+	color.New(color.FgYellow).Println("Could not open a shell to this container. Container logs:")
 
 	var writtenBytes int64
 	writtenBytes, _ = pipePodLogsToStdout(config, namespace, podName, container, false)
 
 	if verbose || writtenBytes == 0 {
-		color.New(color.FgYellow).Println("Could not get logs. Pod events:\n")
+		color.New(color.FgYellow).Println("Could not get logs. Pod events:")
 		pipeEventsToStdout(config, namespace, podName, container, false)
 	}
 	return err

api/server/router/router_test.go → cmd/dev/main.go

@@ -1,26 +1,35 @@
-package router_test
+package main
 
 import (
+	"fmt"
 	"net/http"
 	"strings"
-	"testing"
 
 	"github.com/go-chi/chi"
 	"github.com/porter-dev/porter/api/server/router"
 	"github.com/porter-dev/porter/api/server/shared/apitest"
 )
 
-func TestRouter(t *testing.T) {
+func main() {
 	walkFunc := func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
 		route = strings.Replace(route, "/*/", "/", -1)
-		t.Errorf("%s %s %d\n", method, route, len(middlewares))
+		fmt.Printf("%s %s %d\n", method, route, len(middlewares))
 		return nil
 	}
 
-	config := apitest.LoadConfig(t)
+	configLoader := apitest.NewTestConfigLoader(true)
+
+	config, err := configLoader.LoadConfig()
+
+	if err != nil {
+		fmt.Printf("Logging err: %s\n", err.Error())
+		return
+	}
+
 	r := router.NewAPIRouter(config)
 
 	if err := chi.Walk(r, walkFunc); err != nil {
-		t.Fatalf("Logging err: %s\n", err.Error())
+		fmt.Printf("Logging err: %s\n", err.Error())
+		return
 	}
 }

cmd/migrate/keyrotate/rotate_test.go

@@ -39,7 +39,7 @@ func TestClusterModelRotation(t *testing.T) {
 
 	clusters := []*models.Cluster{}
 
-	if err := tester.DB.Preload("TokenCache").Find(&clusters).Error; err != nil {
+	if err := tester.DB.Find(&clusters).Error; err != nil {
 		t.Fatalf("%v\n", err)
 	}
 

internal/repository/gorm/cluster.go

@@ -297,9 +297,10 @@ func (repo *ClusterRepository) DeleteCluster(
 	cluster *models.Cluster,
 ) error {
 	// clear TokenCache association
-	if err := repo.db.Where("id = ?", cluster.TokenCacheID).Delete(&ints.TokenCache{}).Error; err != nil {
+	if err := repo.db.Where("id = ?", cluster.TokenCacheID).Delete(&ints.ClusterTokenCache{}).Error; err != nil {
 		return err
 	}
+
 	if err := repo.db.Where("id = ?", cluster.ID).Delete(&models.Cluster{}).Error; err != nil {
 		return err
 	}

internal/repository/gorm/cluster_test.go

@@ -250,7 +250,10 @@ func TestCreateCluster(t *testing.T) {
 	}
 
 	// reset fields for deep.Equal
+	expCluster.TokenCacheID = 1
+	expCluster.TokenCache.ClusterID = 1
 	cluster.Model = orm.Model{}
+	cluster.TokenCache.Model = orm.Model{}
 
 	if diff := deep.Equal(expCluster, *cluster); diff != nil {
 		t.Errorf("incorrect cluster")
@@ -287,12 +290,14 @@ func TestListClustersByProjectID(t *testing.T) {
 		Server:                   "https://localhost",
 		KubeIntegrationID:        tester.initKIs[0].ID,
 		CertificateAuthorityData: []byte("-----BEGIN"),
+		TokenCacheID:             1,
 	}
 
 	cluster := clusters[0]
 
 	// reset fields for reflect.DeepEqual
 	cluster.Model = orm.Model{}
+	cluster.TokenCache.Model = orm.Model{}
 
 	if diff := deep.Equal(expCluster, *cluster); diff != nil {
 		t.Errorf("incorrect cluster")
@@ -331,10 +336,15 @@ func TestUpdateCluster(t *testing.T) {
 		Server:                   "https://localhost",
 		KubeIntegrationID:        tester.initKIs[0].ID,
 		CertificateAuthorityData: []byte("-----BEGIN"),
+		TokenCacheID:             1,
+		TokenCache: ints.ClusterTokenCache{
+			ClusterID: 1,
+		},
 	}
 
 	// reset fields for reflect.DeepEqual
 	cluster.Model = orm.Model{}
+	cluster.TokenCache.Model = orm.Model{}
 
 	if diff := deep.Equal(expCluster, *cluster); diff != nil {
 		t.Errorf("incorrect cluster")