From ae725e5a520d429848dae258ebc45c1f23db132a Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Mon, 19 Feb 2024 17:53:29 +0530 Subject: [PATCH 1/3] KSPACE-20: Drop the distinction between host & member ToolchainClusters Signed-off-by: Feny Mehta --- .../masteruserrecord/masteruserrecord_controller_test.go | 1 - controllers/masteruserrecord/sync_test.go | 1 - controllers/space/space_controller_test.go | 1 - .../spacebinding_cleanup_controller_test.go | 1 - .../spacebindingrequest_controller_test.go | 1 - controllers/spacerequest/spacerequest_controller_test.go | 1 - .../toolchainstatus/toolchainstatus_controller_test.go | 1 - go.mod | 2 ++ go.sum | 4 ++-- main.go | 4 +++- test/cluster.go | 3 +-- 11 files changed, 8 insertions(+), 12 deletions(-) diff --git a/controllers/masteruserrecord/masteruserrecord_controller_test.go b/controllers/masteruserrecord/masteruserrecord_controller_test.go index fa8262845..f13f708e2 100644 --- a/controllers/masteruserrecord/masteruserrecord_controller_test.go +++ b/controllers/masteruserrecord/masteruserrecord_controller_test.go @@ -1464,7 +1464,6 @@ func newController(hostCl runtimeclient.Client, s *runtime.Scheme, memberCl ...C r.MemberClusters[name] = cluster.Cluster{ Config: &commoncluster.Config{ Name: name, - Type: commoncluster.Member, OperatorNamespace: commontest.MemberOperatorNs, OwnerClusterName: commontest.MemberClusterName, }, diff --git a/controllers/masteruserrecord/sync_test.go b/controllers/masteruserrecord/sync_test.go index fefa30c93..854495d4d 100644 --- a/controllers/masteruserrecord/sync_test.go +++ b/controllers/masteruserrecord/sync_test.go @@ -982,7 +982,6 @@ func newMemberCluster(cl runtimeclient.Client) cluster.Cluster { Config: &commoncluster.Config{ Name: test.MemberClusterName, APIEndpoint: fmt.Sprintf("https://api.%s:6433", test.MemberClusterName), - Type: commoncluster.Member, OperatorNamespace: test.HostOperatorNs, OwnerClusterName: test.HostClusterName, }, diff --git a/controllers/space/space_controller_test.go b/controllers/space/space_controller_test.go index b95bf0833..f711f6328 100644 --- a/controllers/space/space_controller_test.go +++ b/controllers/space/space_controller_test.go @@ -2078,7 +2078,6 @@ func newReconciler(hostCl runtimeclient.Client, memberClusters ...*commoncluster for _, c := range memberClusters { clusters[c.Name] = cluster.Cluster{ Config: &commoncluster.Config{ - Type: commoncluster.Member, OperatorNamespace: c.OperatorNamespace, OwnerClusterName: test.MemberClusterName, }, diff --git a/controllers/spacebindingcleanup/spacebinding_cleanup_controller_test.go b/controllers/spacebindingcleanup/spacebinding_cleanup_controller_test.go index 697c74c07..56a8a70e8 100644 --- a/controllers/spacebindingcleanup/spacebinding_cleanup_controller_test.go +++ b/controllers/spacebindingcleanup/spacebinding_cleanup_controller_test.go @@ -235,7 +235,6 @@ func prepareReconciler(t *testing.T, hostCl runtimeclient.Client, memberClusters for _, c := range memberClusters { clusters[c.Name] = cluster.Cluster{ Config: &commoncluster.Config{ - Type: commoncluster.Member, OperatorNamespace: c.OperatorNamespace, OwnerClusterName: test.MemberClusterName, }, diff --git a/controllers/spacebindingrequest/spacebindingrequest_controller_test.go b/controllers/spacebindingrequest/spacebindingrequest_controller_test.go index 304ad2dae..e1e83c675 100644 --- a/controllers/spacebindingrequest/spacebindingrequest_controller_test.go +++ b/controllers/spacebindingrequest/spacebindingrequest_controller_test.go @@ -751,7 +751,6 @@ func newReconciler(t *testing.T, hostCl runtimeclient.Client, memberClusters ... for _, c := range memberClusters { clusters[c.Name] = cluster.Cluster{ Config: &commoncluster.Config{ - Type: commoncluster.Member, OperatorNamespace: c.OperatorNamespace, OwnerClusterName: test.MemberClusterName, }, diff --git a/controllers/spacerequest/spacerequest_controller_test.go b/controllers/spacerequest/spacerequest_controller_test.go index 0dc27d058..352c8fd89 100644 --- a/controllers/spacerequest/spacerequest_controller_test.go +++ b/controllers/spacerequest/spacerequest_controller_test.go @@ -1367,7 +1367,6 @@ func newReconciler(t *testing.T, hostCl runtimeclient.Client, memberClusters ... require.NoError(t, err) clusters[c.Name] = cluster.Cluster{ Config: &commoncluster.Config{ - Type: commoncluster.Member, APIEndpoint: c.APIEndpoint, OperatorNamespace: c.OperatorNamespace, OwnerClusterName: test.MemberClusterName, diff --git a/controllers/toolchainstatus/toolchainstatus_controller_test.go b/controllers/toolchainstatus/toolchainstatus_controller_test.go index 707974216..4c2a728ed 100644 --- a/controllers/toolchainstatus/toolchainstatus_controller_test.go +++ b/controllers/toolchainstatus/toolchainstatus_controller_test.go @@ -1829,7 +1829,6 @@ func cachedToolchainCluster(cl runtimeclient.Client, name string, status corev1. return &cluster.CachedToolchainCluster{ Config: &cluster.Config{ Name: name, - Type: cluster.Host, OperatorNamespace: test.MemberOperatorNs, OwnerClusterName: test.MemberClusterName, APIEndpoint: "http://api.devcluster.openshift.com", diff --git a/go.mod b/go.mod index 5162833fc..5ed9699ab 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module github.com/codeready-toolchain/host-operator +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240219115726-d1606659ae07 + require ( github.com/codeready-toolchain/api v0.0.0-20240207000013-661b63025269 github.com/codeready-toolchain/toolchain-common v0.0.0-20240216093005-a7f4a3ea7fb9 diff --git a/go.sum b/go.sum index 7caf0eb2f..3b4eec464 100644 --- a/go.sum +++ b/go.sum @@ -138,8 +138,6 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codeready-toolchain/api v0.0.0-20240207000013-661b63025269 h1:YS5Q6YsTYq9Fo8qA6NQOTWAcVg86VEwulT1UfNWknIQ= github.com/codeready-toolchain/api v0.0.0-20240207000013-661b63025269/go.mod h1:FO7kgXH1x1LqkF327D5a36u0WIrwjVCbeijPkzgwaZc= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240216093005-a7f4a3ea7fb9 h1:iZnlP3lCtNpgR+6BRPxjfkU6XbG0tcGqezGymAhBCzg= -github.com/codeready-toolchain/toolchain-common v0.0.0-20240216093005-a7f4a3ea7fb9/go.mod h1:+COaw79DVTLSb2unqVwcBtYOg6sh7MbMHgXU1/ht2I8= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -193,6 +191,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= +github.com/fbm3307/toolchain-common v0.0.0-20240219115726-d1606659ae07 h1:lk/PRt4UgsvsUpi53Vt9z+fvgDLOytvqD5Tq3gXyyiw= +github.com/fbm3307/toolchain-common v0.0.0-20240219115726-d1606659ae07/go.mod h1:+COaw79DVTLSb2unqVwcBtYOg6sh7MbMHgXU1/ht2I8= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= diff --git a/main.go b/main.go index 3f07546eb..d9adfc1e6 100644 --- a/main.go +++ b/main.go @@ -63,6 +63,7 @@ var ( ) const memberClientTimeout = 3 * time.Second +const useClusterRL = true func init() { utilruntime.Must(clientgoscheme.AddToScheme(scheme)) @@ -219,6 +220,7 @@ func main() { // nolint:gocyclo mgr, namespace, memberClientTimeout, + useClusterRL, ).SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "ToolchainCluster") os.Exit(1) @@ -428,7 +430,7 @@ func main() { // nolint:gocyclo } func addMemberClusters(mgr ctrl.Manager, cl runtimeclient.Client, namespace string, namespacedCache bool) (map[string]cluster.Cluster, error) { - memberConfigs, err := commoncluster.ListToolchainClusterConfigs(cl, namespace, commoncluster.Member, memberClientTimeout) + memberConfigs, err := commoncluster.ListToolchainClusterConfigs(cl, namespace, memberClientTimeout) if err != nil { return nil, errors.Wrapf(err, "unable to get ToolchainCluster configs for members") } diff --git a/test/cluster.go b/test/cluster.go index 78ade93e2..9582d924f 100644 --- a/test/cluster.go +++ b/test/cluster.go @@ -20,7 +20,7 @@ func NewGetMemberClusters(memberClusters ...*cluster.CachedToolchainCluster) clu for _, memberCluster := range memberClusters { clusters[memberCluster.Name] = memberCluster } - filteredClusters := cluster.Filter(cluster.Member, clusters, conditions...) + filteredClusters := cluster.Filter(clusters, conditions...) var filteredClustersInOrder []*cluster.CachedToolchainCluster for _, givenCluster := range memberClusters { for _, filteredCluster := range filteredClusters { @@ -81,7 +81,6 @@ func NewGetMemberCluster(ok bool, status corev1.ConditionStatus, modifiers ...Mo Config: &cluster.Config{ Name: name, APIEndpoint: fmt.Sprintf("https://api.%s:6433", name), - Type: cluster.Member, OperatorNamespace: test.MemberOperatorNs, OwnerClusterName: test.HostClusterName, Labels: map[string]string{}, From 847a21f2b16e94b8bfce747e692964eccfffe112 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Tue, 5 Mar 2024 14:53:57 +0530 Subject: [PATCH 2/3] removing uscluster Signed-off-by: Feny Mehta --- go.mod | 2 +- go.sum | 4 ++-- main.go | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6b24eeb24..daed76dc5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240219115726-d1606659ae07 +replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240305070612-850515566801 require ( github.com/codeready-toolchain/api v0.0.0-20240227210924-371ddb054d87 diff --git a/go.sum b/go.sum index 1b1c9000d..257fe2d07 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,8 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240219115726-d1606659ae07 h1:lk/PRt4UgsvsUpi53Vt9z+fvgDLOytvqD5Tq3gXyyiw= -github.com/fbm3307/toolchain-common v0.0.0-20240219115726-d1606659ae07/go.mod h1:+COaw79DVTLSb2unqVwcBtYOg6sh7MbMHgXU1/ht2I8= +github.com/fbm3307/toolchain-common v0.0.0-20240305070612-850515566801 h1:S5edSNzI+e+xzr4dVmJ4tQcQiWgWTy6wpCbEGfNZm/s= +github.com/fbm3307/toolchain-common v0.0.0-20240305070612-850515566801/go.mod h1:nA1+TOD7zDS6spCBTaIZ63B/KyysR66fJI3DUT86kKE= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= diff --git a/main.go b/main.go index d9adfc1e6..193c898c1 100644 --- a/main.go +++ b/main.go @@ -63,7 +63,6 @@ var ( ) const memberClientTimeout = 3 * time.Second -const useClusterRL = true func init() { utilruntime.Must(clientgoscheme.AddToScheme(scheme)) @@ -220,7 +219,6 @@ func main() { // nolint:gocyclo mgr, namespace, memberClientTimeout, - useClusterRL, ).SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "ToolchainCluster") os.Exit(1) From 5b1373596722ab3fc24fae5744b1a6e4cc610f48 Mon Sep 17 00:00:00 2001 From: Feny Mehta Date: Wed, 13 Mar 2024 14:46:59 +0530 Subject: [PATCH 3/3] Replace go mod with lates toolchaincommon Signed-off-by: Feny Mehta --- go.mod | 14 ++++++-------- go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index daed76dc5..c3fb4c9b0 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,8 @@ module github.com/codeready-toolchain/host-operator -replace github.com/codeready-toolchain/toolchain-common => github.com/fbm3307/toolchain-common v0.0.0-20240305070612-850515566801 - require ( github.com/codeready-toolchain/api v0.0.0-20240227210924-371ddb054d87 - github.com/codeready-toolchain/toolchain-common v0.0.0-20240227212148-b32711b41532 + github.com/codeready-toolchain/toolchain-common v0.0.0-20240313081501-5cafefaa6598 github.com/davecgh/go-spew v1.1.1 // indirect github.com/ghodss/yaml v1.0.0 github.com/go-bindata/go-bindata v3.1.2+incompatible @@ -20,7 +18,7 @@ require ( github.com/redhat-cop/operator-utils v1.3.3-0.20220121120056-862ef22b8cdf github.com/segmentio/analytics-go/v3 v3.2.1 github.com/spf13/cast v1.3.1 - github.com/stretchr/testify v1.8.4 + github.com/stretchr/testify v1.9.0 go.uber.org/zap v1.21.0 gopkg.in/h2non/gock.v1 v1.0.14 gopkg.in/yaml.v2 v2.4.0 @@ -94,11 +92,11 @@ require ( github.com/spf13/pflag v1.0.5 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.17.0 // indirect - golang.org/x/net v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.21.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/term 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.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect diff --git a/go.sum b/go.sum index 257fe2d07..089642ddc 100644 --- a/go.sum +++ b/go.sum @@ -138,6 +138,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codeready-toolchain/api v0.0.0-20240227210924-371ddb054d87 h1:eQLsrMqfjAzGfuO9t6pVxO4K6cUDKOMxEvl0ujQq/2I= github.com/codeready-toolchain/api v0.0.0-20240227210924-371ddb054d87/go.mod h1:FO7kgXH1x1LqkF327D5a36u0WIrwjVCbeijPkzgwaZc= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240313081501-5cafefaa6598 h1:06nit/nCQFVKp51ZtIOyY49ncmxEK5shJGTaM+Ogicw= +github.com/codeready-toolchain/toolchain-common v0.0.0-20240313081501-5cafefaa6598/go.mod h1:c2JxboVI7keMD5fx5bB7LwzowFYYTwbepJhzPWSYXVs= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -191,8 +193,6 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+ne github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= -github.com/fbm3307/toolchain-common v0.0.0-20240305070612-850515566801 h1:S5edSNzI+e+xzr4dVmJ4tQcQiWgWTy6wpCbEGfNZm/s= -github.com/fbm3307/toolchain-common v0.0.0-20240305070612-850515566801/go.mod h1:nA1+TOD7zDS6spCBTaIZ63B/KyysR66fJI3DUT86kKE= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -601,8 +601,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P 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.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -675,8 +675,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= 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= @@ -770,8 +770,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= 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= @@ -884,8 +884,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -893,8 +893,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=