Create models package and fix tests in pr and prlist packages

Signed-off-by: Geoff Franks <[email protected]>
Co-authored-by: Geoff Franks <[email protected]>
Signed-off-by: Geoff Franks <[email protected]>
Co-authored-by: Geoff Franks <[email protected]>

Author: dsabeti

e2e/e2e_test.go

@@ -1,3 +1,4 @@
+//go:build e2e
 // +build e2e
 
 package e2e_test
@@ -14,6 +15,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cloudfoundry-community/github-pr-instances-resource/test_helpers"
 	resource "github.com/telia-oss/github-pr-resource"
 
 	"github.com/google/go-github/v28/github"
@@ -433,19 +435,19 @@ func TestGetAndPutE2E(t *testing.T) {
 			require.NoError(t, err)
 			assert.Equal(t, tc.version, getOutput.Version)
 
-			version := readTestFile(t, filepath.Join(dir, ".git", "resource", "version.json"))
+			version := test_helpers.ReadTestFile(t, filepath.Join(dir, ".git", "resource", "version.json"))
 			assert.Equal(t, tc.versionString, version)
 
-			metadata := readTestFile(t, filepath.Join(dir, ".git", "resource", "metadata.json"))
+			metadata := test_helpers.ReadTestFile(t, filepath.Join(dir, ".git", "resource", "metadata.json"))
 			assert.Equal(t, tc.metadataString, metadata)
 
 			if tc.getParameters.ListChangedFiles {
-				changedFiles := readTestFile(t, filepath.Join(dir, ".git", "resource", "changed_files"))
+				changedFiles := test_helpers.ReadTestFile(t, filepath.Join(dir, ".git", "resource", "changed_files"))
 				assert.Equal(t, tc.filesString, changedFiles)
 			}
 
 			for filename, expected := range tc.metadataFiles {
-				actual := readTestFile(t, filepath.Join(dir, ".git", "resource", filename))
+				actual := test_helpers.ReadTestFile(t, filepath.Join(dir, ".git", "resource", filename))
 				assert.Equal(t, expected, actual)
 			}
 
@@ -688,14 +690,6 @@ func gitHistory(t *testing.T, directory string) map[int]string {
 	return h
 }
 
-func readTestFile(t *testing.T, path string) string {
-	b, err := ioutil.ReadFile(path)
-	if err != nil {
-		t.Fatalf("failed to read: %s: %s", path, err)
-	}
-	return string(b)
-}
-
 func getRemainingRateLimit(t *testing.T, c *githubv4.Client) int {
 	var query struct {
 		RateLimit struct {

fakes/fake_git.go renamed to models/fakes/fake_git.go

@@ -1,4 +1,4 @@
-package resource
+package models
 
 import (
 	"encoding/base64"
@@ -14,6 +14,7 @@ import (
 )
 
 // Git interface for testing purposes.
+//
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o fakes/fake_git.go . Git
 type Git interface {
 	Init(*string) error

fakes/fake_github.go renamed to models/fakes/fake_github.go

@@ -1,4 +1,4 @@
-package resource
+package models
 
 import (
 	"context"
@@ -37,6 +37,7 @@ func (config GithubConfig) RepositoryURL() string {
 }
 
 // Github for testing purposes.
+//
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 -o fakes/fake_github.go . Github
 type Github interface {
 	ListPullRequests([]githubv4.PullRequestState) ([]*PullRequest, error)

git.go renamed to models/git.go

@@ -1,4 +1,4 @@
-package resource
+package models
 
 import "github.com/shurcooL/githubv4"
 

github.go renamed to models/github.go

@@ -1,10 +1,8 @@
 package pr
 
-import (
-	resource "github.com/cloudfoundry-community/github-pr-instances-resource"
-)
+import "github.com/cloudfoundry-community/github-pr-instances-resource/models"
 
-func Check(request CheckRequest, git resource.Git) (CheckResponse, error) {
+func Check(request CheckRequest, git models.Git) (CheckResponse, error) {
 	if err := git.Init(nil); err != nil {
 		return CheckResponse{}, err
 	}

models.go renamed to models/models.go

@@ -9,10 +9,10 @@ import (
 	"strconv"
 	"strings"
 
-	resource "github.com/cloudfoundry-community/github-pr-instances-resource"
+	"github.com/cloudfoundry-community/github-pr-instances-resource/models"
 )
 
-func Get(request GetRequest, github resource.Github, git resource.Git, outputDir string) (*GetResponse, error) {
+func Get(request GetRequest, github models.Github, git models.Git, outputDir string) (*GetResponse, error) {
 	if request.Params.SkipDownload {
 		return &GetResponse{Version: request.Version}, nil
 	}
@@ -42,7 +42,7 @@ func Get(request GetRequest, github resource.Github, git resource.Git, outputDir
 	}
 
 	// Create the metadata
-	var metadata resource.Metadata
+	var metadata models.Metadata
 	metadata.Add("pr", strconv.Itoa(pull.Number))
 	metadata.Add("title", pull.Title)
 	metadata.Add("url", pull.URL)
@@ -140,6 +140,6 @@ type GetRequest struct {
 }
 
 type GetResponse struct {
-	Version  Version           `json:"version"`
-	Metadata resource.Metadata `json:"metadata,omitempty"`
+	Version  Version         `json:"version"`
+	Metadata models.Metadata `json:"metadata,omitempty"`
 }