fix: Add workflow mock test, fix resolveContents

erezrokah · erezrokah · commit cbfe918a865d · 2022-12-12T15:10:55.000+02:00
diff --git a/plugins/source/github/codegen/recipes/actions.go b/plugins/source/github/codegen/recipes/actions.go
@@ -18,7 +18,7 @@ func Actions() []*Resource {
 			ExtraColumns: append(orgColumns, idColumn,
 				codegen.ColumnDefinition{
 					Name:     "contents",
-					Type:     schema.TypeJSON,
+					Type:     schema.TypeString,
 					Resolver: `resolveContents`,
 				},
 			),
diff --git a/plugins/source/github/docs/tables/github_workflows.md b/plugins/source/github/docs/tables/github_workflows.md
@@ -15,7 +15,7 @@ The composite primary key for this table is (**org**, **id**).
 |_cq_parent_id|UUID|
 |org (PK)|String|
 |id (PK)|Int|
-|contents|JSON|
+|contents|String|
 |node_id|String|
 |name|String|
 |path|String|
diff --git a/plugins/source/github/resources/services/actions/workflows.go b/plugins/source/github/resources/services/actions/workflows.go
diff --git a/plugins/source/github/resources/services/actions/workflows_fetch.go b/plugins/source/github/resources/services/actions/workflows_fetch.go
@@ -8,7 +8,6 @@ import (
 	"github.com/cloudquery/cloudquery/plugins/source/github/client"
 	"github.com/cloudquery/plugin-sdk/schema"
 	"github.com/google/go-github/v48/github"
-	"sigs.k8s.io/yaml"
 )
 
 func fetchWorkflows(ctx context.Context, meta schema.ClientMeta, _ *schema.Resource, res chan<- interface{}) error {
@@ -45,7 +44,7 @@ func resolveContents(ctx context.Context, meta schema.ClientMeta, resource *sche
 	cl := meta.(*client.Client)
 	workflow := resource.Item.(*github.Workflow)
 
-	parsedUrl, err := url.Parse(*workflow.URL)
+	parsedUrl, err := url.Parse(*workflow.HTMLURL)
 	if err != nil {
 		return err
 	}
@@ -54,20 +53,20 @@ func resolveContents(ctx context.Context, meta schema.ClientMeta, resource *sche
 	if len(pathParts) < 2 {
 		return nil
 	}
-	opts := github.RepositoryContentGetOptions{}
+	owner := pathParts[1]
+	repo := pathParts[2]
+	ref := pathParts[4]
+	path := *workflow.Path
+	opts := github.RepositoryContentGetOptions{Ref: ref}
 
-	fileContent, _, _, err := cl.Github.Repositories.GetContents(ctx, cl.Org, pathParts[2], *workflow.Path, &opts)
+	fileContent, _, _, err := cl.Github.Repositories.GetContents(ctx, owner, repo, path, &opts)
 	if err != nil {
 		// This is not actually an error, it means that a workflow file has been deleted
-		return err
+		return resource.Set(c.Name, nil)
 	}
 	content, err := fileContent.GetContent()
 	if err != nil {
 		return err
 	}
-	jsonContent, err := yaml.YAMLToJSON([]byte(content))
-	if err != nil {
-		return err
-	}
-	return resource.Set(c.Name, jsonContent)
+	return resource.Set(c.Name, content)
 }
diff --git a/plugins/source/github/resources/services/actions/workflows_test.go b/plugins/source/github/resources/services/actions/workflows_test.go
@@ -0,0 +1,47 @@
+package actions
+
+import (
+	"testing"
+
+	"github.com/cloudquery/cloudquery/plugins/source/github/client"
+	"github.com/cloudquery/cloudquery/plugins/source/github/client/mocks"
+	"github.com/cloudquery/plugin-sdk/faker"
+	"github.com/golang/mock/gomock"
+	"github.com/google/go-github/v48/github"
+)
+
+func buildWorkflows(t *testing.T, ctrl *gomock.Controller) client.GithubServices {
+	repositoriesMock := mocks.NewMockRepositoriesService(ctrl)
+	workflowsMock := mocks.NewMockActionsService(ctrl)
+
+	// create mock for repositories
+	var repository github.Repository
+	if err := faker.FakeObject(&repository); err != nil {
+		t.Fatal(err)
+	}
+
+	var workflow github.Workflow
+	if err := faker.FakeObject(&workflow); err != nil {
+		t.Fatal(err)
+	}
+	workflow.HTMLURL = github.String("https://github.com/testorg/repo/blob/master/.github/workflows/161335")
+	workflow.Path = github.String(".github/workflows/ci.yml")
+	count := 1
+	workflows := github.Workflows{Workflows: []*github.Workflow{&workflow}, TotalCount: &count}
+
+	workflowContent := github.RepositoryContent{}
+	if err := faker.FakeObject(&workflowContent); err != nil {
+		t.Fatal(err)
+	}
+	workflowContent.Encoding = github.String("")
+	opts := github.RepositoryContentGetOptions{Ref: "master"}
+
+	repositoriesMock.EXPECT().ListByOrg(gomock.Any(), "testorg", gomock.Any()).Return([]*github.Repository{&repository}, &github.Response{}, nil)
+	repositoriesMock.EXPECT().GetContents(gomock.Any(), "testorg", "repo", *workflow.Path, &opts).Return(&workflowContent, nil, nil, nil)
+	workflowsMock.EXPECT().ListWorkflows(gomock.Any(), *repository.Owner.Login, *repository.Name, gomock.Any()).Return(&workflows, &github.Response{}, nil)
+	return client.GithubServices{Actions: workflowsMock, Repositories: repositoriesMock}
+}
+
+func TestActionBillings(t *testing.T) {
+	client.GithubMockTestHelper(t, Workflows(), buildWorkflows, client.TestOptions{})
+}
