From 09d7f40a70153464bc833b8d65a2461596bbfad7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 08:52:06 +0000 Subject: [PATCH 1/2] fix(deps): update module github.com/onsi/ginkgo to v2 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 13 ++--- go.sum | 47 ++++++------------- hack/tools/go.mod | 3 +- hack/tools/go.sum | 7 +-- pkg/agent/agent_suite_test.go | 2 +- pkg/agent/agent_test.go | 2 +- pkg/agentserver/agentserver_suite_test.go | 2 +- pkg/agentserver/agentserver_test.go | 2 +- .../v1alpha1/vaultkvsecret_webhook_test.go | 2 +- .../vaultkvsecretengine_webhook_test.go | 2 +- .../vaulttransitengine_webhook_test.go | 2 +- .../v1alpha1/vaulttransitkey_webhook_test.go | 2 +- .../v1alpha1/webhook_suite_test.go | 2 +- pkg/controllers/e2e_test/test_commons.go | 2 +- .../e2e_test/vaultbinding/suite_test.go | 2 +- .../vaultbinding_controller_test.go | 2 +- .../vaultcertificateauthority/suite_test.go | 2 +- ...ultcertificateauthority_controller_test.go | 2 +- .../vaultcertificaterole/suite_test.go | 2 +- .../vaultcertificaterole_controller_test.go | 2 +- .../e2e_test/vaultkvengine/suite_test.go | 2 +- .../vaultkvsecret_controller_test.go | 2 +- .../e2e_test/vaultkvsecret/suite_test.go | 2 +- .../vaultkvsecret_controller_test.go | 2 +- .../e2e_test/vaultsyncsecret/suite_test.go | 2 +- .../vaultsyncsecret_controller_test.go | 2 +- .../e2e_test/vaulttransitengine/suite_test.go | 2 +- .../vaulttransitengine_controller_test.go | 2 +- .../e2e_test/vaulttransitkey/suite_test.go | 2 +- .../vaulttransitkey_controller_test.go | 2 +- pkg/controllers/suite_test.go | 2 +- pkg/injector/injector_suite_test.go | 2 +- pkg/injector/injector_test.go | 2 +- pkg/vault/e2e_test/auth_test.go | 2 +- pkg/vault/e2e_test/kubernetes_roles_test.go | 2 +- pkg/vault/e2e_test/kvengine_test.go | 2 +- pkg/vault/e2e_test/kvsecret_test.go | 2 +- pkg/vault/e2e_test/mount_test.go | 2 +- pkg/vault/e2e_test/pki_test.go | 2 +- pkg/vault/e2e_test/policy_test.go | 2 +- pkg/vault/e2e_test/random_test.go | 2 +- pkg/vault/e2e_test/suite_test.go | 2 +- pkg/vault/e2e_test/transit_test.go | 2 +- 43 files changed, 66 insertions(+), 82 deletions(-) diff --git a/go.mod b/go.mod index 4d530aa6..1a781aab 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/hashicorp/vault/sdk v0.10.0 github.com/mattbaird/jsonpatch v0.0.0-20230413205102-771768614e91 github.com/mitchellh/go-homedir v1.1.0 - github.com/onsi/ginkgo v1.16.5 + github.com/onsi/ginkgo/v2 v2.12.1 github.com/onsi/gomega v1.27.10 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 @@ -40,12 +40,14 @@ require ( 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/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect + github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect github.com/hashicorp/hcl v1.0.1-vault-5 // indirect @@ -65,7 +67,6 @@ require ( 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/nxadm/tail v1.4.8 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.15.1 // indirect @@ -82,18 +83,18 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/crypto v0.11.0 // indirect - golang.org/x/net v0.13.0 // indirect + golang.org/x/crypto v0.12.0 // indirect + golang.org/x/net v0.14.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect golang.org/x/sys v0.12.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect golang.org/x/time v0.3.0 // indirect + golang.org/x/tools v0.12.0 // indirect gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/apiextensions-apiserver v0.27.2 // indirect k8s.io/component-base v0.27.2 // indirect diff --git a/go.sum b/go.sum index 87de04d1..f12cbccb 100644 --- a/go.sum +++ b/go.sum @@ -84,8 +84,6 @@ github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -102,8 +100,8 @@ github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2Kv 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-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= 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/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -171,6 +169,7 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= 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/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -189,7 +188,6 @@ github.com/hashicorp/hcl/v2 v2.18.0 h1:wYnG7Lt31t2zYkcquwgKo6MWXzRUDIeIVU5naZwHL github.com/hashicorp/hcl/v2 v2.18.0/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= github.com/hashicorp/vault/sdk v0.10.0 h1:dDAe1mMG7Qqor1h3i7TU70ykwJy8ijyWeZZkN2CB0j4= github.com/hashicorp/vault/sdk v0.10.0/go.mod h1:s9F8+FF/Q9HuChoi1OWnIPoHRU6V675qHhCYkXVPPQE= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -243,16 +241,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G 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/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= +github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= @@ -297,6 +287,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -335,8 +326,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -371,9 +362,9 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -394,7 +385,6 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -406,8 +396,8 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.13.0 h1:Nvo8UFsZ8X3BhAC9699Z1j7XQ3rsZnUUm7jfBEk1ueY= -golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -431,7 +421,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -440,10 +429,7 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -464,7 +450,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -486,8 +471,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -538,13 +523,13 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= +golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -649,15 +634,11 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 652eed5f..09d3f02a 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -140,6 +140,7 @@ require ( github.com/nunnatsa/ginkgolinter v0.13.5 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/onsi/ginkgo/v2 v2.12.1 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.5 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -204,7 +205,7 @@ require ( golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.11.0 // indirect + golang.org/x/sys v0.12.0 // indirect golang.org/x/text v0.12.0 // indirect golang.org/x/tools v0.12.0 // indirect google.golang.org/protobuf v1.30.0 // indirect diff --git a/hack/tools/go.sum b/hack/tools/go.sum index b0b390c8..1ffa7f11 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -453,7 +453,8 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= +github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= +github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= @@ -837,8 +838,8 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/pkg/agent/agent_suite_test.go b/pkg/agent/agent_suite_test.go index 37197ee4..fee27967 100644 --- a/pkg/agent/agent_suite_test.go +++ b/pkg/agent/agent_suite_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" diff --git a/pkg/agent/agent_test.go b/pkg/agent/agent_test.go index 1c68f2e0..677cfc2c 100644 --- a/pkg/agent/agent_test.go +++ b/pkg/agent/agent_test.go @@ -22,7 +22,7 @@ import ( "os" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/agent" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" diff --git a/pkg/agentserver/agentserver_suite_test.go b/pkg/agentserver/agentserver_suite_test.go index 536e499c..77f01812 100644 --- a/pkg/agentserver/agentserver_suite_test.go +++ b/pkg/agentserver/agentserver_suite_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" diff --git a/pkg/agentserver/agentserver_test.go b/pkg/agentserver/agentserver_test.go index e476b28a..a759a74a 100644 --- a/pkg/agentserver/agentserver_test.go +++ b/pkg/agentserver/agentserver_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/agent" "github.com/youniqx/heist/pkg/agentserver" diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecret_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecret_webhook_test.go index 802c3780..c0d2bcf7 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecret_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecret_webhook_test.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go index 5c7d88a6..88320ade 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go index 1c6c5ead..8c7cb7d5 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go index fe42a7a7..32f72e80 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go @@ -14,7 +14,7 @@ limitations under the License. package v1alpha1 import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault/transit" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go index 570d55f0..20323370 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/managed" "github.com/youniqx/heist/pkg/operator" diff --git a/pkg/controllers/e2e_test/test_commons.go b/pkg/controllers/e2e_test/test_commons.go index 2d302bea..92082f8f 100644 --- a/pkg/controllers/e2e_test/test_commons.go +++ b/pkg/controllers/e2e_test/test_commons.go @@ -5,7 +5,7 @@ import ( "path/filepath" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" diff --git a/pkg/controllers/e2e_test/vaultbinding/suite_test.go b/pkg/controllers/e2e_test/vaultbinding/suite_test.go index 0f24ef64..8578e1ba 100644 --- a/pkg/controllers/e2e_test/vaultbinding/suite_test.go +++ b/pkg/controllers/e2e_test/vaultbinding/suite_test.go @@ -19,7 +19,7 @@ package vaultbinding import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/controllers/e2e_test" ) diff --git a/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go b/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go index 2e8c1d5c..15465c4a 100644 --- a/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go +++ b/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" "github.com/youniqx/heist/pkg/managed" diff --git a/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go b/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go index 3a089d83..ad43bc21 100644 --- a/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go +++ b/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go @@ -19,7 +19,7 @@ package vaultcertificateauthority import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/controllers/e2e_test" ) diff --git a/pkg/controllers/e2e_test/vaultcertificateauthority/vaultcertificateauthority_controller_test.go b/pkg/controllers/e2e_test/vaultcertificateauthority/vaultcertificateauthority_controller_test.go index 9b21d1d3..e4717929 100644 --- a/pkg/controllers/e2e_test/vaultcertificateauthority/vaultcertificateauthority_controller_test.go +++ b/pkg/controllers/e2e_test/vaultcertificateauthority/vaultcertificateauthority_controller_test.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" "github.com/youniqx/heist/pkg/controllers/common" diff --git a/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go b/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go index 5193aabb..86ea7a81 100644 --- a/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go +++ b/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go @@ -19,7 +19,7 @@ package vaultcertificaterole import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/controllers/e2e_test" ) diff --git a/pkg/controllers/e2e_test/vaultcertificaterole/vaultcertificaterole_controller_test.go b/pkg/controllers/e2e_test/vaultcertificaterole/vaultcertificaterole_controller_test.go index b45f3fe5..e06b97d0 100644 --- a/pkg/controllers/e2e_test/vaultcertificaterole/vaultcertificaterole_controller_test.go +++ b/pkg/controllers/e2e_test/vaultcertificaterole/vaultcertificaterole_controller_test.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" "github.com/youniqx/heist/pkg/vault/pki" diff --git a/pkg/controllers/e2e_test/vaultkvengine/suite_test.go b/pkg/controllers/e2e_test/vaultkvengine/suite_test.go index 77b1a7b0..8b28bdb0 100644 --- a/pkg/controllers/e2e_test/vaultkvengine/suite_test.go +++ b/pkg/controllers/e2e_test/vaultkvengine/suite_test.go @@ -19,7 +19,7 @@ package vaultkvengine import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/controllers/e2e_test" ) diff --git a/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go b/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go index 39b20fe0..a7ee7549 100644 --- a/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go +++ b/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go @@ -19,7 +19,7 @@ package vaultkvengine import ( "context" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" . "github.com/youniqx/heist/pkg/testhelper" diff --git a/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go b/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go index 5dfb2f9e..f2971508 100644 --- a/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go +++ b/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go @@ -19,7 +19,7 @@ package vaultkvsecret import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/controllers/e2e_test" ) diff --git a/pkg/controllers/e2e_test/vaultkvsecret/vaultkvsecret_controller_test.go b/pkg/controllers/e2e_test/vaultkvsecret/vaultkvsecret_controller_test.go index dc900b22..5642d20a 100644 --- a/pkg/controllers/e2e_test/vaultkvsecret/vaultkvsecret_controller_test.go +++ b/pkg/controllers/e2e_test/vaultkvsecret/vaultkvsecret_controller_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" . "github.com/youniqx/heist/pkg/testhelper" diff --git a/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go b/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go index 3c1806b2..83bbb21b 100644 --- a/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go +++ b/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go @@ -19,7 +19,7 @@ package vaultsyncsecret import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/controllers/e2e_test" ) diff --git a/pkg/controllers/e2e_test/vaultsyncsecret/vaultsyncsecret_controller_test.go b/pkg/controllers/e2e_test/vaultsyncsecret/vaultsyncsecret_controller_test.go index e91f2f6b..fbef519d 100644 --- a/pkg/controllers/e2e_test/vaultsyncsecret/vaultsyncsecret_controller_test.go +++ b/pkg/controllers/e2e_test/vaultsyncsecret/vaultsyncsecret_controller_test.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" "github.com/youniqx/heist/pkg/controllers/common" diff --git a/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go b/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go index bb8cfaa4..459f930e 100644 --- a/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go +++ b/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go @@ -19,7 +19,7 @@ package vaulttransitengine import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/controllers/e2e_test" ) diff --git a/pkg/controllers/e2e_test/vaulttransitengine/vaulttransitengine_controller_test.go b/pkg/controllers/e2e_test/vaulttransitengine/vaulttransitengine_controller_test.go index e0623ab2..88cb4e71 100644 --- a/pkg/controllers/e2e_test/vaulttransitengine/vaulttransitengine_controller_test.go +++ b/pkg/controllers/e2e_test/vaulttransitengine/vaulttransitengine_controller_test.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" . "github.com/youniqx/heist/pkg/vault/matchers" diff --git a/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go b/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go index 86499f5e..30e60c57 100644 --- a/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go +++ b/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go @@ -19,7 +19,7 @@ package vaulttransitengine import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/controllers/e2e_test" ) diff --git a/pkg/controllers/e2e_test/vaulttransitkey/vaulttransitkey_controller_test.go b/pkg/controllers/e2e_test/vaulttransitkey/vaulttransitkey_controller_test.go index 429f9c55..e0aaf0cb 100644 --- a/pkg/controllers/e2e_test/vaulttransitkey/vaulttransitkey_controller_test.go +++ b/pkg/controllers/e2e_test/vaulttransitkey/vaulttransitkey_controller_test.go @@ -3,7 +3,7 @@ package vaulttransitengine import ( "context" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" . "github.com/youniqx/heist/pkg/testhelper" diff --git a/pkg/controllers/suite_test.go b/pkg/controllers/suite_test.go index 9ba9b1e3..2cc43809 100644 --- a/pkg/controllers/suite_test.go +++ b/pkg/controllers/suite_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" diff --git a/pkg/injector/injector_suite_test.go b/pkg/injector/injector_suite_test.go index 5f578c87..f0dc8fbe 100644 --- a/pkg/injector/injector_suite_test.go +++ b/pkg/injector/injector_suite_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" heistv1alpha1 "github.com/youniqx/heist/pkg/apis/heist.youniqx.com/v1alpha1" diff --git a/pkg/injector/injector_test.go b/pkg/injector/injector_test.go index 8a5fa891..3dafea4a 100644 --- a/pkg/injector/injector_test.go +++ b/pkg/injector/injector_test.go @@ -3,7 +3,7 @@ package injector import ( "context" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/youniqx/heist/pkg/testhelper" corev1 "k8s.io/api/core/v1" diff --git a/pkg/vault/e2e_test/auth_test.go b/pkg/vault/e2e_test/auth_test.go index fc8918a3..868994a9 100644 --- a/pkg/vault/e2e_test/auth_test.go +++ b/pkg/vault/e2e_test/auth_test.go @@ -1,7 +1,7 @@ package e2e_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault/auth" "github.com/youniqx/heist/pkg/vault/core" diff --git a/pkg/vault/e2e_test/kubernetes_roles_test.go b/pkg/vault/e2e_test/kubernetes_roles_test.go index be356abe..33f11db4 100644 --- a/pkg/vault/e2e_test/kubernetes_roles_test.go +++ b/pkg/vault/e2e_test/kubernetes_roles_test.go @@ -1,7 +1,7 @@ package e2e_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault/auth" "github.com/youniqx/heist/pkg/vault/core" diff --git a/pkg/vault/e2e_test/kvengine_test.go b/pkg/vault/e2e_test/kvengine_test.go index 842c02f1..c716907a 100644 --- a/pkg/vault/e2e_test/kvengine_test.go +++ b/pkg/vault/e2e_test/kvengine_test.go @@ -17,7 +17,7 @@ limitations under the License. package e2e_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault/core" "github.com/youniqx/heist/pkg/vault/kvengine" diff --git a/pkg/vault/e2e_test/kvsecret_test.go b/pkg/vault/e2e_test/kvsecret_test.go index 681b5f29..b418b568 100644 --- a/pkg/vault/e2e_test/kvsecret_test.go +++ b/pkg/vault/e2e_test/kvsecret_test.go @@ -1,7 +1,7 @@ package e2e_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault/core" "github.com/youniqx/heist/pkg/vault/kvengine" diff --git a/pkg/vault/e2e_test/mount_test.go b/pkg/vault/e2e_test/mount_test.go index e74f7702..2fb26671 100644 --- a/pkg/vault/e2e_test/mount_test.go +++ b/pkg/vault/e2e_test/mount_test.go @@ -1,7 +1,7 @@ package e2e_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault/core" . "github.com/youniqx/heist/pkg/vault/matchers" diff --git a/pkg/vault/e2e_test/pki_test.go b/pkg/vault/e2e_test/pki_test.go index 19979ff5..1d83a671 100644 --- a/pkg/vault/e2e_test/pki_test.go +++ b/pkg/vault/e2e_test/pki_test.go @@ -10,7 +10,7 @@ import ( "fmt" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault/core" "github.com/youniqx/heist/pkg/vault/mount" diff --git a/pkg/vault/e2e_test/policy_test.go b/pkg/vault/e2e_test/policy_test.go index 13f9f771..4ca2d430 100644 --- a/pkg/vault/e2e_test/policy_test.go +++ b/pkg/vault/e2e_test/policy_test.go @@ -17,7 +17,7 @@ limitations under the License. package e2e_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault/kvengine" . "github.com/youniqx/heist/pkg/vault/matchers" diff --git a/pkg/vault/e2e_test/random_test.go b/pkg/vault/e2e_test/random_test.go index e00576c3..56940138 100644 --- a/pkg/vault/e2e_test/random_test.go +++ b/pkg/vault/e2e_test/random_test.go @@ -1,7 +1,7 @@ package e2e_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/vault/e2e_test/suite_test.go b/pkg/vault/e2e_test/suite_test.go index 5a8b5340..8b122428 100644 --- a/pkg/vault/e2e_test/suite_test.go +++ b/pkg/vault/e2e_test/suite_test.go @@ -19,7 +19,7 @@ package e2e_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault" "github.com/youniqx/heist/pkg/vault/testenv" diff --git a/pkg/vault/e2e_test/transit_test.go b/pkg/vault/e2e_test/transit_test.go index ffdd92ba..cd46debc 100644 --- a/pkg/vault/e2e_test/transit_test.go +++ b/pkg/vault/e2e_test/transit_test.go @@ -1,7 +1,7 @@ package e2e_test import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/youniqx/heist/pkg/vault/core" . "github.com/youniqx/heist/pkg/vault/matchers" From 696edb1edbde5fbc33fb1b4e821f43dd572b4bf9 Mon Sep 17 00:00:00 2001 From: LukasAuerbeck <17929465+LukasAuerbeck@users.noreply.github.com> Date: Fri, 22 Sep 2023 12:07:37 +0200 Subject: [PATCH 2/2] test: remove all decorators Signed-off-by: LukasAuerbeck <17929465+LukasAuerbeck@users.noreply.github.com> --- pkg/agent/agent_suite_test.go | 2 +- pkg/agentserver/agentserver_suite_test.go | 2 +- .../v1alpha1/vaultkvsecretengine_webhook_test.go | 2 +- .../v1alpha1/vaulttransitengine_webhook_test.go | 2 +- .../heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go | 2 +- pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go | 2 +- pkg/controllers/e2e_test/vaultbinding/suite_test.go | 2 +- .../e2e_test/vaultbinding/vaultbinding_controller_test.go | 2 +- .../e2e_test/vaultcertificateauthority/suite_test.go | 2 +- pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go | 2 +- pkg/controllers/e2e_test/vaultkvengine/suite_test.go | 2 +- .../e2e_test/vaultkvengine/vaultkvsecret_controller_test.go | 2 +- pkg/controllers/e2e_test/vaultkvsecret/suite_test.go | 2 +- pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go | 2 +- pkg/controllers/e2e_test/vaulttransitengine/suite_test.go | 2 +- pkg/controllers/e2e_test/vaulttransitkey/suite_test.go | 2 +- pkg/controllers/suite_test.go | 2 +- pkg/injector/injector_suite_test.go | 2 +- pkg/vault/e2e_test/suite_test.go | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/agent/agent_suite_test.go b/pkg/agent/agent_suite_test.go index fee27967..6dc7d2cf 100644 --- a/pkg/agent/agent_suite_test.go +++ b/pkg/agent/agent_suite_test.go @@ -60,7 +60,7 @@ func TestAPIs(t *testing.T) { RunSpecs(t, "Agent Suite") } -var _ = BeforeSuite(BeforeSuiteSetup(), 60) +var _ = BeforeSuite(BeforeSuiteSetup()) func BeforeSuiteSetup() func() { return func() { diff --git a/pkg/agentserver/agentserver_suite_test.go b/pkg/agentserver/agentserver_suite_test.go index 77f01812..3908cb21 100644 --- a/pkg/agentserver/agentserver_suite_test.go +++ b/pkg/agentserver/agentserver_suite_test.go @@ -63,7 +63,7 @@ func TestAPIs(t *testing.T) { RunSpecs(t, "Agent Server Suite") } -var _ = BeforeSuite(BeforeSuiteSetup(), 60) +var _ = BeforeSuite(BeforeSuiteSetup()) func BeforeSuiteSetup() func() { return func() { diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go index 88320ade..f05797fb 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaultkvsecretengine_webhook_test.go @@ -126,5 +126,5 @@ var _ = Describe("VaultKVSecretEngine Webhooks", func() { return K8sClient.Delete(ctx, engine) }).Should(Succeed()) }) - }, 60) + }) }) diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go index 8c7cb7d5..875dbb0d 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitengine_webhook_test.go @@ -39,5 +39,5 @@ var _ = Describe("VaultKVSecretEngine Webhooks", func() { } Expect(K8sClient.Create(ctx, engine)).To(Succeed()) }) - }, 60) + }) }) diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go index 32f72e80..8028abd0 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/vaulttransitkey_webhook_test.go @@ -54,5 +54,5 @@ var _ = Describe("VaultKVSecretEngine Webhooks", func() { } Expect(K8sClient.Create(ctx, key)).To(Succeed()) }) - }, 60) + }) }) diff --git a/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go b/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go index 20323370..26adb786 100644 --- a/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go +++ b/pkg/apis/heist.youniqx.com/v1alpha1/webhook_suite_test.go @@ -173,7 +173,7 @@ var _ = BeforeSuite(func() { K8sClient = mgr.GetClient() Expect(K8sClient).NotTo(BeNil()) -}, 60) +}) var _ = AfterSuite(func() { cancel() diff --git a/pkg/controllers/e2e_test/vaultbinding/suite_test.go b/pkg/controllers/e2e_test/vaultbinding/suite_test.go index 8578e1ba..e2b13426 100644 --- a/pkg/controllers/e2e_test/vaultbinding/suite_test.go +++ b/pkg/controllers/e2e_test/vaultbinding/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go b/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go index 15465c4a..ccc3d733 100644 --- a/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go +++ b/pkg/controllers/e2e_test/vaultbinding/vaultbinding_controller_test.go @@ -333,5 +333,5 @@ var _ = Describe("VaultBinding Controller", func() { By("Deleting the Auth Role if all bindings are deleted") Expect(Test.K8sClient.Delete(context.TODO(), secondBinding)).To(Succeed()) Test.VaultEnv.KubernetesAuthRole(managed.KubernetesAuth, roleName).WithTimeout(5 * time.Minute).Should(BeNil()) - }, 60) + }) }) diff --git a/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go b/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go index ad43bc21..7dfcdc78 100644 --- a/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go +++ b/pkg/controllers/e2e_test/vaultcertificateauthority/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go b/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go index 86ea7a81..8f419d3a 100644 --- a/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go +++ b/pkg/controllers/e2e_test/vaultcertificaterole/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultkvengine/suite_test.go b/pkg/controllers/e2e_test/vaultkvengine/suite_test.go index 8b28bdb0..93741b66 100644 --- a/pkg/controllers/e2e_test/vaultkvengine/suite_test.go +++ b/pkg/controllers/e2e_test/vaultkvengine/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go b/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go index a7ee7549..ae94cc81 100644 --- a/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go +++ b/pkg/controllers/e2e_test/vaultkvengine/vaultkvsecret_controller_test.go @@ -51,5 +51,5 @@ var _ = Describe("VaultKVSecretEngine Controller", func() { Expect(Test.K8sClient.Delete(context.TODO(), engine)).To(Succeed()) Test.K8sEnv.Object(engine).Should(BeNil()) Test.VaultEnv.KvEngine(engine).Should(BeNil()) - }, 60) + }) }) diff --git a/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go b/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go index f2971508..399982d1 100644 --- a/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go +++ b/pkg/controllers/e2e_test/vaultkvsecret/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go b/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go index 83bbb21b..05863d95 100644 --- a/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go +++ b/pkg/controllers/e2e_test/vaultsyncsecret/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go b/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go index 459f930e..a4e7aad2 100644 --- a/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go +++ b/pkg/controllers/e2e_test/vaulttransitengine/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go b/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go index 30e60c57..51222150 100644 --- a/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go +++ b/pkg/controllers/e2e_test/vaulttransitkey/suite_test.go @@ -35,6 +35,6 @@ func TestAPIs(t *testing.T) { } var ( - _ = BeforeSuite(Test.BeforeSuiteSetup, 60) + _ = BeforeSuite(Test.BeforeSuiteSetup) _ = AfterSuite(Test.AfterSuiteTeardown) ) diff --git a/pkg/controllers/suite_test.go b/pkg/controllers/suite_test.go index 2cc43809..35c733d6 100644 --- a/pkg/controllers/suite_test.go +++ b/pkg/controllers/suite_test.go @@ -67,7 +67,7 @@ func TestAPIs(t *testing.T) { RunSpecs(t, "Controller Suite") } -var _ = BeforeSuite(BeforeSuiteSetup(), 60) +var _ = BeforeSuite(BeforeSuiteSetup()) func BeforeSuiteSetup() func() { return func() { diff --git a/pkg/injector/injector_suite_test.go b/pkg/injector/injector_suite_test.go index f0dc8fbe..e47b1a2a 100644 --- a/pkg/injector/injector_suite_test.go +++ b/pkg/injector/injector_suite_test.go @@ -54,7 +54,7 @@ func TestAPIs(t *testing.T) { RunSpecs(t, "Agent Suite") } -var _ = BeforeSuite(BeforeSuiteSetup(), 60) +var _ = BeforeSuite(BeforeSuiteSetup()) func BeforeSuiteSetup() func() { return func() { diff --git a/pkg/vault/e2e_test/suite_test.go b/pkg/vault/e2e_test/suite_test.go index 8b122428..27977cd4 100644 --- a/pkg/vault/e2e_test/suite_test.go +++ b/pkg/vault/e2e_test/suite_test.go @@ -53,7 +53,7 @@ var _ = BeforeSuite(func() { vaultAPI, err = vaultEnv.GetAPI() Expect(err).NotTo(HaveOccurred()) Expect(vaultAPI).NotTo(BeNil()) -}, 60) +}) var _ = AfterSuite(func() { By("tearing down the test environment")