fix compilation errors

cmd/migrate/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/porter-dev/porter/api/server/shared/envloader"
+	"github.com/porter-dev/porter/api/server/shared/config/loader"
 	"github.com/porter-dev/porter/cmd/migrate/keyrotate"
 
 	adapter "github.com/porter-dev/porter/internal/adapter"
@@ -18,7 +18,7 @@ func main() {
 	logger := lr.NewConsole(true)
 	fmt.Println("running migrations...")
 
-	envConf, err := envloader.FromEnv()
+	envConf, err := loader.FromEnv()
 
 	if err != nil {
 		logger.Fatal().Err(err).Msg("")

cmd/ready/main.go

@@ -5,19 +5,27 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/porter-dev/porter/internal/config"
+	"github.com/porter-dev/porter/api/server/shared/config/loader"
+	lr "github.com/porter-dev/porter/internal/logger"
 )
 
 func main() {
-	appConf := config.FromEnv()
+	logger := lr.NewConsole(true)
 
-	resp, err := http.Get(fmt.Sprintf("http://localhost:%d/api/livez", appConf.Server.Port))
+	envConf, err := loader.FromEnv()
+
+	if err != nil {
+		logger.Fatal().Err(err).Msg("")
+		return
+	}
+
+	resp, err := http.Get(fmt.Sprintf("http://localhost:%d/api/livez", envConf.ServerConf.Port))
 
 	if err != nil || resp.StatusCode >= http.StatusBadRequest {
 		os.Exit(1)
 	}
 
-	resp, err = http.Get(fmt.Sprintf("http://localhost:%d/api/readyz", appConf.Server.Port))
+	resp, err = http.Get(fmt.Sprintf("http://localhost:%d/api/readyz", envConf.ServerConf.Port))
 
 	if err != nil || resp.StatusCode >= http.StatusBadRequest {
 		os.Exit(1)

go.mod

@@ -5,7 +5,7 @@ go 1.16
 require (
 	cloud.google.com/go v0.65.0
 	github.com/AlecAivazis/survey/v2 v2.2.9
-	github.com/DATA-DOG/go-sqlmock v1.5.0
+	github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect
 	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/aws/aws-sdk-go v1.35.4
 	github.com/bradleyfalzon/ghinstallation v1.1.1
@@ -37,7 +37,7 @@ require (
 	github.com/gorilla/websocket v1.4.2
 	github.com/hashicorp/golang-lru v0.5.3 // indirect
 	github.com/itchyny/gojq v0.12.1
-	github.com/jinzhu/gorm v1.9.16
+	github.com/jinzhu/gorm v1.9.16 // indirect
 	github.com/joeshaw/envdecode v0.0.0-20200121155833-099f1fc765bd
 	github.com/josharian/impl v1.1.0 // indirect
 	github.com/kris-nova/logger v0.0.0-20181127235838-fd0d87064b06

server/api/helpers_test.go

@@ -7,9 +7,11 @@ import (
 	"time"
 
 	"github.com/go-chi/chi"
-	"github.com/porter-dev/porter/api/server/shared"
+
+	"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/adapter"
-	"github.com/porter-dev/porter/internal/config"
+	"github.com/porter-dev/porter/internal/auth/sessionstore"
 	"github.com/porter-dev/porter/internal/helm"
 	"github.com/porter-dev/porter/internal/kubernetes"
 	lr "github.com/porter-dev/porter/internal/logger"
@@ -19,8 +21,6 @@ import (
 	"github.com/porter-dev/porter/internal/repository/gorm"
 	"github.com/porter-dev/porter/server/api"
 	"github.com/porter-dev/porter/server/router"
-
-	"github.com/porter-dev/porter/internal/auth/sessionstore"
 )
 
 type tester struct {
@@ -64,9 +64,9 @@ func (t *tester) createUserSession(email string, pw string) {
 }
 
 func newTester(canQuery bool) *tester {
-	appConf := config.Conf{
-		Debug: true,
-		Server: config.ServerConf{
+	appConf := loader.EnvConf{
+		ServerConf: &config.ServerConf{
+			Debug:                true,
 			Port:                 8080,
 			CookieName:           "porter",
 			CookieSecrets:        []string{"secret"},
@@ -78,16 +78,12 @@ func newTester(canQuery bool) *tester {
 			BasicLoginEnabled:    true,
 		},
 		// unimportant here
-		Db: config.DBConf{},
-		// set the helm config to testing
-		K8s: config.K8sConf{
-			IsTesting: true,
-		},
+		DBConf: &config.DBConf{},
 	}
 
-	logger := lr.NewConsole(appConf.Debug)
+	logger := lr.NewConsole(appConf.ServerConf.Debug)
 
-	db, _ := adapter.New(&shared.DBConf{
+	db, _ := adapter.New(&config.DBConf{
 		EncryptionKey: "__random_strong_encryption_key__",
 		SQLLite:       true,
 		SQLLitePath:   "api_test.db",
@@ -138,7 +134,7 @@ func newTester(canQuery bool) *tester {
 	app, _ := api.New(&api.AppConfig{
 		Logger:     logger,
 		Repository: repo,
-		ServerConf: appConf.Server,
+		ServerConf: appConf.ServerConf,
 		TestAgents: &api.TestAgents{
 			HelmAgent:             helm.GetAgentTesting(&helm.Form{}, nil, logger, k8sAgent),
 			HelmTestStorageDriver: helm.StorageMap["memory"](nil, nil, ""),