Fixing v1/v2 config. adding v2 version APIS

PrathameshBhat-king · PrathameshBhat-king · commit a12d3f34305b · 2025-12-10T14:18:02.000+05:30
Signed-off-by: Bhat &lt;prathamesh.bhat@mercedes-benz.com&gt;
diff --git a/cmd/ccsAdd.go b/cmd/ccsAdd.go
@@ -36,7 +36,7 @@ var ccsAddCmd = &cobra.Command{
 			data.Comment = args[1]
 		}
 
-		msg := helper.DiscoApiPost(helper.GetProjectVersionAPIURL(projectVersion, "ccs"), data)
+		msg := helper.DiscoApiPost(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "ccs"), data)
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/commands_test.go b/cmd/commands_test.go
@@ -397,7 +397,7 @@ func TestSbomTagCmd(t *testing.T) {
 	}{
 		{
 			name: "Sbom: Add Tag to sbom",
-			cmd:  []string{"sbom", "tag", sbomId,"2.2","-c", configPath},
+			cmd:  []string{"sbom", "tag", sbomId, "2.2", "-c", configPath},
 			want: []string{"success", "true", "message", "Spdx tag updated"},
 		},
 	}
diff --git a/cmd/onDemandCheckSBOM.go b/cmd/onDemandCheckSBOM.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/mercedes-benz/disclosure-cli/conf"
 	"github.com/mercedes-benz/disclosure-cli/pkg/helper"
 	"github.com/spf13/cobra"
 )
@@ -24,7 +25,7 @@ var onDemandCheckSBOM = &cobra.Command{
 			fmt.Println("Missing filename of SBOM upload")
 			os.Exit(1)
 		}
-		msg := helper.SbomUploadFormData(helper.GetProjectAPIURL("/sbomcheck"), fileName, "")
+		msg := helper.SbomUploadFormData(helper.GetProjectAPIURL(conf.DefaultApiVersion, "/sbomcheck"), fileName, "")
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/policyRules.go b/cmd/policyRules.go
@@ -5,6 +5,7 @@
 package cmd
 
 import (
+	"github.com/mercedes-benz/disclosure-cli/conf"
 	"github.com/mercedes-benz/disclosure-cli/pkg/helper"
 	"github.com/spf13/cobra"
 )
@@ -14,7 +15,7 @@ var policyRulesCmd = &cobra.Command{
 	Short: "Returning the project policy rules",
 	Long:  `The policy rules of the project`,
 	Run: func(cmd *cobra.Command, args []string) {
-		msg := helper.DiscoApiGet(helper.GetProjectAPIURL("/policyrules"))
+		msg := helper.DiscoApiGet(helper.GetProjectAPIURL(conf.DefaultApiVersion, "/policyrules"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/projectChildren.go b/cmd/projectChildren.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"github.com/mercedes-benz/disclosure-cli/conf"
 	"github.com/mercedes-benz/disclosure-cli/pkg/helper"
 	"github.com/spf13/cobra"
 )
@@ -10,7 +11,7 @@ var projectChildrenCmd = &cobra.Command{
 	Short: "Returning the project children",
 	Long:  `The details of the project children`,
 	Run: func(cmd *cobra.Command, args []string) {
-		msg := helper.DiscoApiGet(helper.GetGroupAPIURL("/children"))
+		msg := helper.DiscoApiGet(helper.GetGroupAPIURL(conf.DefaultApiVersion, "/children"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/projectDetail.go b/cmd/projectDetail.go
@@ -5,6 +5,7 @@
 package cmd
 
 import (
+	"github.com/mercedes-benz/disclosure-cli/conf"
 	"github.com/mercedes-benz/disclosure-cli/pkg/helper"
 	"github.com/spf13/cobra"
 )
@@ -14,7 +15,7 @@ var projectDetailsCmd = &cobra.Command{
 	Short: "Returning the project details",
 	Long:  `The details of the project`,
 	Run: func(cmd *cobra.Command, args []string) {
-		msg := helper.DiscoApiGet(helper.GetProjectAPIURL(""))
+		msg := helper.DiscoApiGet(helper.GetProjectAPIURL(conf.DefaultApiVersion, ""))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/projectSchema.go b/cmd/projectSchema.go
@@ -5,6 +5,7 @@
 package cmd
 
 import (
+	"github.com/mercedes-benz/disclosure-cli/conf"
 	"github.com/mercedes-benz/disclosure-cli/pkg/helper"
 	"github.com/spf13/cobra"
 )
@@ -14,7 +15,7 @@ var schemaCmd = &cobra.Command{
 	Short: "Returning the project schema",
 	Long:  `The schema of the project`,
 	Run: func(cmd *cobra.Command, args []string) {
-		msg := helper.DiscoApiGet(helper.GetProjectAPIURL("/schema"))
+		msg := helper.DiscoApiGet(helper.GetProjectAPIURL(conf.DefaultApiVersion, "/schema"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/projectStatus.go b/cmd/projectStatus.go
@@ -5,6 +5,7 @@
 package cmd
 
 import (
+	"github.com/mercedes-benz/disclosure-cli/conf"
 	"github.com/mercedes-benz/disclosure-cli/pkg/helper"
 	"github.com/spf13/cobra"
 )
@@ -14,7 +15,7 @@ var projectStatus = &cobra.Command{
 	Short: "Returning the project status",
 	Long:  `The status of the project`,
 	Run: func(cmd *cobra.Command, args []string) {
-		msg := helper.DiscoApiGet(helper.GetProjectAPIURL("/status"))
+		msg := helper.DiscoApiGet(helper.GetProjectAPIURL(conf.DefaultApiVersion, "/status"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/rr.go b/cmd/rr.go
@@ -16,7 +16,7 @@ var reviewRemarkListCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		projectVersion := conf.Config.ProjectVersion
 
-		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, "reviewremarks"))
+		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "reviewremarks"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
@@ -38,7 +38,7 @@ var reviewRemarkCommentCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		msg := helper.DiscoApiPost(helper.GetProjectVersionAPIURL(projectVersion, "reviewremarks/"+rrId), data)
+		msg := helper.DiscoApiPost(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "reviewremarks/"+rrId), data)
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/sbomDetails.go b/cmd/sbomDetails.go
@@ -24,7 +24,7 @@ var sbomDetailsCmd = &cobra.Command{
 			sbomId = "latest"
 		}
 
-		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, "sboms/"+sbomId))
+		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "sboms/"+sbomId))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/sbomLock.go b/cmd/sbomLock.go
@@ -23,7 +23,7 @@ var sbomLockCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		msg := helper.DiscoApiPut(helper.GetProjectVersionAPIURL(projectVersion, "sboms/"+sbomId+"/lock"), struct{}{})
+		msg := helper.DiscoApiPut(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "sboms/"+sbomId+"/lock"), struct{}{})
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/sbomNotice.go b/cmd/sbomNotice.go
@@ -43,7 +43,7 @@ var sbomNoticeCmd = &cobra.Command{
 			sbomId = "latest"
 		}
 
-		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, "sboms/"+sbomId+"/notice/"+noticeFormat))
+		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "sboms/"+sbomId+"/notice/"+noticeFormat))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/sbomPRStatus.go b/cmd/sbomPRStatus.go
@@ -27,7 +27,7 @@ var sbomPRStatusCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, "sboms/"+sbomId+"/status"))
+		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "sboms/"+sbomId+"/status"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/sbomSearch.go b/cmd/sbomSearch.go
@@ -7,6 +7,7 @@ package cmd
 import (
 	"os"
 
+	"github.com/mercedes-benz/disclosure-cli/conf"
 	"github.com/mercedes-benz/disclosure-cli/pkg/domain"
 	"github.com/mercedes-benz/disclosure-cli/pkg/helper"
 	"github.com/spf13/cobra"
@@ -26,7 +27,7 @@ var sbomSearchCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		msg := helper.DiscoApiPost(helper.GetProjectAPIURL("/search"), data)
+		msg := helper.DiscoApiPost(helper.GetProjectAPIURL(conf.DefaultApiVersion, "/search"), data)
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/sbomStatus.go b/cmd/sbomStatus.go
@@ -24,7 +24,7 @@ var sbomStatusCmd = &cobra.Command{
 			sbomId = "latest"
 		}
 
-		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, "sboms/"+sbomId+"/check"))
+		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "sboms/"+sbomId+"/check"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/sbomTag.go b/cmd/sbomTag.go
@@ -30,7 +30,7 @@ var sbomTagCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		msg := helper.DiscoApiPut(helper.GetProjectVersionAPIURL(projectVersion, "sboms/"+sbomId+"/tag"), data)
+		msg := helper.DiscoApiPut(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "sboms/"+sbomId+"/tag"), data)
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/sbomUpload.go b/cmd/sbomUpload.go
@@ -34,7 +34,7 @@ var sbomUploadCmd = &cobra.Command{
 			fmt.Println("Missing filename of SBOM upload")
 			os.Exit(1)
 		}
-		msg := helper.SbomUploadFormData(helper.GetProjectVersionAPIURL(projectVersion, "sboms"), fileName, tag)
+		msg := helper.SbomUploadFormData(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "sboms"), fileName, tag)
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/sboms.go b/cmd/sboms.go
@@ -24,7 +24,7 @@ var sbomsCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, "sboms"))
+		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "sboms"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/statusCCS.go b/cmd/statusCCS.go
@@ -24,7 +24,7 @@ var statusCCSCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, "ccs"))
+		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "ccs"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/versionCreate.go b/cmd/versionCreate.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/mercedes-benz/disclosure-cli/conf"
 	"github.com/mercedes-benz/disclosure-cli/pkg/domain"
 	"github.com/mercedes-benz/disclosure-cli/pkg/helper"
 	"github.com/spf13/cobra"
@@ -29,7 +30,7 @@ var createVersionCmd = &cobra.Command{
 			data.Description = args[1]
 		}
 
-		msg := helper.DiscoApiPost(helper.GetProjectAPIURL("/versions"), data)
+		msg := helper.DiscoApiPost(helper.GetProjectAPIURL(conf.DefaultApiVersion, "/versions"), data)
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/versionDelete.go b/cmd/versionDelete.go
@@ -19,7 +19,7 @@ var versionDeleteCmd = &cobra.Command{
 			fmt.Println("Missing project version")
 			os.Exit(1)
 		}
-		msg := helper.DiscoApiDelete(helper.GetProjectVersionAPIURL(projectVersion, ""))
+		msg := helper.DiscoApiDelete(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, ""))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/versionDetail.go b/cmd/versionDetail.go
@@ -23,7 +23,7 @@ var versionDetailsCmd = &cobra.Command{
 			fmt.Println("Missing project version")
 			os.Exit(1)
 		}
-		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, ""))
+		msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, ""))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/cmd/versionList.go b/cmd/versionList.go
@@ -5,6 +5,7 @@
 package cmd
 
 import (
+	"github.com/mercedes-benz/disclosure-cli/conf"
 	"github.com/mercedes-benz/disclosure-cli/pkg/helper"
 	"github.com/spf13/cobra"
 )
@@ -14,7 +15,7 @@ var versionListCmd = &cobra.Command{
 	Short: "Returning the project version list",
 	Long:  `The version list of the project`,
 	Run: func(cmd *cobra.Command, args []string) {
-		msg := helper.DiscoApiGet(helper.GetProjectAPIURL("/versions"))
+		msg := helper.DiscoApiGet(helper.GetProjectAPIURL(conf.DefaultApiVersion, "/versions"))
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }
diff --git a/conf/config.go b/conf/config.go
@@ -16,8 +16,9 @@ import (
 )
 
 const (
-	DefaultApiVersion = "v1"
-	CLIVersion        = "v0.7"
+	DefaultApiVersion    = "v1"
+	DefaultApiVisibility = "public"
+	CLIVersion           = "v0.7"
 )
 
 var Config = struct {
@@ -106,12 +107,24 @@ func getEnvVariable(envKey string, defaultValue string) string {
 
 func EnsureApiVerison() {
 	Config.Host = strings.TrimSuffix(Config.Host, "/")
-	if strings.HasSuffix(Config.Host, "/public") || strings.HasSuffix(Config.Host, "/disco") {
-		Config.Host += "/" + DefaultApiVersion
-		return
-	}
-	if !strings.HasSuffix(Config.Host, "/"+DefaultApiVersion) {
-		fmt.Println("WARNING: non-default api version set, unexpected behavior is possible")
-	}
 
+	// Check if host contains version paths which are no longer allowed
+	if strings.Contains(Config.Host, "/v1") || strings.Contains(Config.Host, "/v2") {
+		fmt.Println("═══════════════════════════════════════════════════════════════")
+		fmt.Println("⚠️  ERROR: Host URL format has changed!")
+		fmt.Println("═══════════════════════════════════════════════════════════════")
+		fmt.Println("")
+		fmt.Println("Your host URL contains '/v1' or '/v2' which is no longer allowed.")
+		fmt.Println("As per the new update, only the base URL is allowed.")
+		fmt.Println("")
+		fmt.Println("Current URL:", Config.Host)
+		fmt.Println("")
+		fmt.Println("Please update your configuration to use only the base URL:")
+		fmt.Println("Example: https://production.gorillas.mercedes-benz.com/disco")
+		fmt.Println("         https://production.gorillas.mercedes-benz.com/public")
+		fmt.Println("")
+		fmt.Println("The CLI will automatically append the version as needed.")
+		fmt.Println("═══════════════════════════════════════════════════════════════")
+		os.Exit(1)
+	}
 }
diff --git a/conf/config_test.go b/conf/config_test.go
diff --git a/pkg/helper/endoints.go b/pkg/helper/endoints.go

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ var ccsAddCmd = &cobra.Command{`
`36`	`36`	`data.Comment = args[1]`
`37`	`37`	`}`
`38`	`38`
`39`		`- msg := helper.DiscoApiPost(helper.GetProjectVersionAPIURL(projectVersion, "ccs"), data)`
	`39`	`+ msg := helper.DiscoApiPost(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "ccs"), data)`
`40`	`40`	`helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))`
`41`	`41`	`},`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ func TestSbomTagCmd(t *testing.T) {`
`397`	`397`	`}{`
`398`	`398`	`{`
`399`	`399`	`name: "Sbom: Add Tag to sbom",`
`400`		`- cmd: []string{"sbom", "tag", sbomId,"2.2","-c", configPath},`
	`400`	`+ cmd: []string{"sbom", "tag", sbomId, "2.2", "-c", configPath},`
`401`	`401`	`want: []string{"success", "true", "message", "Spdx tag updated"},`
`402`	`402`	`},`
`403`	`403`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"fmt"`
`9`	`9`	`"os"`
`10`	`10`
	`11`	`+ "github.com/mercedes-benz/disclosure-cli/conf"`
`11`	`12`	`"github.com/mercedes-benz/disclosure-cli/pkg/helper"`
`12`	`13`	`"github.com/spf13/cobra"`
`13`	`14`	`)`
`@@ -24,7 +25,7 @@ var onDemandCheckSBOM = &cobra.Command{`
`24`	`25`	`fmt.Println("Missing filename of SBOM upload")`
`25`	`26`	`os.Exit(1)`
`26`	`27`	`}`
`27`		`- msg := helper.SbomUploadFormData(helper.GetProjectAPIURL("/sbomcheck"), fileName, "")`
	`28`	`+ msg := helper.SbomUploadFormData(helper.GetProjectAPIURL(conf.DefaultApiVersion, "/sbomcheck"), fileName, "")`
`28`	`29`	`helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))`
`29`	`30`	`},`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ var reviewRemarkListCmd = &cobra.Command{`
`16`	`16`	`Run: func(cmd *cobra.Command, args []string) {`
`17`	`17`	`projectVersion := conf.Config.ProjectVersion`
`18`	`18`
`19`		`- msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, "reviewremarks"))`
	`19`	`+ msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "reviewremarks"))`
`20`	`20`	`helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))`
`21`	`21`	`},`
`22`	`22`	`}`
`@@ -38,7 +38,7 @@ var reviewRemarkCommentCmd = &cobra.Command{`
`38`	`38`	`os.Exit(1)`
`39`	`39`	`}`
`40`	`40`
`41`		`- msg := helper.DiscoApiPost(helper.GetProjectVersionAPIURL(projectVersion, "reviewremarks/"+rrId), data)`
	`41`	`+ msg := helper.DiscoApiPost(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "reviewremarks/"+rrId), data)`
`42`	`42`	`helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))`
`43`	`43`	`},`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ var sbomDetailsCmd = &cobra.Command{`
`24`	`24`	`sbomId = "latest"`
`25`	`25`	`}`
`26`	`26`
`27`		`- msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(projectVersion, "sboms/"+sbomId))`
	`27`	`+ msg := helper.DiscoApiGet(helper.GetProjectVersionAPIURL(conf.DefaultApiVersion, projectVersion, "sboms/"+sbomId))`
`28`	`28`	`helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))`
`29`	`29`	`},`
`30`	`30`	`}`