Extract code for loading config

Signed-off-by: Ben Firshman <[email protected]>

Author: bfirsh

pkg/cli/debug.go

@@ -2,16 +2,11 @@ package cli
 
 import (
 	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
 
 	"github.com/spf13/cobra"
 
 	"github.com/replicate/cog/pkg/docker"
 	"github.com/replicate/cog/pkg/global"
-	"github.com/replicate/cog/pkg/model"
-	"github.com/replicate/cog/pkg/util/files"
 )
 
 func newDebugCommand() *cobra.Command {
@@ -34,34 +29,11 @@ func newDebugCommand() *cobra.Command {
 }
 
 func cmdDockerfile(cmd *cobra.Command, args []string) error {
-	projectDir, err := os.Getwd()
+	config, projectDir, err := getConfig()
 	if err != nil {
 		return err
 	}
 
-	configPath := path.Join(projectDir, global.ConfigFilename)
-
-	exists, err := files.Exists(configPath)
-	if err != nil {
-		return err
-	}
-	if !exists {
-		return fmt.Errorf("%s does not exist in %s. Are you in the right directory?", global.ConfigFilename, projectDir)
-	}
-
-	contents, err := ioutil.ReadFile(configPath)
-	if err != nil {
-		return err
-	}
-
-	config, err := model.ConfigFromYAML(contents)
-	if err != nil {
-		return err
-	}
-	if err := config.ValidateAndCompleteConfig(); err != nil {
-		return err
-	}
-
 	arch, err := cmd.Flags().GetString("arch")
 	if err != nil {
 		return err

pkg/cli/root.go

@@ -2,7 +2,9 @@ package cli
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
+	"path"
 	"regexp"
 
 	"github.com/spf13/cobra"
@@ -11,6 +13,7 @@ import (
 	"github.com/replicate/cog/pkg/model"
 	"github.com/replicate/cog/pkg/settings"
 	"github.com/replicate/cog/pkg/util/console"
+	"github.com/replicate/cog/pkg/util/files"
 )
 
 var modelFlag string
@@ -108,3 +111,32 @@ func getProjectDir() (string, error) {
 	}
 	return projectDirFlag, nil
 }
+
+func getConfig() (*model.Config, string, error) {
+	projectDir, err := os.Getwd()
+	if err != nil {
+		return nil, "", err
+	}
+
+	configPath := path.Join(projectDir, global.ConfigFilename)
+
+	exists, err := files.Exists(configPath)
+	if err != nil {
+		return nil, "", err
+	}
+	if !exists {
+		return nil, "", fmt.Errorf("%s does not exist in %s. Are you in the right directory?", global.ConfigFilename, projectDir)
+	}
+
+	contents, err := ioutil.ReadFile(configPath)
+	if err != nil {
+		return nil, "", err
+	}
+
+	config, err := model.ConfigFromYAML(contents)
+	if err != nil {
+		return nil, "", err
+	}
+	err = config.ValidateAndCompleteConfig()
+	return config, projectDir, err
+}

pkg/cli/test.go

@@ -3,17 +3,12 @@ package cli
 import (
 	"context"
 	"fmt"
-	"os"
-	"path/filepath"
 
 	"github.com/spf13/cobra"
 
 	"github.com/replicate/cog/pkg/docker"
-	"github.com/replicate/cog/pkg/global"
 	"github.com/replicate/cog/pkg/logger"
-	"github.com/replicate/cog/pkg/model"
 	"github.com/replicate/cog/pkg/serving"
-	"github.com/replicate/cog/pkg/util/files"
 )
 
 func newTestCommand() *cobra.Command {
@@ -33,31 +28,12 @@ func Test(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	projectDir, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-	logWriter := logger.NewConsoleLogger()
 
-	configPath := filepath.Join(projectDir, global.ConfigFilename)
-	exists, err := files.Exists(configPath)
-	if err != nil {
-		return err
-	}
-	if !exists {
-		return fmt.Errorf("%s does not exist in %s. Are you in the right directory?", global.ConfigFilename, projectDir)
-	}
-	configRaw, err := os.ReadFile(filepath.Join(projectDir, global.ConfigFilename))
-	if err != nil {
-		return fmt.Errorf("Failed to read %s: %w", global.ConfigFilename, err)
-	}
-	config, err := model.ConfigFromYAML(configRaw)
+	config, projectDir, err := getConfig()
 	if err != nil {
 		return err
 	}
-	if err := config.ValidateAndCompleteConfig(); err != nil {
-		return err
-	}
+
 	archMap := map[string]bool{}
 	for _, confArch := range config.Environment.Architectures {
 		archMap[confArch] = true
@@ -76,6 +52,7 @@ func Test(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+	logWriter := logger.NewConsoleLogger()
 	buildUseGPU := config.Environment.BuildRequiresGPU && arch == "gpu"
 	tag, err := dockerImageBuilder.Build(context.Background(), projectDir, dockerfileContents, "", buildUseGPU, logWriter)
 	if err != nil {