feat add feature/develop for collecting git metrics

internal/tools/gittar/conf/conf.go

@@ -61,6 +61,7 @@ type Conf struct {
 
 	// metrics
 	RefreshPersonalContributorDuration time.Duration `default:"12h" env:"REFRESH_PERSONAL_CONTRIBUTOR_DURATION"`
+	MetricTargetBranches               []string      `env:"METRIC_TARGET_BRANCHES" default:"[\"master\",\"main\",\"dev\",\"develop\",\"release\",\"feature/develop\"]"`
 
 	// AI
 	AIProxyURL      string `env:"AI_PROXY_URL"`
@@ -215,6 +216,10 @@ func RefreshPersonalContributorDuration() time.Duration {
 	return cfg.RefreshPersonalContributorDuration
 }
 
+func MetricTargetBranches() []string {
+	return cfg.MetricTargetBranches
+}
+
 func DiceCluster() string {
 	return os.Getenv(apistructs.DICE_CLUSTER_NAME.String())
 }

internal/tools/gittar/conf/conf_test.go

@@ -0,0 +1,29 @@
+// Copyright (c) 2021 Terminus, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package conf
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoad(t *testing.T) {
+	Load()
+	branches := MetricTargetBranches()
+	assert.Equal(t, 6, len(branches))
+	assert.Equal(t, "master", branches[0])
+	assert.Equal(t, "feature/develop", branches[5])
+}

internal/tools/gittar/metrics/collector.go

@@ -32,7 +32,6 @@ import (
 
 var (
 	defaultBranch = "master"
-	targetBranch  = []string{"master", "Master", "main", "Main", "dev", "Dev", "develop", "Develop", "release", "Release"}
 )
 
 var (
@@ -101,7 +100,7 @@ func NewPersonalMetric(author *gitmodule.Signature, repo *models.Repo) *Personal
 }
 
 func IsValidBranch(s string, prefixes ...string) bool {
-	if !strutil.HasPrefixes(s, prefixes...) {
+	if !strutil.HasPrefixes(strutil.ToLower(s), prefixes...) {
 		return false
 	}
 	return true
@@ -181,7 +180,7 @@ func (c *Collector) IterateRepos(req apistructs.GittarListRepoRequest) ([]*Perso
 		}
 		var allSourceCommit []*gitmodule.Commit
 		for _, branch := range branches {
-			if !IsValidBranch(branch, targetBranch...) {
+			if !IsValidBranch(branch, conf.MetricTargetBranches()...) {
 				continue
 			}
 			SourceCommit, err := gitRepository.GetBranchCommit(branch)