Merge pull request #27 from KeisukeYamashita/fix-alias-nil-pointer

Fix alias nil pointer
KeisukeYamashita · Oct 7, 2019 · 18e169d · 18e169d
2 parents b9335ce + b676dfe
commit 18e169d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/providers/gcp/gcp.go b/providers/gcp/gcp.go
@@ -198,7 +198,7 @@ func (p *Provider) addProjectParam() {
 
 // GetCtxString ...
 func (p *Provider) GetCtxString(str string) string {
-	key := p.GetCtxString(str)
+	key := p.Ctx.String(str)
 	if key == "" {
 		return ""
 	}

diff --git a/providers/github/github.go b/providers/github/github.go
@@ -8,10 +8,12 @@ import (
 	"github.com/urfave/cli"
 )
 
+// Provider ...
 type Provider struct {
 	baseURL *url.URL
 	URL     *url.URL
 	Ctx     *cli.Context
+	Aliases map[string]interface{}
 }
 
 // Init ...
@@ -47,6 +49,22 @@ func (p *Provider) addProductPath(product string) {
 	}
 }
 
+// GetCtxString ...
+func (p *Provider) GetCtxString(str string) string {
+	key := p.Ctx.String(str)
+	if key == "" {
+		return ""
+	}
+	value, ok := p.Aliases[key].(string)
+	if !ok {
+		return key
+	}
+	if value == "" {
+		return key
+	}
+	return value
+}
+
 func (p *Provider) join(additionPath string) {
 	if p.URL == nil {
 		p.URL = p.baseURL

diff --git a/providers/google/google.go b/providers/google/google.go
@@ -68,7 +68,7 @@ func (p *Provider) join(additionPath string) {
 
 // GetCtxString ...
 func (p *Provider) GetCtxString(str string) string {
-	key := p.GetCtxString(str)
+	key := p.Ctx.String(str)
 	if key == "" {
 		return ""
 	}

diff --git a/providers/pagerduty/pagerduty.go b/providers/pagerduty/pagerduty.go
@@ -72,7 +72,7 @@ func (p *Provider) join(additionPath string) {
 
 // GetCtxString ...
 func (p *Provider) GetCtxString(str string) string {
-	key := p.GetCtxString(str)
+	key := p.Ctx.String(str)
 	if key == "" {
 		return ""
 	}

diff --git a/providers/youtube/youtube.go b/providers/youtube/youtube.go
@@ -59,6 +59,22 @@ func (p *Provider) addProductPath(product string) {
 	}
 }
 
+// GetCtxString ...
+func (p *Provider) GetCtxString(str string) string {
+	key := p.Ctx.String(str)
+	if key == "" {
+		return ""
+	}
+	value, ok := p.Aliases[key].(string)
+	if !ok {
+		return key
+	}
+	if value == "" {
+		return key
+	}
+	return value
+}
+
 func (p *Provider) join(additionPath string) {
 	if p.URL == nil {
 		p.URL = p.baseURL