Merge pull request #142 from planetscale/iheanyi/fix-org-show-for-git…

…hub-repo Fix org show command
planetscale · Apr 1, 2021 · 5e66f90 · 5e66f90
2 parents 224ea5f + 251ee00
commit 5e66f90
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/internal/cmd/org/show.go b/internal/cmd/org/show.go
@@ -47,7 +47,7 @@ func ShowCmd(cfg *config.Config) *cobra.Command {
 				return errors.New("config file exists, but organization is not set")
 			}
 
-			fmt.Printf("%s (from file: %s)", cmdutil.Bold(cfg.Organization), configFile)
+			fmt.Printf("%s (from file: %s)\n", cmdutil.Bold(cfg.Organization), configFile)
 
 			return nil
 		},

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -104,10 +104,10 @@ func AccessTokenPath() (string, error) {
 // repository.
 func ProjectConfigPath() (string, error) {
 	basePath, err := RootGitRepoDir()
-	if err != nil {
-		return "", err
+	if err == nil {
+		return path.Join(basePath, projectConfigName), nil
 	}
-	return path.Join(basePath, projectConfigName), nil
+	return path.Join("", projectConfigName), nil
 }
 
 func RootGitRepoDir() (string, error) {

diff --git a/internal/config/global.go b/internal/config/global.go
@@ -24,13 +24,13 @@ func NewFileConfig(path string) (*FileConfig, error) {
 		return nil, err
 	}
 
-	var cfg *FileConfig
+	var cfg FileConfig
 	err = yaml.Unmarshal(out, &cfg)
 	if err != nil {
 		return nil, fmt.Errorf("can't unmarshal file %q: %s", path, err)
 	}
 
-	return cfg, nil
+	return &cfg, nil
 }
 
 // DefaultConfig returns the file config from the default config path.