Merge pull request #492 from petrkotas/loadenv-in-onego

Remove not used to debug option

Author: openshift-merge-bot[bot]

cadctl/cmd/investigate/investigate.go

@@ -19,7 +19,6 @@ package investigate
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -111,7 +110,7 @@ func run(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	ocmClient, err := GetOCMClient()
+	ocmClient, err := ocm.New()
 	if err != nil {
 		return fmt.Errorf("could not initialize ocm client: %w", err)
 	}
@@ -191,22 +190,6 @@ func handleCADFailure(err error, resources *investigation.Resources, pdClient *p
 	}
 }
 
-// GetOCMClient will retrieve the OcmClient from the 'ocm' package
-func GetOCMClient() (*ocm.SdkClient, error) {
-	cadOcmFilePath := os.Getenv("CAD_OCM_FILE_PATH")
-
-	_, err := os.Stat(cadOcmFilePath)
-	if os.IsNotExist(err) {
-		configDir, err := os.UserConfigDir()
-		if err != nil {
-			return nil, err
-		}
-		cadOcmFilePath = filepath.Join(configDir, "/ocm/ocm.json")
-	}
-
-	return ocm.New(cadOcmFilePath)
-}
-
 // Checks pre-requisites for a cluster investigation:
 // - the cluster's state is supported by CAD for an investigation (= not uninstalling)
 // - the cloud provider is supported by CAD (cluster is AWS)

pkg/ocm/ocm.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"strconv"
 	"strings"
 
 	sdk "github.com/openshift-online/ocm-sdk-go"
@@ -57,34 +56,10 @@ type SdkClient struct {
 
 // New will create a new ocm client by using the path to a config file
 // if no path is provided, it will assume it in the default path
-func New(ocmConfigFile string) (*SdkClient, error) {
+func New() (*SdkClient, error) {
 	var err error
 	client := SdkClient{}
 
-	// The debug environment variable ensures that we will never use
-	// an ocm config file on a cluster deployment. The debug environment variable
-	// is only for local cadctl development
-	debugMode := os.Getenv("CAD_DEBUG")
-
-	// strconv.ParseBool raises an error when debugMode is empty, thus
-	// we have to set it to false if the value is empty.
-	if debugMode == "" {
-		debugMode = "false"
-	}
-
-	debugEnabled, err := strconv.ParseBool(debugMode)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse CAD_DEBUG value '%s': %w", debugMode, err)
-	}
-
-	if debugEnabled {
-		client.conn, err = newConnectionFromFile(ocmConfigFile)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create connection from ocm.json config file: %w", err)
-		}
-		return &client, nil
-	}
-
 	client.conn, err = newConnectionFromClientPair()
 	if err != nil {
 		return nil, fmt.Errorf("failed to create connection from client key pair: %w", err)
@@ -93,26 +68,6 @@ func New(ocmConfigFile string) (*SdkClient, error) {
 	return &client, nil
 }
 
-// newConnectionFromFile loads the configuration file (ocmConfigFile, ~/.ocm.json, /ocm/ocm.json)
-// and creates a connection.
-func newConnectionFromFile(ocmConfigFile string) (*sdk.Connection, error) {
-	if ocmConfigFile != "" {
-		err := os.Setenv("OCM_CONFIG", ocmConfigFile)
-		if err != nil {
-			return nil, err
-		}
-	}
-	// Load the configuration file from std path
-	cfg, err := Load()
-	if err != nil {
-		return nil, err
-	}
-	if cfg == nil || cfg == (&Config{}) {
-		return nil, fmt.Errorf("not logged in")
-	}
-	return cfg.Connection()
-}
-
 // newConnectionFromClientPair creates a new connection via set of client ID, client secret
 // and the target OCM API URL.
 func newConnectionFromClientPair() (*sdk.Connection, error) {