aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-02-23 14:23:34 +0100
committerMichael Muré <batolettre@gmail.com>2020-02-23 14:23:34 +0100
commitdc21ad089295723ca95bf1b452d2f6f31c51c735 (patch)
tree396df7da8fc1fbcb8d4edd289c09bfe933c04c68
parentb3318335986618388637a9d35d68b39633e4548a (diff)
downloadgit-bug-dc21ad089295723ca95bf1b452d2f6f31c51c735.tar.gz
use regex.MustCompile instead of dealing with the error
-rw-r--r--bridge/core/auth/credential.go5
-rw-r--r--bridge/core/bridge.go10
-rw-r--r--bridge/github/config.go5
-rw-r--r--bridge/gitlab/config.go5
-rw-r--r--bridge/launchpad/config.go5
5 files changed, 6 insertions, 24 deletions
diff --git a/bridge/core/auth/credential.go b/bridge/core/auth/credential.go
index 2814e94c..d95b23c7 100644
--- a/bridge/core/auth/credential.go
+++ b/bridge/core/auth/credential.go
@@ -171,10 +171,7 @@ func List(repo repository.RepoConfig, opts ...Option) ([]Credential, error) {
return nil, err
}
- re, err := regexp.Compile(`^` + configKeyPrefix + `\.([^.]+)\.([^.]+(?:\.[^.]+)*)$`)
- if err != nil {
- panic(err)
- }
+ re := regexp.MustCompile(`^` + configKeyPrefix + `\.([^.]+)\.([^.]+(?:\.[^.]+)*)$`)
mapped := make(map[string]map[string]string)
diff --git a/bridge/core/bridge.go b/bridge/core/bridge.go
index 10f6b109..8c1f9714 100644
--- a/bridge/core/bridge.go
+++ b/bridge/core/bridge.go
@@ -155,10 +155,7 @@ func ConfiguredBridges(repo repository.RepoConfig) ([]string, error) {
return nil, errors.Wrap(err, "can't read configured bridges")
}
- re, err := regexp.Compile(bridgeConfigKeyPrefix + `.([^.]+)`)
- if err != nil {
- panic(err)
- }
+ re := regexp.MustCompile(bridgeConfigKeyPrefix + `.([^.]+)`)
set := make(map[string]interface{})
@@ -194,10 +191,7 @@ func BridgeExist(repo repository.RepoConfig, name string) bool {
// Remove a configured bridge
func RemoveBridge(repo repository.RepoConfig, name string) error {
- re, err := regexp.Compile(`^[a-zA-Z0-9]+`)
- if err != nil {
- panic(err)
- }
+ re := regexp.MustCompile(`^[a-zA-Z0-9]+`)
if !re.MatchString(name) {
return fmt.Errorf("bad bridge fullname: %s", name)
diff --git a/bridge/github/config.go b/bridge/github/config.go
index 269c6144..b6f69d74 100644
--- a/bridge/github/config.go
+++ b/bridge/github/config.go
@@ -287,10 +287,7 @@ func promptToken() (*auth.Token, error) {
fmt.Println(" - 'repo' : to be able to read private repositories")
fmt.Println()
- re, err := regexp.Compile(`^[a-zA-Z0-9]{40}$`)
- if err != nil {
- panic("regexp compile:" + err.Error())
- }
+ re := regexp.MustCompile(`^[a-zA-Z0-9]{40}$`)
var login string
diff --git a/bridge/gitlab/config.go b/bridge/gitlab/config.go
index b730a365..d5dc418c 100644
--- a/bridge/gitlab/config.go
+++ b/bridge/gitlab/config.go
@@ -183,10 +183,7 @@ func promptToken(baseUrl string) (*auth.Token, error) {
fmt.Println("'api' access scope: to be able to make api calls")
fmt.Println()
- re, err := regexp.Compile(`^[a-zA-Z0-9\-\_]{20}$`)
- if err != nil {
- panic("regexp compile:" + err.Error())
- }
+ re := regexp.MustCompile(`^[a-zA-Z0-9\-\_]{20}$`)
var login string
diff --git a/bridge/launchpad/config.go b/bridge/launchpad/config.go
index 8567675f..dfff0d3d 100644
--- a/bridge/launchpad/config.go
+++ b/bridge/launchpad/config.go
@@ -91,10 +91,7 @@ func validateProject(project string) (bool, error) {
// extract project name from url
func splitURL(url string) (string, error) {
- re, err := regexp.Compile(`launchpad\.net[\/:]([^\/]*[a-z]+)`)
- if err != nil {
- panic("regexp compile:" + err.Error())
- }
+ re := regexp.MustCompile(`launchpad\.net[\/:]([^\/]*[a-z]+)`)
res := re.FindStringSubmatch(url)
if res == nil {