fix test cases

api/server/shared/apitest/config.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/porter-dev/porter/api/server/shared/config"
-	"github.com/porter-dev/porter/api/server/shared/config/loader"
+	"github.com/porter-dev/porter/api/server/shared/config/envloader"
 	"github.com/porter-dev/porter/internal/analytics"
 	"github.com/porter-dev/porter/internal/auth/sessionstore"
 	"github.com/porter-dev/porter/internal/auth/token"
@@ -27,7 +27,7 @@ func (t *TestConfigLoader) LoadConfig() (*config.Config, error) {
 	l := logger.New(true, os.Stdout)
 	repo := test.NewRepository(t.canQuery, t.failingRepoMethods...)
 
-	envConf, err := loader.FromEnv()
+	envConf, err := envloader.FromEnv()
 
 	if err != nil {
 		return nil, err

api/server/shared/config/loader/envloader.go → api/server/shared/config/envloader/envloader.go

@@ -1,4 +1,4 @@
-package loader
+package envloader
 
 import (
 	"fmt"

api/server/shared/config/loader/loader.go

@@ -9,6 +9,7 @@ import (
 	"github.com/porter-dev/porter/api/server/shared/apierrors/alerter"
 	"github.com/porter-dev/porter/api/server/shared/config"
 	"github.com/porter-dev/porter/api/server/shared/config/env"
+	"github.com/porter-dev/porter/api/server/shared/config/envloader"
 	"github.com/porter-dev/porter/api/server/shared/websocket"
 	"github.com/porter-dev/porter/internal/adapter"
 	"github.com/porter-dev/porter/internal/analytics"
@@ -29,7 +30,7 @@ import (
 )
 
 var InstanceBillingManager billing.BillingManager
-var InstanceEnvConf *EnvConf
+var InstanceEnvConf *envloader.EnvConf
 var InstanceDB *pgorm.DB
 
 type EnvConfigLoader struct {
@@ -41,8 +42,15 @@ func NewEnvLoader(version string) config.ConfigLoader {
 }
 
 func sharedInit() {
-	InstanceEnvConf, _ = FromEnv()
-	InstanceDB, _ = adapter.New(InstanceEnvConf.DBConf)
+	var err error
+	InstanceEnvConf, _ = envloader.FromEnv()
+
+	InstanceDB, err = adapter.New(InstanceEnvConf.DBConf)
+
+	if err != nil {
+		panic(err)
+	}
+
 	InstanceBillingManager = &billing.NoopBillingManager{}
 }
 

cmd/migrate/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/porter-dev/porter/api/server/shared/config/loader"
+	"github.com/porter-dev/porter/api/server/shared/config/envloader"
 	"github.com/porter-dev/porter/cmd/migrate/keyrotate"
 
 	adapter "github.com/porter-dev/porter/internal/adapter"
@@ -17,7 +17,7 @@ func main() {
 	logger := lr.NewConsole(true)
 	logger.Info().Msg("running migrations")
 
-	envConf, err := loader.FromEnv()
+	envConf, err := envloader.FromEnv()
 
 	if err != nil {
 		logger.Fatal().Err(err).Msg("could not load env conf")

cmd/ready/main.go

@@ -5,14 +5,14 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/porter-dev/porter/api/server/shared/config/loader"
+	"github.com/porter-dev/porter/api/server/shared/config/envloader"
 	lr "github.com/porter-dev/porter/internal/logger"
 )
 
 func main() {
 	logger := lr.NewConsole(true)
 
-	envConf, err := loader.FromEnv()
+	envConf, err := envloader.FromEnv()
 
 	if err != nil {
 		logger.Fatal().Err(err).Msg("")

internal/repository/test/repository.go

@@ -166,5 +166,6 @@ func NewRepository(canQuery bool, failingMethods ...string) repository.Repositor
 		slackIntegration:          NewSlackIntegrationRepository(canQuery),
 		notificationConfig:        NewNotificationConfigRepository(canQuery),
 		event:                     NewEventRepository(canQuery),
+		projectUsage:              NewProjectUsageRepository(canQuery),
 	}
 }