Source Code
wtf/bamboohr/Required ENV Variables
- -Key: WTF_BAMBOO_HR_TOKEN
-Value: Your BambooHR API token.
Key: WTF_BAMBOO_HR_SUBDOMAIN
-Value: Your BambooHR API subdomain name.
Keyboard Commands
None.
Configuration
bamboohr:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
enabled: true
position:
top: 0
left: 1
height: 2
width: 1
- refreshInterval: 900Attributes
+apiKey
+Value: Your BambooHR API token.
enabled
-Determines whether or not this module is executed and if its data displayed onscreen.
+Whether or not this module is executed and if its data displayed onscreen.
Values: true, false.
position
@@ -175,6 +172,9 @@ Defines where in the grid this module’s widget will be displayed.
Values: Any positive integer, 0..n.
subdomain
+Value: Your BambooHR API subdomain name.
Source Code
wtf/circleci/Required ENV Variables
- -Key: WTF_CIRCLE_API_KEY
-Value: Your CircleCI API
-token.
Keyboard Commands
None.
Configuration
circleci:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
enabled: true
position:
top: 4
@@ -166,6 +161,9 @@ token.
refreshInterval: 900Attributes
+apiKey
+Value: Your CircleCI API token.
enabled
Determines whether or not this module is executed and if its data displayed onscreen.
Values: true, false.
Displays information about your projects hosted on Gerrit:
Open Incoming Reviews
@@ -149,13 +147,10 @@ height="0" width="0" style="display:none;visibility:hidden">All open reviews created by you.
+
Source Code
wtf/gerrit/Required ENV Variables
- -Key: WTF_GERRIT_PASSWORD
-Action: Your Gerrit HTTP Password.
Keyboard Commands
Key: /
@@ -186,6 +181,7 @@ height="0" width="0" style="display:none;visibility:hidden">
projects:
- org/test-project"
- dotfiles
+ password: "mypassword"
username: "myname"
verifyServerCertificate: false
Attributes
@@ -208,8 +204,11 @@ Values: A valid URI.projects
A list of Gerrit project names to fetch data for.
password
+Value: Your Gerrit HTTP Password.
username
-Your Gerrit username.
verifyServerCertificate
Optional
diff --git a/docs/posts/modules/github/index.html b/docs/posts/modules/github/index.html
index bce066f9..d258bf03 100644
--- a/docs/posts/modules/github/index.html
+++ b/docs/posts/modules/github/index.html
@@ -151,22 +151,6 @@ height="0" width="0" style="display:none;visibility:hidden">
Source Code
wtf/github/GitHub Required ENV Variables
- -Key: WTF_GITHUB_TOKEN
-Action: Your GitHub API token.
GitHub Enterprise Required ENV Variables
- -Key: WTF_GITHUB_TOKEN
-Action: Your GitHub API token.
Key: WTF_GITHUB_BASE_URL
-Action: Your GitHub Enterprise API URL.
Key: WTF_GITHUB_UPLOAD_URL
-Action: Your GitHub Enterprise upload URL (often the same as API URL).
Keyboard Commands
Key: /
@@ -186,6 +170,8 @@ height="0" width="0" style="display:none;visibility:hidden">
Configuration
github:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
+ baseURL: ""
enabled: true
enableStatus: true
position:
@@ -197,11 +183,19 @@ height="0" width="0" style="display:none;visibility:hidden">
repositories:
wesker-api: "UmbrellaCorp"
wtf: "senorprogrammer"
+ uploadURL: ""
username: "senorprogrammer"Attributes
+apiKey
+Value: Your GitHub API token.
baseURL
+Optional
+Value: Your GitHub Enterprise API URL.
enabled
-Determines whether or not this module is executed and if its data displayed onscreen.
+Whether or not this module is executed and if its data displayed onscreen.
Values: true, false.
enableStatus
@@ -222,6 +216,10 @@ for.
Key: The name of the repository.
Value: The name of the account or organization that owns the repository.
uploadURL
+Optional
+Value: Your GitHub Enterprise upload URL (often the same as API URL).
username
Your GitHub username. Used to figure out which review requests you’ve
been added to.
Source Code
wtf/gitlab/Required ENV Variables
- -Key: WTF_GITLAB_TOKEN
-Action: A GitLab personal access token. Requires at least api access.
Keyboard Commands
Key: /
@@ -177,6 +172,7 @@ height="0" width="0" style="display:none;visibility:hidden">
Configuration
gitlab:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
enabled: true
position:
top: 2
@@ -190,6 +186,9 @@ height="0" width="0" style="display:none;visibility:hidden">
username: "senorprogrammer"Attributes
+apiKey
+Value: A GitLab personal access token. Requires at least api access.
enabled
Determines whether or not this module is executed and if its data displayed onscreen.
Values: true, false.
Source Code
wtf/jenkins/Required ENV Variables
- -Key: WTF_JENKINS_API_KEY
-Value: Your Jenkins API key.
Keyboard Commands
None.
Configuration
jenkins:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
enabled: true
position:
top: 2
@@ -169,6 +165,9 @@ width="320" height="68" alt="jenkins screenshot" />
verifyServerCertificate: trueAttributes
+apiKey
+Value: Your Jenkins API key.
enabled
Determines whether or not this module is executed and if its data displayed onscreen.
Values: true, false.
Source Code
wtf/jira/Required ENV Variables
- -Key: WTF_JIRA_API_KEY
-Value: Your Jira API key.
Keyboard Commands
Key: [return]
@@ -169,6 +164,7 @@ height="0" width="0" style="display:none;visibility:hidden">
Single Jira Project
jira:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
colors:
rows:
even: "lightblue"
@@ -191,6 +187,7 @@ height="0" width="0" style="display:none;visibility:hidden">
If you want to monitor multiple Jira projects, use the following
configuration (note the difference in project):
jira:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
colors:
rows:
even: "lightblue"
@@ -210,6 +207,9 @@ configuration (note the difference in project):
verifyServerCertificate: true
Attributes
+apiKey
+Value: Your Jira API key.
+
colors.rows.even
Define the foreground color for even-numbered rows.
Values: Any X11
diff --git a/docs/posts/modules/newrelic/index.html b/docs/posts/modules/newrelic/index.html
index a5f87d7f..59969c82 100644
--- a/docs/posts/modules/newrelic/index.html
+++ b/docs/posts/modules/newrelic/index.html
@@ -144,18 +144,13 @@ monitored application: deploy ID, deploy time, and who deployed it.
Source Code
wtf/newrelic/
-Required ENV Variables
-
-Key: WTF_NEW_RELIC_API_KEY
-Value: Your New Relic API
-token.
-
Keyboard Commands
None.
Configuration
newrelic:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
applicationId: 10549735
deployCount: 6
enabled: true
@@ -167,6 +162,9 @@ token.
refreshInterval: 900
Attributes
+apiKey
+Value: Your New Relic API token.
+
applicationId
The integer ID of the New Relic application you wish to report on.
diff --git a/docs/posts/modules/opsgenie/index.html b/docs/posts/modules/opsgenie/index.html
index d8bb1f62..df8ec6d9 100644
--- a/docs/posts/modules/opsgenie/index.html
+++ b/docs/posts/modules/opsgenie/index.html
@@ -144,18 +144,13 @@ and who’s currently on call.
Source Code
wtf/opsgenie/
-Required ENV Variables
-
-Key: WTF_OPS_GENIE_API_KEY
-Value: Your OpsGenie
-API token.
-
Keyboard Commands
None.
Configuration
opsgenie:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
displayEmpty: false
enabled: true
position:
@@ -166,6 +161,9 @@ API token.
refreshInterval: 21600
Attributes
+apiKey < br />
+Value: Your OpsGenie API token.
+
displayEmpty
Whether schedules with no assigned person on-call should be displayed.
Values: true, false.
diff --git a/docs/posts/modules/todoist/index.html b/docs/posts/modules/todoist/index.html
index a2e6e8a1..9fd8ed2e 100644
--- a/docs/posts/modules/todoist/index.html
+++ b/docs/posts/modules/todoist/index.html
@@ -145,13 +145,6 @@ height="0" width="0" style="display:none;visibility:hidden">
Source Code
wtf/todoist/
-Required ENV Variables
-
-Key: WTF_TODOIST_TOKEN
-Value: Your Todoist API Token.
-
-You can get your API Token at: todoist.com/prefs/integrations.
-
Keyboard Commands
Key: h
@@ -189,6 +182,7 @@ height="0" width="0" style="display:none;visibility:hidden">
Configuration
todoist:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
enabled: true
position:
top: 0
@@ -200,6 +194,9 @@ height="0" width="0" style="display:none;visibility:hidden">
refreshInterval: 3600
Attributes
+apiKey
+Value: Your Todoist API token.
+
enabled
Determines whether or not this module is executed and if its data displayed onscreen.
Values: true, false.
diff --git a/docs/posts/modules/travisci/index.html b/docs/posts/modules/travisci/index.html
index cf28640f..80fb84ba 100644
--- a/docs/posts/modules/travisci/index.html
+++ b/docs/posts/modules/travisci/index.html
@@ -145,17 +145,13 @@ height="0" width="0" style="display:none;visibility:hidden">
Source Code
wtf/travisci/
-Required ENV Variables
-
-Key: WTF_TRAVIS_API_TOKEN
-Value: Your Travis CI API access token.
-
Keyboard Commands
None.
Configuration
travisci:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
enabled: true
position:
top: 4
@@ -166,6 +162,9 @@ height="0" width="0" style="display:none;visibility:hidden">
refreshInterval: 900
Attributes
+apiKey
+Value: Your Travis CI API access token.
+
enabled
Determines whether or not this module is executed and if its data displayed onscreen.
Values: true, false.
diff --git a/docs/posts/modules/trello/index.html b/docs/posts/modules/trello/index.html
index ff6efcb0..7be6552e 100644
--- a/docs/posts/modules/trello/index.html
+++ b/docs/posts/modules/trello/index.html
@@ -143,15 +143,6 @@ height="0" width="0" style="display:none;visibility:hidden">
Source Code
wtf/trello/
-Required ENV Variables
-
-Key: WTF_TRELLO_APP_KEY
-Value: Your Trello App Key.
-Key: WTF_TRELLO_ACCESS_TOKEN
-Value: Your Trello Access Token.
-
-You can get your API key at: trello.com/app-key.
-
Keyboard Commands
None.
@@ -159,11 +150,13 @@ height="0" width="0" style="display:none;visibility:hidden">
Configuration
Single Trello List
-trello:
+trello:
+ accessToken: "7b8b14f8743a408a93276d7155dd9ee2"
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
board: Main
enabled: true
list: "Todo"
- position:
+ position:
height: 1
left: 2
top: 0
@@ -174,11 +167,13 @@ height="0" width="0" style="display:none;visibility:hidden">
If you want to monitor multiple Trello lists, use the following
configuration (note the difference in list):
-trello:
+trello:
+ accessToken: "7b8b14f8743a408a93276d7155dd9ee2"
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
board: Main
enabled: true
list: ["Todo", "Done"]
- position:
+ position:
height: 1
left: 2
top: 0
@@ -187,6 +182,12 @@ configuration (note the difference in list):
username: myname
Attributes
+accessToken
+Value: Your Trello access token.
+
+apiKey
+Value: Your Trello API key.
+
board
The name of the Trello board.
diff --git a/docs/posts/modules/zendesk/index.html b/docs/posts/modules/zendesk/index.html
index 0afa4c1b..0ef1b309 100644
--- a/docs/posts/modules/zendesk/index.html
+++ b/docs/posts/modules/zendesk/index.html
@@ -143,14 +143,6 @@ height="0" width="0" style="display:none;visibility:hidden">
Source Code
wtf/zendesk/
-Required ENV Variables
-
-Key: ZENDESK_API
-Value: Your Zendesk API Token
-
-Key: ZENDESK_DOMAIN
-Value: Your Zendesk subdomain
-
Keyboard Commands
Key: [return]
@@ -170,6 +162,7 @@ height="0" width="0" style="display:none;visibility:hidden">
Configuration
zendesk:
+ apiKey: "3276d7155dd9ee27b8b14f8743a408a9"
enabled: true
position:
top: 0
@@ -177,9 +170,13 @@ height="0" width="0" style="display:none;visibility:hidden">
height: 1
width: 1
status: "new"
+ subdomain: "your_domain"
username: "your_email@acme.com"
Attributes
+apiKey
+Value: Your Zendesk API token.
+
enabled
Determines whether or not this module is executed and if its data displayed onscreen.
Values: true, false.
@@ -191,6 +188,9 @@ Defines where in the grid this module’s widget will be displayed.
new, open, pending, hold.
+subdomain
+Value: Your Zendesk subdomain.
+
username
Your Zendesk username
Values: A valid Zendesk username (usually an email address).
diff --git a/gerrit/widget.go b/gerrit/widget.go
index 0f3f2095..bd87fef2 100644
--- a/gerrit/widget.go
+++ b/gerrit/widget.go
@@ -3,13 +3,14 @@ package gerrit
import (
"crypto/tls"
"fmt"
+ "net/http"
+ "os"
+ "regexp"
+
glb "github.com/andygrunwald/go-gerrit"
"github.com/gdamore/tcell"
"github.com/rivo/tview"
"github.com/senorprogrammer/wtf/wtf"
- "net/http"
- "os"
- "regexp"
)
const HelpText = `
@@ -43,7 +44,12 @@ var (
func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
baseURL := wtf.Config.UString("wtf.mods.gerrit.domain")
username := wtf.Config.UString("wtf.mods.gerrit.username")
- password := os.Getenv("WTF_GERRIT_PASSWORD")
+
+ password := wtf.Config.UString(
+ "wtf.mods.gerrit.password",
+ os.Getenv("WTF_GERRIT_PASSWORD"),
+ )
+
verifyServerCertificate := wtf.Config.UBool("wtf.mods.gerrit.verifyServerCertificate", true)
httpClient := &http.Client{Transport: &http.Transport{
diff --git a/github/github_repo.go b/github/github_repo.go
index 80640f5a..7bf210f7 100644
--- a/github/github_repo.go
+++ b/github/github_repo.go
@@ -6,6 +6,7 @@ import (
"os"
ghb "github.com/google/go-github/github"
+ "github.com/senorprogrammer/wtf/wtf"
"golang.org/x/oauth2"
)
@@ -22,14 +23,12 @@ type GithubRepo struct {
func NewGithubRepo(name, owner string) *GithubRepo {
repo := GithubRepo{
- apiKey: os.Getenv("WTF_GITHUB_TOKEN"),
- baseURL: os.Getenv("WTF_GITHUB_BASE_URL"),
- uploadURL: os.Getenv("WTF_GITHUB_UPLOAD_URL"),
-
Name: name,
Owner: owner,
}
+ repo.loadAPICredentials()
+
return &repo
}
@@ -91,6 +90,23 @@ func (repo *GithubRepo) githubClient() (*ghb.Client, error) {
return ghb.NewClient(oauthClient), nil
}
+func (repo *GithubRepo) loadAPICredentials() {
+ repo.apiKey = wtf.Config.UString(
+ "wtf.mods.github.apiKey",
+ os.Getenv("WTF_GITHUB_TOKEN"),
+ )
+
+ repo.baseURL = wtf.Config.UString(
+ "wtf.mods.github.baseURL",
+ os.Getenv("WTF_GITHUB_BASE_URL"),
+ )
+
+ repo.uploadURL = wtf.Config.UString(
+ "wtf.mods.github.uploadURL",
+ os.Getenv("WTF_GITHUB_UPLOAD_URL"),
+ )
+}
+
// myPullRequests returns a list of pull requests created by username on this repo
func (repo *GithubRepo) myPullRequests(username string) []*ghb.PullRequest {
prs := []*ghb.PullRequest{}
diff --git a/gitlab/widget.go b/gitlab/widget.go
index 2a9324d5..081abd80 100644
--- a/gitlab/widget.go
+++ b/gitlab/widget.go
@@ -34,9 +34,14 @@ type Widget struct {
}
func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
- apiKey := os.Getenv("WTF_GITLAB_TOKEN")
+ apiKey := wtf.Config.UString(
+ "wtf.mods.gitlab.apiKey",
+ os.Getenv("WTF_GITLAB_TOKEN"),
+ )
+
baseURL := wtf.Config.UString("wtf.mods.gitlab.domain")
gitlab := glb.NewClient(nil, apiKey)
+
if baseURL != "" {
gitlab.SetBaseURL(baseURL)
}
diff --git a/jenkins/widget.go b/jenkins/widget.go
index 262da966..cf12609f 100644
--- a/jenkins/widget.go
+++ b/jenkins/widget.go
@@ -28,11 +28,10 @@ func (widget *Widget) Refresh() {
view, err := Create(
wtf.Config.UString("wtf.mods.jenkins.url"),
wtf.Config.UString("wtf.mods.jenkins.user"),
- os.Getenv("WTF_JENKINS_API_KEY"),
+ widget.apiKey(),
)
widget.UpdateRefreshedAt()
- //widget.View.Clear()
var content string
if err != nil {
@@ -50,6 +49,13 @@ func (widget *Widget) Refresh() {
/* -------------------- Unexported Functions -------------------- */
+func (widget *Widget) apiKey() string {
+ return wtf.Config.UString(
+ "wtf.mods.jenkins.apiKey",
+ os.Getenv("WTF_JENKINS_API_KEY"),
+ )
+}
+
func (widget *Widget) contentFrom(view *View) string {
str := fmt.Sprintf(" [red]%s[white]\n", view.Name)
diff --git a/jira/client.go b/jira/client.go
index b28ec616..4ff0f5c2 100644
--- a/jira/client.go
+++ b/jira/client.go
@@ -54,6 +54,13 @@ func buildJql(key string, value string) string {
/* -------------------- Unexported Functions -------------------- */
+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)
@@ -61,7 +68,7 @@ func jiraRequest(path string) (*http.Response, error) {
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())
verifyServerCertificate := wtf.Config.UBool("wtf.mods.jira.verifyServerCertificate", true)
httpClient := &http.Client{Transport: &http.Transport{
diff --git a/newrelic/client.go b/newrelic/client.go
index f88d4e3e..e3937338 100644
--- a/newrelic/client.go
+++ b/newrelic/client.go
@@ -8,7 +8,7 @@ import (
)
func Application() (*nr.Application, error) {
- client := nr.NewClient(os.Getenv("WTF_NEW_RELIC_API_KEY"))
+ client := nr.NewClient(apiKey())
application, err := client.GetApplication(wtf.Config.UInt("wtf.mods.newrelic.applicationId"))
if err != nil {
@@ -19,7 +19,7 @@ func Application() (*nr.Application, error) {
}
func Deployments() ([]nr.ApplicationDeployment, error) {
- client := nr.NewClient(os.Getenv("WTF_NEW_RELIC_API_KEY"))
+ client := nr.NewClient(apiKey())
opts := &nr.ApplicationDeploymentOptions{Page: 1}
deployments, err := client.GetApplicationDeployments(wtf.Config.UInt("wtf.mods.newrelic.applicationId"), opts)
@@ -29,3 +29,10 @@ func Deployments() ([]nr.ApplicationDeployment, error) {
return deployments, nil
}
+
+func apiKey() string {
+ return wtf.Config.UString(
+ "wtf.mods.newrelic.apiKey",
+ os.Getenv("WTF_NEW_RELIC_API_KEY"),
+ )
+}
diff --git a/newrelic/widget.go b/newrelic/widget.go
index 8c4fd8b7..84bdb6bf 100644
--- a/newrelic/widget.go
+++ b/newrelic/widget.go
@@ -31,7 +31,7 @@ func (widget *Widget) Refresh() {
}
widget.UpdateRefreshedAt()
- widget.View.SetTitle(fmt.Sprintf("%s- [green]%s[white]", widget.Name, appName))
+ widget.View.SetTitle(widget.ContextualTitle(fmt.Sprintf("%s - [green]%s[white]", widget.Name, appName)))
widget.View.Clear()
var content string
diff --git a/opsgenie/client.go b/opsgenie/client.go
index 59ba2b90..b2a980cf 100644
--- a/opsgenie/client.go
+++ b/opsgenie/client.go
@@ -5,6 +5,8 @@ import (
"fmt"
"net/http"
"os"
+
+ "github.com/senorprogrammer/wtf/wtf"
)
type OnCallResponse struct {
@@ -28,16 +30,22 @@ type Parent struct {
/* -------------------- Exported Functions -------------------- */
func Fetch() (*OnCallResponse, error) {
- apiKey := os.Getenv("WTF_OPS_GENIE_API_KEY")
scheduleUrl := "https://api.opsgenie.com/v2/schedules/on-calls?flat=true"
- response, err := opsGenieRequest(scheduleUrl, apiKey)
+ response, err := opsGenieRequest(scheduleUrl, apiKey())
return response, err
}
/* -------------------- Unexported Functions -------------------- */
+func apiKey() string {
+ return wtf.Config.UString(
+ "wtf.mods.opsgenie.apiKey",
+ os.Getenv("WTF_OPS_GENIE_API_KEY"),
+ )
+}
+
func opsGenieRequest(url string, apiKey string) (*OnCallResponse, error) {
req, err := http.NewRequest("GET", url, nil)
if err != nil {
diff --git a/opsgenie/widget.go b/opsgenie/widget.go
index c95b7dcd..aab56db3 100644
--- a/opsgenie/widget.go
+++ b/opsgenie/widget.go
@@ -25,7 +25,7 @@ func (widget *Widget) Refresh() {
data, err := Fetch()
widget.UpdateRefreshedAt()
- widget.View.SetTitle(widget.Name)
+ widget.View.SetTitle(widget.ContextualTitle(widget.Name))
var content string
if err != nil {
diff --git a/todoist/widget.go b/todoist/widget.go
index 6ee4f202..c10da595 100644
--- a/todoist/widget.go
+++ b/todoist/widget.go
@@ -44,7 +44,7 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
pages: pages,
}
- todoist.Token = os.Getenv("WTF_TODOIST_TOKEN")
+ widget.loadAPICredentials()
widget.projects = loadProjects()
widget.View.SetInputCapture(widget.keyboardIntercept)
@@ -170,7 +170,13 @@ func (w *Widget) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey {
return event
}
-// TODO: Rename this List to Projects so the internal can be Checklist
+func (widget *Widget) loadAPICredentials() {
+ todoist.Token = wtf.Config.UString(
+ "wtf.mods.todoist.apiKey",
+ os.Getenv("WTF_TODOIST_TOKEN"),
+ )
+}
+
func loadProjects() []*Project {
projects := []*Project{}
diff --git a/travisci/client.go b/travisci/client.go
index 8e80d0de..1e66cb41 100644
--- a/travisci/client.go
+++ b/travisci/client.go
@@ -72,7 +72,10 @@ func travisRequest(path string) (*http.Response, error) {
}
func apiToken() string {
- return os.Getenv(APIEnvToken)
+ return wtf.Config.UString(
+ "wtf.mods.travisci.apiKey",
+ os.Getenv(APIEnvToken),
+ )
}
func parseJson(obj interface{}, text io.Reader) {
diff --git a/trello/widget.go b/trello/widget.go
index 2c2459a4..faa69abd 100644
--- a/trello/widget.go
+++ b/trello/widget.go
@@ -23,7 +23,10 @@ func NewWidget() *Widget {
/* -------------------- Exported Functions -------------------- */
func (widget *Widget) Refresh() {
- client := trello.NewClient(os.Getenv("WTF_TRELLO_APP_KEY"), os.Getenv("WTF_TRELLO_ACCESS_TOKEN"))
+ client := trello.NewClient(
+ widget.apiKey(),
+ widget.accessToken(),
+ )
// Get the cards
searchResult, err := GetCards(client, getLists())
@@ -50,6 +53,21 @@ func (widget *Widget) Refresh() {
}
/* -------------------- Unexported Functions -------------------- */
+
+func (widget *Widget) accessToken() string {
+ return wtf.Config.UString(
+ "wtf.mods.trello.accessToken",
+ os.Getenv("WTF_TRELLO_ACCESS_TOKEN"),
+ )
+}
+
+func (widget *Widget) apiKey() string {
+ return wtf.Config.UString(
+ "wtf.mods.trello.apiKey",
+ os.Getenv("WTF_TRELLO_APP_KEY"),
+ )
+}
+
func (widget *Widget) contentFrom(searchResult *SearchResult) string {
str := ""
diff --git a/weatherservices/weather/widget.go b/weatherservices/weather/widget.go
index 48062285..2d7448e3 100644
--- a/weatherservices/weather/widget.go
+++ b/weatherservices/weather/widget.go
@@ -1,13 +1,11 @@
package weather
import (
- "fmt"
"os"
owm "github.com/briandowns/openweathermap"
"github.com/gdamore/tcell"
"github.com/rivo/tview"
- "github.com/senorprogrammer/wtf/logger"
"github.com/senorprogrammer/wtf/wtf"
)
@@ -43,14 +41,10 @@ func NewWidget(app *tview.Application, pages *tview.Pages) *Widget {
app: app,
pages: pages,
- APIKey: os.Getenv("WTF_OWM_API_KEY"),
- Idx: 0,
+ Idx: 0,
}
- if widget.APIKey == "" {
- logger.Log("loading weather API key from config")
- widget.APIKey = wtf.Config.UString(fmt.Sprintf("wtf.mods.%s.apiKey", configKey), "")
- }
+ widget.loadAPICredentials()
widget.View.SetInputCapture(widget.keyboardIntercept)
@@ -188,6 +182,15 @@ func (widget *Widget) keyboardIntercept(event *tcell.EventKey) *tcell.EventKey {
}
}
+// loadAPICredentials loads the API authentication credentials for this module
+// First checks to see if they're in the config file. If not, checks the ENV var
+func (widget *Widget) loadAPICredentials() {
+ widget.APIKey = wtf.Config.UString(
+ "wtf.mods.weather.apiKey",
+ os.Getenv("WTF_OWM_API_KEY"),
+ )
+}
+
func (widget *Widget) showHelp() {
closeFunc := func() {
widget.pages.RemovePage("help")
diff --git a/wtftests/bargraph/bargraph_test.go b/wtf_tests/bargraph/bargraph_test.go
similarity index 96%
rename from wtftests/bargraph/bargraph_test.go
rename to wtf_tests/bargraph/bargraph_test.go
index 41c2ef7b..02a383e9 100644
--- a/wtftests/bargraph/bargraph_test.go
+++ b/wtf_tests/bargraph/bargraph_test.go
@@ -1,4 +1,4 @@
-package bargraphtests
+package bargraph_test
import (
"testing"
diff --git a/wtf_tests/colors_test.go b/wtf_tests/colors_test.go
new file mode 100644
index 00000000..8c2e6f77
--- /dev/null
+++ b/wtf_tests/colors_test.go
@@ -0,0 +1,14 @@
+package wtf_tests
+
+import (
+ "testing"
+
+ . "github.com/senorprogrammer/wtf/wtf"
+ . "github.com/stretchr/testify/assert"
+)
+
+func TestASCIItoTviewColors(t *testing.T) {
+ Equal(t, "", ASCIItoTviewColors(""))
+ Equal(t, "cat", ASCIItoTviewColors("cat"))
+ Equal(t, "[38;5;226mcat/[-]", ASCIItoTviewColors("[38;5;226mcat/[0m"))
+}
diff --git a/wtftests/datetime_test.go b/wtf_tests/datetime_test.go
similarity index 96%
rename from wtftests/datetime_test.go
rename to wtf_tests/datetime_test.go
index a9159d07..8415d345 100644
--- a/wtftests/datetime_test.go
+++ b/wtf_tests/datetime_test.go
@@ -1,4 +1,4 @@
-package wtftests
+package wtf_tests
import (
"testing"
diff --git a/wtftests/position_test.go b/wtf_tests/position_test.go
similarity index 96%
rename from wtftests/position_test.go
rename to wtf_tests/position_test.go
index 336bc964..370a3373 100644
--- a/wtftests/position_test.go
+++ b/wtf_tests/position_test.go
@@ -1,4 +1,4 @@
-package wtftests
+package wtf_tests
import (
"testing"
diff --git a/wtftests/utils_test.go b/wtf_tests/utils_test.go
similarity index 99%
rename from wtftests/utils_test.go
rename to wtf_tests/utils_test.go
index b1aa7994..d78425cc 100644
--- a/wtftests/utils_test.go
+++ b/wtf_tests/utils_test.go
@@ -1,4 +1,4 @@
-package wtftests
+package wtf_tests
import (
"testing"
diff --git a/zendesk/client.go b/zendesk/client.go
index e450fb7b..19b7b54b 100644
--- a/zendesk/client.go
+++ b/zendesk/client.go
@@ -16,9 +16,19 @@ type Resource struct {
Raw string
}
-var a = os.Getenv("ZENDESK_API")
-var subdomain = os.Getenv("ZENDESK_SUBDOMAIN")
-var baseURL = fmt.Sprintf("https://%v.zendesk.com/api/v2", subdomain)
+func apiKey() string {
+ return wtf.Config.UString(
+ "wtf.mods.zendesk.apiKey",
+ os.Getenv("ZENDESK_API"),
+ )
+}
+
+func subdomain() string {
+ return wtf.Config.UString(
+ "wtf.mods.zendesk.apiKey",
+ os.Getenv("ZENDESK_API"),
+ )
+}
func errHandler(err error) {
if err != nil {
@@ -26,20 +36,15 @@ func errHandler(err error) {
}
}
-func buildUrl(baseURL string) string {
- ticketURL := baseURL + "/tickets.json?sort_by=status"
- return ticketURL
-}
-
func api(key string, meth string, path string, params string) (*Resource, error) {
-
trn := &http.Transport{}
client := &http.Client{
Transport: trn,
}
- var URL = buildUrl(baseURL)
+ baseURL := fmt.Sprintf("https://%v.zendesk.com/api/v2", subdomain())
+ URL := baseURL + "/tickets.json?sort_by=status"
req, err := http.NewRequest(meth, URL, bytes.NewBufferString(params))
if err != nil {
diff --git a/zendesk/tickets.go b/zendesk/tickets.go
index 8cbe53d2..a5ba7575 100644
--- a/zendesk/tickets.go
+++ b/zendesk/tickets.go
@@ -55,7 +55,7 @@ func listTickets(pag ...string) (*TicketArray, error) {
} else {
path = pag[0]
}
- resource, err := api(a, "GET", path, "")
+ resource, err := api(apiKey(), "GET", path, "")
if err != nil {
return nil, err
}
diff --git a/zendesk/widget.go b/zendesk/widget.go
index c2b57ab6..cdf5825e 100644
--- a/zendesk/widget.go
+++ b/zendesk/widget.go
@@ -103,7 +103,7 @@ func (widget *Widget) openTicket() {
sel := widget.selected
if sel >= 0 && widget.result != nil && sel < len(widget.result.Tickets) {
issue := &widget.result.Tickets[widget.selected]
- ticketUrl := fmt.Sprintf("https://%s.zendesk.com/agent/tickets/%d", subdomain, issue.Id)
+ ticketUrl := fmt.Sprintf("https://%s.zendesk.com/agent/tickets/%d", subdomain(), issue.Id)
wtf.OpenFile(ticketUrl)
}
}