fix: narrow diff to only include changes from the source branch (#423)

Author: yagni92

.gitattributes

@@ -0,0 +1,5 @@
+*        text=auto
+*.go     text      eol=lf
+go.mod   text      eol=lf
+go.sum   text      eol=lf linguist-generated=true
+mocks/**                  linguist-generated=true

.mockery.yaml

@@ -1,14 +1,19 @@
-with-expecter: true
-dir: "mocks/{{.PackageName}}/mocks"
+dir: "mocks/{{.SrcPackageName}}/mocks"
+filename: "mock_{{.StructName}}.go"
 packages:
+  github.com/zapier/kubechecks/pkg/affected_apps:
+    interfaces:
+      Matcher: {}
+  github.com/zapier/kubechecks/pkg/generator:
+    interfaces:
+      AppsGenerator: {}
   github.com/zapier/kubechecks/pkg/vcs:
-    config:
-      all: true
+    interfaces:
+      Client: {}
   github.com/zapier/kubechecks/pkg/vcs/github_client:
-    # place your package-specific config here
-    config:
-      all: true
+    interfaces:
+      RepositoriesServices: {}
+      PullRequestsServices: {}
   github.com/zapier/kubechecks/pkg/vcs/gitlab_client:
-    # place your package-specific config here
-    config:
-      all: true
+    interfaces:
+      ProjectsServices: {}

.tool-versions

@@ -6,5 +6,5 @@ helm-cr 1.6.1
 helm-ct 3.11.0
 kubeconform 0.6.7
 kustomize 5.6.0
-mockery 2.46.3
+mockery 3.3.4
 tilt 0.33.2

cmd/locations.go

@@ -22,7 +22,7 @@ import (
 // The function returns an error if any Git repository fails to clone.
 func processLocations(ctx context.Context, ctr container.Container, locations []string) error {
 	for index, location := range locations {
-		if newLocation, err := maybeCloneGitUrl(ctx, ctr.RepoManager, ctr.Config.RepoRefreshInterval, location, ctr.VcsClient.Username(), ctr.Config.RepoShallowClone); err != nil {
+		if newLocation, err := maybeCloneGitUrl(ctx, ctr.RepoManager, ctr.Config.RepoRefreshInterval, location, ctr.VcsClient.CloneUsername(), ctr.Config.RepoShallowClone); err != nil {
 			return errors.Wrapf(err, "failed to clone %q", location)
 		} else if newLocation != "" {
 			locations[index] = newLocation

docs/contributing.md

@@ -69,36 +69,38 @@ To get started do the following:
 
 * Copy the `.secret.example` and set required values.
 
-    ```console
+    ```sh
     cp .secret.example .secret
     ```
-  You will need to fill in either `GITLAB_TOKEN` or `GITLAB_TOKEN`  
-  If you are testing with GITHUB, please set the tile_config.json file to specify the vcs-type as the default is `gitlab`.  
-  The token you specify must have ability to get repositories, add/delete comment and webhooks.  
-    ```json
-    {
-      "vcs-type": "github"
-    }
-    ```
+
+    You will need to fill in either `GITLAB_TOKEN` or `GITLAB_TOKEN`  
+    If you are testing with GITHUB, please set the tilt_config.json file to specify the vcs-type as the default is `gitlab`:
+
+      ```json title="tilt_config.json"
+      {
+        "vcs-type": "github"
+      }
+      ```
+
+    The token you specify must have ability to get repositories, add/delete comment and webhooks.
 
 * From the root directory of this repo:
 
-    ```console
+    ```sh
     tilt up
     ```
 
 You should see output like:
 
-    ```
-    Tilt started on http://localhost:10350/
-    v0.30.13, built 2022-12-05
-
-    (space) to open the browser
-    (s) to stream logs (--stream=true)
-    (t) to open legacy terminal mode (--legacy=true)
-    (ctrl-c) to exit
+```
+Tilt started on http://localhost:10350/
+v0.30.13, built 2022-12-05
 
-    ```
+(space) to open the browser
+(s) to stream logs (--stream=true)
+(t) to open legacy terminal mode (--legacy=true)
+(ctrl-c) to exit
+```
 
 In the background Tilt has started building and deploying resources.
 

go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399
 	github.com/go-logr/zerologr v1.2.3
+	github.com/golang-jwt/jwt/v4 v4.5.2
 	github.com/google/go-github/v62 v62.0.0
 	github.com/google/uuid v1.6.0
 	github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
@@ -159,7 +160,6 @@ require (
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/btree v1.1.3 // indirect

justfile

@@ -67,5 +67,8 @@ unit_test_race:
 rebuild_docs:
     ./earthly.sh +rebuild-docs
 
+rebuild_mocks:
+    go run github.com/vektra/mockery/v3@v3.3.4
+
 ci-golang:
     ./earthly.sh +ci-golang

mkdocs.yml

@@ -8,4 +8,11 @@ theme:
   name: material
 
 markdown_extensions:
-  - attr_list
+  - attr_list
+  - pymdownx.highlight:
+      anchor_linenums: true
+      line_spans: __span
+      pygments_lang_class: true
+  - pymdownx.inlinehilite
+  - pymdownx.snippets
+  - pymdownx.superfences