api version

Signed-off-by: Karl Piplies <[email protected]>

Author: karlpip

cmd/root.go

@@ -81,4 +81,5 @@ func initConfig() {
 		rootCmd.MarkPersistentFlagRequired("token")
 		rootCmd.MarkPersistentFlagRequired("host")
 	}
+	conf.EnsureApiVerison()
 }

conf/config.go

@@ -15,6 +15,8 @@ import (
 	"github.com/jinzhu/configor"
 )
 
+const DefaultApiVersion = "v1"
+
 var Config = struct {
 	ProjectToken   string `default:""`
 	ProjectUUID    string `default:""`
@@ -50,6 +52,7 @@ func rightPad2Len(s string, padStr string, overallLen int) string {
 	var retStr = s + strings.Repeat(padStr, padCountInt)
 	return retStr[:overallLen]
 }
+
 func dumpStructToSystemOut(parentTitle string, data interface{}) interface{} {
 	if reflect.ValueOf(data).Kind() == reflect.Struct {
 		v := reflect.ValueOf(data)
@@ -93,3 +96,15 @@ func getEnvVariable(envKey string, defaultValue string) string {
 	}
 	return defaultValue
 }
+
+func EnsureApiVerison() {
+	Config.Host = strings.TrimSuffix(Config.Host, "/")
+	if strings.HasSuffix(Config.Host, "/public") {
+		Config.Host += "/" + DefaultApiVersion
+		return
+	}
+	if !strings.HasSuffix(Config.Host, "/"+DefaultApiVersion) {
+		fmt.Println("WARNING: non-default api version set, unexpected behavior is possible")
+	}
+
+}

disclosure-cli

@@ -13,7 +13,7 @@ import (
 
 func GetProjectAPIURL(appendix string) string {
 	if len(conf.Config.ProjectUUID) > 0 {
-		return conf.Config.Host + "/v1/projects/" + conf.Config.ProjectUUID + appendix
+		return conf.Config.Host + "/projects/" + conf.Config.ProjectUUID + appendix
 	} else {
 		fmt.Println("Missing flag u - uuid of the project")
 		os.Exit(1)
@@ -23,7 +23,7 @@ func GetProjectAPIURL(appendix string) string {
 
 func GetProjectVersionAPIURL(versionName, appendix string) string {
 	if len(versionName) > 0 {
-		url := conf.Config.Host + "/v1/projects/" + conf.Config.ProjectUUID + "/versions/" + versionName
+		url := conf.Config.Host + "/projects/" + conf.Config.ProjectUUID + "/versions/" + versionName
 		if len(appendix) > 0 {
 			url = url + "/" + appendix
 		}