Merge pull request #6 from flanksource/secure-token-file

fix: set project groupID before attempting to lookup projectID
flanksource · Jun 22, 2022 · bdba1fa · bdba1fa
2 parents d9a1299 + 942f570
commit bdba1fa
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/config.go b/pkg/config.go
@@ -40,6 +40,9 @@ func NewConfig(file string, tokenFile string, accessToken string, jobToken strin
 	}
 	for i := range cfg.Projects {
 		cfg.Projects[i].SetClient(git)
+		if cfg.Projects[i].GroupID == 0 {
+			cfg.Projects[i].GroupID = cfg.GroupID
+		}
 		id, err := cfg.Projects[i].GetID()
 		if err != nil {
 			return cfg, errors.New(fmt.Sprintf("Failed to lookup project ID: %v", err))
@@ -51,9 +54,6 @@ func NewConfig(file string, tokenFile string, accessToken string, jobToken strin
 		if err := cfg.Projects[i].SetToken(projectToken); err != nil {
 			return cfg, errors.New(fmt.Sprintf("No deployment token for %s: %s", cfg.Projects[i].Name, err))
 		}
-		if cfg.Projects[i].GroupID == 0 {
-			cfg.Projects[i].GroupID = cfg.GroupID
-		}
 	}
 	return cfg, nil
 }