Merge pull request #1 from chetan-rns/master

Update the default branch to main

Author: bigkevmcd

pkg/git/client_test.go

@@ -16,15 +16,15 @@ import (
 
 func TestFileContents(t *testing.T) {
 	m := metrics.NewMock()
-	as := makeAPIServer(t, "/api/v3/repos/Codertocat/Hello-World/contents/pipelines.yaml", "master", "testdata/content.json")
+	as := makeAPIServer(t, "/api/v3/repos/Codertocat/Hello-World/contents/pipelines.yaml", "main", "testdata/content.json")
 	defer as.Close()
 	scmClient, err := factory.NewClient("github", as.URL, "", factory.Client(as.Client()))
 	if err != nil {
 		t.Fatal(err)
 	}
 	client := New(scmClient, m)
 
-	body, err := client.FileContents(context.TODO(), "Codertocat/Hello-World", "pipelines.yaml", "master")
+	body, err := client.FileContents(context.TODO(), "Codertocat/Hello-World", "pipelines.yaml", "main")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -39,15 +39,15 @@ func TestFileContents(t *testing.T) {
 
 func TestFileContentsWithNotFoundResponse(t *testing.T) {
 	m := metrics.NewMock()
-	as := makeAPIServer(t, "/api/v3/repos/Codertocat/Hello-World/contents/pipelines.yaml", "master", "")
+	as := makeAPIServer(t, "/api/v3/repos/Codertocat/Hello-World/contents/pipelines.yaml", "main", "")
 	defer as.Close()
 	scmClient, err := factory.NewClient("github", as.URL, "", factory.Client(as.Client()))
 	if err != nil {
 		t.Fatal(err)
 	}
 	client := New(scmClient, m)
 
-	_, err = client.FileContents(context.TODO(), "Codertocat/Hello-World", "pipelines.yaml", "master")
+	_, err = client.FileContents(context.TODO(), "Codertocat/Hello-World", "pipelines.yaml", "main")
 	if !IsNotFound(err) {
 		t.Fatalf("failed with %#v", err)
 	}
@@ -64,7 +64,7 @@ func TestFileContentsUnableToConnect(t *testing.T) {
 	}
 	client := New(scmClient, m)
 
-	_, err = client.FileContents(context.TODO(), "Codertocat/Hello-World", "pipelines.yaml", "master")
+	_, err = client.FileContents(context.TODO(), "Codertocat/Hello-World", "pipelines.yaml", "main")
 	if !test.MatchError(t, "connection refused", err) {
 		t.Fatal(err)
 	}

pkg/git/testdata/push_hook.json

@@ -105,9 +105,9 @@
     "forks": 1,
     "open_issues": 2,
     "watchers": 0,
-    "default_branch": "master",
+    "default_branch": "main",
     "stargazers": 0,
-    "master_branch": "master"
+    "main_branch": "main"
   },
   "pusher": {
     "name": "Codertocat",

pkg/httpapi/api.go

@@ -24,7 +24,7 @@ var DefaultSecretRef = types.NamespacedName{
 	Namespace: "pipelines-app-delivery",
 }
 
-const defaultRef = "master"
+const defaultRef = "main"
 
 // APIRouter is an HTTP API for accessing app configurations.
 type APIRouter struct {

pkg/httpapi/api_test.go

@@ -27,7 +27,7 @@ const (
 
 func TestGetPipelines(t *testing.T) {
 	ts, c := makeServer(t)
-	c.addContents("example/gitops", "pipelines.yaml", "master", "testdata/pipelines.yaml")
+	c.addContents("example/gitops", "pipelines.yaml", "main", "testdata/pipelines.yaml")
 	pipelinesURL := "https://github.com/example/gitops.git"
 
 	req := makeClientRequest(t, "Bearer testing", fmt.Sprintf("%s/pipelines?url=%s", ts.URL, pipelinesURL))
@@ -81,7 +81,7 @@ func TestGetPipelinesWithNoURL(t *testing.T) {
 
 func TestGetPipelinesWithBadURL(t *testing.T) {
 	ts, c := makeServer(t)
-	c.addContents("example/gitops", "pipelines.yaml", "master", "testdata/pipelines.yaml")
+	c.addContents("example/gitops", "pipelines.yaml", "main", "testdata/pipelines.yaml")
 	req := makeClientRequest(t, "Bearer testing", fmt.Sprintf("%s/pipelines?url=%%%%test.html", ts.URL))
 	res, err := ts.Client().Do(req)
 	if err != nil {
@@ -115,7 +115,7 @@ func TestGetPipelinesWithNamespaceAndNameInURL(t *testing.T) {
 	ts, c := makeServer(t, func(a *APIRouter) {
 		a.secretGetter = sg
 	})
-	c.addContents("example/gitops", "pipelines.yaml", "master", "testdata/pipelines.yaml")
+	c.addContents("example/gitops", "pipelines.yaml", "main", "testdata/pipelines.yaml")
 	pipelinesURL := "https://github.com/example/gitops.git"
 	options := url.Values{
 		"url":        []string{pipelinesURL},
@@ -142,7 +142,7 @@ func TestGetPipelinesWithNamespaceAndNameInURL(t *testing.T) {
 
 func TestGetPipelinesWithUnknownSecret(t *testing.T) {
 	ts, c := makeServer(t)
-	c.addContents("example/gitops", "pipelines.yaml", "master", "testdata/pipelines.yaml")
+	c.addContents("example/gitops", "pipelines.yaml", "main", "testdata/pipelines.yaml")
 	pipelinesURL := "https://github.com/example/gitops.git"
 	options := url.Values{
 		"url":        []string{pipelinesURL},
@@ -173,7 +173,7 @@ func TestGetPipelineApplication(t *testing.T) {
 	ts, c := makeServer(t, func(a *APIRouter) {
 		a.resourceParser = stubResourceParser(testResource)
 	})
-	c.addContents("example/gitops", "pipelines.yaml", "master", "testdata/pipelines.yaml")
+	c.addContents("example/gitops", "pipelines.yaml", "main", "testdata/pipelines.yaml")
 	pipelinesURL := "https://github.com/example/gitops.git"
 	options := url.Values{
 		"url": []string{pipelinesURL},