Merge remote-tracking branch 'origin/main' into github-app

djeebus · djeebus · commit 6e239816143f · 2024-11-12T18:44:52.000-05:00
# Conflicts:
#	.github/actions/build-image/action.yaml
#	docs/usage.md
diff --git a/.github/actions/build-image/action.yaml b/.github/actions/build-image/action.yaml
@@ -5,6 +5,10 @@ inputs:
   image_tag:
     description: The image tag
     required: true
+  push:
+    description: True to push image after building, false otherwise
+    required: false
+    default: "false"
   tag_latest:
     description: Tag latest as well as the provided tag
     default: "false"
@@ -21,7 +25,7 @@ runs:
   using: composite
 
   steps:
-    - uses: docker/setup-qemu-action@v1
+    - uses: docker/setup-qemu-action@v3
       with:
         image: tonistiigi/binfmt:latest
         platforms: all
@@ -32,7 +36,7 @@ runs:
       with: { version: "v${{ env.EARTHLY_TOOL_VERSION }}" }
 
     - name: login to registry
-      uses: docker/login-action@v1
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
@@ -41,10 +45,10 @@ runs:
     - name: Build and push the Docker image
       shell: bash
       run: >-
-        ./earthly.sh
-        --push
+        ./earthly.sh 
+        ${{ inputs.push == 'true' && '--push' || '' }} 
         +docker-multiarch
-        ${{ inputs.tag_latest != 'false' && format('--LATEST_IMAGE_NAME=ghcr.io/{0}:latest', github.repository) || '' }} 
+        ${{ inputs.tag_latest != 'false' && format('--LATEST_IMAGE_NAME=ghcr.io/{0}:latest', github.repository) || '' }}
         --GIT_TAG=${{ inputs.image_tag }}
         --IMAGE_NAME=ghcr.io/${{ github.repository }}:${{ inputs.image_tag }}
       if: github.repository == 'zapier/kubechecks'
diff --git a/.github/workflows/on_pull_request.yaml b/.github/workflows/on_pull_request.yaml
@@ -32,10 +32,12 @@ jobs:
       - uses: ./.github/actions/build-image
         id: build-image
         with:
+          push: '${{ github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name }}'
           image_tag: ${{ env.FS_TAG }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: mshick/add-pr-comment@v2
         with:
           message: |
             Temporary image available at `${{ steps.build-image.outputs.image }}`.
+        if: github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
diff --git a/.github/workflows/on_push_to_main.yaml b/.github/workflows/on_push_to_main.yaml
@@ -23,6 +23,7 @@ jobs:
 
       - uses: ./.github/actions/build-image
         with:
+          push: 'true'
           image_tag: ${{ env.GIT_TAG }}
           token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/cmd/root.go b/cmd/root.go
@@ -50,6 +50,7 @@ func init() {
 	)
 	boolFlag(flags, "persist-log-level", "Persists the set log level down to other module loggers.")
 	stringFlag(flags, "vcs-base-url", "VCS base url, useful if self hosting gitlab, enterprise github, etc.")
+	stringFlag(flags, "vcs-upload-url", "VCS upload url, required for enterprise github.")
 	stringFlag(flags, "vcs-type", "VCS type. One of gitlab or github. Defaults to gitlab.",
 		newStringOpts().
 			withChoices("github", "gitlab").
diff --git a/docs/usage.md b/docs/usage.md
@@ -72,6 +72,7 @@ The full list of supported environment variables is described below:
 |`KUBECHECKS_VCS_EMAIL`|VCS Email.||
 |`KUBECHECKS_VCS_TOKEN`|VCS API token.||
 |`KUBECHECKS_VCS_TYPE`|VCS type. One of gitlab or github.|`gitlab`|
+|`KUBECHECKS_VCS_UPLOAD_URL`|VCS upload url, required for enterprise github.||
 |`KUBECHECKS_VCS_USERNAME`|VCS Username.||
 |`KUBECHECKS_WEBHOOK_SECRET`|Optional secret key for validating the source of incoming webhooks.||
 |`KUBECHECKS_WEBHOOK_URL_BASE`|The endpoint to listen on for incoming PR/MR event webhooks. For example, 'https://checker.mycompany.com'.||
diff --git a/go.mod b/go.mod
@@ -33,8 +33,8 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
 	github.com/prometheus/client_golang v1.20.2
 	github.com/rikatz/kubepug v1.4.0
-	github.com/rs/zerolog v1.32.0
-	github.com/sashabaranov/go-openai v1.30.3
+	github.com/rs/zerolog v1.33.0
+	github.com/sashabaranov/go-openai v1.31.0
 	github.com/shurcooL/githubv4 v0.0.0-20231126234147-1cffa1f02456
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.1
diff --git a/go.sum b/go.sum
@@ -919,8 +919,8 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
-github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -930,8 +930,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g
 github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
 github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
 github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
-github.com/sashabaranov/go-openai v1.30.3 h1:TEdRP3otRXX2A7vLoU+kI5XpoSo7VUUlM/rEttUqgek=
-github.com/sashabaranov/go-openai v1.30.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/sashabaranov/go-openai v1.31.0 h1:rGe77x7zUeCjtS2IS7NCY6Tp4bQviXNMhkQM6hz/UC4=
+github.com/sashabaranov/go-openai v1.31.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
diff --git a/pkg/commitState.go b/pkg/commitState.go
@@ -30,6 +30,7 @@ func (s CommitState) BareString() string {
 
 var stateString = map[CommitState]string{
 	StateNone:    "",
+	StateSkip:    "Skipped",
 	StateSuccess: "Passed",
 	StateRunning: "Running",
 	StateWarning: "Warning",
@@ -62,6 +63,8 @@ func ParseCommitState(s string) (CommitState, error) {
 		return StateError, nil
 	case "panic":
 		return StatePanic, nil
+	case "skip", "skipped":
+		return StateSkip, nil
 	default:
 		return StateNone, fmt.Errorf("unknown commit state: %s", s)
 
diff --git a/pkg/vcs/github_client/client.go b/pkg/vcs/github_client/client.go
@@ -204,7 +204,7 @@ func toGithubCommitStatus(state pkg.CommitState) *string {
 		return pkg.Pointer("failure")
 	case pkg.StateRunning:
 		return pkg.Pointer("pending")
-	case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone:
+	case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone, pkg.StateSkip:
 		return pkg.Pointer("success")
 	}
 
diff --git a/pkg/vcs/gitlab_client/status.go b/pkg/vcs/gitlab_client/status.go
@@ -69,7 +69,7 @@ func convertState(state pkg.CommitState) gitlab.BuildStateValue {
 		return gitlab.Running
 	case pkg.StateFailure, pkg.StateError, pkg.StatePanic:
 		return gitlab.Failed
-	case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone:
+	case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone, pkg.StateSkip:
 		return gitlab.Success
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ func init() {`
`50`	`50`	`)`
`51`	`51`	`boolFlag(flags, "persist-log-level", "Persists the set log level down to other module loggers.")`
`52`	`52`	`stringFlag(flags, "vcs-base-url", "VCS base url, useful if self hosting gitlab, enterprise github, etc.")`
	`53`	`+ stringFlag(flags, "vcs-upload-url", "VCS upload url, required for enterprise github.")`
`53`	`54`	`stringFlag(flags, "vcs-type", "VCS type. One of gitlab or github. Defaults to gitlab.",`
`54`	`55`	`newStringOpts().`
`55`	`56`	`withChoices("github", "gitlab").`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ func toGithubCommitStatus(state pkg.CommitState) *string {`
`204`	`204`	`return pkg.Pointer("failure")`
`205`	`205`	`case pkg.StateRunning:`
`206`	`206`	`return pkg.Pointer("pending")`
`207`		`- case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone:`
	`207`	`+ case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone, pkg.StateSkip:`
`208`	`208`	`return pkg.Pointer("success")`
`209`	`209`	`}`
`210`	`210`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func convertState(state pkg.CommitState) gitlab.BuildStateValue {`
`69`	`69`	`return gitlab.Running`
`70`	`70`	`case pkg.StateFailure, pkg.StateError, pkg.StatePanic:`
`71`	`71`	`return gitlab.Failed`
`72`		`- case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone:`
	`72`	`+ case pkg.StateSuccess, pkg.StateWarning, pkg.StateNone, pkg.StateSkip:`
`73`	`73`	`return gitlab.Success`
`74`	`74`	`}`
`75`	`75`