refactor(github): decouple trellogithub and "github.com/google/go-git…

…hub/v42/github"

closes devstream-io#307

internal/pkg/plugin/trellogithub/github.go

@@ -5,12 +5,10 @@ import (
 	"net/http"
 	"strings"
 
-	githubx "github.com/google/go-github/v42/github"
-	"github.com/spf13/viper"
-
 	"github.com/merico-dev/stream/pkg/util/github"
 	"github.com/merico-dev/stream/pkg/util/log"
 	"github.com/merico-dev/stream/pkg/util/mapz"
+	"github.com/spf13/viper"
 )
 
 // VerifyWorkflows get the workflows with names "wf1.yml", "wf2.yml", then:
@@ -37,12 +35,11 @@ func (tg *TrelloGithub) VerifyWorkflows(workflows []*github.Workflow) (map[strin
 
 func (tg *TrelloGithub) FetchRemoteContent(wsFiles []string) ([]string, map[string]error, error) {
 	var filesInRemoteDir = make([]string, 0)
-	_, dirContent, resp, err := tg.client.Repositories.GetContents(
+	dirContent, resp, err := tg.client.GetContents(
 		tg.ctx,
 		tg.options.Owner,
 		tg.options.Repo,
 		".github/workflows",
-		&githubx.RepositoryContentGetOptions{},
 	)
 
 	// error reason is not 404
@@ -119,12 +116,11 @@ func (tg *TrelloGithub) AddTrelloIdSecret(trelloId *TrelloItemId) error {
 }
 
 func (tg *TrelloGithub) GetWorkflowPath() (string, error) {
-	_, _, resp, err := tg.client.Repositories.GetContents(
+	_, resp, err := tg.client.GetContents(
 		tg.ctx,
 		tg.options.Owner,
 		tg.options.Repo,
 		".github/workflows",
-		&githubx.RepositoryContentGetOptions{},
 	)
 
 	// error reason is not 404

pkg/util/github/github.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/google/go-github/v42/github"
+	github "github.com/google/go-github/v42/github"
 	"golang.org/x/oauth2"
 
 	"github.com/merico-dev/stream/pkg/util/log"
@@ -99,3 +99,11 @@ func NewClient(option *Option) (*Client, error) {
 
 	return client, nil
 }
+
+func (*Client) GetContents(ctx context.Context, owner string, repo string, path string) ([]*github.RepositoryContent, *github.Response, error) {
+	_, dirContent, resp, err := client.Repositories.GetContents(
+		ctx, owner, repo, path,
+		&github.RepositoryContentGetOptions{},
+	)
+	return dirContent, resp, err
+}