Added resolving for organization ID from flags first and then config file (#160)

Author: evyatarmeged

src/pkg/cloudclient/restapi/client.go

@@ -3,6 +3,7 @@ package restapi
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/deepmap/oapi-codegen/pkg/securityprovider"
 	"github.com/deepmap/oapi-codegen/pkg/util"
@@ -15,6 +16,8 @@ import (
 	"net/http"
 )
 
+var NoOrganizationError = errors.New("no organization exists in config or as parameter")
+
 type Client struct {
 	*cloudapi.ClientWithResponses
 	restApiURL string
@@ -25,7 +28,11 @@ type Doer interface {
 }
 
 func NewClient(ctx context.Context) (*Client, error) {
-	return NewClientFromToken(viper.GetString(config.OtterizeAPIAddressKey), auth.GetAPIToken(ctx), viper.GetString(config.ApiSelectedOrganizationId))
+	orgID, found := ResolveOrgID()
+	if !found { // Shouldn't happen after login
+		return nil, NoOrganizationError
+	}
+	return NewClientFromToken(viper.GetString(config.OtterizeAPIAddressKey), auth.GetAPIToken(ctx), orgID)
 }
 
 func NewClientFromToken(apiRoot string, token string, orgId string) (*Client, error) {

src/pkg/cloudclient/restapi/utils.go

@@ -2,7 +2,10 @@ package restapi
 
 import (
 	"github.com/otterize/otterize-cli/src/pkg/cloudclient/restapi/cloudapi"
+	"github.com/otterize/otterize-cli/src/pkg/config"
+	"github.com/otterize/otterize-cli/src/pkg/utils/must"
 	"github.com/samber/lo"
+	"github.com/spf13/viper"
 )
 
 func LabelsToLabelInput(labels map[string]string) []cloudapi.LabelInput {
@@ -20,3 +23,24 @@ func LabelToLabelInput(key string, value string) cloudapi.LabelInput {
 		Value: lo.Ternary(value == "", nil, &value),
 	}
 }
+
+func ResolveOrgID() (string, bool) {
+	if viper.GetString(config.ApiSelectedOrganizationId) != "" {
+		return viper.GetString(config.ApiSelectedOrganizationId), true
+	}
+
+	var Config config.Config
+	loaded, err := config.LoadConfigFile(&Config, config.ApiCredentialsFilename)
+	must.Must(err)
+
+	if !loaded {
+		return "", false
+	}
+
+	if Config.OrganizationId != "" {
+		return Config.OrganizationId, true
+	}
+
+	return "", false
+
+}

src/pkg/config/persistent_config.go

@@ -77,9 +77,7 @@ func LoadApiCredentialsFile() {
 	if !Config.Expiry.IsZero() {
 		viper.Set(ApiUserTokenExpiryKey, Config.Expiry)
 	}
-	if Config.OrganizationId != "" {
-		viper.Set(ApiSelectedOrganizationId, Config.OrganizationId)
-	}
+
 	if Config.ClientId != "" || Config.ClientSecret != "" {
 		viper.Set(ApiClientIdKey, Config.ClientId)
 		viper.Set(ApiClientSecretKey, Config.ClientSecret)