Use public repository for forks/repository with github secrets

Author: jsoref

.github/workflows/pull_request.yaml

@@ -49,6 +49,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.CLOUDBUILD_GITHUB_TOKEN || github.token }}
         SKIP_GCLOUD_TESTS: ${{ secrets.GCP_SA_KEY == '' && '1' || '' }}
+        HAS_CLOUDBUILD_GITHUB_TOKEN: ${{ secrets.CLOUDBUILD_GITHUB_TOKEN && '1' || '' }}
         TEST_PKG: ./... # Run all tests
       run: make test
     - name: Set up testspaceTestspace

changelogutils/reader_test.go

@@ -2,6 +2,7 @@ package changelogutils_test
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path/filepath"
 	"time"
@@ -27,8 +28,6 @@ var _ = Describe("ReaderTest", func() {
 
 		const (
 			owner = "solo-io"
-			repo  = "testrepo"
-			sha   = "9065a9a84e286ea7f067f4fc240944b0a4d4c82a"
 		)
 
 		var (
@@ -41,8 +40,22 @@ var _ = Describe("ReaderTest", func() {
 			file = changelogutils.ChangelogFile{
 				Entries: []*changelogutils.ChangelogEntry{&entry},
 			}
+			log  = "1.yaml"
+			repo = "testrepo"
+			sha  = "9065a9a84e286ea7f067f4fc240944b0a4d4c82a"
 		)
 
+		if os.Getenv("HAS_CLOUDBUILD_GITHUB_TOKEN") == "" {
+			log = "new-signature-manager.yaml"
+			repo = "reporting-client"
+			sha = "af5d207720ee6b548704b06bfa6631f9a2897294"
+			entry = changelogutils.ChangelogEntry{
+				Type:        changelogutils.NEW_FEATURE,
+				Description: "New signature manager implementation to be used in CLI clients that writes the signature to ~/.soloio",
+				IssueLink:   "https://github.com/solo-io/gloo/issues/1559",
+			}
+		}
+
 		BeforeEach(func() {
 			client, err := githubutils.GetClient(ctx)
 			Expect(err).NotTo(HaveOccurred())
@@ -51,7 +64,7 @@ var _ = Describe("ReaderTest", func() {
 		})
 
 		It("can read changelog file", func() {
-			changelogFile, err := reader.ReadChangelogFile(ctx, "changelog/v0.1.1/1.yaml")
+			changelogFile, err := reader.ReadChangelogFile(ctx, fmt.Sprintf("changelog/v0.1.1/%s", log))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(*changelogFile).To(BeEquivalentTo(file))
 		})

githubutils/repo_client_test.go

@@ -24,10 +24,26 @@ var _ = Describe("repo client utils", func() {
 		repo                    = "testrepo"
 		repoWithoutReleasesName = "testrepo-noreleases"
 		sha                     = "9065a9a84e286ea7f067f4fc240944b0a4d4c82a"
+		commitsInSha            = 3
 		otherSha                = "ea649cd931820a6a59970b051d480094f9d61c4e"
 		pr                      = 62
+		commit1                 = "6d389bc860e1cefdcbc99d43979e62104f13092f"
+		commit2                 = "9065a9a84e286ea7f067f4fc240944b0a4d4c82a"
+		tagWithSha              = "v0.1.16"
+		shaForTag               = "04da4a385be3fde4797963cd4f3f76a185e56ba7"
 	)
 
+	if os.Getenv("HAS_CLOUDBUILD_GITHUB_TOKEN") == "" {
+		repo = "reporting-client"
+		repoWithoutReleasesName = "unik-hub"
+		sha = "af5d207720ee6b548704b06bfa6631f9a2897294"
+		commitsInSha = 2
+		commit1 = "7ef898bc3df32db0e1ed2dee70a838c955a7b422"
+		commit2 = "f47eacc21bd62e6bc8bb8954af0dc1817079af0d"
+		tagWithSha = "v0.1.2"
+		shaForTag = "a1c75ffaa40ea2b89368bfc338dc3f6f990b6df2"
+	}
+
 	BeforeEach(func() {
 		c, err := githubutils.GetClient(ctx)
 		Expect(err).To(BeNil())
@@ -67,23 +83,23 @@ var _ = Describe("repo client utils", func() {
 
 	It("can do a commit comparison", func() {
 		client = githubutils.NewRepoClient(githubClient, owner, repo)
-		cc, err := client.CompareCommits(ctx, "6d389bc860e1cefdcbc99d43979e62104f13092f", "9065a9a84e286ea7f067f4fc240944b0a4d4c82a")
+		cc, err := client.CompareCommits(ctx, commit1, commit2)
 		Expect(err).To(BeNil())
 		Expect(cc.Files).To(HaveLen(5))
 	})
 
 	It("can get sha for tag", func() {
 		client = githubutils.NewRepoClient(githubClient, owner, repo)
-		sha, err := client.GetShaForTag(ctx, "v0.1.16")
+		sha, err := client.GetShaForTag(ctx, tagWithSha)
 		Expect(err).To(BeNil())
-		Expect(sha).To(Equal("04da4a385be3fde4797963cd4f3f76a185e56ba7"))
+		Expect(sha).To(Equal(shaForTag))
 	})
 
 	It("can get a commit", func() {
 		client = githubutils.NewRepoClient(githubClient, owner, repo)
 		commit, err := client.GetCommit(ctx, sha)
 		Expect(err).To(BeNil())
-		Expect(len(commit.Files)).To(Equal(3))
+		Expect(len(commit.Files)).To(Equal(commitsInSha))
 	})
 
 	expectStatus := func(actual, expected *github.RepoStatus) {

vfsutils/mount_test.go

@@ -2,6 +2,7 @@ package vfsutils_test
 
 import (
 	"context"
+	"os"
 
 	"github.com/solo-io/go-utils/githubutils"
 	"github.com/solo-io/go-utils/vfsutils"
@@ -14,29 +15,40 @@ var _ = Describe("mounted repo utils", func() {
 
 	const (
 		owner = "solo-io"
-		repo  = "testrepo"
-		sha   = "9065a9a84e286ea7f067f4fc240944b0a4d4c82a"
 	)
 
 	var (
-		ctx         = context.Background()
-		mountedRepo vfsutils.MountedRepo
+		ctx             = context.Background()
+		mountedRepo     vfsutils.MountedRepo
+		repo            = "testrepo"
+		sha             = "9065a9a84e286ea7f067f4fc240944b0a4d4c82a"
+		file            = "tmp.txt"
+		expectedContent = "another"
+		path            = "namespace"
 	)
 
+	if os.Getenv("HAS_CLOUDBUILD_GITHUB_TOKEN") == "" {
+		repo = "unik"
+		sha = "767fb7285ea9c893efcced90a612c4e253ef8e4b"
+		file = "README.md"
+		expectedContent = "UniK"
+		path = "containers/utils/vsphere-client/src/main/java/com/emc/unik"
+	}
+
 	BeforeEach(func() {
 		client, err := githubutils.GetClient(ctx)
 		Expect(err).NotTo(HaveOccurred())
 		mountedRepo = vfsutils.NewLazilyMountedRepo(client, owner, repo, sha)
 	})
 
 	It("can get contents", func() {
-		contents, err := mountedRepo.GetFileContents(ctx, "tmp.txt")
+		contents, err := mountedRepo.GetFileContents(ctx, file)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(string(contents)).To(ContainSubstring("another"))
+		Expect(string(contents)).To(ContainSubstring(expectedContent))
 	})
 
 	It("can list files", func() {
-		files, err := mountedRepo.ListFiles(ctx, "namespace")
+		files, err := mountedRepo.ListFiles(ctx, path)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(len(files)).To(Equal(1))
 	})