From 54d82408f9e299cc782db8e865abd65b4cb30147 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Tue, 31 Jul 2018 15:42:41 -0700 Subject: [PATCH] Clean up the Jira client code a bit --- jira/client.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/jira/client.go b/jira/client.go index 231f6746..4ff0f5c2 100644 --- a/jira/client.go +++ b/jira/client.go @@ -54,20 +54,21 @@ func buildJql(key string, value string) string { /* -------------------- Unexported Functions -------------------- */ -func jiraRequest(path string) (*http.Response, error) { - url := fmt.Sprintf("%s%s", wtf.Config.UString("wtf.mods.jira.domain"), path) - - apiKey := wtf.Config.UString( +func apiKey() string { + return wtf.Config.UString( "wtf.mods.jira.apiKey", os.Getenv("WTF_JIRA_API_KEY"), ) +} + +func jiraRequest(path string) (*http.Response, error) { + url := fmt.Sprintf("%s%s", wtf.Config.UString("wtf.mods.jira.domain"), path) 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"), apiKey) + 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{