From 91ad6da0913d58ddba36aa815879c8db4ef47494 Mon Sep 17 00:00:00 2001 From: Ahmad Ibrahim Date: Mon, 12 Aug 2024 10:33:47 -0700 Subject: [PATCH 1/8] chore: make reviewable --- pkg/config/versions.go | 4 ++-- tests/integration/_validator/testcases/data/validator.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/config/versions.go b/pkg/config/versions.go index d9fd8077..a130784c 100644 --- a/pkg/config/versions.go +++ b/pkg/config/versions.go @@ -2,10 +2,10 @@ package config // ValidatorChartVersions is a map of validator component names to their respective versions var ValidatorChartVersions = map[string]string{ - Validator: "v0.1.2", + Validator: "v0.1.3", ValidatorPluginAws: "v0.1.3", ValidatorPluginAzure: "v0.0.15", ValidatorPluginNetwork: "v0.0.22", - ValidatorPluginOci: "v0.1.0", + ValidatorPluginOci: "v0.2.0", ValidatorPluginVsphere: "v0.0.29", } diff --git a/tests/integration/_validator/testcases/data/validator.yaml b/tests/integration/_validator/testcases/data/validator.yaml index e6dbe12b..d75c0842 100644 --- a/tests/integration/_validator/testcases/data/validator.yaml +++ b/tests/integration/_validator/testcases/data/validator.yaml @@ -5,7 +5,7 @@ helmRelease: chart: name: validator repository: validator - version: v0.1.2 + version: v0.1.3 values: "" helmReleaseSecret: name: validator-helm-release-validator @@ -201,7 +201,7 @@ ociPlugin: chart: name: validator-plugin-oci repository: validator-plugin-oci - version: v0.1.0 + version: v0.2.0 values: "" secrets: - name: oci-creds From 2efb51f629c580c20295db9ce3f79e5a541ea107 Mon Sep 17 00:00:00 2001 From: Ahmad Ibrahim Date: Mon, 12 Aug 2024 10:41:23 -0700 Subject: [PATCH 2/8] chore: go mod tidy --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 17e11b09..4b00a272 100644 --- a/go.mod +++ b/go.mod @@ -16,12 +16,12 @@ require ( github.com/spectrocloud-labs/prompts-tui v0.1.1 github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 - github.com/validator-labs/validator v0.1.3-0.20240809205255-c05a36eebd3c - github.com/validator-labs/validator-plugin-aws v0.1.4-0.20240809205833-8085473f77df - github.com/validator-labs/validator-plugin-azure v0.0.16-0.20240809210033-fab1ab878d10 - github.com/validator-labs/validator-plugin-network v0.0.23-0.20240809205936-18ffc3b792c4 - github.com/validator-labs/validator-plugin-oci v0.1.1-0.20240809205756-c1942b7a7104 - github.com/validator-labs/validator-plugin-vsphere v0.0.30-0.20240809210242-a318dfc2be38 + github.com/validator-labs/validator v0.1.3 + github.com/validator-labs/validator-plugin-aws v0.1.3 + github.com/validator-labs/validator-plugin-azure v0.0.15 + github.com/validator-labs/validator-plugin-network v0.0.22 + github.com/validator-labs/validator-plugin-oci v0.2.0 + github.com/validator-labs/validator-plugin-vsphere v0.0.29 github.com/vmware/govmomi v0.39.0 golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa gopkg.in/yaml.v2 v2.4.0 diff --git a/go.sum b/go.sum index 6861a25d..2176583f 100644 --- a/go.sum +++ b/go.sum @@ -752,18 +752,18 @@ github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/transparency-dev/merkle v0.0.2 h1:Q9nBoQcZcgPamMkGn7ghV8XiTZ/kRxn1yCG81+twTK4= github.com/transparency-dev/merkle v0.0.2/go.mod h1:pqSy+OXefQ1EDUVmAJ8MUhHB9TXGuzVAT58PqBoHz1A= -github.com/validator-labs/validator v0.1.3-0.20240809205255-c05a36eebd3c h1:9Dy8DW7qdSQflkwiNPcBPkf/wgAOT+ddmSDvOabjnVQ= -github.com/validator-labs/validator v0.1.3-0.20240809205255-c05a36eebd3c/go.mod h1:TU04WjenuJxvJI/uhRsBJRym3ysA+dvSwUs2qvnak1Q= -github.com/validator-labs/validator-plugin-aws v0.1.4-0.20240809205833-8085473f77df h1:ryzjKVisPy4yRIBOBUyKO4k7/CAL8wDHHN+9T6+bPUE= -github.com/validator-labs/validator-plugin-aws v0.1.4-0.20240809205833-8085473f77df/go.mod h1:NAPw04DYgOQUKN7GmGy65gETac19lDAjCAPtE4nLe5Q= -github.com/validator-labs/validator-plugin-azure v0.0.16-0.20240809210033-fab1ab878d10 h1:BFlJUBviwxKnrgYnemEqW643Ohj32XvDr6VNbQYzmOI= -github.com/validator-labs/validator-plugin-azure v0.0.16-0.20240809210033-fab1ab878d10/go.mod h1:Lg4K6Uc7BkNi3KIr0gEPYDcwfjmFNI0uYHm4tbVyswo= -github.com/validator-labs/validator-plugin-network v0.0.23-0.20240809205936-18ffc3b792c4 h1:iHmrJU1FBgfBzMuQ1tcYZiy2nZ5Qwmvu6GZ787b5odo= -github.com/validator-labs/validator-plugin-network v0.0.23-0.20240809205936-18ffc3b792c4/go.mod h1:zA+EcB7wV2qj67SiFpzpTq1Bv08BIqJWU/+XrbeBRZM= -github.com/validator-labs/validator-plugin-oci v0.1.1-0.20240809205756-c1942b7a7104 h1:5A/j5XFU720xFvmuqunGM4Rz1NB1KIWVodQqhleP4Jk= -github.com/validator-labs/validator-plugin-oci v0.1.1-0.20240809205756-c1942b7a7104/go.mod h1:lC/pR8XKRKLKlDYObm8v6eDaj7NkmBjAskheuQXE7V0= -github.com/validator-labs/validator-plugin-vsphere v0.0.30-0.20240809210242-a318dfc2be38 h1:hYw3ZTbHBdhCJoFeXkhYipWHkVpdLufwWsSxuoWN1aE= -github.com/validator-labs/validator-plugin-vsphere v0.0.30-0.20240809210242-a318dfc2be38/go.mod h1:hBGQsKzO2TCG0QArBnZHNUpofxT02J9WYBV/rtDVcok= +github.com/validator-labs/validator v0.1.3 h1:IH7Jfn/t4qJWnvAtL/KkNXWB+7KSmrN4oiYFMxhQjeU= +github.com/validator-labs/validator v0.1.3/go.mod h1:2KfBoFMB0Y6aH2REu7fL7oW3eK8m302EvI52nC4CP3c= +github.com/validator-labs/validator-plugin-aws v0.1.3 h1:8C/cprrt0RW8j97LOPSyuqyy1EDuHZfJthpS+tZY5PE= +github.com/validator-labs/validator-plugin-aws v0.1.3/go.mod h1:aY+4x9iA76XzjjS7fTXWJPytxCFospvzIOhJgnlpkq0= +github.com/validator-labs/validator-plugin-azure v0.0.15 h1:hh5oMwq64WdAekcXVIAMS9tNGuXWCOWZ9YvUp49p6ko= +github.com/validator-labs/validator-plugin-azure v0.0.15/go.mod h1:7XVYQDtfQK9A+1RV6e09NKMs4Z6XGwDj2X0ToUZ34ro= +github.com/validator-labs/validator-plugin-network v0.0.22 h1:tlyyA8wq2j9/tmNjxP5JuQEY0Xh6aLedFp9s2943CVg= +github.com/validator-labs/validator-plugin-network v0.0.22/go.mod h1:0zlqCtTNHxPAp7jKN/1abzRBXRXvBNWSQzVEhkQCrXg= +github.com/validator-labs/validator-plugin-oci v0.2.0 h1:gdSkuzbHxld8aD6KPuFJ6IqsrNmEBLPWgydqJHNqzZ0= +github.com/validator-labs/validator-plugin-oci v0.2.0/go.mod h1:lC/pR8XKRKLKlDYObm8v6eDaj7NkmBjAskheuQXE7V0= +github.com/validator-labs/validator-plugin-vsphere v0.0.29 h1:tgf3NfrFGbCBS1wV3AUcscqaPo9YuE3heI6UoQZqcZI= +github.com/validator-labs/validator-plugin-vsphere v0.0.29/go.mod h1:XzD1rmP91LRocKGsnTdqRjsSdkk7G127HEPnhc4BWkQ= github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts= github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk= github.com/vmware/govmomi v0.39.0 h1:soLZ08Q2zvjRSinNup8xVlw0KDDCJPPA1rIDmBhi7As= From 7286c98d7aa745feecf3ac62f5d022254bdf8eec Mon Sep 17 00:00:00 2001 From: Ahmad Ibrahim Date: Mon, 12 Aug 2024 14:28:04 -0700 Subject: [PATCH 3/8] chore: bump plugin versions --- go.mod | 16 ++-- go.sum | 73 +++++++++++-------- pkg/config/versions.go | 10 +-- .../_validator/testcases/data/validator.yaml | 10 +-- 4 files changed, 61 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index 4b00a272..e9f401af 100644 --- a/go.mod +++ b/go.mod @@ -16,12 +16,12 @@ require ( github.com/spectrocloud-labs/prompts-tui v0.1.1 github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 - github.com/validator-labs/validator v0.1.3 - github.com/validator-labs/validator-plugin-aws v0.1.3 - github.com/validator-labs/validator-plugin-azure v0.0.15 - github.com/validator-labs/validator-plugin-network v0.0.22 + github.com/validator-labs/validator v0.1.4 + github.com/validator-labs/validator-plugin-aws v0.1.4 + github.com/validator-labs/validator-plugin-azure v0.0.16 + github.com/validator-labs/validator-plugin-network v0.0.23 github.com/validator-labs/validator-plugin-oci v0.2.0 - github.com/validator-labs/validator-plugin-vsphere v0.0.29 + github.com/validator-labs/validator-plugin-vsphere v0.0.30 github.com/vmware/govmomi v0.39.0 golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa gopkg.in/yaml.v2 v2.4.0 @@ -29,7 +29,7 @@ require ( k8s.io/apimachinery v0.30.3 k8s.io/client-go v0.30.3 k8s.io/helm v2.17.0+incompatible - sigs.k8s.io/controller-runtime v0.18.4 + sigs.k8s.io/controller-runtime v0.18.5 sigs.k8s.io/yaml v1.4.0 ) @@ -243,11 +243,11 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.30.1 // indirect + k8s.io/apiextensions-apiserver v0.30.3 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect - sigs.k8s.io/cluster-api v1.7.4 // indirect + sigs.k8s.io/cluster-api v1.8.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/release-utils v0.8.4 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect diff --git a/go.sum b/go.sum index 2176583f..9e8498a7 100644 --- a/go.sum +++ b/go.sum @@ -227,6 +227,8 @@ github.com/buildkite/roko v1.2.0/go.mod h1:23R9e6nHxgedznkwwfmqZ6+0VJZJZ2Sg/uVcp github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M= github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -254,10 +256,10 @@ github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= -github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0= -github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= -github.com/coredns/corefile-migration v1.0.21 h1:W/DCETrHDiFo0Wj03EyMkaQ9fwsmSgqTCQDHpceaSsE= -github.com/coredns/corefile-migration v1.0.21/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE= +github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0= +github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= +github.com/coredns/corefile-migration v1.0.23 h1:Fp4FETmk8sT/IRgnKX2xstC2dL7+QdcU+BL5AYIN3Jw= +github.com/coredns/corefile-migration v1.0.23/go.mod h1:8HyMhuyzx9RLZp8cRc9Uf3ECpEAafHOFxQWUPqktMQI= github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI= github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -280,8 +282,8 @@ github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 h1:lxmTCgmHE1G github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7/go.mod h1:GvWntX9qiTlOud0WkQ6ewFm0LPy5JUR1Xo0Ngbd1w6Y= github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U= github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= -github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= -github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE= github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= @@ -303,8 +305,8 @@ github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= +github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= @@ -446,6 +448,9 @@ github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWS github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= @@ -752,18 +757,18 @@ github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/transparency-dev/merkle v0.0.2 h1:Q9nBoQcZcgPamMkGn7ghV8XiTZ/kRxn1yCG81+twTK4= github.com/transparency-dev/merkle v0.0.2/go.mod h1:pqSy+OXefQ1EDUVmAJ8MUhHB9TXGuzVAT58PqBoHz1A= -github.com/validator-labs/validator v0.1.3 h1:IH7Jfn/t4qJWnvAtL/KkNXWB+7KSmrN4oiYFMxhQjeU= -github.com/validator-labs/validator v0.1.3/go.mod h1:2KfBoFMB0Y6aH2REu7fL7oW3eK8m302EvI52nC4CP3c= -github.com/validator-labs/validator-plugin-aws v0.1.3 h1:8C/cprrt0RW8j97LOPSyuqyy1EDuHZfJthpS+tZY5PE= -github.com/validator-labs/validator-plugin-aws v0.1.3/go.mod h1:aY+4x9iA76XzjjS7fTXWJPytxCFospvzIOhJgnlpkq0= -github.com/validator-labs/validator-plugin-azure v0.0.15 h1:hh5oMwq64WdAekcXVIAMS9tNGuXWCOWZ9YvUp49p6ko= -github.com/validator-labs/validator-plugin-azure v0.0.15/go.mod h1:7XVYQDtfQK9A+1RV6e09NKMs4Z6XGwDj2X0ToUZ34ro= -github.com/validator-labs/validator-plugin-network v0.0.22 h1:tlyyA8wq2j9/tmNjxP5JuQEY0Xh6aLedFp9s2943CVg= -github.com/validator-labs/validator-plugin-network v0.0.22/go.mod h1:0zlqCtTNHxPAp7jKN/1abzRBXRXvBNWSQzVEhkQCrXg= +github.com/validator-labs/validator v0.1.4 h1:NWmOwJMciLGvJ/zfOAiYRvXNtlB4MUj0PeQ0sr8Vits= +github.com/validator-labs/validator v0.1.4/go.mod h1:UwuzW7ebeg8HTei2fBDHtMgEvs2gYQsBLawjYsUcMjY= +github.com/validator-labs/validator-plugin-aws v0.1.4 h1:0SMEIddrCRJfHvsqkyMCmkDQ5zfLHnju0ZDlAMEnr1M= +github.com/validator-labs/validator-plugin-aws v0.1.4/go.mod h1:Nh/RM9SygPPV9aMmMoOHg7PnYlCRYEHeOfOQ0qk5hBs= +github.com/validator-labs/validator-plugin-azure v0.0.16 h1:ttQmsmF8sG2Q6WPaTxzJ/rOYom4gR3TnNVxlQkMW0Po= +github.com/validator-labs/validator-plugin-azure v0.0.16/go.mod h1:gcBBYgKfx6WH6fT8BL94kn7aPrBBchEUEjP4wlekCKs= +github.com/validator-labs/validator-plugin-network v0.0.23 h1:+1fooiXuve73NAOUTTjf2jPd9DDYHekzEKh7bLtrOFc= +github.com/validator-labs/validator-plugin-network v0.0.23/go.mod h1:9f7tzIR1toQD0XVMTIba/42V+06j4IoUhwELe+V0Jfs= github.com/validator-labs/validator-plugin-oci v0.2.0 h1:gdSkuzbHxld8aD6KPuFJ6IqsrNmEBLPWgydqJHNqzZ0= github.com/validator-labs/validator-plugin-oci v0.2.0/go.mod h1:lC/pR8XKRKLKlDYObm8v6eDaj7NkmBjAskheuQXE7V0= -github.com/validator-labs/validator-plugin-vsphere v0.0.29 h1:tgf3NfrFGbCBS1wV3AUcscqaPo9YuE3heI6UoQZqcZI= -github.com/validator-labs/validator-plugin-vsphere v0.0.29/go.mod h1:XzD1rmP91LRocKGsnTdqRjsSdkk7G127HEPnhc4BWkQ= +github.com/validator-labs/validator-plugin-vsphere v0.0.30 h1:CgJUW8vEftslSAb/xmHZW5dtS51tEA/n6pmN+dwk9Ao= +github.com/validator-labs/validator-plugin-vsphere v0.0.30/go.mod h1:g2+O2WYlXYYX5FxHfa7Vu7GCJLtX9QgQ0A8+9IODpQY= github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinCts= github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk= github.com/vmware/govmomi v0.39.0 h1:soLZ08Q2zvjRSinNup8xVlw0KDDCJPPA1rIDmBhi7As= @@ -797,12 +802,18 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIX go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= +go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= go.step.sm/crypto v0.51.1 h1:ktUg/2hetEMiBAqgz502ktZDGoDoGrcHFg3XpkmkvvA= go.step.sm/crypto v0.51.1/go.mod h1:PdrhttNU/tG9/YsVd4fdlysBN+UV503p0o2irFZQlAw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -1020,18 +1031,18 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ= k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04= -k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws= -k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4= +k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U= +k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4= k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc= k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8= -k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo= +k8s.io/apiserver v0.30.3 h1:QZJndA9k2MjFqpnyYv/PH+9PE0SHhx3hBho4X0vE65g= +k8s.io/apiserver v0.30.3/go.mod h1:6Oa88y1CZqnzetd2JdepO0UXzQX4ZnOekx2/PtEjrOg= k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k= k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U= -k8s.io/cluster-bootstrap v0.29.3 h1:DIMDZSN8gbFMy9CS2mAS2Iqq/fIUG783WN/1lqi5TF8= -k8s.io/cluster-bootstrap v0.29.3/go.mod h1:aPAg1VtXx3uRrx5qU2jTzR7p1rf18zLXWS+pGhiqPto= -k8s.io/component-base v0.30.1 h1:bvAtlPh1UrdaZL20D9+sWxsJljMi0QZ3Lmw+kmZAaxQ= -k8s.io/component-base v0.30.1/go.mod h1:e/X9kDiOebwlI41AvBHuWdqFriSRrX50CdwA9TFaHLI= +k8s.io/cluster-bootstrap v0.30.3 h1:MgxyxMkpaC6mu0BKWJ8985XCOnKU+eH3Iy+biwtDXRk= +k8s.io/cluster-bootstrap v0.30.3/go.mod h1:h8BoLDfdD7XEEIXy7Bx9FcMzxHwz29jsYYi34bM5DKU= +k8s.io/component-base v0.30.3 h1:Ci0UqKWf4oiwy8hr1+E3dsnliKnkMLZMVbWzeorlk7s= +k8s.io/component-base v0.30.3/go.mod h1:C1SshT3rGPCuNtBs14RmVD2xW0EhRSeLvBh7AGk1quA= k8s.io/helm v2.17.0+incompatible h1:Bpn6o1wKLYqKM3+Osh8e+1/K2g/GsQJ4F4yNF2+deao= k8s.io/helm v2.17.0+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= @@ -1040,10 +1051,12 @@ k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a h1:zD1uj3Jf+mD4zmA7W+goE5 k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/cluster-api v1.7.4 h1:gT9WGbLXKE19pNR6s/cTLRqK2G0EbwxxQrUrw7/w5P4= -sigs.k8s.io/cluster-api v1.7.4/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= -sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= -sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs= +sigs.k8s.io/cluster-api v1.8.0 h1:xdF9svGCbezxOn9Y6QmlVnNaZ0n9QkRJpNuKJkeorUw= +sigs.k8s.io/cluster-api v1.8.0/go.mod h1:iSUcU8rHBNRa6wZJvU6klHKI3EVQC0aMcgjeSofBwKw= +sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk= +sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/release-utils v0.8.4 h1:4QVr3UgbyY/d9p74LBhg0njSVQofUsAZqYOzVZBhdBw= diff --git a/pkg/config/versions.go b/pkg/config/versions.go index a130784c..6736125f 100644 --- a/pkg/config/versions.go +++ b/pkg/config/versions.go @@ -2,10 +2,10 @@ package config // ValidatorChartVersions is a map of validator component names to their respective versions var ValidatorChartVersions = map[string]string{ - Validator: "v0.1.3", - ValidatorPluginAws: "v0.1.3", - ValidatorPluginAzure: "v0.0.15", - ValidatorPluginNetwork: "v0.0.22", + Validator: "v0.1.4", + ValidatorPluginAws: "v0.1.4", + ValidatorPluginAzure: "v0.0.16", + ValidatorPluginNetwork: "v0.0.23", ValidatorPluginOci: "v0.2.0", - ValidatorPluginVsphere: "v0.0.29", + ValidatorPluginVsphere: "v0.0.30", } diff --git a/tests/integration/_validator/testcases/data/validator.yaml b/tests/integration/_validator/testcases/data/validator.yaml index d75c0842..4d411dcc 100644 --- a/tests/integration/_validator/testcases/data/validator.yaml +++ b/tests/integration/_validator/testcases/data/validator.yaml @@ -5,7 +5,7 @@ helmRelease: chart: name: validator repository: validator - version: v0.1.3 + version: v0.1.4 values: "" helmReleaseSecret: name: validator-helm-release-validator @@ -59,7 +59,7 @@ awsPlugin: chart: name: validator-plugin-aws repository: validator-plugin-aws - version: v0.1.3 + version: v0.1.4 values: "" accessKeyId: a0XCQd+Emx7/bwAaTyY13ipTRychb4MiQw== secretAccessKey: IrGIW8FPVuOxVDRWQUdTa22SDf1MQ2PBw0kdngVq+w== @@ -173,7 +173,7 @@ networkPlugin: chart: name: validator-plugin-network repository: validator-plugin-network - version: v0.0.22 + version: v0.0.23 values: "" validator: dnsRules: @@ -231,7 +231,7 @@ vspherePlugin: chart: name: validator-plugin-vsphere repository: validator-plugin-vsphere - version: v0.0.29 + version: v0.0.30 values: "" account: insecure: true @@ -524,7 +524,7 @@ azurePlugin: chart: name: validator-plugin-azure repository: validator-plugin-azure - version: v0.0.15 + version: v0.0.16 insecureSkipVerify: true values: "" tenantId: d551b7b1-78ae-43df-9d61-4935c843a454 From 41036dff1511efd3f6db71dfaf551ec18c1a9b45 Mon Sep 17 00:00:00 2001 From: Ahmad Ibrahim Date: Mon, 12 Aug 2024 14:35:46 -0700 Subject: [PATCH 4/8] feat: configure oci validation type --- pkg/services/validator/oci.go | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkg/services/validator/oci.go b/pkg/services/validator/oci.go index 7f76e20c..bc7c3ef0 100644 --- a/pkg/services/validator/oci.go +++ b/pkg/services/validator/oci.go @@ -282,6 +282,20 @@ func readOciRegistryRule(c *components.OCIPluginConfig, r *plug.OciRegistryRule, } r.Host = strings.TrimSuffix(host, "/") + log.InfoCLI(` + The following validation types are available:, + - 'none': only the existence of the artifacts in the registry is validated + - 'fast': the artifacts are pulled and fast layer, manifest, and config validation is performed + - 'full': the artifacts are pulled and full layer, manifest, and config validation is performed + More information on fast and full validation can be found at: + https://github.com/validator-labs/validator-plugin-oci/blob/9847a0ac4fde8f91dd5ea68f83db79edafbd1a61/api/v1alpha1/ocivalidator_types.go#L51-L63 + `) + vType, err := prompts.Select("Validation type", []string{string(plug.ValidationTypeNone), string(plug.ValidationTypeFast), string(plug.ValidationTypeFull)}) + if err != nil { + return err + } + r.ValidationType = plug.ValidationType(vType) + authSecretName, err := prompts.Select("Registry authentication secret name, select N/A for public registries", authSecretNames) if err != nil { return err @@ -345,12 +359,6 @@ func readArtifactRefs(r *plug.OciRegistryRule) error { } } - log.InfoCLI("Full layer validation is enabled by default for all artifacts.") - r.SkipLayerValidation, err = prompts.ReadBool("Disable full layer validation for all artifacts", false) - if err != nil { - return err - } - return nil } From 54e9407edfefae5bc33e240f96df2aee0e19e8cd Mon Sep 17 00:00:00 2001 From: Ahmad Ibrahim Date: Mon, 12 Aug 2024 14:57:20 -0700 Subject: [PATCH 5/8] fix: log line formatting --- pkg/services/validator/oci.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/services/validator/oci.go b/pkg/services/validator/oci.go index bc7c3ef0..38165653 100644 --- a/pkg/services/validator/oci.go +++ b/pkg/services/validator/oci.go @@ -283,13 +283,11 @@ func readOciRegistryRule(c *components.OCIPluginConfig, r *plug.OciRegistryRule, r.Host = strings.TrimSuffix(host, "/") log.InfoCLI(` - The following validation types are available:, - - 'none': only the existence of the artifacts in the registry is validated + The following validation types are available: + - 'none': only the existence of the artifacts in the registry is validated - 'fast': the artifacts are pulled and fast layer, manifest, and config validation is performed - 'full': the artifacts are pulled and full layer, manifest, and config validation is performed - More information on fast and full validation can be found at: - https://github.com/validator-labs/validator-plugin-oci/blob/9847a0ac4fde8f91dd5ea68f83db79edafbd1a61/api/v1alpha1/ocivalidator_types.go#L51-L63 - `) + `) vType, err := prompts.Select("Validation type", []string{string(plug.ValidationTypeNone), string(plug.ValidationTypeFast), string(plug.ValidationTypeFull)}) if err != nil { return err From c39148f39f6fc84fedac7f6a74c382434073ee38 Mon Sep 17 00:00:00 2001 From: Ahmad Ibrahim Date: Tue, 13 Aug 2024 00:08:31 -0700 Subject: [PATCH 6/8] test: update integration tests --- tests/integration/_validator/testcases/data/validator.yaml | 1 + tests/integration/_validator/testcases/test_validator.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/_validator/testcases/data/validator.yaml b/tests/integration/_validator/testcases/data/validator.yaml index 4d411dcc..bc2cc478 100644 --- a/tests/integration/_validator/testcases/data/validator.yaml +++ b/tests/integration/_validator/testcases/data/validator.yaml @@ -223,6 +223,7 @@ ociPlugin: ociRegistryRules: - name: public ecr registry host: public.ecr.aws + validationType: none artifacts: - ref: u5n5j0b4/oci-test-public vspherePlugin: diff --git a/tests/integration/_validator/testcases/test_validator.go b/tests/integration/_validator/testcases/test_validator.go index 7ddc3ed0..d0b842b5 100644 --- a/tests/integration/_validator/testcases/test_validator.go +++ b/tests/integration/_validator/testcases/test_validator.go @@ -399,9 +399,9 @@ func (t *ValidatorTest) ociPluginValues(ctx *test.TestContext, vals []string) [] "n", // add another signature verification secret "public ecr registry", // rule name "public.ecr.aws", // registry host + "none", // validation type "N/A", // registry auth secret name "public.ecr.aws/u5n5j0b4/oci-test-public", // artifact references - "y", // disable full layer validation "N/A", // signature verification secret name "", // ca certificate "n", // add another registry rule From c0cf0a02cf46655eb3ab69d45aab77691d773f89 Mon Sep 17 00:00:00 2001 From: Ahmad Ibrahim Date: Tue, 13 Aug 2024 00:14:13 -0700 Subject: [PATCH 7/8] chore: re-order prompts --- pkg/services/validator/oci.go | 16 ++++++++-------- .../_validator/testcases/test_validator.go | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/services/validator/oci.go b/pkg/services/validator/oci.go index 38165653..3b9cbf49 100644 --- a/pkg/services/validator/oci.go +++ b/pkg/services/validator/oci.go @@ -282,6 +282,14 @@ func readOciRegistryRule(c *components.OCIPluginConfig, r *plug.OciRegistryRule, } r.Host = strings.TrimSuffix(host, "/") + authSecretName, err := prompts.Select("Registry authentication secret name, select N/A for public registries", authSecretNames) + if err != nil { + return err + } + if authSecretName != notApplicable { + r.Auth = plug.Auth{SecretName: &authSecretName} + } + log.InfoCLI(` The following validation types are available: - 'none': only the existence of the artifacts in the registry is validated @@ -294,14 +302,6 @@ func readOciRegistryRule(c *components.OCIPluginConfig, r *plug.OciRegistryRule, } r.ValidationType = plug.ValidationType(vType) - authSecretName, err := prompts.Select("Registry authentication secret name, select N/A for public registries", authSecretNames) - if err != nil { - return err - } - if authSecretName != notApplicable { - r.Auth = plug.Auth{SecretName: &authSecretName} - } - if err := readArtifactRefs(r); err != nil { return err } diff --git a/tests/integration/_validator/testcases/test_validator.go b/tests/integration/_validator/testcases/test_validator.go index d0b842b5..82dfdf3d 100644 --- a/tests/integration/_validator/testcases/test_validator.go +++ b/tests/integration/_validator/testcases/test_validator.go @@ -399,8 +399,8 @@ func (t *ValidatorTest) ociPluginValues(ctx *test.TestContext, vals []string) [] "n", // add another signature verification secret "public ecr registry", // rule name "public.ecr.aws", // registry host - "none", // validation type "N/A", // registry auth secret name + "none", // validation type "public.ecr.aws/u5n5j0b4/oci-test-public", // artifact references "N/A", // signature verification secret name "", // ca certificate From caa9975546bdd11d631a0d8304a4a97271436435 Mon Sep 17 00:00:00 2001 From: Ahmad Ibrahim Date: Tue, 13 Aug 2024 00:41:02 -0700 Subject: [PATCH 8/8] chore: update hack/validator.tmpl --- hack/validator.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/validator.tmpl b/hack/validator.tmpl index 596cdf95..ff41220a 100644 --- a/hack/validator.tmpl +++ b/hack/validator.tmpl @@ -223,6 +223,7 @@ ociPlugin: ociRegistryRules: - name: public ecr registry host: public.ecr.aws + validationType: none artifacts: - ref: u5n5j0b4/oci-test-public vspherePlugin: