Naming fixes

Amine Hilaly created 6 years ago

Change summary

bridge/bridges.go       | 2 +-
bridge/core/bridge.go   | 1 -
bridge/github/config.go | 8 +++++---
commands/bridge_rm.go   | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)

Detailed changes

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)
 }

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
 	}
 

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 {

commands/bridge_rm.go

@@ -15,7 +15,7 @@ func runBridgeRm(cmd *cobra.Command, args []string) error {
 	defer backend.Close()
 	interrupt.RegisterCleaner(backend.Close)
 
-	err = bridge.RemoveBridges(backend, args[0])
+	err = bridge.RemoveBridge(backend, args[0])
 	if err != nil {
 		return err
 	}