Merge pull request #25 from LinuxSuRen/fix-publish-draft-release

Fix missing publish a draft release
kubesphere-sigs · Nov 6, 2021 · d4c188f · d4c188f
2 parents 3a0d076 + 9a461e8
commit d4c188f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/controllers/internal_scm/factory.go b/controllers/internal_scm/factory.go
@@ -34,7 +34,20 @@ func release(client *scm.Client, repo, version, commitish string, draft, prerele
 
 func findRelease(client *scm.Client, repo, version string) (release *scm.Release) {
 	var err error
-	if release, _, err = client.Releases.FindByTag(context.TODO(), repo, version); err != nil {
+	cxt := context.TODO()
+	if release, _, err = client.Releases.FindByTag(cxt, repo, version); err == scm.ErrNotFound {
+		var list []*scm.Release
+		if list, _, err = client.Releases.List(cxt, repo, scm.ReleaseListOptions{Page: 1, Size: 200}); err != nil {
+			release = nil
+		} else {
+			for i, _ := range list {
+				if list[i].Tag == version {
+					release = list[i]
+					return
+				}
+			}
+		}
+	} else if err != nil {
 		release = nil
 	}
 	return

diff --git a/controllers/internal_scm/factory_test.go b/controllers/internal_scm/factory_test.go
@@ -21,14 +21,26 @@ func TestGetGitProvider(t *testing.T) {
 			kind: "github",
 		},
 		exist: true,
+	}, {
+		name: "gitlab",
+		args: args{
+			kind: "gitlab",
+		},
+		exist: true,
+	}, {
+		name: "gitea",
+		args: args{
+			kind: "gitea",
+		},
+		exist: true,
 	}, {
 		name:  "fake",
 		args:  args{},
 		exist: false,
 	}}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := GetGitProvider(tt.args.kind, tt.args.repo, tt.args.token)
+			got := GetGitProvider(tt.args.kind, "", tt.args.repo, tt.args.token)
 			if tt.exist {
 				assert.NotNil(t, got)
 			} else {