Osd 22527: osdctl "jiratoken" flag in "cluster context" command is not used (#678)

* Initial working commit of using passed in jiratoken

* changed logic to set jiratoken to viper value if it is defined.

Author: Mhodesty

cmd/cluster/context.go

@@ -403,7 +403,7 @@ func (o *contextOptions) generateContextData() (*contextData, []error) {
 	GetJiraIssues := func() {
 		defer wg.Done()
 		defer utils.StartDelayTracker(o.verbose, "Jira Issues").End()
-		data.JiraIssues, err = utils.GetJiraIssuesForCluster(o.clusterID, o.externalClusterID)
+		data.JiraIssues, err = utils.GetJiraIssuesForCluster(o.clusterID, o.externalClusterID, o.jiratoken)
 		if err != nil {
 			errors = append(errors, fmt.Errorf("error while getting the open jira tickets: %v", err))
 		}
@@ -412,7 +412,7 @@ func (o *contextOptions) generateContextData() (*contextData, []error) {
 	GetSupportExceptions := func() {
 		defer wg.Done()
 		defer utils.StartDelayTracker(o.verbose, "Support Exceptions").End()
-		data.SupportExceptions, err = utils.GetJiraSupportExceptionsForOrg(o.organizationID)
+		data.SupportExceptions, err = utils.GetJiraSupportExceptionsForOrg(o.organizationID, o.jiratoken)
 		if err != nil {
 			errors = append(errors, fmt.Errorf("error while getting support exceptions: %v", err))
 		}

cmd/jira/quick-task.go

@@ -2,11 +2,12 @@ package jira
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/andygrunwald/go-jira"
 	"github.com/openshift/osdctl/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"strings"
 )
 
 const (
@@ -54,7 +55,7 @@ osdctl jira quick-task "Update command to take new flag" --add-to-sprint
 		}
 		boardId := viper.GetInt(BoardIdLabel)
 
-		jiraClient, err := utils.GetJiraClient()
+		jiraClient, err := utils.GetJiraClient("")
 		if err != nil {
 			return fmt.Errorf("failed to get Jira client: %w", err)
 		}

cmd/org/context.go

@@ -296,7 +296,7 @@ func addServiceLogs(clusterInfo *ClusterInfo) error {
 
 func addJiraIssues(clusterInfo *ClusterInfo, externalId string) error {
 	var jiraIssuesErr error
-	clusterInfo.JiraIssues, jiraIssuesErr = utils.GetJiraIssuesForCluster(clusterInfo.ID, externalId)
+	clusterInfo.JiraIssues, jiraIssuesErr = utils.GetJiraIssuesForCluster(clusterInfo.ID, externalId, "")
 	if jiraIssuesErr != nil {
 		return fmt.Errorf("failed to fetch Jira issues for cluster %v: %v", clusterInfo.ID, jiraIssuesErr)
 	}

cmd/swarm/secondary.go

@@ -35,7 +35,7 @@ var secondaryCmd = &cobra.Command{
 		osdctl swarm secondary`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 
-		jiraClient, err := utils.GetJiraClient()
+		jiraClient, err := utils.GetJiraClient("")
 		if err != nil {
 			return fmt.Errorf("failed to get Jira client: %w", err)
 		}

pkg/utils/jira.go

@@ -16,29 +16,26 @@ const (
 // GetJiraClient creates a jira client that connects to
 // https://issues.redhat.com. To work, the jiraToken needs to be set in the
 // config
-func GetJiraClient() (*jira.Client, error) {
-	var jiratoken string
-
-	if !viper.IsSet(JiraTokenConfigKey) {
-		jiratoken = viper.GetString(JiraTokenConfigKey)
-	}
-
-	if os.Getenv("JIRA_API_TOKEN") != "" {
-		jiratoken = os.Getenv("JIRA_API_TOKEN")
-	}
-
+func GetJiraClient(jiratoken string) (*jira.Client, error) {
 	if jiratoken == "" {
-		return nil, fmt.Errorf("JIRA token is not defined.")
+		if viper.IsSet(JiraTokenConfigKey) {
+			jiratoken = viper.GetString(JiraTokenConfigKey)
+		}
+		if os.Getenv("JIRA_API_TOKEN") != "" {
+			jiratoken = os.Getenv("JIRA_API_TOKEN")
+		}
+		if jiratoken == "" {
+			return nil, fmt.Errorf("JIRA token is not defined")
+		}
 	}
-
 	tp := jira.PATAuthTransport{
 		Token: jiratoken,
 	}
 	return jira.NewClient(tp.Client(), JiraBaseURL)
 }
 
-func GetJiraIssuesForCluster(clusterID string, externalClusterID string) ([]jira.Issue, error) {
-	jiraClient, err := GetJiraClient()
+func GetJiraIssuesForCluster(clusterID string, externalClusterID string, jiratoken string) ([]jira.Issue, error) {
+	jiraClient, err := GetJiraClient(jiratoken)
 	if err != nil {
 		return nil, fmt.Errorf("error connecting to jira: %v", err)
 	}
@@ -59,8 +56,8 @@ func GetJiraIssuesForCluster(clusterID string, externalClusterID string) ([]jira
 	return issues, nil
 }
 
-func GetJiraSupportExceptionsForOrg(organizationID string) ([]jira.Issue, error) {
-	jiraClient, err := GetJiraClient()
+func GetJiraSupportExceptionsForOrg(organizationID string, jiratoken string) ([]jira.Issue, error) {
+	jiraClient, err := GetJiraClient(jiratoken)
 	if err != nil {
 		return nil, fmt.Errorf("error connecting to jira: %v", err)
 	}