Merge pull request #33 from koudaiii/koudaiii/getenv

[Fix bug] os.Getenv
koudaiii · Oct 18, 2017 · 27cadcb · 27cadcb
2 parents cf1a1bf + e2ef4f9
commit 27cadcb
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.3 (2017-10-18)
+
+- [Fix bug] os.Getenv #33 #32
+
 ## 0.6.2 (2017-10-17)
 
 - fix version v0.6.2 and fix link in READE #30 #29
@@ -25,4 +29,3 @@
 ## 0.2.0 (2017-01-18)
 
 - list command
-
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME      := qucli
-VERSION   := v0.6.2
+VERSION   := v0.6.3
 REVISION  := $(shell git rev-parse --short HEAD)
 
 SRCS      := $(shell find . -name '*.go' -type f)

diff --git a/quay/notification.go b/quay/notification.go
@@ -2,7 +2,6 @@ package quay
 
 import (
 	"encoding/json"
-	"os"
 	"path"
 
 	"github.com/koudaiii/qucli/utils"
@@ -16,7 +15,7 @@ func ListRepositoryNotifications(namespace string, name string, hostname string)
 
 	u.Path = path.Join(u.Path, "repository", namespace, name, "notification")
 
-	body, err := utils.HttpGet(u.String(), os.Getenv("QUAY_API_TOKEN"))
+	body, err := utils.HttpGet(u.String(), QuayAPIToken)
 	if err != nil {
 		return notifications, err
 	}
@@ -48,7 +47,7 @@ func DeleteRepositoryNotification(namespace string, name string, uuid string, ho
 
 	u.Path = path.Join(u.Path, "repository", namespace, name, "notification", uuid)
 
-	_, err := utils.HttpDelete(u.String(), os.Getenv("QUAY_API_TOKEN"))
+	_, err := utils.HttpDelete(u.String(), QuayAPIToken)
 	if err != nil {
 		return err
 	}
@@ -63,7 +62,7 @@ func AddRepositoryNotification(namespace string, name string, request RequestRep
 	u := QuayURLParse(hostname)
 	u.Path = path.Join(u.Path, "repository", namespace, name, "notification")
 
-	body, err := utils.HttpPost(u.String()+"/", os.Getenv("QUAY_API_TOKEN"), req)
+	body, err := utils.HttpPost(u.String()+"/", QuayAPIToken, req)
 	if err != nil {
 		return repos, err
 	}
@@ -80,7 +79,7 @@ func TestRepositoryNotification(namespace string, name string, uuid string, host
 
 	u.Path = path.Join(u.Path, "repository", namespace, name, "notification", uuid, "test")
 
-	_, err := utils.HttpPost(u.String(), os.Getenv("QUAY_API_TOKEN"), nil)
+	_, err := utils.HttpPost(u.String(), QuayAPIToken, nil)
 	if err != nil {
 		return err
 	}

diff --git a/quay/permission.go b/quay/permission.go
@@ -2,7 +2,6 @@ package quay
 
 import (
 	"encoding/json"
-	"os"
 	"path"
 
 	"github.com/koudaiii/qucli/utils"
@@ -15,7 +14,7 @@ func GetPermissions(namespace string, name string, accountType string, hostname
 	u := QuayURLParse(hostname)
 	u.Path = path.Join(u.Path, "repository", namespace, name, "permissions", accountType) + "/"
 
-	body, err := utils.HttpGet(u.String(), os.Getenv("QUAY_API_TOKEN"))
+	body, err := utils.HttpGet(u.String(), QuayAPIToken)
 	if err != nil {
 		return permissions, err
 	}
@@ -36,7 +35,7 @@ func DeletePermission(namespace string, name string, accountType string, account
 	u := QuayURLParse(hostname)
 	u.Path = path.Join(u.Path, "repository", namespace, name, "permissions", accountType, account)
 
-	_, err := utils.HttpDelete(u.String(), os.Getenv("QUAY_API_TOKEN"))
+	_, err := utils.HttpDelete(u.String(), QuayAPIToken)
 	if err != nil {
 		return err
 	}
@@ -53,7 +52,7 @@ func AddPermission(namespace string, name string, accountType string, account st
 	u := QuayURLParse(hostname)
 	u.Path = path.Join(u.Path, "repository", namespace, name, "permissions", accountType, account)
 
-	body, err := utils.HttpPut(u.String(), os.Getenv("QUAY_API_TOKEN"), req)
+	body, err := utils.HttpPut(u.String(), QuayAPIToken, req)
 	if err != nil {
 		return repos, err
 	}

diff --git a/quay/quay.go b/quay/quay.go
@@ -93,3 +93,5 @@ func QuayURLParse(hostname string) *url.URL {
 	}
 	return u
 }
+
+var QuayAPIToken = os.Getenv("QUAY_API_TOKEN")
diff --git a/quay/repository.go b/quay/repository.go
@@ -3,7 +3,6 @@ package quay
 import (
 	"encoding/json"
 	"net/url"
-	"os"
 	"path"
 	"strconv"
 
@@ -21,7 +20,7 @@ func ListRepository(namespace string, public bool, hostname string) (QuayReposit
 
 	u.Path = path.Join(u.Path, "repository")
 
-	body, err := utils.HttpGet(u.String()+"?"+values.Encode(), os.Getenv("QUAY_API_TOKEN"))
+	body, err := utils.HttpGet(u.String()+"?"+values.Encode(), QuayAPIToken)
 	if err != nil {
 		return repositories, err
 	}
@@ -46,7 +45,7 @@ func GetRepository(namespace string, name string, hostname string) (ResponseRepo
 	u := QuayURLParse(hostname)
 	u.Path = path.Join(u.Path, "repository", namespace, name)
 
-	body, err := utils.HttpGet(u.String(), os.Getenv("QUAY_API_TOKEN"))
+	body, err := utils.HttpGet(u.String(), QuayAPIToken)
 	if err != nil {
 		return repos, err
 	}
@@ -62,7 +61,7 @@ func DeleteRepository(namespace string, name string, hostname string) error {
 	u := QuayURLParse(hostname)
 	u.Path = path.Join(u.Path, "repository", namespace, name)
 
-	_, err := utils.HttpDelete(u.String(), os.Getenv("QUAY_API_TOKEN"))
+	_, err := utils.HttpDelete(u.String(), QuayAPIToken)
 	if err != nil {
 		return err
 	}
@@ -81,7 +80,7 @@ func CreateRepository(namespace string, name string, visibility string, hostname
 	u := QuayURLParse(hostname)
 	u.Path = path.Join(u.Path, "repository")
 
-	body, err := utils.HttpPost(u.String(), os.Getenv("QUAY_API_TOKEN"), req)
+	body, err := utils.HttpPost(u.String(), QuayAPIToken, req)
 	if err != nil {
 		return repos, err
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,3 +93,5 @@ func QuayURLParse(hostname string) *url.URL { @@
     	}
     	return u
     }
+    var QuayAPIToken = os.Getenv("QUAY_API_TOKEN")