From 7c1271905dcc2be1e7cbe0c4a82503bfb0ef3c59 Mon Sep 17 00:00:00 2001
From: Consolethinks <wewa@first-email.net>
Date: Wed, 10 Jul 2024 12:27:23 +0200
Subject: [PATCH] refactor dataset get proposal code

---
 cmd/commands/datasetGetProposal.go | 43 ++++++++++++------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/cmd/commands/datasetGetProposal.go b/cmd/commands/datasetGetProposal.go
index 73d4cb6..fba80e2 100644
--- a/cmd/commands/datasetGetProposal.go
+++ b/cmd/commands/datasetGetProposal.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"os"
 	"time"
 
 	"github.com/fatih/color"
@@ -29,8 +28,8 @@ For further help see "` + MANUAL + `"`,
 
 		const APP = "datasetGetProposal"
 
-		var APIServer string
-		var env string
+		var APIServer string = PROD_API_SERVER
+		var env string = "production"
 
 		// pass parameters
 		userpass, _ := cmd.Flags().GetString("user")
@@ -61,30 +60,24 @@ For further help see "` + MANUAL + `"`,
 		// check for program version only if running interactively
 		datasetUtils.CheckForNewVersion(client, APP, VERSION)
 
+		if devenvFlag {
+			APIServer = DEV_API_SERVER
+			env = "dev"
+		}
 		if testenvFlag {
 			APIServer = TEST_API_SERVER
 			env = "test"
-		} else if devenvFlag {
-			APIServer = DEV_API_SERVER
-			env = "dev"
-		} else {
-			APIServer = PROD_API_SERVER
-			env = "production"
 		}
 
 		color.Set(color.FgGreen)
 		log.Printf("You are about to retrieve the proposal information from the === %s === data catalog environment...", env)
 		color.Unset()
 
-		ownerGroup := ""
-
 		//TODO cleanup text formatting:
-		if len(args) == 1 {
-			ownerGroup = args[0]
-		} else {
-			log.Println("invalid number of args")
-			return
+		if len(args) < 1 || len(args) > 1 {
+			log.Fatalln("invalid number of args")
 		}
+		ownerGroup := args[0]
 
 		auth := &datasetUtils.RealAuthenticator{}
 		user, accessGroups := datasetUtils.Authenticate(auth, client, APIServer, &token, &userpass)
@@ -95,17 +88,15 @@ For further help see "` + MANUAL + `"`,
 
 		// proposal is of type map[string]interface{}
 
-		if len(proposal) > 0 {
-			if fieldname != "" {
-				fmt.Println(proposal[fieldname])
-			} else {
-				pretty, _ := json.MarshalIndent(proposal, "", "    ")
-				fmt.Printf("%s\n", pretty)
-			}
-			os.Exit(0)
+		if len(proposal) <= 0 {
+			log.Fatalf("No Proposal information found for group %v\n", ownerGroup)
+		}
+
+		if fieldname != "" {
+			fmt.Println(proposal[fieldname])
 		} else {
-			log.Printf("No Proposal information found for group %v\n", ownerGroup)
-			os.Exit(1)
+			pretty, _ := json.MarshalIndent(proposal, "", "    ")
+			fmt.Printf("%s\n", pretty)
 		}
 	},
 }