From ddd3eb9625e4d1d085f0cad954b3a45c06df1b21 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Tue, 31 Jul 2018 14:03:12 -0700 Subject: [PATCH] Clean up the Jira module's API credentials loading --- jira/client.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jira/client.go b/jira/client.go index b28ec616..231f6746 100644 --- a/jira/client.go +++ b/jira/client.go @@ -57,11 +57,17 @@ func buildJql(key string, value string) string { func jiraRequest(path string) (*http.Response, error) { url := fmt.Sprintf("%s%s", wtf.Config.UString("wtf.mods.jira.domain"), path) + apiKey := wtf.Config.UString( + "wtf.mods.jira.apiKey", + os.Getenv("WTF_JIRA_API_KEY"), + ) + req, err := http.NewRequest("GET", url, nil) if err != nil { return nil, err } - req.SetBasicAuth(wtf.Config.UString("wtf.mods.jira.email"), os.Getenv("WTF_JIRA_API_KEY")) + //req.SetBasicAuth(wtf.Config.UString("wtf.mods.jira.email"), os.Getenv("WTF_JIRA_API_KEY")) + req.SetBasicAuth(wtf.Config.UString("wtf.mods.jira.email"), apiKey) verifyServerCertificate := wtf.Config.UBool("wtf.mods.jira.verifyServerCertificate", true) httpClient := &http.Client{Transport: &http.Transport{