aboutsummaryrefslogtreecommitdiffstats
path: root/bridge
diff options
context:
space:
mode:
authorAmine Hilaly <hilalyamine@gmail.com>2019-06-16 23:02:59 +0200
committerAmine Hilaly <hilalyamine@gmail.com>2019-06-16 23:02:59 +0200
commit319b648d0f2d30c457c56df860dcecf89c80157a (patch)
tree8e4cfd58f79d47890110896450effdcf7e66721c /bridge
parentf70e775dbd7c53ebb6e3cd2ec1af8d73d13449b0 (diff)
downloadgit-bug-319b648d0f2d30c457c56df860dcecf89c80157a.tar.gz
Naming fixes
Diffstat (limited to 'bridge')
-rw-r--r--bridge/bridges.go2
-rw-r--r--bridge/core/bridge.go1
-rw-r--r--bridge/github/config.go8
3 files changed, 6 insertions, 5 deletions
diff --git a/bridge/bridges.go b/bridge/bridges.go
index 0aa0007f..ce6013e3 100644
--- a/bridge/bridges.go
+++ b/bridge/bridges.go
@@ -37,6 +37,6 @@ func ConfiguredBridges(repo repository.RepoCommon) ([]string, error) {
}
// Remove a configured bridge
-func RemoveBridges(repo repository.RepoCommon, name string) error {
+func RemoveBridge(repo repository.RepoCommon, name string) error {
return core.RemoveBridge(repo, name)
}
diff --git a/bridge/core/bridge.go b/bridge/core/bridge.go
index 2b2db0a2..4b93be7f 100644
--- a/bridge/core/bridge.go
+++ b/bridge/core/bridge.go
@@ -236,7 +236,6 @@ func (b *Bridge) loadConfig() (Configuration, error) {
result := make(Configuration, len(pairs))
for key, value := range pairs {
key := strings.TrimPrefix(key, keyPrefix)
- fmt.Println(key, value)
result[key] = value
}
diff --git a/bridge/github/config.go b/bridge/github/config.go
index 9c1bbcbb..1971abbc 100644
--- a/bridge/github/config.go
+++ b/bridge/github/config.go
@@ -17,7 +17,6 @@ import (
"time"
"github.com/pkg/errors"
-
"golang.org/x/crypto/ssh/terminal"
"github.com/MichaelMure/git-bug/bridge/core"
@@ -25,6 +24,7 @@ import (
)
const (
+ target = "github"
githubV3Url = "https://api.github.com"
keyTarget = "target"
keyOwner = "owner"
@@ -102,7 +102,7 @@ func (*Github) Configure(repo repository.RepoCommon, params core.BridgeParams) (
return nil, fmt.Errorf("project doesn't exist or authentication token has an incorrect scope")
}
- conf[keyTarget] = "github"
+ conf[keyTarget] = target
conf[keyToken] = token
conf[keyOwner] = owner
conf[keyProject] = project
@@ -111,8 +111,10 @@ func (*Github) Configure(repo repository.RepoCommon, params core.BridgeParams) (
}
func (*Github) ValidateConfig(conf core.Configuration) error {
- if _, ok := conf[keyTarget]; !ok {
+ if v, ok := conf[keyTarget]; !ok {
return fmt.Errorf("missing %s key", keyTarget)
+ } else if v != target {
+ return fmt.Errorf("unexpected target name: %v", v)
}
if _, ok := conf[keyToken]; !ok {