feature: Restrict Kubechecks to a Single Namespace for App Watcher #235
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently, Kubechecks can monitor all ArgoCD applications and ApplicationSet CRDs across the entire cluster. This is not ideal in scenarios where multiple ArgoCD instances are running on a single cluster, such as for testing purposes. This change introduces the ability for the operator to specify a namespace for ArgoCD. As a result, Kubechecks will be limited to watching ArgoCD CRDs within the specified namespace only.
|
Temporary image deleted. |
Greyeye
changed the title
1. add config failure 2. change argocd-api-namespace description 3. usage.md updated
1. change func description to use /* */ 2. refactor cfg.ArgoCDNameSpace to ArgoCDNamespace 3. remove log out put for webhook check.
Greyeye
changed the title
Previous condition was checking against the webhook API URL, not the payloadURL. 1. change GetHookByURl to perform check against hook.Config["url"]
confcheck can't run without the policy mount which does not exists. set to false for the tilt test
Greyeye
force-pushed
the
green-fix
branch
3 times, most recently
from
a0ca1ae to
1b43ac8
Compare
2. stop using .env, use .secret 3. update contributing doc
djeebus
reviewed
Jul 1, 2024
djeebus
reviewed
Jul 1, 2024
djeebus
reviewed
Jul 1, 2024
djeebus
reviewed
Jul 1, 2024
cmd/root.go
Outdated
| boolFlag(flags, "argocd-api-insecure", "Enable to use insecure connections to the ArgoCD API server.") | ||
| stringFlag(flags, "argocd-api-namespace", "ArgoCD namespace where the application watcher will read Custom Resource Definitions (CRD).", |
There was a problem hiding this comment.
I think, technically, the CRD is the schema definition, I think we want to say something like "Application and ApplicationSet resources"
djeebus
reviewed
Jul 1, 2024
djeebus
reviewed
Jul 1, 2024
djeebus
approved these changes
Jul 1, 2024
2. argocd-api-namespace description changed 3. changed from debug to info on "not monitoring applications" msg 4. fix Tiltfile as there is no .env file anymore
djeebus
approved these changes
Jul 2, 2024
1. add interface to wrap the api calls 2. add unit tests for hooks apis 3. add mockery config and mocks. 4. github lib updated to v62
1. add bit more docs 2. tilt file update to prevent start up if .secret is missing.
Mergecat's ReviewClick to read mergecats review!😼 Mergecat review of .github/workflows/on_pull-request_docs.yaml- run: ./earthly +rebuild-docs
+ run: ./earthly.sh +rebuild-docsFeedback & Suggestions:
😼 Mergecat review of pkg/vcs/github_client/message.go@@ -5,7 +5,7 @@ import (
"fmt"
"strings"
- "github.com/google/go-github/v53/github"
+ "github.com/google/go-github/v62/github"
"github.com/rs/zerolog/log"
"github.com/shurcooL/githubv4"
Feedback & Suggestions:
😼 Mergecat review of .github/workflows/on_pull_request_go.yaml- - run: ./earthly +ci-golang
+ - run: ./earthly.sh +ci-golangFeedback & Suggestions:
😼 Mergecat review of justfile@@ -65,7 +65,7 @@ unit_test_race:
go test -race ./...
rebuild_docs:
- ./earthly +rebuild-docs
+ ./earthly.sh +rebuild-docs
ci-golang:
- ./earthly +ci-golang
+ ./earthly.sh +ci-golangFeedback & Suggestions:
😼 Mergecat review of .gitignore@@ -26,3 +26,5 @@ localdev/terraform/gitlab/project.url
*.DS_Store
/kubechecks
localdev/terraform/github/project.url
+.secret
+.argFeedback & Suggestions:
😼 Mergecat review of .github/workflows/on_push_to_main.yaml@@ -43,7 +43,7 @@ jobs:
- name: Build and push the helm charts
run: |
- ./earthly \
+ ./earthly.sh \
--push \
+release-helm \
--repo_owner ${{ github.repository_owner }} \Feedback & Suggestions:
😼 Mergecat review of .github/workflows/on_pull-request_helm.yaml@@ -17,4 +17,4 @@ jobs:
- uses: earthly/actions-setup@v1
with: { version: "v${{ env.EARTHLY_TOOL_VERSION }}" }
- - run: ./earthly +ci-helm
+ - run: ./earthly.sh +ci-helmFeedback & Suggestions:
😼 Mergecat review of .github/actions/build-image/action.yaml@@ -41,7 +41,7 @@ runs:
- name: Build and push the Docker image
shell: bash
run: >-
- ./earthly
+ ./earthly.sh
--push
+docker-multiarch
${{ inputs.tag_latest != 'false' && format('--LATEST_IMAGE_NAME=ghcr.io/{0}:latest', github.repository) || '' }} Feedback & Suggestions:
😼 Mergecat review of docs/usage.md@@ -37,6 +37,7 @@ The full list of supported environment variables is described below:
|Env Var|Description|Default Value|
|-----------|-------------|------|
|`KUBECHECKS_ARGOCD_API_INSECURE`|Enable to use insecure connections to the ArgoCD API server.|`false`|
+|`KUBECHECKS_ARGOCD_API_NAMESPACE`|ArgoCD namespace where the application watcher will read Custom Resource Definitions (CRD) for Application and ApplicationSet resources.|`argocd`|
|`KUBECHECKS_ARGOCD_API_SERVER_ADDR`|ArgoCD API Server Address.|`argocd-server`|
|`KUBECHECKS_ARGOCD_API_TOKEN`|ArgoCD API token.||
|`KUBECHECKS_ENABLE_CONFTEST`|Set to true to enable conftest policy checking of manifests.|`false`|Feedback & Suggestions:
😼 Mergecat review of pkg/aisummary/diff_summary.go@@ -17,7 +17,7 @@ func (c *OpenAiClient) SummarizeDiff(ctx context.Context, appName, diff string)
ctx, span := tracer.Start(ctx, "SummarizeDiff")
defer span.End()
- model := openai.GPT4Turbo0125
+ model := openai.GPT4o
if len(diff) < 3500 {
model = openai.GPT3Dot5Turbo
}Feedback & Suggestions:
Example: validModels := map[string]bool{
openai.GPT4Turbo0125: true,
openai.GPT4o: true,
openai.GPT3Dot5Turbo: true,
}
if !validModels[model] {
err := fmt.Errorf("invalid model name: %s", model)
telemetry.SetError(span, err, "Invalid model name")
return "", err
}😼 Mergecat review of cmd/container.go@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/pkg/errors"
-
+ "github.com/rs/zerolog/log"
"github.com/zapier/kubechecks/pkg/app_watcher"
"github.com/zapier/kubechecks/pkg/appdir"
"github.com/zapier/kubechecks/pkg/argo_client"
@@ -60,6 +60,8 @@ func newContainer(ctx context.Context, cfg config.ServerConfig, watchApps bool)
go ctr.ApplicationWatcher.Run(ctx, 1)
}
+ } else {
+ log.Info().Msgf("not monitoring applications, MonitorAllApplications: %+v", cfg.MonitorAllApplications)
}
return ctr, nilFeedback & Suggestions:
Overall, the diff improves the code by adding informative logging, but always ensure consistency and security in logging practices. 😼 Mergecat review of cmd/root.go@@ -56,8 +56,13 @@ func init() {
withDefault("gitlab"))
stringFlag(flags, "vcs-token", "VCS API token.")
stringFlag(flags, "argocd-api-token", "ArgoCD API token.")
- stringFlag(flags, "argocd-api-server-addr", "ArgoCD API Server Address.", newStringOpts().withDefault("argocd-server"))
+ stringFlag(flags, "argocd-api-server-addr", "ArgoCD API Server Address.",
+ newStringOpts().
+ withDefault("argocd-server"))
boolFlag(flags, "argocd-api-insecure", "Enable to use insecure connections to the ArgoCD API server.")
+ stringFlag(flags, "argocd-api-namespace", "ArgoCD namespace where the application watcher will read Custom Resource Definitions (CRD) for Application and ApplicationSet resources.",
+ newStringOpts().
+ withDefault("argocd"))
stringFlag(flags, "kubernetes-config", "Path to your kubernetes config file, used to monitor applications.")
stringFlag(flags, "otel-collector-port", "The OpenTelemetry collector port.")Feedback & Suggestions:
Overall, the changes are well-integrated and maintain the existing code style. Just ensure that the new flag is documented, validated, and tested properly. 🚀 😼 Mergecat review of pkg/app_watcher/app_watcher_test.go@@ -8,12 +8,18 @@ import (
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
appclientsetfake "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "github.com/zapier/kubechecks/pkg/config"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/zapier/kubechecks/pkg/appdir"
)
-func initTestObjects() *ApplicationWatcher {
+func initTestObjects(t *testing.T) *ApplicationWatcher {
+ cfg, err := config.New()
+ // Handle the error appropriately, e.g., log it or fail the test
+ require.NoError(t, err, "failed to create config")
+
// set up the fake Application client set and informer.
testApp1 := &v1alpha1.Application{
ObjectMeta: metav1.ObjectMeta{Name: "test-app-1", Namespace: "default"},
@@ -34,15 +40,15 @@ func initTestObjects() *ApplicationWatcher {
vcsToArgoMap: appdir.NewVcsToArgoMap("vcs-username"),
}
- appInformer, appLister := ctrl.newApplicationInformerAndLister(time.Second * 1)
+ appInformer, appLister := ctrl.newApplicationInformerAndLister(time.Second*1, cfg)
ctrl.appInformer = appInformer
ctrl.appLister = appLister
return ctrl
}
func TestApplicationAdded(t *testing.T) {
- appWatcher := initTestObjects()
+ appWatcher := initTestObjects(t)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@@ -68,7 +74,7 @@ func TestApplicationAdded(t *testing.T) {
}
func TestApplicationUpdated(t *testing.T) {
- ctrl := initTestObjects()
+ ctrl := initTestObjects(t)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@@ -101,7 +107,7 @@ func TestApplicationUpdated(t *testing.T) {
}
func TestApplicationDeleted(t *testing.T) {
- ctrl := initTestObjects()
+ ctrl := initTestObjects(t)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()Feedback & Suggestions:
Overall, the changes improve error handling and make the tests more robust. 🛠️ 😼 Mergecat review of localdev/kubechecks/values.yaml@@ -5,7 +5,7 @@ configMap:
KUBECHECKS_ENABLE_WEBHOOK_CONTROLLER: "false"
KUBECHECKS_ARGOCD_API_INSECURE: "true"
KUBECHECKS_ARGOCD_API_PATH_PREFIX : '/argocd'
- KUBECHECKS_ARGOCD_NAMESPACE: 'kubechecks'
+ KUBECHECKS_ARGOCD_API_NAMESPACE: 'kubechecks'
KUBECHECKS_WEBHOOK_URL_PREFIX: 'kubechecks'
KUBECHECKS_NAMESPACE: 'kubechecks'
KUBECHECKS_FALLBACK_K8S_VERSION: "1.25.0"
@@ -20,7 +20,7 @@ configMap:
# KUBECHECKS_LABEL_FILTER: "test" # On your PR/MR, prefix this with "kubechecks:"
# KUBECHECKS_SCHEMAS_LOCATION: https://github.com/zapier/kubecheck-schemas.git
KUBECHECKS_TIDY_OUTDATED_COMMENTS_MODE: "delete"
- KUBECHECKS_ENABLE_CONFTEST: "true"
+ KUBECHECKS_ENABLE_CONFTEST: "false"Feedback & Suggestions:
😼 Mergecat review of pkg/app_watcher/app_watcher.go@@ -44,7 +44,7 @@ func NewApplicationWatcher(vcsToArgoMap appdir.VcsToArgoMap, cfg config.ServerCo
vcsToArgoMap: vcsToArgoMap,
}
- appInformer, appLister := ctrl.newApplicationInformerAndLister(time.Second * 30)
+ appInformer, appLister := ctrl.newApplicationInformerAndLister(time.Second*30, cfg)
ctrl.appInformer = appInformer
ctrl.appLister = appLister
@@ -118,12 +118,19 @@ func (ctrl *ApplicationWatcher) onApplicationDeleted(obj interface{}) {
}
/*
-This Go function, named newApplicationInformerAndLister, is part of the ApplicationWatcher struct. It sets up a Kubernetes SharedIndexInformer and a Lister for Argo CD Applications.
-A SharedIndexInformer is used to watch changes to a specific type of Kubernetes resource in an efficient manner. It significantly reduces the load on the Kubernetes API server by sharing and caching watches between all controllers that need to observe the object.
-Listers use the data from the informer's cache to provide a read-optimized view of the cache which reduces the load on the API Server and hides some complexity.
+newApplicationInformerAndLister, is part of the ApplicationWatcher struct. It sets up a Kubernetes SharedIndexInformer
+and a Lister for Argo CD Applications.
+
+A SharedIndexInformer is used to watch changes to a specific type of Kubernetes resource in an efficient manner.
+It significantly reduces the load on the Kubernetes API server by sharing and caching watches between all controllers
+that need to observe the object.
+
+newApplicationInformerAndLister use the data from the informer's cache to provide a read-optimized view of the cache which reduces
+the load on the API Server and hides some complexity.
*/
-func (ctrl *ApplicationWatcher) newApplicationInformerAndLister(refreshTimeout time.Duration) (cache.SharedIndexInformer, applisters.ApplicationLister) {
- informer := informers.NewApplicationInformer(ctrl.applicationClientset, "", refreshTimeout,
+func (ctrl *ApplicationWatcher) newApplicationInformerAndLister(refreshTimeout time.Duration, cfg config.ServerConfig) (cache.SharedIndexInformer, applisters.ApplicationLister) {
+ log.Debug().Msgf("Creating Application informer with namespace: %s", cfg.ArgoCDNamespace)
+ informer := informers.NewApplicationInformer(ctrl.applicationClientset, cfg.ArgoCDNamespace, refreshTimeout,
cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
)
Feedback & Suggestions:
😼 Mergecat review of docs/contributing.md@@ -67,10 +67,18 @@ It creates:
To get started do the following:
-* Copy the `.env.example` and set required values.
+* Copy the `.secret.example` and set required values.
```console
- cp .env.example .env
+ 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"
+ }
```
* From the root directory of this repo:
@@ -110,7 +118,7 @@ If you're using minikube with Tilt we recommend following this [guide](https://g
### Code Changes
-We use Earthly to simplify our CI/CD process with `kubechecks`. There's a thin wrapper around earthly that passes some common arguments in the root of the repo called `./earthly` that should be used instead of calling earthly directly. This also simplifies testing changes locally before pushing them up to ensure your PR will pass all required checks. The best command to run is `./earthly +test` this will pull all the required dependencies (including any new ones that you have added). It will then run [go vet](https://pkg.go.dev/cmd/vet), and if those pass it will run `go test` with race detection enabled. You can also always run these commands directly `go test -race ./...` will run all tests in the repo with race detection enabled. Please ensure that `./earthly +test` is passing before opening a PR.
+We use Earthly to simplify our CI/CD process with `kubechecks`. There's a thin wrapper around earthly that passes some common arguments in the root of the repo called `./earthly.sh` that should be used instead of calling earthly directly. This also simplifies testing changes locally before pushing them up to ensure your PR will pass all required checks. The best command to run is `./earthly.sh +test` this will pull all the required dependencies (including any new ones that you have added). It will then run [go vet](https://pkg.go.dev/cmd/vet), and if those pass it will run `go test` with race detection enabled. You can also always run these commands directly `go test -race ./...` will run all tests in the repo with race detection enabled. Please ensure that `./earthly.sh +test` is passing before opening a PR.
### Documentation ChangesFeedback & Suggestions:
By addressing these points, the documentation will be clearer and more user-friendly. 📝✨ 😼 Mergecat review of pkg/config/config.go@@ -21,6 +21,7 @@ type ServerConfig struct {
ArgoCDToken string `mapstructure:"argocd-api-token"`
ArgoCDPathPrefix string `mapstructure:"argocd-api-path-prefix"`
ArgoCDInsecure bool `mapstructure:"argocd-api-insecure"`
+ ArgoCDNamespace string `mapstructure:"argocd-api-namespace"`
KubernetesConfig string `mapstructure:"kubernetes-config"`
// otel
@@ -29,9 +30,10 @@ type ServerConfig struct {
OtelCollectorPort string `mapstructure:"otel-collector-port"`
// vcs
- VcsBaseUrl string `mapstructure:"vcs-base-url"`
- VcsToken string `mapstructure:"vcs-token"`
- VcsType string `mapstructure:"vcs-type"`
+ VcsBaseUrl string `mapstructure:"vcs-base-url"`
+ VcsUploadUrl string `mapstructure:"vcs-upload-url"` // github enterprise upload URL
+ VcsToken string `mapstructure:"vcs-token"`
+ VcsType string `mapstructure:"vcs-type"`
// webhooks
EnsureWebhooks bool `mapstructure:"ensure-webhooks"`
@@ -101,6 +103,7 @@ func NewWithViper(v *viper.Viper) (ServerConfig, error) {
log.Info().Msgf("Webhook URL Base: %s", cfg.WebhookUrlBase)
log.Info().Msgf("Webhook URL Prefix: %s", cfg.UrlPrefix)
log.Info().Msgf("VCS Type: %s", cfg.VcsType)
+ log.Info().Msgf("ArgoCD Namespace: %s", cfg.ArgoCDNamespace)
return cfg, nil
}Feedback & Suggestions:
😼 Mergecat review of Tiltfile@@ -7,7 +7,12 @@ load('ext://uibutton', 'cmd_button')
load('ext://helm_resource', 'helm_resource')
load('./.tilt/terraform/Tiltfile', 'local_terraform_resource')
load('./.tilt/utils/Tiltfile', 'check_env_set')
-dotenv()
+
+# Check if the .secret file exists
+if not os.path.exists('.secret'):
+ fail('The .secret file is missing. Please copy .secret file from .secret.example and setup before running Tilt.')
+
+dotenv(fn='.secret')
config.define_bool("enable_repo", True, 'create a new project for testing this app')
config.define_string("vcs-type")
@@ -126,7 +131,7 @@ if cfg.get('enable_repo', True):
test_go(
'go-test', '.',
recursive=True,
- timeout='30s',
+ timeout='60s',
extra_args=['-v'],
labels=["kubechecks"],
deps=[
@@ -138,12 +143,55 @@ test_go(
],
)
+
+# get the git commit ref
+def get_git_head():
+ result = local('git rev-parse --short HEAD')
+ return result
+
+# read .tool-versions file and return a dictionary of tools and their versions
+def parse_tool_versions(fn):
+ if not os.path.exists(fn):
+ warn("tool versions file not found: '%s'" % fn)
+ return dict()
+
+ f = read_file(fn)
+
+ lines = str(f).splitlines()
+
+ tools = dict()
+
+ for linenumber in range(len(lines)):
+ line = lines[linenumber]
+ parts = line.split("#", 1)
+ if len(parts) == 2:
+ line = parts[0]
+ line = line.strip()
+ if line == "":
+ continue
+ parts = line.split(' ', 1)
+ tools[parts[0].strip()] = parts[1].strip()
+ return tools
+
+tool_versions = parse_tool_versions(".tool-versions")
+git_commit = str(get_git_head()).strip()
+
earthly_build(
context='.',
target="+docker-debug",
ref='kubechecks',
image_arg='IMAGE_NAME',
ignore='./dist',
+ extra_args=[
+ '--CHART_RELEASER_VERSION='+tool_versions.get('helm-cr'),
+ '--GOLANG_VERSION='+tool_versions.get('golang'),
+ '--GOLANGCI_LINT_VERSION='+tool_versions.get('golangci-lint'),
+ '--HELM_VERSION='+tool_versions.get('helm'),
+ '--KUBECONFORM_VERSION='+tool_versions.get('kubeconform'),
+ '--KUSTOMIZE_VERSION='+tool_versions.get('kustomize'),
+ '--STATICCHECK_VERSION='+tool_versions.get('staticcheck'),
+ '--GIT_COMMIT='+git_commit,
+ ],
)
cmd_button('loc:go mod tidy',
@@ -216,4 +264,4 @@ load("localdev/test_appsets/Tiltfile", "install_test_appsets")
install_test_appsets(cfg)
-force_argocd_cleanup_on_tilt_down()
\ No newline at end of file
+force_argocd_cleanup_on_tilt_down()Feedback & Suggestions:
😼 Mergecat review of go.mod@@ -14,7 +14,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/google/go-github/v53 v53.2.0
+ github.com/google/go-github/v62 v62.0.0
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
github.com/labstack/echo-contrib v0.16.0
github.com/labstack/echo/v4 v4.11.4
@@ -27,7 +27,7 @@ require (
github.com/prometheus/client_golang v1.19.0
github.com/rikatz/kubepug v1.4.0
github.com/rs/zerolog v1.32.0
- github.com/sashabaranov/go-openai v1.20.4
+ github.com/sashabaranov/go-openai v1.26.2
github.com/shurcooL/githubv4 v0.0.0-20231126234147-1cffa1f02456
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
@@ -131,6 +131,7 @@ require (
github.com/google/btree v1.1.2 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
+ github.com/google/go-github/v53 v53.2.0 // indirect
github.com/google/go-jsonnet v0.20.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
@@ -215,6 +216,7 @@ require (
github.com/spdx/tools-golang v0.5.3 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
+ github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
github.com/tmccombs/hcl2json v0.3.6 // indirectFeedback & Suggestions:
By addressing these points, you can ensure a smooth transition to the new library versions and maintain the stability of your project. 🚀 😼 Mergecat review of pkg/vcs/github_client/client.go@@ -10,7 +10,7 @@ import (
"strings"
"github.com/chainguard-dev/git-urls"
- "github.com/google/go-github/v53/github"
+ "github.com/google/go-github/v62/github"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/shurcooL/githubv4"
@@ -26,12 +26,19 @@ var tracer = otel.Tracer("pkg/vcs/github_client")
type Client struct {
shurcoolClient *githubv4.Client
- googleClient *github.Client
+ googleClient *GClient
cfg config.ServerConfig
username, email string
}
+// GClient is a struct that holds the services for the GitHub client
+type GClient struct {
+ PullRequests PullRequestsServices
+ Repositories RepositoriesServices
+ Issues IssuesServices
+}
+
// CreateGithubClient creates a new GitHub client using the auth token provided. We
// can't validate the token at this point, so if it exists we assume it works
func CreateGithubClient(cfg config.ServerConfig) (*Client, error) {
@@ -54,13 +61,15 @@ func CreateGithubClient(cfg config.ServerConfig) (*Client, error) {
tc := oauth2.NewClient(ctx, ts)
githubUrl := cfg.VcsBaseUrl
- if githubUrl == "" {
+ githubUploadUrl := cfg.VcsUploadUrl
+ // we need both urls to be set for github enterprise
+ if githubUrl == "" || githubUploadUrl == "" {
googleClient = github.NewClient(tc) // If this has failed, we'll catch it on first call
// Use the client from shurcooL's githubv4 library for queries.
shurcoolClient = githubv4.NewClient(tc)
} else {
- googleClient, err = github.NewEnterpriseClient(githubUrl, githubUrl, tc)
+ googleClient, err = github.NewClient(tc).WithEnterpriseURLs(githubUrl, githubUploadUrl)
if err != nil {
log.Fatal().Err(err).Msg("failed to create github enterprise client")
}
@@ -73,8 +82,12 @@ func CreateGithubClient(cfg config.ServerConfig) (*Client, error) {
}
client := &Client{
- cfg: cfg,
- googleClient: googleClient,
+ cfg: cfg,
+ googleClient: &GClient{
+ PullRequests: PullRequestsService{googleClient.PullRequests},
+ Repositories: RepositoriesService{googleClient.Repositories},
+ Issues: IssuesService{googleClient.Issues},
+ },
shurcoolClient: shurcoolClient,
}
if user != nil {
@@ -219,9 +232,15 @@ func (c *Client) GetHookByUrl(ctx context.Context, ownerAndRepoName, webhookUrl
}
for _, item := range items {
- if item.URL != nil && *item.URL == webhookUrl {
+ itemConfig := item.GetConfig()
+ // check if the hook's config has a URL
+ hookPayloadURL := ""
+ if itemConfig != nil {
+ hookPayloadURL = itemConfig.GetURL()
+ }
+ if hookPayloadURL == webhookUrl {
return &vcs.WebHookConfig{
- Url: item.GetURL(),
+ Url: hookPayloadURL,
Events: item.Events, // TODO: translate GH specific event names to VCS agnostic
}, nil
}
@@ -232,23 +251,26 @@ func (c *Client) GetHookByUrl(ctx context.Context, ownerAndRepoName, webhookUrl
func (c *Client) CreateHook(ctx context.Context, ownerAndRepoName, webhookUrl, webhookSecret string) error {
owner, repoName := parseRepo(ownerAndRepoName)
- _, _, err := c.googleClient.Repositories.CreateHook(ctx, owner, repoName, &github.Hook{
+ _, resp, err := c.googleClient.Repositories.CreateHook(ctx, owner, repoName, &github.Hook{
Active: pkg.Pointer(true),
- Config: map[string]interface{}{
- "content_type": "json",
- "insecure_ssl": "0",
- "secret": webhookSecret,
- "url": webhookUrl,
+ Config: &github.HookConfig{
+ ContentType: pkg.Pointer("json"),
+ InsecureSSL: pkg.Pointer("0"),
+ URL: pkg.Pointer(webhookUrl),
+ Secret: pkg.Pointer(webhookSecret),
},
Events: []string{
"pull_request",
},
Name: pkg.Pointer("web"),
})
- if err != nil {
- return errors.Wrap(err, "failed to create hook")
+ if err != nil || resp.StatusCode < 200 || resp.StatusCode >= 300 {
+ statusCode := 0
+ if resp != nil {
+ statusCode = resp.StatusCode
+ }
+ return errors.Wrap(err, fmt.Sprintf("failed to create hook, statuscode: %d", statusCode))
}
-
return nil
}
Feedback & Suggestions:
By addressing these points, you can ensure that the code is more robust, maintainable, and ready for future extensions. 🛠️ 😼 Mergecat review of tools/dump_crds/go.mod@@ -1,7 +1,70 @@
module github.com/zapier/kubechecks/tools/dump_crds
-go 1.21
+go 1.22.0
-toolchain go1.21.6
+toolchain go1.22.2
-require github.com/Masterminds/semver v1.5.0
+require (
+ github.com/Masterminds/semver v1.5.0
+ github.com/spf13/cobra v1.8.0
+ github.com/spf13/viper v1.18.2
+ k8s.io/apimachinery v0.30.1
+ k8s.io/client-go v0.30.1
+)
+
+require (
+ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+ github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+ github.com/fsnotify/fsnotify v1.7.0 // indirect
+ github.com/go-logr/logr v1.4.1 // indirect
+ github.com/go-openapi/jsonpointer v0.19.6 // indirect
+ github.com/go-openapi/jsonreference v0.20.2 // indirect
+ github.com/go-openapi/swag v0.22.3 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/golang/protobuf v1.5.4 // indirect
+ github.com/google/gnostic-models v0.6.8 // indirect
+ github.com/google/gofuzz v1.2.0 // indirect
+ github.com/google/uuid v1.4.0 // indirect
+ github.com/hashicorp/hcl v1.0.0 // indirect
+ github.com/imdario/mergo v0.3.6 // indirect
+ github.com/inconshreveable/mousetrap v1.1.0 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
+ github.com/json-iterator/go v1.1.12 // indirect
+ github.com/lmittmann/tint v1.0.4 // indirect
+ github.com/magiconair/properties v1.8.7 // indirect
+ github.com/mailru/easyjson v0.7.7 // indirect
+ github.com/mitchellh/mapstructure v1.5.0 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ github.com/pelletier/go-toml/v2 v2.1.0 // indirect
+ github.com/sagikazarmark/locafero v0.4.0 // indirect
+ github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+ github.com/sourcegraph/conc v0.3.0 // indirect
+ github.com/spf13/afero v1.11.0 // indirect
+ github.com/spf13/cast v1.6.0 // indirect
+ github.com/spf13/pflag v1.0.5 // indirect
+ github.com/subosito/gotenv v1.6.0 // indirect
+ go.uber.org/atomic v1.9.0 // indirect
+ go.uber.org/multierr v1.9.0 // indirect
+ golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+ golang.org/x/net v0.23.0 // indirect
+ golang.org/x/oauth2 v0.15.0 // indirect
+ golang.org/x/sys v0.18.0 // indirect
+ golang.org/x/term v0.18.0 // indirect
+ golang.org/x/text v0.14.0 // indirect
+ golang.org/x/time v0.5.0 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/protobuf v1.33.0 // indirect
+ gopkg.in/inf.v0 v0.9.1 // indirect
+ gopkg.in/ini.v1 v1.67.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
+ k8s.io/api v0.30.1 // indirect
+ k8s.io/klog/v2 v2.120.1 // indirect
+ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+ k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+ sigs.k8s.io/yaml v1.3.0 // indirect
+)Feedback & Suggestions:
😼 Mergecat review of pkg/vcs/github_client/client_test.go package github_client
import (
+ "context"
+ "fmt"
+ "net/http"
"testing"
+ "github.com/google/go-github/v62/github"
+ "github.com/shurcooL/githubv4"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/mock"
+ githubMocks "github.com/zapier/kubechecks/mocks/github_client/mocks"
+ "github.com/zapier/kubechecks/pkg/config"
+ "github.com/zapier/kubechecks/pkg/vcs"
)
+// MockGitHubMethod is a generic function to mock GitHub client methods
+func MockGitHubMethod(methodName string, returns []interface{}) *GClient {
+ mockClient := new(githubMocks.MockRepositoriesServices)
+ mockClient.On(methodName, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(returns...)
+
+ return &GClient{
+ Repositories: mockClient,
+ }
+}
+
func TestParseRepo(t *testing.T) {
testcases := []struct {
name, input string
@@ -40,3 +59,268 @@ func TestParseRepo(t *testing.T) {
})
}
}
+
+func TestClient_CreateHook(t *testing.T) {
+ type fields struct {
+ shurcoolClient *githubv4.Client
+ googleClient *GClient
+ cfg config.ServerConfig
+ username string
+ email string
+ }
+ type args struct {
+ ctx context.Context
+ ownerAndRepoName string
+ webhookUrl string
+ webhookSecret string
+ }
+ tests := []struct {
+ name string
+ fields fields
+ args args
+ wantErr assert.ErrorAssertionFunc
+ }{
+ {
+ name: "normal ok",
+ fields: fields{
+ shurcoolClient: nil,
+ googleClient: MockGitHubMethod("CreateHook",
+ []interface{}{
+ &github.Hook{},
+ &github.Response{Response: &http.Response{StatusCode: http.StatusOK}},
+ nil}),
+ cfg: config.ServerConfig{
+ VcsToken: "ghp_helloworld",
+ VcsType: "github",
+ },
+ username: "dummy-bot",
+ email: "[email protected]",
+ },
+ args: args{
+ ctx: context.Background(),
+ ownerAndRepoName: "https://dummy-bot:********@github.com/dummy-bot-zapier/test-repo.git",
+ webhookUrl: "https://dummywebhooks.local",
+ webhookSecret: "dummy-webhook-secret",
+ },
+ wantErr: assert.NoError,
+ },
+ {
+ name: "github responds with error",
+ fields: fields{
+ shurcoolClient: nil,
+ googleClient: MockGitHubMethod("CreateHook",
+ []interface{}{
+ nil,
+ &github.Response{Response: &http.Response{StatusCode: http.StatusBadRequest}},
+ fmt.Errorf("mock bad request")}),
+ cfg: config.ServerConfig{
+ VcsToken: "ghp_helloworld",
+ VcsType: "github",
+ },
+ username: "dummy-bot",
+ email: "[email protected]",
+ },
+ args: args{
+ ctx: context.Background(),
+ ownerAndRepoName: "https://dummy-bot:********@github.com/dummy-bot-zapier/test-repo.git",
+ webhookUrl: "https://dummywebhooks.local",
+ webhookSecret: "dummy-webhook-secret",
+ },
+ wantErr: assert.Error,
+ },
+ {
+ name: "mock network error error",
+ fields: fields{
+ shurcoolClient: nil,
+ googleClient: MockGitHubMethod("CreateHook",
+ []interface{}{
+ nil,
+ nil,
+ fmt.Errorf("mock network error")}),
+ cfg: config.ServerConfig{
+ VcsToken: "ghp_helloworld",
+ VcsType: "github",
+ },
+ username: "dummy-bot",
+ email: "[email protected]",
+ },
+ args: args{
+ ctx: context.Background(),
+ ownerAndRepoName: "https://dummy-bot:********@github.com/dummy-bot-zapier/test-repo.git",
+ webhookUrl: "https://dummywebhooks.local",
+ webhookSecret: "dummy-webhook-secret",
+ },
+ wantErr: assert.Error,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ c := &Client{
+ shurcoolClient: tt.fields.shurcoolClient,
+ googleClient: tt.fields.googleClient,
+ cfg: tt.fields.cfg,
+ username: tt.fields.username,
+ email: tt.fields.email,
+ }
+ tt.wantErr(t, c.CreateHook(tt.args.ctx, tt.args.ownerAndRepoName, tt.args.webhookUrl, tt.args.webhookSecret), fmt.Sprintf("CreateHook(%v, %v, %v, %v)", tt.args.ctx, tt.args.ownerAndRepoName, tt.args.webhookUrl, tt.args.webhookSecret))
+ })
+ }
+}
+
+func TestClient_GetHookByUrl(t *testing.T) {
+ type fields struct {
+ shurcoolClient *githubv4.Client
+ googleClient *GClient
+ cfg config.ServerConfig
+ username string
+ email string
+ }
+ type args struct {
+ ctx context.Context
+ ownerAndRepoName string
+ webhookUrl string
+ }
+ tests := []struct {
+ name string
+ fields fields
+ args args
+ want *vcs.WebHookConfig
+ wantErr assert.ErrorAssertionFunc
+ }{
+ {
+ name: "normal ok",
+ fields: fields{
+ shurcoolClient: nil,
+ googleClient: MockGitHubMethod("ListHooks",
+ []interface{}{
+ []*github.Hook{
+ {
+ Config: &github.HookConfig{
+ ContentType: github.String("json"),
+ InsecureSSL: github.String("0"),
+ URL: github.String("https://dummywebhooks.local"),
+ Secret: github.String("dummy-webhook-secret"),
+ },
+ Events: []string{"pull_request"},
+ },
+ },
+ &github.Response{Response: &http.Response{StatusCode: http.StatusOK}},
+ nil}),
+ cfg: config.ServerConfig{
+ VcsToken: "ghp_helloworld",
+ VcsType: "github",
+ },
+ username: "dummy-bot",
+ email: "[email protected]",
+ },
+ args: args{
+ ctx: context.Background(),
+ ownerAndRepoName: "https://dummy-bot:********@github.com/dummy-bot-zapier/test-repo.git",
+ webhookUrl: "https://dummywebhooks.local",
+ },
+ want: &vcs.WebHookConfig{
+ Url: "https://dummywebhooks.local",
+ Events: []string{"pull_request"},
+ },
+ wantErr: assert.NoError,
+ },
+ {
+ name: "no matching webhook found",
+ fields: fields{
+ shurcoolClient: nil,
+ googleClient: MockGitHubMethod("ListHooks",
+ []interface{}{
+ []*github.Hook{
+ {
+ Config: &github.HookConfig{
+ ContentType: github.String("json"),
+ InsecureSSL: github.String("0"),
+ URL: github.String("https://differentwebhook.local"),
+ Secret: github.String("dummy-webhook-secret"),
+ },
+ Events: []string{"pull_request"},
+ },
+ },
+ &github.Response{Response: &http.Response{StatusCode: http.StatusOK}},
+ nil}),
+ cfg: config.ServerConfig{
+ VcsToken: "ghp_helloworld",
+ VcsType: "github",
+ },
+ username: "dummy-bot",
+ email: "[email protected]",
+ },
+ args: args{
+ ctx: context.Background(),
+ ownerAndRepoName: "https://dummy-bot:********@github.com/dummy-bot-zapier/test-repo.git",
+ webhookUrl: "https://dummywebhooks.local",
+ },
+ want: nil,
+ wantErr: assert.Error,
+ },
+ {
+ name: "0 webhook found",
+ fields: fields{
+ shurcoolClient: nil,
+ googleClient: MockGitHubMethod("ListHooks",
+ []interface{}{
+ nil,
+ &github.Response{Response: &http.Response{StatusCode: http.StatusOK}},
+ nil}),
+ cfg: config.ServerConfig{
+ VcsToken: "ghp_helloworld",
+ VcsType: "github",
+ },
+ username: "dummy-bot",
+ email: "[email protected]",
+ },
+ args: args{
+ ctx: context.Background(),
+ ownerAndRepoName: "https://dummy-bot:********@github.com/dummy-bot-zapier/test-repo.git",
+ webhookUrl: "https://dummywebhooks.local",
+ },
+ want: nil,
+ wantErr: assert.Error,
+ },
+ {
+ name: "github error",
+ fields: fields{
+ shurcoolClient: nil,
+ googleClient: MockGitHubMethod("ListHooks",
+ []interface{}{
+ nil,
+ &github.Response{Response: &http.Response{StatusCode: http.StatusBadRequest}},
+ fmt.Errorf("mock bad request")}),
+ cfg: config.ServerConfig{
+ VcsToken: "ghp_helloworld",
+ VcsType: "github",
+ },
+ username: "dummy-bot",
+ email: "[email protected]",
+ },
+ args: args{
+ ctx: context.Background(),
+ ownerAndRepoName: "https://dummy-bot:********@github.com/dummy-bot-zapier/test-repo.git",
+ webhookUrl: "https://dummywebhooks.local",
+ },
+ want: nil,
+ wantErr: assert.Error,
+ },
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ c := &Client{
+ shurcoolClient: tt.fields.shurcoolClient,
+ googleClient: tt.fields.googleClient,
+ cfg: tt.fields.cfg,
+ username: tt.fields.username,
+ email: tt.fields.email,
+ }
+ got, err := c.GetHookByUrl(tt.args.ctx, tt.args.ownerAndRepoName, tt.args.webhookUrl)
+ if !tt.wantErr(t, err, fmt.Sprintf("GetHookByUrl(%v, %v, %v)", tt.args.ctx, tt.args.ownerAndRepoName, tt.args.webhookUrl)) {
+ return
+ }
+ assert.Equalf(t, tt.want, got, "GetHookByUrl(%v, %v, %v)", tt.args.ctx, tt.args.ownerAndRepoName, tt.args.webhookUrl)
+ })
+ }
+}Feedback & Suggestions:
By addressing these points, the code will be more secure, maintainable, and easier to understand. Keep up the good work! 😸 😼 Mergecat review of tools/dump_crds/go.sum@@ -1,2 +1,198 @@
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
+github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
+github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lmittmann/tint v1.0.4 h1:LeYihpJ9hyGvE0w+K2okPTGUdVLfng1+nDNVR4vWISc=
+github.com/lmittmann/tint v1.0.4/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
+github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
+github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
+github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
+github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
+github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
+github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
+github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3
</details>
---
## Dependency Review
<details><summary>Click to read mergecats review!</summary>
No suggestions found
</details> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Namespace Restriction for Kubechecks:
argocd-api-namespaceand a corresponding server configArgoCDNameSpace.NewApplicationInformerto target the specifiedargocdnamespace.Improvement to
dumpcrd:dumpcrdcan now run without requiring a localkubectlbinary.Modification to GitHub Webhook Check:
OpenAI ChatGPT Model Update:
GPT-4omodel.GitHub lib updated to v62
Localdev Changes
Earthly File Renaming:
earthly.shto minimize confusion.TiltFile Fix:
TiltFileto read the.tools-versionfile directly, preventing failures during the earthly build..secretinstead of.env; as secrets env vars are read from the .secretValues.yaml Update:
KUBECHECKS_ARGOCD_NAMESPACEtoKUBECHECKS_ARGOCD_API_NAMESPACEinlocaldev/kubechecks/values.yaml.Configuration Change:
KUBECHECKS_ENABLE_CONFTESTtofalseas the./policypath is not valid.