diff --git a/cmd/kn/main.go b/cmd/kn/main.go index c88980fba7..e8b93f5211 100644 --- a/cmd/kn/main.go +++ b/cmd/kn/main.go @@ -22,9 +22,9 @@ import ( "strings" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/config" - pluginpkg "knative.dev/client/pkg/kn/plugin" - "knative.dev/client/pkg/kn/root" + "knative.dev/client/pkg/config" + pluginpkg "knative.dev/client/pkg/plugin" + "knative.dev/client/pkg/root" ) func main() { diff --git a/cmd/kn/main_test.go b/cmd/kn/main_test.go index 3b016fc79b..4e96b0711a 100644 --- a/cmd/kn/main_test.go +++ b/cmd/kn/main_test.go @@ -21,25 +21,23 @@ import ( "strings" "testing" - pluginpkg "knative.dev/client/pkg/kn/plugin" - "github.com/spf13/cobra" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" - "knative.dev/client/pkg/kn/config" - "knative.dev/client/pkg/kn/root" + "knative.dev/client/pkg/config" + pluginpkg "knative.dev/client/pkg/plugin" + "knative.dev/client/pkg/root" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestValidatePlugin(t *testing.T) { // Build up simple command hierarchy - root := cobra.Command{} + rootCmd := cobra.Command{} one := &cobra.Command{Use: "one"} one.AddCommand(&cobra.Command{Use: "eins"}, &cobra.Command{Use: "zwei"}) two := &cobra.Command{Use: "two"} - root.AddCommand(one, two) + rootCmd.AddCommand(one, two) data := []struct { givenPluginCommandParts []string @@ -84,7 +82,7 @@ func TestValidatePlugin(t *testing.T) { for i, d := range data { step := fmt.Sprintf("Check %d", i) - err := validatePlugin(&root, commandPartsOnlyPlugin(d.givenPluginCommandParts)) + err := validatePlugin(&rootCmd, commandPartsOnlyPlugin(d.givenPluginCommandParts)) if len(d.expectedErrors) == 0 { assert.NilError(t, err, step) } else { diff --git a/go.mod b/go.mod index 3a39fff86e..43234975cc 100644 --- a/go.mod +++ b/go.mod @@ -3,25 +3,12 @@ module knative.dev/client go 1.22.0 require ( - github.com/google/go-cmp v0.6.0 - github.com/hashicorp/golang-lru v1.0.2 // indirect - github.com/hashicorp/hcl v1.0.0 // indirect - github.com/mitchellh/go-homedir v1.1.0 - github.com/spf13/afero v1.9.5 // indirect github.com/spf13/cobra v1.7.0 - github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.16.0 - golang.org/x/mod v0.20.0 - golang.org/x/term v0.23.0 gotest.tools/v3 v3.3.0 k8s.io/api v0.30.3 - k8s.io/apiextensions-apiserver v0.30.3 k8s.io/apimachinery v0.30.3 - k8s.io/cli-runtime v0.29.2 - k8s.io/client-go v0.30.3 k8s.io/code-generator v0.30.3 - knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 - knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea + knative.dev/client/pkg v0.0.0-00010101000000-000000000000 knative.dev/hack v0.0.0-20240814130635-06f7aff93954 knative.dev/networking v0.0.0-20240815142417-37fdbdd0854b knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c @@ -29,7 +16,7 @@ require ( sigs.k8s.io/yaml v1.4.0 ) -require k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 +replace knative.dev/client/pkg => ./pkg require ( contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect @@ -60,12 +47,15 @@ require ( github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-containerregistry v0.13.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect + github.com/hashicorp/golang-lru v1.0.2 // indirect + github.com/hashicorp/hcl v1.0.1-vault-5 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -74,6 +64,7 @@ require ( github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -94,9 +85,11 @@ require ( github.com/rickb777/plural v1.4.1 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/sergi/go-diff v1.2.0 // indirect + github.com/spf13/afero v1.10.0 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/viper v1.16.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/xlab/treeprint v1.2.0 // indirect go.opencensus.io v0.24.0 // indirect @@ -104,10 +97,12 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect + golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.24.0 // indirect + golang.org/x/term v0.23.0 // indirect golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.24.0 // indirect @@ -121,11 +116,17 @@ require ( gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/apiextensions-apiserver v0.30.3 // indirect k8s.io/apiserver v0.30.3 // indirect + k8s.io/cli-runtime v0.29.2 // indirect + k8s.io/client-go v0.30.3 // indirect k8s.io/gengo v0.0.0-20240404160639-a0386bf69313 // indirect k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect + knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 // indirect + knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect diff --git a/go.sum b/go.sum index 6e415dd682..6e1989116c 100644 --- a/go.sum +++ b/go.sum @@ -234,8 +234,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM= +github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= @@ -313,8 +313,9 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -366,8 +367,8 @@ github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= @@ -382,8 +383,9 @@ github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1Fof github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= diff --git a/go.work b/go.work new file mode 100644 index 0000000000..5f4f21782c --- /dev/null +++ b/go.work @@ -0,0 +1,6 @@ +go 1.22.0 + +use ( + . + pkg +) diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 0000000000..d4c5d82214 --- /dev/null +++ b/go.work.sum @@ -0,0 +1,389 @@ +cel.dev/expr v0.15.0 h1:O1jzfJCQBfL5BFoYktaxwIhuttaQPsVWerH9/EEKx0w= +cel.dev/expr v0.15.0/go.mod h1:TRSuuV7DlVCE/uwv5QbAiW/v8l5O8C4eEPHeu7gf7Sg= +cloud.google.com/go v0.114.0 h1:OIPFAdfrFDFO2ve2U7r/H5SwSbBzEdrBdE7xkgwc+kY= +cloud.google.com/go v0.114.0/go.mod h1:ZV9La5YYxctro1HTPug5lXH/GefROyW8PPD4T8n9J8E= +cloud.google.com/go/auth v0.5.1 h1:0QNO7VThG54LUzKiQxv8C6x1YX7lUrzlAa1nVLF8CIw= +cloud.google.com/go/auth v0.5.1/go.mod h1:vbZT8GjzDf3AVqCcQmqeeM32U9HBFc32vVVAbwDsa6s= +cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= +cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= +cloud.google.com/go/bigquery v1.8.0 h1:PQcPefKFdaIzjQFbiyOgAqyx8q5djaE7x9Sqe712DPA= +cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= +cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= +cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= +cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= +cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ= +cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA= +cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= +cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= +cloud.google.com/go/pubsub v1.3.1 h1:ukjixP1wl0LpnZ6LWtZJ0mX5tBmjp1f8Sqer8Z2OMUU= +cloud.google.com/go/storage v1.14.0 h1:6RRlFMv1omScs6iq2hfE3IvgE+l6RfJPampq8UZc5TU= +contrib.go.opencensus.io/exporter/zipkin v0.1.2 h1:YqE293IZrKtqPnpwDPH/lOqTWD/s3Iwabycam74JV3g= +contrib.go.opencensus.io/exporter/zipkin v0.1.2/go.mod h1:mP5xM3rrgOjpn79MM8fZbj3gsxcuytSqtH0dxSWW1RE= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY= +github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU= +github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.29 h1:I4+HL/JDvErx2LjyzaVxllw2lRDB5/BT2Bm4g20iqYw= +github.com/Azure/go-autorest/autorest v0.11.29/go.mod h1:ZtEzC4Jy2JDrZLxvWs8LrBWEBycl1hbT1eknI8MtfAs= +github.com/Azure/go-autorest/autorest/adal v0.9.23 h1:Yepx8CvFxwNKpH6ja7RZ+sKX+DWYNldbLiALMC3BTz8= +github.com/Azure/go-autorest/autorest/adal v0.9.23/go.mod h1:5pcMqFkdPhviJdlEy3kC/v1ZLnQl0MH6XA5YCcMhy4c= +github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 h1:P6bYXFoao05z5uhOQzbC3Qd8JqF3jUoocoTeIxkp2cA= +github.com/Azure/go-autorest/autorest/azure/auth v0.5.11/go.mod h1:84w/uV8E37feW2NCJ08uT9VBfjfUHpgLVnG2InYD6cg= +github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 h1:w77/uPk80ZET2F+AfQExZyEWtn+0Rk/uw17m9fv5Ajc= +github.com/Azure/go-autorest/autorest/azure/cli v0.4.6/go.mod h1:piCfgPho7BiIDdEQ1+g4VmKyD5y+p/XtSNqE6Hc4QD0= +github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= +github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= +github.com/IBM/sarama v1.43.1 h1:Z5uz65Px7f4DhI/jQqEm/tV9t8aU+JUdTyW/K/fCXpA= +github.com/IBM/sarama v1.43.1/go.mod h1:GG5q1RURtDNPz8xxJs3mgX6Ytak8Z9eLhAkJPObe2xE= +github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= +github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= +github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= +github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20210609063737-0067dc6dcea2 h1:t/ces1/q8tuApSb+T5ajsu3wqkofUT43U1gpDYTPYME= +github.com/ahmetb/gen-crd-api-reference-docs v0.3.1-0.20210609063737-0067dc6dcea2/go.mod h1:TdjdkYhlOifCQWPs1UdTma97kQQMozf5h26hTuG70u8= +github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY= +github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= +github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= +github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18= +github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= +github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= +github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/aws/aws-sdk-go-v2 v1.16.16 h1:M1fj4FE2lB4NzRb9Y0xdWsn2P0+2UHVxwKyOa4YJNjk= +github.com/aws/aws-sdk-go-v2 v1.16.16/go.mod h1:SwiyXi/1zTUZ6KIAmLK5V5ll8SiURNUYOqTerZPaF9k= +github.com/aws/aws-sdk-go-v2/config v1.17.8 h1:b9LGqNnOdg9vR4Q43tBTVWk4J6F+W774MSchvKJsqnE= +github.com/aws/aws-sdk-go-v2/config v1.17.8/go.mod h1:UkCI3kb0sCdvtjiXYiU4Zx5h07BOpgBTtkPu/49r+kA= +github.com/aws/aws-sdk-go-v2/credentials v1.12.21 h1:4tjlyCD0hRGNQivh5dN8hbP30qQhMLBE/FgQR1vHHWM= +github.com/aws/aws-sdk-go-v2/credentials v1.12.21/go.mod h1:O+4XyAt4e+oBAoIwNUYkRg3CVMscaIJdmZBOcPgJ8D8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17 h1:r08j4sbZu/RVi+BNxkBJwPMUYY3P8mgSDuKkZ/ZN1lE= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17/go.mod h1:yIkQcCDYNsZfXpd5UX2Cy+sWA1jPgIhGTw9cOBzfVnQ= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23 h1:s4g/wnzMf+qepSNgTvaQQHNxyMLKSawNhKCPNy++2xY= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23/go.mod h1:2DFxAQ9pfIRy0imBCJv+vZ2X6RKxves6fbnEuSry6b4= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17 h1:/K482T5A3623WJgWT8w1yRAFK4RzGzEl7y39yhtn9eA= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17/go.mod h1:pRwaTYCJemADaqCbUAxltMoHKata7hmB5PjEXeu0kfg= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24 h1:wj5Rwc05hvUSvKuOF29IYb9QrCLjU+rHAy/x/o0DK2c= +github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24/go.mod h1:jULHjqqjDlbyTa7pfM7WICATnOv+iOhjletM3N0Xbu8= +github.com/aws/aws-sdk-go-v2/service/ecr v1.17.18 h1:uiF/RI+Up8H2xdgT2GWa20YzxiKEalHieqNjm6HC3Xk= +github.com/aws/aws-sdk-go-v2/service/ecr v1.17.18/go.mod h1:DQtDYmexqR+z+B6HBCvY7zK/tuXKv6Zy/IwOXOK3eow= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.17 h1:bcQy5/dcJO8VQD+p0tDoIYdgEC3ch9f1/BNRES7XMug= +github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.17/go.mod h1:r1Vuka0kyzqN0sZm4lYTXf0Vhl+o/mTLq6vKpBBZYaQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.17 h1:Jrd/oMh0PKQc6+BowB+pLEwLIgaQF29eYbe7E1Av9Ug= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.17/go.mod h1:4nYOrY41Lrbk2170/BGkcJKBhws9Pfn8MG3aGqjjeFI= +github.com/aws/aws-sdk-go-v2/service/sso v1.11.23 h1:pwvCchFUEnlceKIgPUouBJwK81aCkQ8UDMORfeFtW10= +github.com/aws/aws-sdk-go-v2/service/sso v1.11.23/go.mod h1:/w0eg9IhFGjGyyncHIQrXtU8wvNsTJOP0R6PPj0wf80= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.6 h1:OwhhKc1P9ElfWbMKPIbMMZBV6hzJlL2JKD76wNNVzgQ= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.6/go.mod h1:csZuQY65DAdFBt1oIjO5hhBR49kQqop4+lcuCjf2arA= +github.com/aws/aws-sdk-go-v2/service/sts v1.16.19 h1:9pPi0PsFNAGILFfPCk8Y0iyEBGc6lu6OQ97U7hmdesg= +github.com/aws/aws-sdk-go-v2/service/sts v1.16.19/go.mod h1:h4J3oPZQbxLhzGnk+j9dfYHi5qIOVJ5kczZd658/ydM= +github.com/aws/smithy-go v1.13.3 h1:l7LYxGuzK6/K+NzJ2mC+VvLUbae0sL3bXU//04MkmnA= +github.com/aws/smithy-go v1.13.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20221004211355-a250ad2ca1e3 h1:Ted/bR1N6ltMrASdwRhX1BrGYSFg3aeGMlK8GlgkGh4= +github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20221004211355-a250ad2ca1e3/go.mod h1:m06KtrZgOloUaePAQMv+Ha8kRmTnKdozTHZrweepIrw= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 h1:6lhrsTEnloDPXyeZBvSYvQf8u86jbKehZPVDDlkgDl4= +github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cert-manager/cert-manager v1.13.3 h1:3R4G0RI7K0OkTZhWlVOC5SGZMYa2NwqmQJoyKydrz/M= +github.com/cert-manager/cert-manager v1.13.3/go.mod h1:BM2+Pt/NmSv1Zr25/MHv6BgIEF9IUxA1xAjp80qkxgc= +github.com/chrismellard/docker-credential-acr-env v0.0.0-20221002210726-e883f69e0206 h1:lG6Usi/kX/JBZzGz1H+nV+KwM97vThQeKunCbS6PutU= +github.com/chrismellard/docker-credential-acr-env v0.0.0-20221002210726-e883f69e0206/go.mod h1:1UmFRnmMnVsHwD+ZntmLkoVBB1ZLa6V+XXEbF6hZCxU= +github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= +github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= +github.com/cloudevents/conformance v0.2.0 h1:NvSXOKlagcsOWMEbi8U7Ex/0oQ4JZE1HQ45bnxYf2zk= +github.com/cloudevents/conformance v0.2.0/go.mod h1:rHKDwylBH89Rns6U3wL9ww8bg9/4GbwRCDNuyoC6bcc= +github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.15.2 h1:AbtPqiUDzKup5JpTZzO297/QXgL/TAdpdXQCNwLzlaM= +github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.15.2/go.mod h1:ZbYLE+yaEQ2j4vbRc9qzvGmg30A9LhwFt/1bSebNnbU= +github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20240508060731-1ed9471c98bd h1:MGVlnkCz/b0vjfkM5tSVLD+4oaUnYuVEjiW6lAMJ9IM= +github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20240508060731-1ed9471c98bd/go.mod h1:s+KZsVZst0bVW6vuKYb8CH49CcSJDO09+ZiIeKzJmqE= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403 h1:cqQfy1jclcSy/FwLjemeg3SR1yaINm74aQyupQ0Bl8M= +github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b h1:ga8SEFjZ60pxLcmhnThWgvH2wg8376yUJmPhEH4H3kw= +github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= +github.com/containerd/stargz-snapshotter/estargz v0.12.1 h1:+7nYmHJb0tEkcRaAW+MHqoKaJYZmkikupxCqVtmPuY0= +github.com/containerd/stargz-snapshotter/estargz v0.12.1/go.mod h1:12VUuCq3qPq4y8yUW+l5w3+oXV3cx2Po3KSe/SmPGqw= +github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= +github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU= +github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= +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/docker/cli v20.10.20+incompatible h1:lWQbHSHUFs7KraSN2jOJK7zbMS2jNCHI4mt4xUFUVQ4= +github.com/docker/cli v20.10.20+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= +github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v25.0.1+incompatible h1:k5TYd5rIVQRSqcTwCID+cyVA0yRg86+Pcrz1ls0/frA= +github.com/docker/docker v25.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= +github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/eapache/go-resiliency v1.6.0 h1:CqGDTLtpwuWKn6Nj3uNUdflaq+/kIPsg0gfNzHton30= +github.com/eapache/go-resiliency v1.6.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= +github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/eclipse/paho.golang v0.12.0 h1:EXQFJbJklDnUqW6lyAknMWRhM2NgpHxwrrL8riUmp3Q= +github.com/eclipse/paho.golang v0.12.0/go.mod h1:TSDCUivu9JnoR9Hl+H7sQMcHkejWH2/xKK1NJGtLbIE= +github.com/envoyproxy/go-control-plane v0.12.0 h1:4X+VP1GHd1Mhj6IB5mMeGbLCleqxjletLK6K0rbxyZI= +github.com/envoyproxy/go-control-plane v0.12.0/go.mod h1:ZBTaoJ23lqITozF0M6G4/IragXCQKCnYbmlmtHvwRG0= +github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= +github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= +github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fxamacker/cbor/v2 v2.6.0 h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1tWA= +github.com/fxamacker/cbor/v2 v2.6.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I= +github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA= +github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= +github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= +github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4= +github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= +github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/cel-go v0.17.8 h1:j9m730pMZt1Fc4oKhCLUHfjj6527LuhYcYw0Rl8gqto= +github.com/google/cel-go v0.17.8/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY= +github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20230209165335-3624968304fd h1:hQf//Ak0trkoqnm94i9mw00d7axUwfK92hMxslxNKYc= +github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20230209165335-3624968304fd/go.mod h1:x5fIlj5elU+/eYF60q4eASMQ9kDc+GMFa7UU9M3mFFw= +github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20230209165335-3624968304fd h1:AQZlI371LcvBYY/7Q55TjxrpZJs6wtEXMw4Wq38XLy8= +github.com/google/go-containerregistry/pkg/authn/kubernetes v0.0.0-20230209165335-3624968304fd/go.mod h1:6pjZpt+0dg+Z0kUEn53qLtD57raiZo/bqWzsuX6dDjo= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= +github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60= +github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= +github.com/googleapis/gax-go/v2 v2.12.4 h1:9gWcmF85Wvq4ryPFvGFaOgPIs1AQX0d0bcbGw4Z96qg= +github.com/googleapis/gax-go/v2 v2.12.4/go.mod h1:KYEYLorsnIGDi/rPC8b5TdlB9kbKoFubselGIoBMCwI= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 h1:tlyzajkF3030q6M8SvmJSemC9DTHL/xaMa18b65+JM4= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.20.0 h1:9IHTjNVSZ7MIwjlW3N3a7iGiykCMDpxZu8jsxFJh0yc= +github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo= +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-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= +github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= +github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= +github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI= +github.com/influxdata/influxdb-client-go/v2 v2.9.0 h1:1Ejxpt+cpWkadefxd5xvVx7pFgFaafdNp1ItfHzKRW4= +github.com/influxdata/influxdb-client-go/v2 v2.9.0/go.mod h1:x7Jo5UHHl+w8wu8UnGiNobDDHygojXwJX4mx7rXGKMk= +github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU= +github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= +github.com/influxdata/tdigest v0.0.1 h1:XpFptwYmnEKUqmkcDjrzffswZ3nvNeevbUSLPP/ZzIY= +github.com/influxdata/tdigest v0.0.1/go.mod h1:Z0kXnxzbTC2qrx4NaIzYkE1k66+6oEDQTvL95hQFh5Y= +github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= +github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= +github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= +github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= +github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= +github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= +github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= +github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= +github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= +github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY= +github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= +github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= +github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= +github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= +github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY= +github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= +github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY= +github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0 h1:rBhB9Rls+yb8kA4x5a/cWxOufWfXt24E+kq4YlbGj3g= +github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0/go.mod h1:fJ0UAZc1fx3xZhU4eSHQDJ1ApFmTVhp5VTpV9tm2ogg= +github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= +github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= +github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs= +github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= +github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= +github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo= +github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s= +github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 h1:18kd+8ZUlt/ARXhljq+14TwAoKa61q6dX8jtwOf6DH8= +github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA= +github.com/sagikazarmark/crypt v0.10.0 h1:96E1qrToLBU6fGzo+PRRz7KGOc9FkYFiPnR3/zf8Smg= +github.com/sagikazarmark/crypt v0.10.0/go.mod h1:gwTNHQVoOS3xp9Xvz5LLR+1AauC5M6880z5NWzdhOyQ= +github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f h1:MvTmaQdww/z0Q4wrYjDSCcZ78NoftLQyHBSLW/Cx79Y= +github.com/sahilm/fuzzy v0.1.1-0.20230530133925-c48e322e2a8f/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807 h1:LUsDduamlucuNnWcaTbXQ6aLILFcLXADpOzeEH3U+OI= +github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= +github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= +github.com/tsenart/go-tsz v0.0.0-20180814235614-0bd30b3df1c3 h1:pcQGQzTwCg//7FgVywqge1sW9Yf8VMsMdG58MI5kd8s= +github.com/tsenart/go-tsz v0.0.0-20180814235614-0bd30b3df1c3/go.mod h1:SWZznP1z5Ki7hDT2ioqiFKEse8K9tU2OUvaRI0NeGQo= +github.com/tsenart/vegeta/v12 v12.12.0 h1:FKMMNomd3auAElO/TtbXzRFXAKGee6N/GKCGweFVm2U= +github.com/tsenart/vegeta/v12 v12.12.0/go.mod h1:gpdfR++WHV9/RZh4oux0f6lNPhsOH8pCjIGUlcPQe1M= +github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME= +github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI= +github.com/wavesoftware/go-ensure v1.0.0 h1:6X3gQL5psBWwtu/H9a+69xQ+JGTUELaLhgOB/iB3AQk= +github.com/wavesoftware/go-ensure v1.0.0/go.mod h1:K2UAFSwMTvpiRGay/M3aEYYuurcR8S4A6HkQlJPV8k4= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= +github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= +github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= +go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= +go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k= +go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI= +go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0= +go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U= +go.etcd.io/etcd/client/v2 v2.305.10 h1:MrmRktzv/XF8CvtQt+P6wLUlURaNpSDJHFZhe//2QE4= +go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA= +go.etcd.io/etcd/client/v3 v3.5.10 h1:W9TXNZ+oB3MCd/8UjxHTWK5J9Nquw9fQBLJd5ne5/Ao= +go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc= +go.etcd.io/etcd/pkg/v3 v3.5.10 h1:WPR8K0e9kWl1gAhB5A7gEa5ZBTNkT9NdNWrR8Qpo1CM= +go.etcd.io/etcd/pkg/v3 v3.5.10/go.mod h1:TKTuCKKcF1zxmfKWDkfz5qqYaE3JncKKZPFf8c1nFUs= +go.etcd.io/etcd/raft/v3 v3.5.10 h1:cgNAYe7xrsrn/5kXMSaH8kM/Ky8mAdMqGOxyYwpP0LA= +go.etcd.io/etcd/raft/v3 v3.5.10/go.mod h1:odD6kr8XQXTy9oQnyMPBOr0TVe+gT0neQhElQ6jbGRc= +go.etcd.io/etcd/server/v3 v3.5.10 h1:4NOGyOwD5sUZ22PiWYKmfxqoeh72z6EhYjNosKGLmZg= +go.etcd.io/etcd/server/v3 v3.5.10/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= +go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= +go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= +go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= +go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs= +golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMePxjXAJctxKmyjKUsjA11Uzuk= +golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/genproto v0.0.0-20240528184218-531527333157 h1:u7WMYrIrVvs0TF5yaKwKNbcJyySYf+HAIFXxWltJOXE= +google.golang.org/genproto v0.0.0-20240528184218-531527333157/go.mod h1:ubQlAQnzejB8uZzszhrTCU2Fyp6Vi7ZE5nn0c3W8+qQ= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240528184218-531527333157 h1:znHUtThh5/fLbEC/p3Khp5xOucyAgMZ1Nj9ditbxd44= +google.golang.org/genproto/googleapis/bytestream v0.0.0-20240528184218-531527333157/go.mod h1:0J6mmn3XAEjfNbPvpH63c0RXCjGNFcCzlEfWSN4In+k= +gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= +gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= +gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= +gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= +k8s.io/component-base v0.30.3 h1:Ci0UqKWf4oiwy8hr1+E3dsnliKnkMLZMVbWzeorlk7s= +k8s.io/component-base v0.30.3/go.mod h1:C1SshT3rGPCuNtBs14RmVD2xW0EhRSeLvBh7AGk1quA= +k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= +k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/kms v0.30.3 h1:NLg+oN45S2Y3U0WiLRzbS61AY/XrS5JBMZp531Z+Pho= +k8s.io/kms v0.30.3/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4= +knative.dev/caching v0.0.0-20240812133420-93e6a0a5b46d h1:pj+XufdayIdxV/PUFpuIB1Y/pFoiWPJT6VrAXja4OcE= +knative.dev/caching v0.0.0-20240812133420-93e6a0a5b46d/go.mod h1:vxgDv5XOAYFa2LrreP8quBiyKB2HB2fqWG6nc6LmDR4= +knative.dev/hack/schema v0.0.0-20240814130635-06f7aff93954 h1:0yjDplGHUnZ8NpcfgmH0thXSzG28VSM16hb3Vz171l8= +knative.dev/hack/schema v0.0.0-20240814130635-06f7aff93954/go.mod h1:jRH/sx6mwwuMVhvJgnzSaoYA1N4qaIkJa+zxEGtVA5I= +knative.dev/reconciler-test v0.0.0-20240820100420-036ce14b8617 h1:UW3CH3wWocQiQKQYxf8gdDw9EEOgL31GU8yXY4w5lE8= +knative.dev/reconciler-test v0.0.0-20240820100420-036ce14b8617/go.mod h1:GmL2taVxYoXADdFOl534FcW+rYDQP6LDjWj82Q5yQDI= +rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= +rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= +rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4= +sigs.k8s.io/gateway-api v0.8.0 h1:isQQ3Jx2qFP7vaA3ls0846F0Amp9Eq14P08xbSwVbQg= +sigs.k8s.io/gateway-api v0.8.0/go.mod h1:okOnjPNBFbIS/Rw9kAhuIUaIkLhTKEu+ARIuXk2dgaM= diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt deleted file mode 100644 index 6f818683bd..0000000000 --- a/hack/boilerplate.go.txt +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2020 The Knative Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ diff --git a/hack/build.sh b/hack/build.sh index 49727375f3..909304897b 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -20,7 +20,7 @@ set -o pipefail set -o errexit set -o nounset -source_dirs="cmd pkg test lib tools" +source_dirs="cmd pkg test tools" # Store for later if [ -z "${1-}" ]; then diff --git a/hack/generate-docs.go b/hack/generate-docs.go index ffa2f37b0d..2d8a4e99de 100644 --- a/hack/generate-docs.go +++ b/hack/generate-docs.go @@ -20,7 +20,7 @@ import ( "os" "github.com/spf13/cobra/doc" - "knative.dev/client/pkg/kn/root" + "knative.dev/client/pkg/root" ) func main() { diff --git a/pkg/LICENSE b/pkg/LICENSE new file mode 100644 index 0000000000..261eeb9e9f --- /dev/null +++ b/pkg/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/pkg/apis/client/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/client/v1alpha1/zz_generated.deepcopy.go index 8a78cde819..721d474f8b 100644 --- a/pkg/apis/client/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/client/v1alpha1/zz_generated.deepcopy.go @@ -8,7 +8,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/pkg/kn/commands/broker/broker.go b/pkg/commands/broker/broker.go similarity index 96% rename from pkg/kn/commands/broker/broker.go rename to pkg/commands/broker/broker.go index 52e45478a3..c642f757df 100644 --- a/pkg/kn/commands/broker/broker.go +++ b/pkg/commands/broker/broker.go @@ -19,7 +19,7 @@ package broker import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewBrokerCommand represents broker management commands diff --git a/pkg/kn/commands/broker/broker_test.go b/pkg/commands/broker/broker_test.go similarity index 99% rename from pkg/kn/commands/broker/broker_test.go rename to pkg/commands/broker/broker_test.go index aaae5aa44e..a4a76caab8 100644 --- a/pkg/kn/commands/broker/broker_test.go +++ b/pkg/commands/broker/broker_test.go @@ -26,8 +26,8 @@ import ( duckv1 "knative.dev/pkg/apis/duck/v1" servingv1 "knative.dev/serving/pkg/apis/serving/v1" + "knative.dev/client/pkg/commands" clientv1beta1 "knative.dev/client/pkg/eventing/v1" - "knative.dev/client/pkg/kn/commands" v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" ) diff --git a/pkg/kn/commands/broker/config_flags.go b/pkg/commands/broker/config_flags.go similarity index 100% rename from pkg/kn/commands/broker/config_flags.go rename to pkg/commands/broker/config_flags.go diff --git a/pkg/kn/commands/broker/config_flags_test.go b/pkg/commands/broker/config_flags_test.go similarity index 100% rename from pkg/kn/commands/broker/config_flags_test.go rename to pkg/commands/broker/config_flags_test.go diff --git a/pkg/kn/commands/broker/create.go b/pkg/commands/broker/create.go similarity index 99% rename from pkg/kn/commands/broker/create.go rename to pkg/commands/broker/create.go index eeca1cb109..758f745d6b 100644 --- a/pkg/kn/commands/broker/create.go +++ b/pkg/commands/broker/create.go @@ -24,8 +24,8 @@ import ( v1 "knative.dev/eventing/pkg/apis/duck/v1" duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" clientv1beta1 "knative.dev/client/pkg/eventing/v1" - "knative.dev/client/pkg/kn/commands" ) var createExample = ` diff --git a/pkg/kn/commands/broker/create_test.go b/pkg/commands/broker/create_test.go similarity index 100% rename from pkg/kn/commands/broker/create_test.go rename to pkg/commands/broker/create_test.go diff --git a/pkg/kn/commands/broker/delete.go b/pkg/commands/broker/delete.go similarity index 98% rename from pkg/kn/commands/broker/delete.go rename to pkg/commands/broker/delete.go index c62d6323cd..ce015d7f05 100644 --- a/pkg/kn/commands/broker/delete.go +++ b/pkg/commands/broker/delete.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) var deleteExample = ` diff --git a/pkg/kn/commands/broker/delete_test.go b/pkg/commands/broker/delete_test.go similarity index 100% rename from pkg/kn/commands/broker/delete_test.go rename to pkg/commands/broker/delete_test.go diff --git a/pkg/kn/commands/broker/delivery_option_flags.go b/pkg/commands/broker/delivery_option_flags.go similarity index 98% rename from pkg/kn/commands/broker/delivery_option_flags.go rename to pkg/commands/broker/delivery_option_flags.go index e9c21dea3f..b817a38864 100644 --- a/pkg/kn/commands/broker/delivery_option_flags.go +++ b/pkg/commands/broker/delivery_option_flags.go @@ -18,8 +18,8 @@ import ( "reflect" "github.com/spf13/cobra" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands/flags" duckv1 "knative.dev/pkg/apis/duck/v1" ) diff --git a/pkg/kn/commands/broker/describe.go b/pkg/commands/broker/describe.go similarity index 98% rename from pkg/kn/commands/broker/describe.go rename to pkg/commands/broker/describe.go index 31b2d7273f..845a390b67 100644 --- a/pkg/kn/commands/broker/describe.go +++ b/pkg/commands/broker/describe.go @@ -28,7 +28,7 @@ import ( v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/broker/describe_test.go b/pkg/commands/broker/describe_test.go similarity index 100% rename from pkg/kn/commands/broker/describe_test.go rename to pkg/commands/broker/describe_test.go diff --git a/pkg/kn/commands/broker/list.go b/pkg/commands/broker/list.go similarity index 98% rename from pkg/kn/commands/broker/list.go rename to pkg/commands/broker/list.go index 438829be88..9182dcd927 100644 --- a/pkg/kn/commands/broker/list.go +++ b/pkg/commands/broker/list.go @@ -26,8 +26,8 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1" ) diff --git a/pkg/kn/commands/broker/list_test.go b/pkg/commands/broker/list_test.go similarity index 100% rename from pkg/kn/commands/broker/list_test.go rename to pkg/commands/broker/list_test.go diff --git a/pkg/kn/commands/broker/update.go b/pkg/commands/broker/update.go similarity index 98% rename from pkg/kn/commands/broker/update.go rename to pkg/commands/broker/update.go index d81ae25cdf..22c86632f4 100644 --- a/pkg/kn/commands/broker/update.go +++ b/pkg/commands/broker/update.go @@ -25,7 +25,7 @@ import ( v1 "knative.dev/client/pkg/eventing/v1" duckv1 "knative.dev/eventing/pkg/apis/duck/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" eventingv1 "knative.dev/eventing/pkg/apis/eventing/v1" ) diff --git a/pkg/kn/commands/broker/update_test.go b/pkg/commands/broker/update_test.go similarity index 100% rename from pkg/kn/commands/broker/update_test.go rename to pkg/commands/broker/update_test.go diff --git a/pkg/kn/commands/channel/channel.go b/pkg/commands/channel/channel.go similarity index 98% rename from pkg/kn/commands/channel/channel.go rename to pkg/commands/channel/channel.go index 0a412d3618..930db1202f 100644 --- a/pkg/kn/commands/channel/channel.go +++ b/pkg/commands/channel/channel.go @@ -18,7 +18,7 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" messagingv1 "knative.dev/client/pkg/messaging/v1" clientv1beta1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1" ) diff --git a/pkg/kn/commands/channel/channel_test.go b/pkg/commands/channel/channel_test.go similarity index 98% rename from pkg/kn/commands/channel/channel_test.go rename to pkg/commands/channel/channel_test.go index faefb3608a..e6e85d48a1 100644 --- a/pkg/kn/commands/channel/channel_test.go +++ b/pkg/commands/channel/channel_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/client-go/tools/clientcmd" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientv1beta1 "knative.dev/client/pkg/messaging/v1" eventingduck "knative.dev/eventing/pkg/apis/duck/v1" ) diff --git a/pkg/kn/commands/channel/create.go b/pkg/commands/channel/create.go similarity index 96% rename from pkg/kn/commands/channel/create.go rename to pkg/commands/channel/create.go index 0489588951..6a7e11c90d 100644 --- a/pkg/kn/commands/channel/create.go +++ b/pkg/commands/channel/create.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" knmessagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/channel/create_test.go b/pkg/commands/channel/create_test.go similarity index 100% rename from pkg/kn/commands/channel/create_test.go rename to pkg/commands/channel/create_test.go diff --git a/pkg/kn/commands/channel/delete.go b/pkg/commands/channel/delete.go similarity index 97% rename from pkg/kn/commands/channel/delete.go rename to pkg/commands/channel/delete.go index ebb3eb5d28..11cfda4230 100644 --- a/pkg/kn/commands/channel/delete.go +++ b/pkg/commands/channel/delete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewChannelDeleteCommand is for deleting a Channel diff --git a/pkg/kn/commands/channel/delete_test.go b/pkg/commands/channel/delete_test.go similarity index 100% rename from pkg/kn/commands/channel/delete_test.go rename to pkg/commands/channel/delete_test.go diff --git a/pkg/kn/commands/channel/describe.go b/pkg/commands/channel/describe.go similarity index 98% rename from pkg/kn/commands/channel/describe.go rename to pkg/commands/channel/describe.go index 38e03cdaba..e5b8b4331b 100644 --- a/pkg/kn/commands/channel/describe.go +++ b/pkg/commands/channel/describe.go @@ -24,8 +24,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/channel/describe_test.go b/pkg/commands/channel/describe_test.go similarity index 100% rename from pkg/kn/commands/channel/describe_test.go rename to pkg/commands/channel/describe_test.go diff --git a/pkg/kn/commands/channel/flags.go b/pkg/commands/channel/flags.go similarity index 99% rename from pkg/kn/commands/channel/flags.go rename to pkg/commands/channel/flags.go index d5673ee601..668879944a 100644 --- a/pkg/kn/commands/channel/flags.go +++ b/pkg/commands/channel/flags.go @@ -22,7 +22,7 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" hprinters "knative.dev/client/pkg/printers" diff --git a/pkg/kn/commands/channel/list.go b/pkg/commands/channel/list.go similarity index 96% rename from pkg/kn/commands/channel/list.go rename to pkg/commands/channel/list.go index ab81371791..a87c66805a 100644 --- a/pkg/kn/commands/channel/list.go +++ b/pkg/commands/channel/list.go @@ -21,8 +21,8 @@ import ( messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/eventing/pkg/client/clientset/versioned/scheme" ) diff --git a/pkg/kn/commands/channel/list_test.go b/pkg/commands/channel/list_test.go similarity index 100% rename from pkg/kn/commands/channel/list_test.go rename to pkg/commands/channel/list_test.go diff --git a/pkg/kn/commands/channel/list_types.go b/pkg/commands/channel/list_types.go similarity index 97% rename from pkg/kn/commands/channel/list_types.go rename to pkg/commands/channel/list_types.go index 944504224c..864fdc6f38 100644 --- a/pkg/kn/commands/channel/list_types.go +++ b/pkg/commands/channel/list_types.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/dynamic" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" messagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/channel/list_types_test.go b/pkg/commands/channel/list_types_test.go similarity index 99% rename from pkg/kn/commands/channel/list_types_test.go rename to pkg/commands/channel/list_types_test.go index 49d4e055d4..4edc75c27f 100644 --- a/pkg/kn/commands/channel/list_types_test.go +++ b/pkg/commands/channel/list_types_test.go @@ -29,8 +29,8 @@ import ( dynamicfakeClient "knative.dev/client/pkg/dynamic/fake" + "knative.dev/client/pkg/commands" clientdynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" "knative.dev/client/pkg/util" "knative.dev/eventing/pkg/apis/messaging" ) diff --git a/pkg/kn/commands/completion/completion.go b/pkg/commands/completion/completion.go similarity index 98% rename from pkg/kn/commands/completion/completion.go rename to pkg/commands/completion/completion.go index 39b6b18c4c..a731eb0c90 100644 --- a/pkg/kn/commands/completion/completion.go +++ b/pkg/commands/completion/completion.go @@ -18,7 +18,7 @@ import ( "errors" "os" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "github.com/spf13/cobra" ) diff --git a/pkg/kn/commands/completion/completion_test.go b/pkg/commands/completion/completion_test.go similarity index 96% rename from pkg/kn/commands/completion/completion_test.go rename to pkg/commands/completion/completion_test.go index 495f75d991..7108076040 100644 --- a/pkg/kn/commands/completion/completion_test.go +++ b/pkg/commands/completion/completion_test.go @@ -17,12 +17,11 @@ package completion import ( "testing" - "knative.dev/client/lib/test" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/util" - "github.com/spf13/cobra" "gotest.tools/v3/assert" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestCompletionUsage(t *testing.T) { diff --git a/pkg/kn/commands/completion_helper.go b/pkg/commands/completion_helper.go similarity index 100% rename from pkg/kn/commands/completion_helper.go rename to pkg/commands/completion_helper.go diff --git a/pkg/kn/commands/completion_helper_test.go b/pkg/commands/completion_helper_test.go similarity index 100% rename from pkg/kn/commands/completion_helper_test.go rename to pkg/commands/completion_helper_test.go diff --git a/pkg/kn/commands/container/add.go b/pkg/commands/container/add.go similarity index 97% rename from pkg/kn/commands/container/add.go rename to pkg/commands/container/add.go index 06a05f5c17..eb7a7bb3c2 100644 --- a/pkg/kn/commands/container/add.go +++ b/pkg/commands/container/add.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/flags" sigyaml "sigs.k8s.io/yaml" ) diff --git a/pkg/kn/commands/container/add_test.go b/pkg/commands/container/add_test.go similarity index 100% rename from pkg/kn/commands/container/add_test.go rename to pkg/commands/container/add_test.go diff --git a/pkg/kn/commands/container/container.go b/pkg/commands/container/container.go similarity index 96% rename from pkg/kn/commands/container/container.go rename to pkg/commands/container/container.go index 4745ddab78..ca38a6caa0 100644 --- a/pkg/kn/commands/container/container.go +++ b/pkg/commands/container/container.go @@ -16,7 +16,7 @@ package container import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewContainerCommand to manage containers diff --git a/pkg/kn/commands/container/container_test.go b/pkg/commands/container/container_test.go similarity index 97% rename from pkg/kn/commands/container/container_test.go rename to pkg/commands/container/container_test.go index fd79c8ef10..f22ef8706a 100644 --- a/pkg/kn/commands/container/container_test.go +++ b/pkg/commands/container/container_test.go @@ -19,7 +19,7 @@ import ( "testing" "gotest.tools/v3/assert" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func TestContainerCommand(t *testing.T) { diff --git a/pkg/kn/commands/describe.go b/pkg/commands/describe.go similarity index 100% rename from pkg/kn/commands/describe.go rename to pkg/commands/describe.go diff --git a/pkg/kn/commands/describe_test.go b/pkg/commands/describe_test.go similarity index 100% rename from pkg/kn/commands/describe_test.go rename to pkg/commands/describe_test.go diff --git a/pkg/kn/commands/domain/create.go b/pkg/commands/domain/create.go similarity index 98% rename from pkg/kn/commands/domain/create.go rename to pkg/commands/domain/create.go index 181775e76b..828ca2b50d 100644 --- a/pkg/kn/commands/domain/create.go +++ b/pkg/commands/domain/create.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/util/validation" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" clientv1beta1 "knative.dev/client/pkg/serving/v1beta1" ) diff --git a/pkg/kn/commands/domain/create_test.go b/pkg/commands/domain/create_test.go similarity index 100% rename from pkg/kn/commands/domain/create_test.go rename to pkg/commands/domain/create_test.go diff --git a/pkg/kn/commands/domain/delete.go b/pkg/commands/domain/delete.go similarity index 97% rename from pkg/kn/commands/domain/delete.go rename to pkg/commands/domain/delete.go index 6d0e65e5be..f308f8c8a7 100644 --- a/pkg/kn/commands/domain/delete.go +++ b/pkg/commands/domain/delete.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" ) // NewDomainMappingDeleteCommand to create event channels diff --git a/pkg/kn/commands/domain/delete_test.go b/pkg/commands/domain/delete_test.go similarity index 100% rename from pkg/kn/commands/domain/delete_test.go rename to pkg/commands/domain/delete_test.go diff --git a/pkg/kn/commands/domain/describe.go b/pkg/commands/domain/describe.go similarity index 98% rename from pkg/kn/commands/domain/describe.go rename to pkg/commands/domain/describe.go index 5ebc051e96..1baa49753a 100644 --- a/pkg/kn/commands/domain/describe.go +++ b/pkg/commands/domain/describe.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" "knative.dev/serving/pkg/apis/serving/v1beta1" ) diff --git a/pkg/kn/commands/domain/describe_test.go b/pkg/commands/domain/describe_test.go similarity index 100% rename from pkg/kn/commands/domain/describe_test.go rename to pkg/commands/domain/describe_test.go diff --git a/pkg/kn/commands/domain/domain.go b/pkg/commands/domain/domain.go similarity index 98% rename from pkg/kn/commands/domain/domain.go rename to pkg/commands/domain/domain.go index 280b590aa8..3c179cb013 100644 --- a/pkg/kn/commands/domain/domain.go +++ b/pkg/commands/domain/domain.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/commands" clientdynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" duckv1 "knative.dev/pkg/apis/duck/v1" ) diff --git a/pkg/kn/commands/domain/domain_test.go b/pkg/commands/domain/domain_test.go similarity index 98% rename from pkg/kn/commands/domain/domain_test.go rename to pkg/commands/domain/domain_test.go index 9a246627fc..3041b7fdd3 100644 --- a/pkg/kn/commands/domain/domain_test.go +++ b/pkg/commands/domain/domain_test.go @@ -26,10 +26,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/clientcmd" + "knative.dev/client/pkg/commands" kndynamic "knative.dev/client/pkg/dynamic" dynamicfake "knative.dev/client/pkg/dynamic/fake" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" clientservingv1beta1 "knative.dev/client/pkg/serving/v1beta1" duckv1 "knative.dev/pkg/apis/duck/v1" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/domain/human_readable_flags.go b/pkg/commands/domain/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/domain/human_readable_flags.go rename to pkg/commands/domain/human_readable_flags.go index 9cba66b4c6..ae9e6fb31a 100644 --- a/pkg/kn/commands/domain/human_readable_flags.go +++ b/pkg/commands/domain/human_readable_flags.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "knative.dev/serving/pkg/apis/serving/v1beta1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/domain/list.go b/pkg/commands/domain/list.go similarity index 95% rename from pkg/kn/commands/domain/list.go rename to pkg/commands/domain/list.go index e6dbb99f59..aebce9dc63 100644 --- a/pkg/kn/commands/domain/list.go +++ b/pkg/commands/domain/list.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewDomainMappingListCommand represents 'kn revision list' command diff --git a/pkg/kn/commands/domain/list_test.go b/pkg/commands/domain/list_test.go similarity index 100% rename from pkg/kn/commands/domain/list_test.go rename to pkg/commands/domain/list_test.go diff --git a/pkg/kn/commands/domain/update.go b/pkg/commands/domain/update.go similarity index 98% rename from pkg/kn/commands/domain/update.go rename to pkg/commands/domain/update.go index 52b0e8ade7..5e244b34b9 100644 --- a/pkg/kn/commands/domain/update.go +++ b/pkg/commands/domain/update.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" ) // NewDomainMappingUpdateCommand to create event channels diff --git a/pkg/kn/commands/domain/update_test.go b/pkg/commands/domain/update_test.go similarity index 100% rename from pkg/kn/commands/domain/update_test.go rename to pkg/commands/domain/update_test.go diff --git a/pkg/kn/commands/eventtype/create.go b/pkg/commands/eventtype/create.go similarity index 97% rename from pkg/kn/commands/eventtype/create.go rename to pkg/commands/eventtype/create.go index 7c8d557a66..bfbebe26ff 100644 --- a/pkg/kn/commands/eventtype/create.go +++ b/pkg/commands/eventtype/create.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/commands/flags" clienteventingv1beta2 "knative.dev/client/pkg/eventing/v1beta2" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/commands/flags" "knative.dev/pkg/apis" ) diff --git a/pkg/kn/commands/eventtype/create_test.go b/pkg/commands/eventtype/create_test.go similarity index 100% rename from pkg/kn/commands/eventtype/create_test.go rename to pkg/commands/eventtype/create_test.go diff --git a/pkg/kn/commands/eventtype/delete.go b/pkg/commands/eventtype/delete.go similarity index 98% rename from pkg/kn/commands/eventtype/delete.go rename to pkg/commands/eventtype/delete.go index 72c8b19eba..d247318c80 100644 --- a/pkg/kn/commands/eventtype/delete.go +++ b/pkg/commands/eventtype/delete.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) var deleteExample = ` diff --git a/pkg/kn/commands/eventtype/delete_test.go b/pkg/commands/eventtype/delete_test.go similarity index 100% rename from pkg/kn/commands/eventtype/delete_test.go rename to pkg/commands/eventtype/delete_test.go diff --git a/pkg/kn/commands/eventtype/describe.go b/pkg/commands/eventtype/describe.go similarity index 98% rename from pkg/kn/commands/eventtype/describe.go rename to pkg/commands/eventtype/describe.go index 4e292933f1..6d89fdb018 100644 --- a/pkg/kn/commands/eventtype/describe.go +++ b/pkg/commands/eventtype/describe.go @@ -26,7 +26,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "knative.dev/eventing/pkg/apis/eventing/v1beta2" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/eventtype/describe_test.go b/pkg/commands/eventtype/describe_test.go similarity index 100% rename from pkg/kn/commands/eventtype/describe_test.go rename to pkg/commands/eventtype/describe_test.go diff --git a/pkg/kn/commands/eventtype/eventtype.go b/pkg/commands/eventtype/eventtype.go similarity index 97% rename from pkg/kn/commands/eventtype/eventtype.go rename to pkg/commands/eventtype/eventtype.go index 6e6b75fd2c..56c2fbeb8b 100644 --- a/pkg/kn/commands/eventtype/eventtype.go +++ b/pkg/commands/eventtype/eventtype.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/runtime/schema" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewEventTypeCommand represents event type management commands diff --git a/pkg/kn/commands/eventtype/eventtype_test.go b/pkg/commands/eventtype/eventtype_test.go similarity index 98% rename from pkg/kn/commands/eventtype/eventtype_test.go rename to pkg/commands/eventtype/eventtype_test.go index f4a44be857..127821d2fd 100644 --- a/pkg/kn/commands/eventtype/eventtype_test.go +++ b/pkg/commands/eventtype/eventtype_test.go @@ -22,8 +22,8 @@ import ( kndynamic "knative.dev/client/pkg/dynamic" "k8s.io/client-go/tools/clientcmd" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/eventing/v1beta2" - "knative.dev/client/pkg/kn/commands" eventingv1beta2 "knative.dev/eventing/pkg/apis/eventing/v1beta2" "knative.dev/pkg/apis" ) diff --git a/pkg/kn/commands/eventtype/list.go b/pkg/commands/eventtype/list.go similarity index 98% rename from pkg/kn/commands/eventtype/list.go rename to pkg/commands/eventtype/list.go index 53da78e53e..e51c93bd3e 100644 --- a/pkg/kn/commands/eventtype/list.go +++ b/pkg/commands/eventtype/list.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" eventingv1beta2 "knative.dev/eventing/pkg/apis/eventing/v1beta2" ) diff --git a/pkg/kn/commands/eventtype/list_test.go b/pkg/commands/eventtype/list_test.go similarity index 100% rename from pkg/kn/commands/eventtype/list_test.go rename to pkg/commands/eventtype/list_test.go diff --git a/pkg/kn/commands/flags/eventtype.go b/pkg/commands/flags/eventtype.go similarity index 100% rename from pkg/kn/commands/flags/eventtype.go rename to pkg/commands/flags/eventtype.go diff --git a/pkg/kn/commands/flags/eventtype_test.go b/pkg/commands/flags/eventtype_test.go similarity index 100% rename from pkg/kn/commands/flags/eventtype_test.go rename to pkg/commands/flags/eventtype_test.go diff --git a/pkg/kn/commands/flags/listfilters.go b/pkg/commands/flags/listfilters.go similarity index 100% rename from pkg/kn/commands/flags/listfilters.go rename to pkg/commands/flags/listfilters.go diff --git a/pkg/kn/commands/flags/listfilters_test.go b/pkg/commands/flags/listfilters_test.go similarity index 100% rename from pkg/kn/commands/flags/listfilters_test.go rename to pkg/commands/flags/listfilters_test.go diff --git a/pkg/kn/commands/flags/listprint.go b/pkg/commands/flags/listprint.go similarity index 98% rename from pkg/kn/commands/flags/listprint.go rename to pkg/commands/flags/listprint.go index da73381c01..ae1337eb2f 100644 --- a/pkg/kn/commands/flags/listprint.go +++ b/pkg/commands/flags/listprint.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/flags/listprint_test.go b/pkg/commands/flags/listprint_test.go similarity index 100% rename from pkg/kn/commands/flags/listprint_test.go rename to pkg/commands/flags/listprint_test.go diff --git a/pkg/kn/commands/flags/sink.go b/pkg/commands/flags/sink.go similarity index 99% rename from pkg/kn/commands/flags/sink.go rename to pkg/commands/flags/sink.go index 5bcd4254a8..cb03edc461 100644 --- a/pkg/kn/commands/flags/sink.go +++ b/pkg/commands/flags/sink.go @@ -22,11 +22,11 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/config" "knative.dev/pkg/apis" duckv1 "knative.dev/pkg/apis/duck/v1" clientdynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/config" ) type SinkFlags struct { diff --git a/pkg/kn/commands/flags/sink_test.go b/pkg/commands/flags/sink_test.go similarity index 100% rename from pkg/kn/commands/flags/sink_test.go rename to pkg/commands/flags/sink_test.go diff --git a/pkg/kn/commands/flags/traffic.go b/pkg/commands/flags/traffic.go similarity index 100% rename from pkg/kn/commands/flags/traffic.go rename to pkg/commands/flags/traffic.go diff --git a/pkg/kn/commands/flags/traffic_test.go b/pkg/commands/flags/traffic_test.go similarity index 100% rename from pkg/kn/commands/flags/traffic_test.go rename to pkg/commands/flags/traffic_test.go diff --git a/pkg/kn/commands/human_readable_flags.go b/pkg/commands/human_readable_flags.go similarity index 100% rename from pkg/kn/commands/human_readable_flags.go rename to pkg/commands/human_readable_flags.go diff --git a/pkg/kn/commands/human_readable_flags_test.go b/pkg/commands/human_readable_flags_test.go similarity index 100% rename from pkg/kn/commands/human_readable_flags_test.go rename to pkg/commands/human_readable_flags_test.go diff --git a/pkg/kn/commands/namespaced.go b/pkg/commands/namespaced.go similarity index 100% rename from pkg/kn/commands/namespaced.go rename to pkg/commands/namespaced.go diff --git a/pkg/kn/commands/namespaced_test.go b/pkg/commands/namespaced_test.go similarity index 99% rename from pkg/kn/commands/namespaced_test.go rename to pkg/commands/namespaced_test.go index 3110c08508..92a6f893d1 100644 --- a/pkg/kn/commands/namespaced_test.go +++ b/pkg/commands/namespaced_test.go @@ -19,12 +19,10 @@ import ( "path/filepath" "testing" - "knative.dev/client/lib/test" - - "k8s.io/client-go/tools/clientcmd" - "github.com/spf13/cobra" "gotest.tools/v3/assert" + "k8s.io/client-go/tools/clientcmd" + "knative.dev/client/pkg/util/test" ) // testCommandGenerator generates a test cobra command diff --git a/pkg/kn/commands/options/options.go b/pkg/commands/options/options.go similarity index 100% rename from pkg/kn/commands/options/options.go rename to pkg/commands/options/options.go diff --git a/pkg/kn/commands/plugin/list.go b/pkg/commands/plugin/list.go similarity index 97% rename from pkg/kn/commands/plugin/list.go rename to pkg/commands/plugin/list.go index a97ca5d88b..d6d31ed3e2 100644 --- a/pkg/kn/commands/plugin/list.go +++ b/pkg/commands/plugin/list.go @@ -20,10 +20,10 @@ import ( "strings" "github.com/spf13/cobra" + "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/config" - "knative.dev/client/pkg/kn/plugin" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/plugin" ) // ValidPluginFilenamePrefixes controls the prefix for all kn plugins diff --git a/pkg/kn/commands/plugin/list_test.go b/pkg/commands/plugin/list_test.go similarity index 98% rename from pkg/kn/commands/plugin/list_test.go rename to pkg/commands/plugin/list_test.go index 9d6fdba5b6..4dfa25b2a6 100644 --- a/pkg/kn/commands/plugin/list_test.go +++ b/pkg/commands/plugin/list_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/config" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/config" "knative.dev/client/pkg/util" "github.com/spf13/cobra" diff --git a/pkg/kn/commands/plugin/plugin.go b/pkg/commands/plugin/plugin.go similarity index 96% rename from pkg/kn/commands/plugin/plugin.go rename to pkg/commands/plugin/plugin.go index 155023fe9a..d79c4d5354 100644 --- a/pkg/kn/commands/plugin/plugin.go +++ b/pkg/commands/plugin/plugin.go @@ -17,7 +17,7 @@ package plugin import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewPluginCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/plugin/plugin_test.go b/pkg/commands/plugin/plugin_test.go similarity index 96% rename from pkg/kn/commands/plugin/plugin_test.go rename to pkg/commands/plugin/plugin_test.go index 2a23d7a241..417a34e99a 100644 --- a/pkg/kn/commands/plugin/plugin_test.go +++ b/pkg/commands/plugin/plugin_test.go @@ -19,7 +19,7 @@ import ( "gotest.tools/v3/assert" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/revision/delete.go b/pkg/commands/revision/delete.go similarity index 99% rename from pkg/kn/commands/revision/delete.go rename to pkg/commands/revision/delete.go index db9b6c9982..59ec54884f 100644 --- a/pkg/kn/commands/revision/delete.go +++ b/pkg/commands/revision/delete.go @@ -22,7 +22,7 @@ import ( "time" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/serving/v1" servingv1 "knative.dev/serving/pkg/apis/serving/v1" ) diff --git a/pkg/kn/commands/revision/delete_mock_test.go b/pkg/commands/revision/delete_mock_test.go similarity index 100% rename from pkg/kn/commands/revision/delete_mock_test.go rename to pkg/commands/revision/delete_mock_test.go diff --git a/pkg/kn/commands/revision/delete_test.go b/pkg/commands/revision/delete_test.go similarity index 98% rename from pkg/kn/commands/revision/delete_test.go rename to pkg/commands/revision/delete_test.go index d6ab73c5e4..8ef85825b3 100644 --- a/pkg/kn/commands/revision/delete_test.go +++ b/pkg/commands/revision/delete_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/watch" clienttesting "k8s.io/client-go/testing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/revision/describe.go b/pkg/commands/revision/describe.go similarity index 99% rename from pkg/kn/commands/revision/describe.go rename to pkg/commands/revision/describe.go index 8c8acab0d3..679485f083 100644 --- a/pkg/kn/commands/revision/describe.go +++ b/pkg/commands/revision/describe.go @@ -28,7 +28,7 @@ import ( "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" clientserving "knative.dev/client/pkg/serving" ) diff --git a/pkg/kn/commands/revision/describe_test.go b/pkg/commands/revision/describe_test.go similarity index 99% rename from pkg/kn/commands/revision/describe_test.go rename to pkg/commands/revision/describe_test.go index bb09ff9649..371f373b98 100644 --- a/pkg/kn/commands/revision/describe_test.go +++ b/pkg/commands/revision/describe_test.go @@ -34,7 +34,7 @@ import ( servingv1 "knative.dev/serving/pkg/apis/serving/v1" "sigs.k8s.io/yaml" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/revision/human_readable_flags.go b/pkg/commands/revision/human_readable_flags.go similarity index 99% rename from pkg/kn/commands/revision/human_readable_flags.go rename to pkg/commands/revision/human_readable_flags.go index 081279b9c4..981e0b9fb4 100644 --- a/pkg/kn/commands/revision/human_readable_flags.go +++ b/pkg/commands/revision/human_readable_flags.go @@ -20,7 +20,7 @@ import ( "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/revision/list.go b/pkg/commands/revision/list.go similarity index 98% rename from pkg/kn/commands/revision/list.go rename to pkg/commands/revision/list.go index 2f818b73f4..eace7c8104 100644 --- a/pkg/kn/commands/revision/list.go +++ b/pkg/commands/revision/list.go @@ -26,8 +26,8 @@ import ( "github.com/spf13/cobra" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/revision/list_test.go b/pkg/commands/revision/list_test.go similarity index 99% rename from pkg/kn/commands/revision/list_test.go rename to pkg/commands/revision/list_test.go index 647baec9f5..d0fd57db05 100644 --- a/pkg/kn/commands/revision/list_test.go +++ b/pkg/commands/revision/list_test.go @@ -25,7 +25,7 @@ import ( "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/revision/revision.go b/pkg/commands/revision/revision.go similarity index 97% rename from pkg/kn/commands/revision/revision.go rename to pkg/commands/revision/revision.go index 6b8bac0648..a344666b81 100644 --- a/pkg/kn/commands/revision/revision.go +++ b/pkg/commands/revision/revision.go @@ -18,7 +18,7 @@ import ( "github.com/spf13/cobra" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewRevisionCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/revision/revision_test.go b/pkg/commands/revision/revision_test.go similarity index 97% rename from pkg/kn/commands/revision/revision_test.go rename to pkg/commands/revision/revision_test.go index 3bf77b6bc1..7c4efad609 100644 --- a/pkg/kn/commands/revision/revision_test.go +++ b/pkg/commands/revision/revision_test.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" "gotest.tools/v3/assert" "k8s.io/client-go/tools/clientcmd" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/route/describe.go b/pkg/commands/route/describe.go similarity index 98% rename from pkg/kn/commands/route/describe.go rename to pkg/commands/route/describe.go index 3064350cd2..3cd3f3773c 100644 --- a/pkg/kn/commands/route/describe.go +++ b/pkg/commands/route/describe.go @@ -23,7 +23,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/route/describe_test.go b/pkg/commands/route/describe_test.go similarity index 99% rename from pkg/kn/commands/route/describe_test.go rename to pkg/commands/route/describe_test.go index c26e9fbaac..a496b2bc58 100644 --- a/pkg/kn/commands/route/describe_test.go +++ b/pkg/commands/route/describe_test.go @@ -27,7 +27,7 @@ import ( servingv1 "knative.dev/serving/pkg/apis/serving/v1" "sigs.k8s.io/yaml" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/pkg/ptr" ) diff --git a/pkg/kn/commands/route/human_readable_flags.go b/pkg/commands/route/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/route/human_readable_flags.go rename to pkg/commands/route/human_readable_flags.go index f366f9580d..b114dea86a 100644 --- a/pkg/kn/commands/route/human_readable_flags.go +++ b/pkg/commands/route/human_readable_flags.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/route/list.go b/pkg/commands/route/list.go similarity index 96% rename from pkg/kn/commands/route/list.go rename to pkg/commands/route/list.go index 2e40896341..c4d88667f5 100644 --- a/pkg/kn/commands/route/list.go +++ b/pkg/commands/route/list.go @@ -18,13 +18,13 @@ import ( "errors" "fmt" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "github.com/spf13/cobra" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands/flags" ) // NewrouteListCommand represents 'kn route list' command diff --git a/pkg/kn/commands/route/list_test.go b/pkg/commands/route/list_test.go similarity index 99% rename from pkg/kn/commands/route/list_test.go rename to pkg/commands/route/list_test.go index de87b69563..0c319fae1e 100644 --- a/pkg/kn/commands/route/list_test.go +++ b/pkg/commands/route/list_test.go @@ -25,7 +25,7 @@ import ( "knative.dev/pkg/ptr" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/route/route.go b/pkg/commands/route/route.go similarity index 96% rename from pkg/kn/commands/route/route.go rename to pkg/commands/route/route.go index e2d855696e..ad84683cd5 100644 --- a/pkg/kn/commands/route/route.go +++ b/pkg/commands/route/route.go @@ -17,7 +17,7 @@ package route import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewRouteCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/create.go b/pkg/commands/secret/create.go similarity index 98% rename from pkg/kn/commands/secret/create.go rename to pkg/commands/secret/create.go index 7bd2abb852..a3d4983802 100644 --- a/pkg/kn/commands/secret/create.go +++ b/pkg/commands/secret/create.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "knative.dev/client/pkg/util" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewSecretCreateCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/create_test.go b/pkg/commands/secret/create_test.go similarity index 100% rename from pkg/kn/commands/secret/create_test.go rename to pkg/commands/secret/create_test.go diff --git a/pkg/kn/commands/secret/delete.go b/pkg/commands/secret/delete.go similarity index 97% rename from pkg/kn/commands/secret/delete.go rename to pkg/commands/secret/delete.go index 4d9de01832..43d44497dd 100644 --- a/pkg/kn/commands/secret/delete.go +++ b/pkg/commands/secret/delete.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewSecretDeleteCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/delete_test.go b/pkg/commands/secret/delete_test.go similarity index 100% rename from pkg/kn/commands/secret/delete_test.go rename to pkg/commands/secret/delete_test.go diff --git a/pkg/kn/commands/secret/list.go b/pkg/commands/secret/list.go similarity index 97% rename from pkg/kn/commands/secret/list.go rename to pkg/commands/secret/list.go index 66e8fde37e..aac2d1bc69 100644 --- a/pkg/kn/commands/secret/list.go +++ b/pkg/commands/secret/list.go @@ -22,10 +22,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewSecretListCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/list_test.go b/pkg/commands/secret/list_test.go similarity index 100% rename from pkg/kn/commands/secret/list_test.go rename to pkg/commands/secret/list_test.go diff --git a/pkg/kn/commands/secret/secret.go b/pkg/commands/secret/secret.go similarity index 96% rename from pkg/kn/commands/secret/secret.go rename to pkg/commands/secret/secret.go index d1c6a9de4b..120b735601 100644 --- a/pkg/kn/commands/secret/secret.go +++ b/pkg/commands/secret/secret.go @@ -16,7 +16,7 @@ package secret import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) func NewSecretCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/secret/secret_test.go b/pkg/commands/secret/secret_test.go similarity index 96% rename from pkg/kn/commands/secret/secret_test.go rename to pkg/commands/secret/secret_test.go index aa7ecce7e5..61b51790c1 100644 --- a/pkg/kn/commands/secret/secret_test.go +++ b/pkg/commands/secret/secret_test.go @@ -22,8 +22,8 @@ import ( "gotest.tools/v3/assert" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/flags" ) // Helper methods diff --git a/pkg/kn/commands/service/apply.go b/pkg/commands/service/apply.go similarity index 99% rename from pkg/kn/commands/service/apply.go rename to pkg/commands/service/apply.go index f0771bf1df..07dd5401d8 100644 --- a/pkg/kn/commands/service/apply.go +++ b/pkg/commands/service/apply.go @@ -23,7 +23,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/apply_mock_test.go b/pkg/commands/service/apply_mock_test.go similarity index 100% rename from pkg/kn/commands/service/apply_mock_test.go rename to pkg/commands/service/apply_mock_test.go diff --git a/pkg/kn/commands/service/configuration_edit_flags.go b/pkg/commands/service/configuration_edit_flags.go similarity index 99% rename from pkg/kn/commands/service/configuration_edit_flags.go rename to pkg/commands/service/configuration_edit_flags.go index d4d7a45d6c..ea23e771f1 100644 --- a/pkg/kn/commands/service/configuration_edit_flags.go +++ b/pkg/commands/service/configuration_edit_flags.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + knconfig "knative.dev/client/pkg/config" "knative.dev/serving/pkg/apis/config" - knconfig "knative.dev/client/pkg/kn/config" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" servinglib "knative.dev/client/pkg/serving" "knative.dev/client/pkg/util" network "knative.dev/networking/pkg/apis/networking" diff --git a/pkg/kn/commands/service/configuration_edit_flags_test.go b/pkg/commands/service/configuration_edit_flags_test.go similarity index 98% rename from pkg/kn/commands/service/configuration_edit_flags_test.go rename to pkg/commands/service/configuration_edit_flags_test.go index 4955fcc942..b237282268 100644 --- a/pkg/kn/commands/service/configuration_edit_flags_test.go +++ b/pkg/commands/service/configuration_edit_flags_test.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/viper" "gotest.tools/v3/assert" + "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/config" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/serving/pkg/apis/autoscaling" ) diff --git a/pkg/kn/commands/service/create.go b/pkg/commands/service/create.go similarity index 99% rename from pkg/kn/commands/service/create.go rename to pkg/commands/service/create.go index 0657c2c548..2c217726aa 100644 --- a/pkg/kn/commands/service/create.go +++ b/pkg/commands/service/create.go @@ -22,11 +22,11 @@ import ( "os" "time" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" - "knative.dev/client/pkg/kn/traffic" servinglib "knative.dev/client/pkg/serving" + "knative.dev/client/pkg/traffic" "knative.dev/serving/pkg/apis/serving" diff --git a/pkg/kn/commands/service/create_mock_test.go b/pkg/commands/service/create_mock_test.go similarity index 100% rename from pkg/kn/commands/service/create_mock_test.go rename to pkg/commands/service/create_mock_test.go diff --git a/pkg/kn/commands/service/create_test.go b/pkg/commands/service/create_test.go similarity index 99% rename from pkg/kn/commands/service/create_test.go rename to pkg/commands/service/create_test.go index 97bd28123f..48166bdc9f 100644 --- a/pkg/kn/commands/service/create_test.go +++ b/pkg/commands/service/create_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" network "knative.dev/networking/pkg/apis/networking" diff --git a/pkg/kn/commands/service/delete.go b/pkg/commands/service/delete.go similarity index 98% rename from pkg/kn/commands/service/delete.go rename to pkg/commands/service/delete.go index d7524f167d..f079f06999 100644 --- a/pkg/kn/commands/service/delete.go +++ b/pkg/commands/service/delete.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/delete_mock_test.go b/pkg/commands/service/delete_mock_test.go similarity index 100% rename from pkg/kn/commands/service/delete_mock_test.go rename to pkg/commands/service/delete_mock_test.go diff --git a/pkg/kn/commands/service/delete_test.go b/pkg/commands/service/delete_test.go similarity index 98% rename from pkg/kn/commands/service/delete_test.go rename to pkg/commands/service/delete_test.go index 7bf6d77ca3..5d261196ce 100644 --- a/pkg/kn/commands/service/delete_test.go +++ b/pkg/commands/service/delete_test.go @@ -25,7 +25,7 @@ import ( client_testing "k8s.io/client-go/testing" clienttesting "k8s.io/client-go/testing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" ) diff --git a/pkg/kn/commands/service/describe.go b/pkg/commands/service/describe.go similarity index 99% rename from pkg/kn/commands/service/describe.go rename to pkg/commands/service/describe.go index dc438ef415..948ba7aa37 100644 --- a/pkg/kn/commands/service/describe.go +++ b/pkg/commands/service/describe.go @@ -27,8 +27,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "knative.dev/serving/pkg/apis/serving" - "knative.dev/client/pkg/kn/commands/revision" - "knative.dev/client/pkg/kn/plugin" + "knative.dev/client/pkg/commands/revision" + "knative.dev/client/pkg/plugin" "knative.dev/client/pkg/printers" clientservingv1 "knative.dev/client/pkg/serving/v1" @@ -37,7 +37,7 @@ import ( "knative.dev/pkg/apis" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // Command for printing out a description of a service, meant to be consumed by humans diff --git a/pkg/kn/commands/service/describe_test.go b/pkg/commands/service/describe_test.go similarity index 100% rename from pkg/kn/commands/service/describe_test.go rename to pkg/commands/service/describe_test.go diff --git a/pkg/kn/commands/service/export.go b/pkg/commands/service/export.go similarity index 99% rename from pkg/kn/commands/service/export.go rename to pkg/commands/service/export.go index 570da9961a..fb653cc15f 100644 --- a/pkg/kn/commands/service/export.go +++ b/pkg/commands/service/export.go @@ -32,7 +32,7 @@ import ( "k8s.io/cli-runtime/pkg/printers" clientv1alpha1 "knative.dev/client/pkg/apis/client/v1alpha1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/service/export_test.go b/pkg/commands/service/export_test.go similarity index 67% rename from pkg/kn/commands/service/export_test.go rename to pkg/commands/service/export_test.go index 7b2b2ee83f..f39f961a3d 100644 --- a/pkg/kn/commands/service/export_test.go +++ b/pkg/commands/service/export_test.go @@ -19,15 +19,13 @@ import ( "encoding/json" "testing" - "knative.dev/client/pkg/serving" - "gotest.tools/v3/assert" - v1 "k8s.io/api/core/v1" - libtest "knative.dev/client/lib/test" clientv1alpha1 "knative.dev/client/pkg/apis/client/v1alpha1" + "knative.dev/client/pkg/serving" knclient "knative.dev/client/pkg/serving/v1" "knative.dev/client/pkg/util/mock" + "knative.dev/client/pkg/util/test" "knative.dev/pkg/ptr" apiserving "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" @@ -63,14 +61,14 @@ func TestServiceExportError(t *testing.T) { func TestServiceExport(t *testing.T) { for _, tc := range []testCase{ - {latestSvc: libtest.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()))}, - {latestSvc: libtest.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(v1.EnvVar{Name: "a", Value: "mouse"}))}, - {latestSvc: libtest.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), libtest.WithRevisionAnnotations(map[string]string{"client.knative.dev/user-image": "busybox:v2"}))}, - {latestSvc: libtest.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithServiceLabel("a", "mouse"), servingtest.WithServiceAnnotation("a", "mouse"))}, - {latestSvc: libtest.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithVolume("secretName", "/mountpath", volumeSource("secretName")))}, + {latestSvc: test.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()))}, + {latestSvc: test.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(v1.EnvVar{Name: "a", Value: "mouse"}))}, + {latestSvc: test.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), test.WithRevisionAnnotations(map[string]string{"client.knative.dev/user-image": "busybox:v2"}))}, + {latestSvc: test.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithServiceLabel("a", "mouse"), servingtest.WithServiceAnnotation("a", "mouse"))}, + {latestSvc: test.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithVolume("secretName", "/mountpath", volumeSource("secretName")))}, } { exportServiceTestForReplay(t, &tc) - tc.expectedKNExport = libtest.BuildKNExportWithOptions() + tc.expectedKNExport = test.BuildKNExportWithOptions() exportServiceTest(t, &tc, true) //test default exportServiceTest(t, &tc, false) @@ -108,38 +106,38 @@ func exportServiceTest(t *testing.T, tc *testCase, addMode bool) { func TestServiceExportwithMultipleRevisions(t *testing.T) { for _, tc := range []testCase{{ name: "test 2 revisions with traffic split", - latestSvc: libtest.BuildServiceWithOptions( + latestSvc: test.BuildServiceWithOptions( "foo", servingtest.WithConfigSpec(buildConfiguration()), - libtest.WithRevisionAnnotations(map[string]string{"client.knative.dev/user-image": "busybox:v2"}), - libtest.WithTrafficSpec([]string{"foo-rev-1", "latest"}, []int{50, 50}, []string{"", ""}), + test.WithRevisionAnnotations(map[string]string{"client.knative.dev/user-image": "busybox:v2"}), + test.WithTrafficSpec([]string{"foo-rev-1", "latest"}, []int{50, 50}, []string{"", ""}), ), - expectedSvcList: libtest.BuildServiceListWithOptions( - libtest.WithService(libtest.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), - libtest.WithRevisionAnnotations(map[string]string{"client.knative.dev/user-image": "busybox:v1"}), + expectedSvcList: test.BuildServiceListWithOptions( + test.WithService(test.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), + test.WithRevisionAnnotations(map[string]string{"client.knative.dev/user-image": "busybox:v1"}), servingtest.WithBYORevisionName("foo-rev-1"), )), - libtest.WithService(libtest.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), - libtest.WithRevisionAnnotations(map[string]string{"client.knative.dev/user-image": "busybox:v2"}), - libtest.WithTrafficSpec([]string{"foo-rev-1", "latest"}, []int{50, 50}, []string{"", ""}), + test.WithService(test.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), + test.WithRevisionAnnotations(map[string]string{"client.knative.dev/user-image": "busybox:v2"}), + test.WithTrafficSpec([]string{"foo-rev-1", "latest"}, []int{50, 50}, []string{"", ""}), )), ), - revisionList: libtest.BuildRevisionListWithOptions( - libtest.WithRevision(*(libtest.BuildRevision("foo-rev-1", + revisionList: test.BuildRevisionListWithOptions( + test.WithRevision(*(test.BuildRevision("foo-rev-1", servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "1"), servingtest.WithRevisionAnn("client.knative.dev/user-image", "busybox:v1"), servingtest.WithRevisionAnn("serving.knative.dev/lastPinned", "1111132"), servingtest.WithRevisionAnn(serving.UpdateTimestampAnnotationKey, "now"), ))), - libtest.WithRevision(*(libtest.BuildRevision("foo-rev-2", + test.WithRevision(*(test.BuildRevision("foo-rev-2", servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "1"), servingtest.WithRevisionAnn("client.knative.dev/user-image", "busybox:v2"), servingtest.WithRevisionAnn(serving.UpdateTimestampAnnotationKey, "now"), ))), ), - expectedKNExport: libtest.BuildKNExportWithOptions( - libtest.WithKNRevision(*(libtest.BuildRevision("foo-rev-1", + expectedKNExport: test.BuildKNExportWithOptions( + test.WithKNRevision(*(test.BuildRevision("foo-rev-1", servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "1"), servingtest.WithRevisionAnn("client.knative.dev/user-image", "busybox:v1"), @@ -147,86 +145,86 @@ func TestServiceExportwithMultipleRevisions(t *testing.T) { ), }, { name: "test 2 revisions no traffic split", - latestSvc: libtest.BuildServiceWithOptions( + latestSvc: test.BuildServiceWithOptions( "foo", servingtest.WithConfigSpec(buildConfiguration()), - libtest.WithTrafficSpec([]string{"latest"}, []int{100}, []string{""}), + test.WithTrafficSpec([]string{"latest"}, []int{100}, []string{""}), ), - expectedSvcList: libtest.BuildServiceListWithOptions( - libtest.WithService(libtest.BuildServiceWithOptions( + expectedSvcList: test.BuildServiceListWithOptions( + test.WithService(test.BuildServiceWithOptions( "foo", servingtest.WithConfigSpec(buildConfiguration()), - libtest.WithTrafficSpec([]string{"latest"}, []int{100}, []string{""}), + test.WithTrafficSpec([]string{"latest"}, []int{100}, []string{""}), )), ), - revisionList: libtest.BuildRevisionListWithOptions( - libtest.WithRevision(*(libtest.BuildRevision("foo-rev-1", + revisionList: test.BuildRevisionListWithOptions( + test.WithRevision(*(test.BuildRevision("foo-rev-1", servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "1"), servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), ))), - libtest.WithRevision(*(libtest.BuildRevision("foo-rev-2", + test.WithRevision(*(test.BuildRevision("foo-rev-2", servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "2"), servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), ))), ), - expectedKNExport: libtest.BuildKNExportWithOptions(), + expectedKNExport: test.BuildKNExportWithOptions(), }, { name: "test 3 active revisions with traffic split with no latest revision", - latestSvc: libtest.BuildServiceWithOptions( + latestSvc: test.BuildServiceWithOptions( "foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(v1.EnvVar{Name: "a", Value: "mouse"}), servingtest.WithBYORevisionName("foo-rev-3"), - libtest.WithTrafficSpec([]string{"foo-rev-1", "foo-rev-2", "foo-rev-3"}, []int{25, 50, 25}, []string{"", "", ""}), + test.WithTrafficSpec([]string{"foo-rev-1", "foo-rev-2", "foo-rev-3"}, []int{25, 50, 25}, []string{"", "", ""}), ), - expectedSvcList: libtest.BuildServiceListWithOptions( - libtest.WithService( - libtest.BuildServiceWithOptions( + expectedSvcList: test.BuildServiceListWithOptions( + test.WithService( + test.BuildServiceWithOptions( "foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(v1.EnvVar{Name: "a", Value: "cat"}), servingtest.WithBYORevisionName("foo-rev-1"), ), ), - libtest.WithService( - libtest.BuildServiceWithOptions( + test.WithService( + test.BuildServiceWithOptions( "foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(v1.EnvVar{Name: "a", Value: "dog"}), servingtest.WithBYORevisionName("foo-rev-2"), ), ), - libtest.WithService( - libtest.BuildServiceWithOptions( + test.WithService( + test.BuildServiceWithOptions( "foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(v1.EnvVar{Name: "a", Value: "mouse"}), servingtest.WithBYORevisionName("foo-rev-3"), - libtest.WithTrafficSpec([]string{"foo-rev-1", "foo-rev-2", "foo-rev-3"}, []int{25, 50, 25}, []string{"", "", ""}), + test.WithTrafficSpec([]string{"foo-rev-1", "foo-rev-2", "foo-rev-3"}, []int{25, 50, 25}, []string{"", "", ""}), ), ), ), - revisionList: libtest.BuildRevisionListWithOptions( - libtest.WithRevision(*(libtest.BuildRevision("foo-rev-1", + revisionList: test.BuildRevisionListWithOptions( + test.WithRevision(*(test.BuildRevision("foo-rev-1", servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "1"), servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), - libtest.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "cat"}), + test.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "cat"}), ))), - libtest.WithRevision(*(libtest.BuildRevision("foo-rev-2", + test.WithRevision(*(test.BuildRevision("foo-rev-2", servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "2"), servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), - libtest.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "dog"}), + test.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "dog"}), ))), - libtest.WithRevision(*(libtest.BuildRevision("foo-rev-3", + test.WithRevision(*(test.BuildRevision("foo-rev-3", servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "3"), servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), - libtest.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "mouse"}), + test.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "mouse"}), ))), ), - expectedKNExport: libtest.BuildKNExportWithOptions( - libtest.WithKNRevision(*(libtest.BuildRevision("foo-rev-1", + expectedKNExport: test.BuildKNExportWithOptions( + test.WithKNRevision(*(test.BuildRevision("foo-rev-1", servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "1"), servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), - libtest.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "cat"}), + test.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "cat"}), ))), - libtest.WithKNRevision(*(libtest.BuildRevision("foo-rev-2", + test.WithKNRevision(*(test.BuildRevision("foo-rev-2", servingtest.WithRevisionLabel(apiserving.ConfigurationGenerationLabelKey, "2"), servingtest.WithRevisionLabel(apiserving.ServiceLabelKey, "foo"), - libtest.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "dog"}), + test.WithRevisionEnv(v1.EnvVar{Name: "a", Value: "dog"}), ))), ), }} { diff --git a/pkg/kn/commands/service/human_readable_flags.go b/pkg/commands/service/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/service/human_readable_flags.go rename to pkg/commands/service/human_readable_flags.go index a4e2a8fb79..3727fad41e 100644 --- a/pkg/kn/commands/service/human_readable_flags.go +++ b/pkg/commands/service/human_readable_flags.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/service/import.go b/pkg/commands/service/import.go similarity index 99% rename from pkg/kn/commands/service/import.go rename to pkg/commands/service/import.go index 64fac87902..283765f123 100644 --- a/pkg/kn/commands/service/import.go +++ b/pkg/commands/service/import.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/util/retry" clientv1alpha1 "knative.dev/client/pkg/apis/client/v1alpha1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "knative.dev/pkg/kmeta" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/service/import_test.go b/pkg/commands/service/import_test.go similarity index 100% rename from pkg/kn/commands/service/import_test.go rename to pkg/commands/service/import_test.go diff --git a/pkg/kn/commands/service/list.go b/pkg/commands/service/list.go similarity index 97% rename from pkg/kn/commands/service/list.go rename to pkg/commands/service/list.go index 1212a0db53..1a6d38253d 100644 --- a/pkg/kn/commands/service/list.go +++ b/pkg/commands/service/list.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/list_mock_test.go b/pkg/commands/service/list_mock_test.go similarity index 100% rename from pkg/kn/commands/service/list_mock_test.go rename to pkg/commands/service/list_mock_test.go diff --git a/pkg/kn/commands/service/list_test.go b/pkg/commands/service/list_test.go similarity index 99% rename from pkg/kn/commands/service/list_test.go rename to pkg/commands/service/list_test.go index c74539ec04..a75bc70f9a 100644 --- a/pkg/kn/commands/service/list_test.go +++ b/pkg/commands/service/list_test.go @@ -26,7 +26,7 @@ import ( "knative.dev/pkg/apis" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/service/service.go b/pkg/commands/service/service.go similarity index 98% rename from pkg/kn/commands/service/service.go rename to pkg/commands/service/service.go index 6b1afcdf38..1c98f86c76 100644 --- a/pkg/kn/commands/service/service.go +++ b/pkg/commands/service/service.go @@ -20,7 +20,7 @@ import ( "io" "time" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" "knative.dev/client/pkg/wait" diff --git a/pkg/kn/commands/service/service_test.go b/pkg/commands/service/service_test.go similarity index 95% rename from pkg/kn/commands/service/service_test.go rename to pkg/commands/service/service_test.go index 6b57d4a740..57889fcef4 100644 --- a/pkg/kn/commands/service/service_test.go +++ b/pkg/commands/service/service_test.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/flags" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/service_update_mock_test.go b/pkg/commands/service/service_update_mock_test.go similarity index 100% rename from pkg/kn/commands/service/service_update_mock_test.go rename to pkg/commands/service/service_update_mock_test.go diff --git a/pkg/kn/commands/service/update.go b/pkg/commands/service/update.go similarity index 98% rename from pkg/kn/commands/service/update.go rename to pkg/commands/service/update.go index 5beefaf8d5..292c785e2a 100644 --- a/pkg/kn/commands/service/update.go +++ b/pkg/commands/service/update.go @@ -22,12 +22,12 @@ import ( "github.com/spf13/cobra" "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands/flags" - "knative.dev/client/pkg/kn/traffic" + "knative.dev/client/pkg/commands/flags" + "knative.dev/client/pkg/traffic" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/update_test.go b/pkg/commands/service/update_test.go similarity index 99% rename from pkg/kn/commands/service/update_test.go rename to pkg/commands/service/update_test.go index 4a695fd693..9cc3df3724 100644 --- a/pkg/kn/commands/service/update_test.go +++ b/pkg/commands/service/update_test.go @@ -28,7 +28,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" servinglib "knative.dev/client/pkg/serving" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" @@ -40,7 +40,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" clienttesting "k8s.io/client-go/testing" - "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/flags" "knative.dev/serving/pkg/apis/serving" servingv1 "knative.dev/serving/pkg/apis/serving/v1" ) diff --git a/pkg/kn/commands/service/wait.go b/pkg/commands/service/wait.go similarity index 98% rename from pkg/kn/commands/service/wait.go rename to pkg/commands/service/wait.go index 66b39b893e..b41ceb1df7 100644 --- a/pkg/kn/commands/service/wait.go +++ b/pkg/commands/service/wait.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientservingv1 "knative.dev/client/pkg/serving/v1" ) diff --git a/pkg/kn/commands/service/wait_test.go b/pkg/commands/service/wait_test.go similarity index 98% rename from pkg/kn/commands/service/wait_test.go rename to pkg/commands/service/wait_test.go index af340e4e07..227e0c188d 100644 --- a/pkg/kn/commands/service/wait_test.go +++ b/pkg/commands/service/wait_test.go @@ -20,7 +20,7 @@ import ( "gotest.tools/v3/assert" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" "knative.dev/client/pkg/wait" servingv1 "knative.dev/serving/pkg/apis/serving/v1" diff --git a/pkg/kn/commands/source/apiserver/apiserver.go b/pkg/commands/source/apiserver/apiserver.go similarity index 98% rename from pkg/kn/commands/source/apiserver/apiserver.go rename to pkg/commands/source/apiserver/apiserver.go index dba6af956b..4d62e27456 100644 --- a/pkg/kn/commands/source/apiserver/apiserver.go +++ b/pkg/commands/source/apiserver/apiserver.go @@ -19,7 +19,7 @@ import ( "k8s.io/client-go/tools/clientcmd" clientv1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/sources/v1" ) diff --git a/pkg/kn/commands/source/apiserver/apiserver_test.go b/pkg/commands/source/apiserver/apiserver_test.go similarity index 98% rename from pkg/kn/commands/source/apiserver/apiserver_test.go rename to pkg/commands/source/apiserver/apiserver_test.go index b3586997ab..b339fe7419 100644 --- a/pkg/kn/commands/source/apiserver/apiserver_test.go +++ b/pkg/commands/source/apiserver/apiserver_test.go @@ -24,7 +24,7 @@ import ( kndynamic "knative.dev/client/pkg/dynamic" clientv1 "knative.dev/client/pkg/sources/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) var blankConfig clientcmd.ClientConfig diff --git a/pkg/kn/commands/source/apiserver/create.go b/pkg/commands/source/apiserver/create.go similarity index 97% rename from pkg/kn/commands/source/apiserver/create.go rename to pkg/commands/source/apiserver/create.go index 3412866f30..568b3e241c 100644 --- a/pkg/kn/commands/source/apiserver/create.go +++ b/pkg/commands/source/apiserver/create.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" v1 "knative.dev/client/pkg/sources/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/apiserver/create_test.go b/pkg/commands/source/apiserver/create_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/create_test.go rename to pkg/commands/source/apiserver/create_test.go diff --git a/pkg/kn/commands/source/apiserver/delete.go b/pkg/commands/source/apiserver/delete.go similarity index 97% rename from pkg/kn/commands/source/apiserver/delete.go rename to pkg/commands/source/apiserver/delete.go index be7f2fb7f0..b314f9703e 100644 --- a/pkg/kn/commands/source/apiserver/delete.go +++ b/pkg/commands/source/apiserver/delete.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewAPIServerDeleteCommand for deleting source diff --git a/pkg/kn/commands/source/apiserver/delete_test.go b/pkg/commands/source/apiserver/delete_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/delete_test.go rename to pkg/commands/source/apiserver/delete_test.go diff --git a/pkg/kn/commands/source/apiserver/describe.go b/pkg/commands/source/apiserver/describe.go similarity index 96% rename from pkg/kn/commands/source/apiserver/describe.go rename to pkg/commands/source/apiserver/describe.go index ad692bc14e..844628f5e1 100644 --- a/pkg/kn/commands/source/apiserver/describe.go +++ b/pkg/commands/source/apiserver/describe.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "knative.dev/client/pkg/printers/describe" - "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" v1 "knative.dev/eventing/pkg/apis/sources/v1" ) @@ -85,7 +85,7 @@ func NewAPIServerDescribeCommand(p *commands.KnParams) *cobra.Command { return err } - printing.DescribeSink(dw, "Sink", apiSource.Namespace, &apiSource.Spec.Sink) + describe.Sink(dw, "Sink", apiSource.Namespace, &apiSource.Spec.Sink) dw.WriteLine() if err := dw.Flush(); err != nil { return err diff --git a/pkg/kn/commands/source/apiserver/describe_test.go b/pkg/commands/source/apiserver/describe_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/describe_test.go rename to pkg/commands/source/apiserver/describe_test.go diff --git a/pkg/kn/commands/source/apiserver/flags.go b/pkg/commands/source/apiserver/flags.go similarity index 99% rename from pkg/kn/commands/source/apiserver/flags.go rename to pkg/commands/source/apiserver/flags.go index f891d36ba7..53aef7568e 100644 --- a/pkg/kn/commands/source/apiserver/flags.go +++ b/pkg/commands/source/apiserver/flags.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" diff --git a/pkg/kn/commands/source/apiserver/flags_test.go b/pkg/commands/source/apiserver/flags_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/flags_test.go rename to pkg/commands/source/apiserver/flags_test.go diff --git a/pkg/kn/commands/source/apiserver/list.go b/pkg/commands/source/apiserver/list.go similarity index 95% rename from pkg/kn/commands/source/apiserver/list.go rename to pkg/commands/source/apiserver/list.go index edf701e7d8..481939caa8 100644 --- a/pkg/kn/commands/source/apiserver/list.go +++ b/pkg/commands/source/apiserver/list.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewAPIServerListCommand is for listing ApiServer source COs diff --git a/pkg/kn/commands/source/apiserver/list_test.go b/pkg/commands/source/apiserver/list_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/list_test.go rename to pkg/commands/source/apiserver/list_test.go diff --git a/pkg/kn/commands/source/apiserver/update.go b/pkg/commands/source/apiserver/update.go similarity index 97% rename from pkg/kn/commands/source/apiserver/update.go rename to pkg/commands/source/apiserver/update.go index f369a8aafd..873e1acd72 100644 --- a/pkg/kn/commands/source/apiserver/update.go +++ b/pkg/commands/source/apiserver/update.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" v1 "knative.dev/client/pkg/sources/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/apiserver/update_test.go b/pkg/commands/source/apiserver/update_test.go similarity index 100% rename from pkg/kn/commands/source/apiserver/update_test.go rename to pkg/commands/source/apiserver/update_test.go diff --git a/pkg/kn/commands/source/binding/binding.go b/pkg/commands/source/binding/binding.go similarity index 98% rename from pkg/kn/commands/source/binding/binding.go rename to pkg/commands/source/binding/binding.go index 403ce143ad..2361ac1e06 100644 --- a/pkg/kn/commands/source/binding/binding.go +++ b/pkg/commands/source/binding/binding.go @@ -22,7 +22,7 @@ import ( v1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1" "knative.dev/pkg/tracker" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientsourcesv1alpha1 "knative.dev/client/pkg/sources/v1" ) diff --git a/pkg/kn/commands/source/binding/binding_test.go b/pkg/commands/source/binding/binding_test.go similarity index 98% rename from pkg/kn/commands/source/binding/binding_test.go rename to pkg/commands/source/binding/binding_test.go index d68105ba7b..42d4f28cb1 100644 --- a/pkg/kn/commands/source/binding/binding_test.go +++ b/pkg/commands/source/binding/binding_test.go @@ -22,8 +22,8 @@ import ( sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1" duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" kndynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" clientv1 "knative.dev/client/pkg/sources/v1" ) diff --git a/pkg/kn/commands/source/binding/create.go b/pkg/commands/source/binding/create.go similarity index 97% rename from pkg/kn/commands/source/binding/create.go rename to pkg/commands/source/binding/create.go index 13f868a033..f0ca5a3783 100644 --- a/pkg/kn/commands/source/binding/create.go +++ b/pkg/commands/source/binding/create.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" v1alpha12 "knative.dev/client/pkg/sources/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/binding/create_test.go b/pkg/commands/source/binding/create_test.go similarity index 100% rename from pkg/kn/commands/source/binding/create_test.go rename to pkg/commands/source/binding/create_test.go diff --git a/pkg/kn/commands/source/binding/delete.go b/pkg/commands/source/binding/delete.go similarity index 97% rename from pkg/kn/commands/source/binding/delete.go rename to pkg/commands/source/binding/delete.go index ff1cf0dc27..5f76c96f96 100644 --- a/pkg/kn/commands/source/binding/delete.go +++ b/pkg/commands/source/binding/delete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewBindingDeleteCommand is for deleting a sink binding diff --git a/pkg/kn/commands/source/binding/delete_test.go b/pkg/commands/source/binding/delete_test.go similarity index 100% rename from pkg/kn/commands/source/binding/delete_test.go rename to pkg/commands/source/binding/delete_test.go diff --git a/pkg/kn/commands/source/binding/describe.go b/pkg/commands/source/binding/describe.go similarity index 96% rename from pkg/kn/commands/source/binding/describe.go rename to pkg/commands/source/binding/describe.go index 152e2c5687..99e9ead4e3 100644 --- a/pkg/kn/commands/source/binding/describe.go +++ b/pkg/commands/source/binding/describe.go @@ -21,11 +21,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "knative.dev/client/pkg/printers/describe" v1 "knative.dev/eventing/pkg/apis/sources/v1" "knative.dev/pkg/tracker" - "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" ) @@ -105,7 +105,7 @@ func NewBindingDescribeCommand(p *commands.KnParams) *cobra.Command { func writeSinkBinding(dw printers.PrefixWriter, binding *v1.SinkBinding, printDetails bool) { commands.WriteMetadata(dw, &binding.ObjectMeta, printDetails) writeSubject(dw, binding.Namespace, &binding.Spec.Subject) - printing.DescribeSink(dw, "Sink", binding.Namespace, &binding.Spec.Sink) + describe.Sink(dw, "Sink", binding.Namespace, &binding.Spec.Sink) if binding.Spec.CloudEventOverrides != nil && binding.Spec.CloudEventOverrides.Extensions != nil { writeCeOverrides(dw, binding.Spec.CloudEventOverrides.Extensions) } diff --git a/pkg/kn/commands/source/binding/describe_test.go b/pkg/commands/source/binding/describe_test.go similarity index 100% rename from pkg/kn/commands/source/binding/describe_test.go rename to pkg/commands/source/binding/describe_test.go diff --git a/pkg/kn/commands/source/binding/flags.go b/pkg/commands/source/binding/flags.go similarity index 97% rename from pkg/kn/commands/source/binding/flags.go rename to pkg/commands/source/binding/flags.go index f8a2ab42cd..60fb8e62df 100644 --- a/pkg/kn/commands/source/binding/flags.go +++ b/pkg/commands/source/binding/flags.go @@ -19,8 +19,8 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" v1 "knative.dev/eventing/pkg/apis/sources/v1" diff --git a/pkg/kn/commands/source/binding/list.go b/pkg/commands/source/binding/list.go similarity index 95% rename from pkg/kn/commands/source/binding/list.go rename to pkg/commands/source/binding/list.go index cf8bb0234e..6a53f3be37 100644 --- a/pkg/kn/commands/source/binding/list.go +++ b/pkg/commands/source/binding/list.go @@ -18,8 +18,8 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewBindingListCommand is for listing sink bindings diff --git a/pkg/kn/commands/source/binding/list_test.go b/pkg/commands/source/binding/list_test.go similarity index 100% rename from pkg/kn/commands/source/binding/list_test.go rename to pkg/commands/source/binding/list_test.go diff --git a/pkg/kn/commands/source/binding/update.go b/pkg/commands/source/binding/update.go similarity index 97% rename from pkg/kn/commands/source/binding/update.go rename to pkg/commands/source/binding/update.go index 3886e3f3d5..99d7161017 100644 --- a/pkg/kn/commands/source/binding/update.go +++ b/pkg/commands/source/binding/update.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" v1alpha12 "knative.dev/client/pkg/sources/v1" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/binding/update_test.go b/pkg/commands/source/binding/update_test.go similarity index 100% rename from pkg/kn/commands/source/binding/update_test.go rename to pkg/commands/source/binding/update_test.go diff --git a/pkg/kn/commands/source/container/container.go b/pkg/commands/source/container/container.go similarity index 98% rename from pkg/kn/commands/source/container/container.go rename to pkg/commands/source/container/container.go index 3cfa0942a3..b82f13c91d 100644 --- a/pkg/kn/commands/source/container/container.go +++ b/pkg/commands/source/container/container.go @@ -19,7 +19,7 @@ package container import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/sources/v1" clientv1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1" ) diff --git a/pkg/kn/commands/source/container/container_test.go b/pkg/commands/source/container/container_test.go similarity index 98% rename from pkg/kn/commands/source/container/container_test.go rename to pkg/commands/source/container/container_test.go index 10dadf3259..b14cdb5661 100644 --- a/pkg/kn/commands/source/container/container_test.go +++ b/pkg/commands/source/container/container_test.go @@ -28,7 +28,7 @@ import ( kndynamic "knative.dev/client/pkg/dynamic" clientv1 "knative.dev/client/pkg/sources/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) var blankConfig clientcmd.ClientConfig diff --git a/pkg/kn/commands/source/container/create.go b/pkg/commands/source/container/create.go similarity index 95% rename from pkg/kn/commands/source/container/create.go rename to pkg/commands/source/container/create.go index d7f817519a..2426d1530b 100644 --- a/pkg/kn/commands/source/container/create.go +++ b/pkg/commands/source/container/create.go @@ -22,11 +22,11 @@ import ( "os" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands/flags" - knflags "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands/flags" + knflags "knative.dev/client/pkg/flags" corev1 "k8s.io/api/core/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/sources/v1" ) diff --git a/pkg/kn/commands/source/container/create_test.go b/pkg/commands/source/container/create_test.go similarity index 100% rename from pkg/kn/commands/source/container/create_test.go rename to pkg/commands/source/container/create_test.go diff --git a/pkg/kn/commands/source/container/delete.go b/pkg/commands/source/container/delete.go similarity index 97% rename from pkg/kn/commands/source/container/delete.go rename to pkg/commands/source/container/delete.go index 0354233923..49a7464a15 100644 --- a/pkg/kn/commands/source/container/delete.go +++ b/pkg/commands/source/container/delete.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewContainerDeleteCommand for deleting source diff --git a/pkg/kn/commands/source/container/delete_test.go b/pkg/commands/source/container/delete_test.go similarity index 100% rename from pkg/kn/commands/source/container/delete_test.go rename to pkg/commands/source/container/delete_test.go diff --git a/pkg/kn/commands/source/container/describe.go b/pkg/commands/source/container/describe.go similarity index 96% rename from pkg/kn/commands/source/container/describe.go rename to pkg/commands/source/container/describe.go index 7e5b1efe8b..ed96265b3a 100644 --- a/pkg/kn/commands/source/container/describe.go +++ b/pkg/commands/source/container/describe.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" - "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" + "knative.dev/client/pkg/printers/describe" v1 "knative.dev/eventing/pkg/apis/sources/v1" ) @@ -67,7 +67,7 @@ func NewContainerDescribeCommand(p *commands.KnParams) *cobra.Command { return err } - printing.DescribeSink(dw, "Sink", source.Namespace, &source.Spec.Sink) + describe.Sink(dw, "Sink", source.Namespace, &source.Spec.Sink) dw.WriteLine() if err := dw.Flush(); err != nil { return err diff --git a/pkg/kn/commands/source/container/describe_test.go b/pkg/commands/source/container/describe_test.go similarity index 100% rename from pkg/kn/commands/source/container/describe_test.go rename to pkg/commands/source/container/describe_test.go diff --git a/pkg/kn/commands/source/container/human_readable_flags.go b/pkg/commands/source/container/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/source/container/human_readable_flags.go rename to pkg/commands/source/container/human_readable_flags.go index 1454f9657f..ad1c4a1181 100644 --- a/pkg/kn/commands/source/container/human_readable_flags.go +++ b/pkg/commands/source/container/human_readable_flags.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" v1 "knative.dev/eventing/pkg/apis/sources/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" diff --git a/pkg/kn/commands/source/container/list.go b/pkg/commands/source/container/list.go similarity index 95% rename from pkg/kn/commands/source/container/list.go rename to pkg/commands/source/container/list.go index a28a1d52dd..72951d450f 100644 --- a/pkg/kn/commands/source/container/list.go +++ b/pkg/commands/source/container/list.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewContainerListCommand is for listing Container sources diff --git a/pkg/kn/commands/source/container/list_test.go b/pkg/commands/source/container/list_test.go similarity index 100% rename from pkg/kn/commands/source/container/list_test.go rename to pkg/commands/source/container/list_test.go diff --git a/pkg/kn/commands/source/container/update.go b/pkg/commands/source/container/update.go similarity index 95% rename from pkg/kn/commands/source/container/update.go rename to pkg/commands/source/container/update.go index e0e1816cd5..ac69083748 100644 --- a/pkg/kn/commands/source/container/update.go +++ b/pkg/commands/source/container/update.go @@ -22,11 +22,11 @@ import ( "os" "github.com/spf13/cobra" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/config" - "knative.dev/client/pkg/kn/commands/flags" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" v1 "knative.dev/client/pkg/sources/v1" sourcesv1 "knative.dev/eventing/pkg/apis/sources/v1" ) diff --git a/pkg/kn/commands/source/container/update_test.go b/pkg/commands/source/container/update_test.go similarity index 100% rename from pkg/kn/commands/source/container/update_test.go rename to pkg/commands/source/container/update_test.go diff --git a/pkg/kn/commands/source/duck/multisourcelist.go b/pkg/commands/source/duck/multisourcelist.go similarity index 98% rename from pkg/kn/commands/source/duck/multisourcelist.go rename to pkg/commands/source/duck/multisourcelist.go index 28d3346233..05c5f9a42c 100644 --- a/pkg/kn/commands/source/duck/multisourcelist.go +++ b/pkg/commands/source/duck/multisourcelist.go @@ -29,8 +29,8 @@ import ( duck "knative.dev/pkg/apis/duck" duckv1 "knative.dev/pkg/apis/duck/v1" - "knative.dev/client/pkg/kn/commands" - knflags "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + knflags "knative.dev/client/pkg/commands/flags" ) // Source struct holds common properties between different eventing sources diff --git a/pkg/kn/commands/source/duck/multisourcelist_test.go b/pkg/commands/source/duck/multisourcelist_test.go similarity index 100% rename from pkg/kn/commands/source/duck/multisourcelist_test.go rename to pkg/commands/source/duck/multisourcelist_test.go diff --git a/pkg/kn/commands/source/human_readable_flags.go b/pkg/commands/source/human_readable_flags.go similarity index 98% rename from pkg/kn/commands/source/human_readable_flags.go rename to pkg/commands/source/human_readable_flags.go index c86045cff6..ad5aed25ed 100644 --- a/pkg/kn/commands/source/human_readable_flags.go +++ b/pkg/commands/source/human_readable_flags.go @@ -22,7 +22,7 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - clientduck "knative.dev/client/pkg/kn/commands/source/duck" + clientduck "knative.dev/client/pkg/commands/source/duck" "knative.dev/client/pkg/printers" ) diff --git a/pkg/kn/commands/source/list.go b/pkg/commands/source/list.go similarity index 96% rename from pkg/kn/commands/source/list.go rename to pkg/commands/source/list.go index 82f2519075..73f8dab191 100644 --- a/pkg/kn/commands/source/list.go +++ b/pkg/commands/source/list.go @@ -22,11 +22,11 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" + "knative.dev/client/pkg/commands/source/duck" "knative.dev/client/pkg/dynamic" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" - "knative.dev/client/pkg/kn/commands/source/duck" ) const ( diff --git a/pkg/kn/commands/source/list_test.go b/pkg/commands/source/list_test.go similarity index 99% rename from pkg/kn/commands/source/list_test.go rename to pkg/commands/source/list_test.go index 9a568f6afb..f1b962d925 100644 --- a/pkg/kn/commands/source/list_test.go +++ b/pkg/commands/source/list_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/list_types.go b/pkg/commands/source/list_types.go similarity index 97% rename from pkg/kn/commands/source/list_types.go rename to pkg/commands/source/list_types.go index f0fbb1108b..c4d540d675 100644 --- a/pkg/kn/commands/source/list_types.go +++ b/pkg/commands/source/list_types.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/dynamic" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" ) // NewListTypesCommand defines and processes `kn source list-types` diff --git a/pkg/kn/commands/source/ping/create.go b/pkg/commands/source/ping/create.go similarity index 97% rename from pkg/kn/commands/source/ping/create.go rename to pkg/commands/source/ping/create.go index e566936a31..ab77eaacd4 100644 --- a/pkg/kn/commands/source/ping/create.go +++ b/pkg/commands/source/ping/create.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" clientsourcesv1beta2 "knative.dev/client/pkg/sources/v1beta2" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/source/ping/create_test.go b/pkg/commands/source/ping/create_test.go similarity index 100% rename from pkg/kn/commands/source/ping/create_test.go rename to pkg/commands/source/ping/create_test.go diff --git a/pkg/kn/commands/source/ping/delete.go b/pkg/commands/source/ping/delete.go similarity index 97% rename from pkg/kn/commands/source/ping/delete.go rename to pkg/commands/source/ping/delete.go index b7e8699b02..e789cd9a1e 100644 --- a/pkg/kn/commands/source/ping/delete.go +++ b/pkg/commands/source/ping/delete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewPingDeleteCommand is for deleting a Ping source diff --git a/pkg/kn/commands/source/ping/delete_test.go b/pkg/commands/source/ping/delete_test.go similarity index 100% rename from pkg/kn/commands/source/ping/delete_test.go rename to pkg/commands/source/ping/delete_test.go diff --git a/pkg/kn/commands/source/ping/describe.go b/pkg/commands/source/ping/describe.go similarity index 96% rename from pkg/kn/commands/source/ping/describe.go rename to pkg/commands/source/ping/describe.go index b6fc2c119e..b070f7dd41 100644 --- a/pkg/kn/commands/source/ping/describe.go +++ b/pkg/commands/source/ping/describe.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "knative.dev/client/pkg/printers/describe" - "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" clientsourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2" ) @@ -85,7 +85,7 @@ func NewPingDescribeCommand(p *commands.KnParams) *cobra.Command { } // Revisions summary info - printing.DescribeSink(dw, "Sink", pingSource.Namespace, &pingSource.Spec.Sink) + describe.Sink(dw, "Sink", pingSource.Namespace, &pingSource.Spec.Sink) dw.WriteLine() if err := dw.Flush(); err != nil { return err diff --git a/pkg/kn/commands/source/ping/describe_test.go b/pkg/commands/source/ping/describe_test.go similarity index 100% rename from pkg/kn/commands/source/ping/describe_test.go rename to pkg/commands/source/ping/describe_test.go diff --git a/pkg/kn/commands/source/ping/flags.go b/pkg/commands/source/ping/flags.go similarity index 99% rename from pkg/kn/commands/source/ping/flags.go rename to pkg/commands/source/ping/flags.go index 65cd916d0d..ac91ce31ef 100644 --- a/pkg/kn/commands/source/ping/flags.go +++ b/pkg/commands/source/ping/flags.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" hprinters "knative.dev/client/pkg/printers" sourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2" diff --git a/pkg/kn/commands/source/ping/list.go b/pkg/commands/source/ping/list.go similarity index 95% rename from pkg/kn/commands/source/ping/list.go rename to pkg/commands/source/ping/list.go index 9e2118af13..8ed48176c5 100644 --- a/pkg/kn/commands/source/ping/list.go +++ b/pkg/commands/source/ping/list.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewPingListCommand is for listing Ping source COs diff --git a/pkg/kn/commands/source/ping/list_test.go b/pkg/commands/source/ping/list_test.go similarity index 100% rename from pkg/kn/commands/source/ping/list_test.go rename to pkg/commands/source/ping/list_test.go diff --git a/pkg/kn/commands/source/ping/ping.go b/pkg/commands/source/ping/ping.go similarity index 98% rename from pkg/kn/commands/source/ping/ping.go rename to pkg/commands/source/ping/ping.go index ad09247efd..b8d68b63dc 100644 --- a/pkg/kn/commands/source/ping/ping.go +++ b/pkg/commands/source/ping/ping.go @@ -19,7 +19,7 @@ import ( "k8s.io/client-go/tools/clientcmd" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" clientv1beta2 "knative.dev/client/pkg/sources/v1beta2" sourcesv1beta2 "knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2" ) diff --git a/pkg/kn/commands/source/ping/ping_test.go b/pkg/commands/source/ping/ping_test.go similarity index 98% rename from pkg/kn/commands/source/ping/ping_test.go rename to pkg/commands/source/ping/ping_test.go index ee3af4666e..71f83510c2 100644 --- a/pkg/kn/commands/source/ping/ping_test.go +++ b/pkg/commands/source/ping/ping_test.go @@ -24,8 +24,8 @@ import ( sourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2" duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" kndynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" clientv1beta2 "knative.dev/client/pkg/sources/v1beta2" ) diff --git a/pkg/kn/commands/source/ping/update.go b/pkg/commands/source/ping/update.go similarity index 97% rename from pkg/kn/commands/source/ping/update.go rename to pkg/commands/source/ping/update.go index 1eda2f25c7..9eb2987f1f 100644 --- a/pkg/kn/commands/source/ping/update.go +++ b/pkg/commands/source/ping/update.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" sourcesv1beta2 "knative.dev/client/pkg/sources/v1beta2" eventingsourcesv1beta2 "knative.dev/eventing/pkg/apis/sources/v1beta2" diff --git a/pkg/kn/commands/source/ping/update_test.go b/pkg/commands/source/ping/update_test.go similarity index 100% rename from pkg/kn/commands/source/ping/update_test.go rename to pkg/commands/source/ping/update_test.go diff --git a/pkg/kn/commands/source/source.go b/pkg/commands/source/source.go similarity index 82% rename from pkg/kn/commands/source/source.go rename to pkg/commands/source/source.go index 42bb4548d7..0bf28c41c6 100644 --- a/pkg/kn/commands/source/source.go +++ b/pkg/commands/source/source.go @@ -17,11 +17,11 @@ package source import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/source/apiserver" - "knative.dev/client/pkg/kn/commands/source/binding" - "knative.dev/client/pkg/kn/commands/source/container" - "knative.dev/client/pkg/kn/commands/source/ping" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/source/apiserver" + "knative.dev/client/pkg/commands/source/binding" + "knative.dev/client/pkg/commands/source/container" + "knative.dev/client/pkg/commands/source/ping" ) func NewSourceCommand(p *commands.KnParams) *cobra.Command { diff --git a/pkg/kn/commands/subscription/create.go b/pkg/commands/subscription/create.go similarity index 96% rename from pkg/kn/commands/subscription/create.go rename to pkg/commands/subscription/create.go index f2f9019ab2..721abf4f46 100644 --- a/pkg/kn/commands/subscription/create.go +++ b/pkg/commands/subscription/create.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" knmessagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/subscription/create_test.go b/pkg/commands/subscription/create_test.go similarity index 100% rename from pkg/kn/commands/subscription/create_test.go rename to pkg/commands/subscription/create_test.go diff --git a/pkg/kn/commands/subscription/delete.go b/pkg/commands/subscription/delete.go similarity index 97% rename from pkg/kn/commands/subscription/delete.go rename to pkg/commands/subscription/delete.go index 26a7e23509..de01661df7 100644 --- a/pkg/kn/commands/subscription/delete.go +++ b/pkg/commands/subscription/delete.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewSubscriptionDeleteCommand is for deleting a Subscription diff --git a/pkg/kn/commands/subscription/delete_test.go b/pkg/commands/subscription/delete_test.go similarity index 100% rename from pkg/kn/commands/subscription/delete_test.go rename to pkg/commands/subscription/delete_test.go diff --git a/pkg/kn/commands/subscription/describe.go b/pkg/commands/subscription/describe.go similarity index 89% rename from pkg/kn/commands/subscription/describe.go rename to pkg/commands/subscription/describe.go index aced44a85c..02c015f6d7 100644 --- a/pkg/kn/commands/subscription/describe.go +++ b/pkg/commands/subscription/describe.go @@ -21,13 +21,13 @@ import ( "fmt" "github.com/spf13/cobra" + "knative.dev/client/pkg/printers/describe" "k8s.io/cli-runtime/pkg/genericclioptions" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" - "knative.dev/client/lib/printing" + "knative.dev/client/pkg/commands" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" "knative.dev/client/pkg/printers" ) @@ -103,9 +103,9 @@ func writeSubscription(dw printers.PrefixWriter, subscription *messagingv1.Subsc commands.WriteMetadata(dw, &subscription.ObjectMeta, printDetails) ctype := fmt.Sprintf("%s:%s (%s)", subscription.Spec.Channel.Kind, subscription.Spec.Channel.Name, subscription.Spec.Channel.APIVersion) dw.WriteAttribute("Channel", ctype) - printing.DescribeSink(dw, "Subscriber", subscription.Namespace, subscription.Spec.Subscriber) - printing.DescribeSink(dw, "Reply", subscription.Namespace, subscription.Spec.Reply) + describe.Sink(dw, "Subscriber", subscription.Namespace, subscription.Spec.Subscriber) + describe.Sink(dw, "Reply", subscription.Namespace, subscription.Spec.Reply) if subscription.Spec.DeepCopy().Delivery != nil { - printing.DescribeSink(dw, "DeadLetterSink", subscription.Namespace, subscription.Spec.Delivery.DeadLetterSink) + describe.Sink(dw, "DeadLetterSink", subscription.Namespace, subscription.Spec.Delivery.DeadLetterSink) } } diff --git a/pkg/kn/commands/subscription/describe_test.go b/pkg/commands/subscription/describe_test.go similarity index 100% rename from pkg/kn/commands/subscription/describe_test.go rename to pkg/commands/subscription/describe_test.go diff --git a/pkg/kn/commands/subscription/flags.go b/pkg/commands/subscription/flags.go similarity index 98% rename from pkg/kn/commands/subscription/flags.go rename to pkg/commands/subscription/flags.go index a139bac2a3..4fcfaff803 100644 --- a/pkg/kn/commands/subscription/flags.go +++ b/pkg/commands/subscription/flags.go @@ -22,8 +22,8 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" diff --git a/pkg/kn/commands/subscription/list.go b/pkg/commands/subscription/list.go similarity index 96% rename from pkg/kn/commands/subscription/list.go rename to pkg/commands/subscription/list.go index d77da3741d..fb988e12f5 100644 --- a/pkg/kn/commands/subscription/list.go +++ b/pkg/commands/subscription/list.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewSubscriptionListCommand is for listing subscription objects diff --git a/pkg/kn/commands/subscription/list_test.go b/pkg/commands/subscription/list_test.go similarity index 100% rename from pkg/kn/commands/subscription/list_test.go rename to pkg/commands/subscription/list_test.go diff --git a/pkg/kn/commands/subscription/subscription.go b/pkg/commands/subscription/subscription.go similarity index 98% rename from pkg/kn/commands/subscription/subscription.go rename to pkg/commands/subscription/subscription.go index cc1b00eaa4..d3eef5f6af 100644 --- a/pkg/kn/commands/subscription/subscription.go +++ b/pkg/commands/subscription/subscription.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/tools/clientcmd" clientv1beta1 "knative.dev/eventing/pkg/client/clientset/versioned/typed/messaging/v1" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" messagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/subscription/subscription_test.go b/pkg/commands/subscription/subscription_test.go similarity index 99% rename from pkg/kn/commands/subscription/subscription_test.go rename to pkg/commands/subscription/subscription_test.go index 8a19d066bc..9a62673331 100644 --- a/pkg/kn/commands/subscription/subscription_test.go +++ b/pkg/commands/subscription/subscription_test.go @@ -26,8 +26,8 @@ import ( duckv1 "knative.dev/pkg/apis/duck/v1" servingv1 "knative.dev/serving/pkg/apis/serving/v1" + "knative.dev/client/pkg/commands" kndynamic "knative.dev/client/pkg/dynamic" - "knative.dev/client/pkg/kn/commands" clientv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/subscription/update.go b/pkg/commands/subscription/update.go similarity index 97% rename from pkg/kn/commands/subscription/update.go rename to pkg/commands/subscription/update.go index 851755cc07..334558c900 100644 --- a/pkg/kn/commands/subscription/update.go +++ b/pkg/commands/subscription/update.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" knerrors "knative.dev/client/pkg/errors" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" knmessagingv1 "knative.dev/client/pkg/messaging/v1" ) diff --git a/pkg/kn/commands/subscription/update_test.go b/pkg/commands/subscription/update_test.go similarity index 100% rename from pkg/kn/commands/subscription/update_test.go rename to pkg/commands/subscription/update_test.go diff --git a/pkg/kn/commands/testing_helper.go b/pkg/commands/testing_helper.go similarity index 99% rename from pkg/kn/commands/testing_helper.go rename to pkg/commands/testing_helper.go index 391d8ab9c7..9f9899bf18 100644 --- a/pkg/kn/commands/testing_helper.go +++ b/pkg/commands/testing_helper.go @@ -24,7 +24,7 @@ import ( clienttesting "k8s.io/client-go/testing" servingv1fake "knative.dev/serving/pkg/client/clientset/versioned/typed/serving/v1/fake" - "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/flags" clientservingv1 "knative.dev/client/pkg/serving/v1" v1 "knative.dev/client/pkg/sources/v1" diff --git a/pkg/kn/commands/testing_helper_test.go b/pkg/commands/testing_helper_test.go similarity index 98% rename from pkg/kn/commands/testing_helper_test.go rename to pkg/commands/testing_helper_test.go index 0685010abb..d7691b67f9 100644 --- a/pkg/kn/commands/testing_helper_test.go +++ b/pkg/commands/testing_helper_test.go @@ -20,8 +20,7 @@ import ( "github.com/spf13/cobra" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" + "knative.dev/client/pkg/util/test" ) func TestCreateTestKnCommand(t *testing.T) { diff --git a/pkg/kn/commands/trigger/create.go b/pkg/commands/trigger/create.go similarity index 97% rename from pkg/kn/commands/trigger/create.go rename to pkg/commands/trigger/create.go index 181c750551..d7c52cedf4 100644 --- a/pkg/kn/commands/trigger/create.go +++ b/pkg/commands/trigger/create.go @@ -22,9 +22,9 @@ import ( duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" clientv1beta1 "knative.dev/client/pkg/eventing/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" ) // NewTriggerCreateCommand to create trigger create command diff --git a/pkg/kn/commands/trigger/create_test.go b/pkg/commands/trigger/create_test.go similarity index 100% rename from pkg/kn/commands/trigger/create_test.go rename to pkg/commands/trigger/create_test.go diff --git a/pkg/kn/commands/trigger/delete.go b/pkg/commands/trigger/delete.go similarity index 97% rename from pkg/kn/commands/trigger/delete.go rename to pkg/commands/trigger/delete.go index 0335d2d249..f7ed7dcdb1 100644 --- a/pkg/kn/commands/trigger/delete.go +++ b/pkg/commands/trigger/delete.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewTriggerDeleteCommand represent 'revision delete' command diff --git a/pkg/kn/commands/trigger/delete_test.go b/pkg/commands/trigger/delete_test.go similarity index 100% rename from pkg/kn/commands/trigger/delete_test.go rename to pkg/commands/trigger/delete_test.go diff --git a/pkg/kn/commands/trigger/describe.go b/pkg/commands/trigger/describe.go similarity index 97% rename from pkg/kn/commands/trigger/describe.go rename to pkg/commands/trigger/describe.go index 278c67499f..887753e081 100644 --- a/pkg/kn/commands/trigger/describe.go +++ b/pkg/commands/trigger/describe.go @@ -19,9 +19,9 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - "knative.dev/client/lib/printing" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/printers" + "knative.dev/client/pkg/printers/describe" v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" ) @@ -91,7 +91,7 @@ func NewTriggerDescribeCommand(p *commands.KnParams) *cobra.Command { } // Revisions summary info - printing.DescribeSink(dw, "Sink", trigger.Namespace, &trigger.Spec.Subscriber) + describe.Sink(dw, "Sink", trigger.Namespace, &trigger.Spec.Subscriber) dw.WriteLine() if err := dw.Flush(); err != nil { return err diff --git a/pkg/kn/commands/trigger/describe_test.go b/pkg/commands/trigger/describe_test.go similarity index 100% rename from pkg/kn/commands/trigger/describe_test.go rename to pkg/commands/trigger/describe_test.go diff --git a/pkg/kn/commands/trigger/list.go b/pkg/commands/trigger/list.go similarity index 96% rename from pkg/kn/commands/trigger/list.go rename to pkg/commands/trigger/list.go index 7c952a2bab..d6cf385b31 100644 --- a/pkg/kn/commands/trigger/list.go +++ b/pkg/commands/trigger/list.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" ) // NewTriggerListCommand represents 'kn trigger list' command diff --git a/pkg/kn/commands/trigger/list_flags.go b/pkg/commands/trigger/list_flags.go similarity index 98% rename from pkg/kn/commands/trigger/list_flags.go rename to pkg/commands/trigger/list_flags.go index a9dde8c379..569bfd4383 100644 --- a/pkg/kn/commands/trigger/list_flags.go +++ b/pkg/commands/trigger/list_flags.go @@ -19,8 +19,8 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" hprinters "knative.dev/client/pkg/printers" v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" ) diff --git a/pkg/kn/commands/trigger/list_test.go b/pkg/commands/trigger/list_test.go similarity index 100% rename from pkg/kn/commands/trigger/list_test.go rename to pkg/commands/trigger/list_test.go diff --git a/pkg/kn/commands/trigger/trigger.go b/pkg/commands/trigger/trigger.go similarity index 96% rename from pkg/kn/commands/trigger/trigger.go rename to pkg/commands/trigger/trigger.go index 5c448dbc34..c306bad05c 100644 --- a/pkg/kn/commands/trigger/trigger.go +++ b/pkg/commands/trigger/trigger.go @@ -17,7 +17,7 @@ package trigger import ( "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" ) // NewTriggerCommand to create trigger command group diff --git a/pkg/kn/commands/trigger/trigger_test.go b/pkg/commands/trigger/trigger_test.go similarity index 98% rename from pkg/kn/commands/trigger/trigger_test.go rename to pkg/commands/trigger/trigger_test.go index 8665f2dc58..dfc3ab0c8c 100644 --- a/pkg/kn/commands/trigger/trigger_test.go +++ b/pkg/commands/trigger/trigger_test.go @@ -22,9 +22,9 @@ import ( "knative.dev/pkg/apis" duckv1 "knative.dev/pkg/apis/duck/v1" + "knative.dev/client/pkg/commands" clientdynamic "knative.dev/client/pkg/dynamic" eventclientv1beta1 "knative.dev/client/pkg/eventing/v1" - "knative.dev/client/pkg/kn/commands" ) // Helper methods diff --git a/pkg/kn/commands/trigger/update.go b/pkg/commands/trigger/update.go similarity index 97% rename from pkg/kn/commands/trigger/update.go rename to pkg/commands/trigger/update.go index d0ab10610f..b141ef42b1 100644 --- a/pkg/kn/commands/trigger/update.go +++ b/pkg/commands/trigger/update.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/cobra" v1beta1 "knative.dev/eventing/pkg/apis/eventing/v1" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/flags" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/trigger/update_flags.go b/pkg/commands/trigger/update_flags.go similarity index 100% rename from pkg/kn/commands/trigger/update_flags.go rename to pkg/commands/trigger/update_flags.go diff --git a/pkg/kn/commands/trigger/update_flags_test.go b/pkg/commands/trigger/update_flags_test.go similarity index 100% rename from pkg/kn/commands/trigger/update_flags_test.go rename to pkg/commands/trigger/update_flags_test.go diff --git a/pkg/kn/commands/trigger/update_test.go b/pkg/commands/trigger/update_test.go similarity index 100% rename from pkg/kn/commands/trigger/update_test.go rename to pkg/commands/trigger/update_test.go diff --git a/pkg/kn/commands/types.go b/pkg/commands/types.go similarity index 100% rename from pkg/kn/commands/types.go rename to pkg/commands/types.go diff --git a/pkg/kn/commands/types_test.go b/pkg/commands/types_test.go similarity index 99% rename from pkg/kn/commands/types_test.go rename to pkg/commands/types_test.go index 0ae5f166c6..7986774b38 100644 --- a/pkg/kn/commands/types_test.go +++ b/pkg/commands/types_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "knative.dev/client/lib/test" + "knative.dev/client/pkg/util/test" "gotest.tools/v3/assert" "k8s.io/client-go/tools/clientcmd" diff --git a/pkg/kn/commands/version/version.go b/pkg/commands/version/version.go similarity index 99% rename from pkg/kn/commands/version/version.go rename to pkg/commands/version/version.go index f72a9d9357..05b91dfda2 100644 --- a/pkg/kn/commands/version/version.go +++ b/pkg/commands/version/version.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/mod/semver" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "sigs.k8s.io/yaml" ) diff --git a/pkg/kn/commands/version/version_test.go b/pkg/commands/version/version_test.go similarity index 99% rename from pkg/kn/commands/version/version_test.go rename to pkg/commands/version/version_test.go index 8902fd9919..ed32a2cd48 100644 --- a/pkg/kn/commands/version/version_test.go +++ b/pkg/commands/version/version_test.go @@ -25,7 +25,7 @@ import ( "gotest.tools/v3/assert" "sigs.k8s.io/yaml" - "knative.dev/client/pkg/kn/commands" + "knative.dev/client/pkg/commands" "knative.dev/client/pkg/util" ) diff --git a/pkg/kn/commands/wait_flags.go b/pkg/commands/wait_flags.go similarity index 98% rename from pkg/kn/commands/wait_flags.go rename to pkg/commands/wait_flags.go index 22dae67463..0158c26875 100644 --- a/pkg/kn/commands/wait_flags.go +++ b/pkg/commands/wait_flags.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/cobra" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" ) // Default time out to use when waiting for reconciliation. It is deliberately very long as it is expected that diff --git a/pkg/kn/commands/wait_flags_test.go b/pkg/commands/wait_flags_test.go similarity index 99% rename from pkg/kn/commands/wait_flags_test.go rename to pkg/commands/wait_flags_test.go index 51b57bf0ed..d174f0809f 100644 --- a/pkg/kn/commands/wait_flags_test.go +++ b/pkg/commands/wait_flags_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - knflags "knative.dev/client/pkg/kn/flags" + knflags "knative.dev/client/pkg/flags" "github.com/spf13/cobra" "gotest.tools/v3/assert" diff --git a/pkg/kn/config/config.go b/pkg/config/config.go similarity index 99% rename from pkg/kn/config/config.go rename to pkg/config/config.go index 75e5dc49c6..0abe9cc5ce 100644 --- a/pkg/kn/config/config.go +++ b/pkg/config/config.go @@ -21,7 +21,7 @@ import ( "path/filepath" "runtime" - homedir "github.com/mitchellh/go-homedir" + "github.com/mitchellh/go-homedir" flag "github.com/spf13/pflag" "github.com/spf13/viper" ) diff --git a/pkg/kn/config/config_test.go b/pkg/config/config_test.go similarity index 98% rename from pkg/kn/config/config_test.go rename to pkg/config/config_test.go index 5f70055042..0d387b28bf 100644 --- a/pkg/kn/config/config_test.go +++ b/pkg/config/config_test.go @@ -19,7 +19,7 @@ import ( "path/filepath" "testing" - homedir "github.com/mitchellh/go-homedir" + "github.com/mitchellh/go-homedir" "github.com/spf13/viper" "gotest.tools/v3/assert" ) @@ -166,7 +166,7 @@ func setupConfig(t *testing.T, configContent string) (string, func()) { // Save old args backupArgs := os.Args - // WriteCache out a temporary configContent file + // Write out a temporary configContent file var cfgFile string if configContent != "" { cfgFile = filepath.Join(tmpDir, "config.yaml") diff --git a/pkg/config/dir/local.go b/pkg/config/dir/local.go new file mode 100644 index 0000000000..ee4f9cf72e --- /dev/null +++ b/pkg/config/dir/local.go @@ -0,0 +1,88 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package dir + +import ( + "context" + "log" + "os" + "path" + + "emperror.dev/errors" +) + +const ( + // ConfigDirEnvName is the name of the environment variable that can be used + // to override the config directory. + ConfigDirEnvName = "KN_CONFIG_DIR" + + // CacheDirEnvName is the name of the environment variable that can be used + // to override the cache directory. + CacheDirEnvName = "KN_CACHE_DIR" +) + +var ( + configDirKey = struct{}{} //nolint:gochecknoglobals + cacheDirKey = struct{}{} //nolint:gochecknoglobals +) + +// Config returns the path to the config directory. It will be created if it +// does not exist. +func Config(ctx context.Context) string { + return userPath(ctx, configDirKey, ConfigDirEnvName, localConfig) +} + +// Cache returns the path to the cache directory. It will be created if it +// does not exist. +func Cache(ctx context.Context) string { + return userPath(ctx, cacheDirKey, CacheDirEnvName, localCache) +} + +func localConfig() string { + cd, err := os.UserConfigDir() + if err != nil { + log.Fatal(errors.WithStack(err)) + } + return path.Join(cd, "kn") +} + +func localCache() string { + cd, err := os.UserCacheDir() + if err != nil { + log.Fatal(errors.WithStack(err)) + } + return path.Join(cd, "kn") +} + +func userPath(ctx context.Context, key interface{}, envKey string, fn func() string) string { + if p, ok := ctx.Value(key).(string); ok { + return ensurePathExists(p) + } + p := os.Getenv(envKey) + if p == "" { + p = fn() + } + return ensurePathExists(p) +} + +func ensurePathExists(p string) string { + fileMode := os.FileMode(0o750) + if err := os.MkdirAll(p, fileMode); err != nil { + log.Fatal(errors.WithStack(err)) + } + return p +} diff --git a/pkg/config/dir/local_test.go b/pkg/config/dir/local_test.go new file mode 100644 index 0000000000..fbfc9a0742 --- /dev/null +++ b/pkg/config/dir/local_test.go @@ -0,0 +1,69 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package dir_test + +import ( + "strings" + "testing" + + "knative.dev/client/pkg/config/dir" + "knative.dev/client/pkg/context" +) + +func TestConfig(t *testing.T) { + ctx := context.TestContext(t) + want := t.TempDir() + ctx = dir.WithConfigDir(ctx, want) + + got := dir.Config(ctx) + if got != want { + t.Errorf("want %s,\n got %s", want, got) + } +} + +func TestConfigDefaults(t *testing.T) { + ctx := context.TestContext(t) + got := dir.Config(ctx) + if got == "" { + t.Errorf("want non-empty config dir") + } + if !strings.Contains(got, "kn") { + t.Errorf("want config dir to contain 'kn'") + } +} + +func TestCache(t *testing.T) { + ctx := context.TestContext(t) + want := t.TempDir() + ctx = dir.WithCacheDir(ctx, want) + + got := dir.Cache(ctx) + if got != want { + t.Errorf("want %s,\n got %s", want, got) + } +} + +func TestCacheDefaults(t *testing.T) { + ctx := context.TestContext(t) + got := dir.Cache(ctx) + if got == "" { + t.Errorf("want non-empty cache dir") + } + if !strings.Contains(got, "kn") { + t.Errorf("want cache dir to contain 'kn'") + } +} diff --git a/pkg/config/dir/testing.go b/pkg/config/dir/testing.go new file mode 100644 index 0000000000..b69ea727ab --- /dev/null +++ b/pkg/config/dir/testing.go @@ -0,0 +1,40 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package dir + +import ( + "context" + "testing" +) + +// WithConfigDir returns a new context with the given config directory +// configured. It should be used for testing only. +func WithConfigDir(ctx context.Context, p string) context.Context { + if !testing.Testing() { + panic("WithConfigDir should be used only in tests") + } + return context.WithValue(ctx, configDirKey, p) +} + +// WithCacheDir returns a new context with the given cache directory +// configured. It should be used for testing only. +func WithCacheDir(ctx context.Context, p string) context.Context { + if !testing.Testing() { + panic("WithCacheDir should be used only in tests") + } + return context.WithValue(ctx, cacheDirKey, p) +} diff --git a/pkg/kn/config/testing.go b/pkg/config/testing.go similarity index 100% rename from pkg/kn/config/testing.go rename to pkg/config/testing.go diff --git a/pkg/kn/config/testing_test.go b/pkg/config/testing_test.go similarity index 100% rename from pkg/kn/config/testing_test.go rename to pkg/config/testing_test.go diff --git a/pkg/kn/config/types.go b/pkg/config/types.go similarity index 100% rename from pkg/kn/config/types.go rename to pkg/config/types.go diff --git a/pkg/context/testing.go b/pkg/context/testing.go new file mode 100644 index 0000000000..a17da3da54 --- /dev/null +++ b/pkg/context/testing.go @@ -0,0 +1,57 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package context + +import ( + sysctx "context" + + "go.uber.org/zap/zaptest" +) + +type testingTKey struct{} + +// TestingT is a subset of the API provided by all *testing.T and *testing.B +// objects. It is also compatible with zaptest.TestingT. This allows us to +// write tests that use zaptest and our own context package. +type TestingT interface { + Log(args ...any) + Cleanup(func()) + TempDir() string + Setenv(key, value string) + + zaptest.TestingT +} + +// TestContext returns a new context with the given testing object configured. +func TestContext(t TestingT) sysctx.Context { + return WithTestingT(sysctx.TODO(), t) +} + +// WithTestingT returns a context with the given testing object configured. +func WithTestingT(ctx sysctx.Context, t TestingT) sysctx.Context { + return sysctx.WithValue(ctx, testingTKey{}, t) +} + +// TestingTFromContext returns the testing object configured in the given +// context. If no testing object is configured, it returns nil. +func TestingTFromContext(ctx sysctx.Context) TestingT { + t, ok := ctx.Value(testingTKey{}).(TestingT) + if !ok { + return nil + } + return t +} diff --git a/pkg/context/testing_test.go b/pkg/context/testing_test.go new file mode 100644 index 0000000000..ca77f82528 --- /dev/null +++ b/pkg/context/testing_test.go @@ -0,0 +1,31 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package context_test + +import ( + "testing" + + "knative.dev/client/pkg/context" +) + +func TestTestingTFromContext(t *testing.T) { + ctx := context.TestContext(t) + got := context.TestingTFromContext(ctx) + if got != t { + t.Errorf("want %v,\n got %v", t, got) + } +} diff --git a/pkg/context/wrapper.go b/pkg/context/wrapper.go new file mode 100644 index 0000000000..db2ae90b14 --- /dev/null +++ b/pkg/context/wrapper.go @@ -0,0 +1,59 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package context + +import ( + sysctx "context" + "time" +) + +type Context = sysctx.Context + +// TODO is a wrapper for sysctx.TODO for ease of use (single import). +func TODO() sysctx.Context { + return sysctx.TODO() +} + +// Background is a wrapper for sysctx.Background for ease of use (single import). +func Background() sysctx.Context { + return sysctx.Background() +} + +// WithCancel is a wrapper for sysctx.WithCancel for ease of use (single import). +func WithCancel(parent sysctx.Context) (sysctx.Context, sysctx.CancelFunc) { + return sysctx.WithCancel(parent) +} + +// WithDeadline is a wrapper for sysctx.WithDeadline for ease of use (single import). +func WithDeadline(parent sysctx.Context, deadline time.Time) (sysctx.Context, sysctx.CancelFunc) { + return sysctx.WithDeadline(parent, deadline) +} + +// WithTimeout is a wrapper for sysctx.WithTimeout for ease of use (single import). +func WithTimeout(parent sysctx.Context, timeout time.Duration) (sysctx.Context, sysctx.CancelFunc) { + return sysctx.WithTimeout(parent, timeout) +} + +// WithValue is a wrapper for sysctx.WithValue for ease of use (single import). +func WithValue(parent sysctx.Context, key, val interface{}) sysctx.Context { + return sysctx.WithValue(parent, key, val) +} + +// Value is a wrapper for sysctx.Value for ease of use (single import). +func Value(ctx sysctx.Context, key interface{}) interface{} { + return ctx.Value(key) +} diff --git a/pkg/kn/flags/bool.go b/pkg/flags/bool.go similarity index 100% rename from pkg/kn/flags/bool.go rename to pkg/flags/bool.go diff --git a/pkg/kn/flags/bool_test.go b/pkg/flags/bool_test.go similarity index 100% rename from pkg/kn/flags/bool_test.go rename to pkg/flags/bool_test.go diff --git a/pkg/kn/flags/channel_types.go b/pkg/flags/channel_types.go similarity index 99% rename from pkg/kn/flags/channel_types.go rename to pkg/flags/channel_types.go index 58d0e96a32..255905a21b 100644 --- a/pkg/kn/flags/channel_types.go +++ b/pkg/flags/channel_types.go @@ -18,14 +18,13 @@ import ( "fmt" "strings" + "knative.dev/client/pkg/config" duckv1 "knative.dev/pkg/apis/duck/v1" messagingv1 "knative.dev/eventing/pkg/apis/messaging/v1" "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/runtime/schema" - - "knative.dev/client/pkg/kn/config" ) type ChannelTypeFlags struct { diff --git a/pkg/kn/flags/channel_types_test.go b/pkg/flags/channel_types_test.go similarity index 100% rename from pkg/kn/flags/channel_types_test.go rename to pkg/flags/channel_types_test.go diff --git a/pkg/kn/flags/podspec.go b/pkg/flags/podspec.go similarity index 100% rename from pkg/kn/flags/podspec.go rename to pkg/flags/podspec.go diff --git a/pkg/kn/flags/podspec_helper.go b/pkg/flags/podspec_helper.go similarity index 100% rename from pkg/kn/flags/podspec_helper.go rename to pkg/flags/podspec_helper.go diff --git a/pkg/kn/flags/podspec_helper_test.go b/pkg/flags/podspec_helper_test.go similarity index 99% rename from pkg/kn/flags/podspec_helper_test.go rename to pkg/flags/podspec_helper_test.go index 52d8c77e7e..aeee9914f1 100644 --- a/pkg/kn/flags/podspec_helper_test.go +++ b/pkg/flags/podspec_helper_test.go @@ -24,14 +24,12 @@ import ( "strings" "testing" - "k8s.io/apimachinery/pkg/util/intstr" - - "k8s.io/apimachinery/pkg/api/resource" - "knative.dev/client/lib/test" - "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/apimachinery/pkg/util/intstr" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" "knative.dev/pkg/ptr" ) diff --git a/pkg/kn/flags/podspec_test.go b/pkg/flags/podspec_test.go similarity index 99% rename from pkg/kn/flags/podspec_test.go rename to pkg/flags/podspec_test.go index 96da8b8719..8f91976c84 100644 --- a/pkg/kn/flags/podspec_test.go +++ b/pkg/flags/podspec_test.go @@ -22,14 +22,12 @@ import ( "path/filepath" "testing" - "k8s.io/apimachinery/pkg/util/intstr" - - "knative.dev/client/lib/test" - "github.com/spf13/cobra" "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/util/intstr" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" "knative.dev/pkg/ptr" ) diff --git a/pkg/kn/flags/resources.go b/pkg/flags/resources.go similarity index 100% rename from pkg/kn/flags/resources.go rename to pkg/flags/resources.go diff --git a/pkg/kn/flags/resources_test.go b/pkg/flags/resources_test.go similarity index 100% rename from pkg/kn/flags/resources_test.go rename to pkg/flags/resources_test.go diff --git a/pkg/go.mod b/pkg/go.mod new file mode 100644 index 0000000000..856c257dce --- /dev/null +++ b/pkg/go.mod @@ -0,0 +1,144 @@ +module knative.dev/client/pkg + +go 1.22.0 + +require ( + emperror.dev/errors v0.8.1 + github.com/charmbracelet/bubbles v0.17.1 + github.com/charmbracelet/bubbletea v0.25.0 + github.com/charmbracelet/lipgloss v0.9.1 + github.com/erikgeiser/promptkit v0.9.0 + github.com/google/go-cmp v0.6.0 + github.com/hashicorp/golang-lru v1.0.2 // indirect + github.com/hashicorp/hcl v1.0.1-vault-5 // indirect + github.com/mitchellh/go-homedir v1.1.0 + github.com/spf13/afero v1.10.0 // indirect + github.com/spf13/cobra v1.7.0 + github.com/spf13/pflag v1.0.5 + github.com/spf13/viper v1.16.0 + go.uber.org/multierr v1.11.0 + go.uber.org/zap v1.27.0 + golang.org/x/mod v0.20.0 + golang.org/x/term v0.23.0 + gotest.tools/v3 v3.3.0 + k8s.io/api v0.30.3 + k8s.io/apiextensions-apiserver v0.30.3 + k8s.io/apimachinery v0.30.3 + k8s.io/cli-runtime v0.29.2 + k8s.io/client-go v0.30.3 + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 + knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 + knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea + knative.dev/networking v0.0.0-20240815142417-37fdbdd0854b + knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c + knative.dev/serving v0.42.1-0.20240820122005-5f5f6d820b03 + sigs.k8s.io/yaml v1.4.0 +) + +require ( + contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect + contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect + github.com/atotto/clipboard v0.1.4 // indirect + github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/blendle/zapdriver v1.3.1 // indirect + github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/charmbracelet/harmonica v0.2.0 // indirect + github.com/cloudevents/sdk-go/sql/v2 v2.15.2 // indirect + github.com/cloudevents/sdk-go/v2 v2.15.2 // indirect + github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/emicklei/go-restful/v3 v3.12.1 // indirect + github.com/evanphx/json-patch v5.9.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-errors/errors v1.4.2 // indirect + github.com/go-kit/log v0.2.1 // indirect + github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // 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.4 // indirect + github.com/google/btree v1.1.2 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-containerregistry v0.13.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect + github.com/imdario/mergo v0.3.16 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/kelseyhightower/envconfig v1.4.0 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect + github.com/muesli/cancelreader v0.2.2 // indirect + github.com/muesli/reflow v0.3.0 // indirect + github.com/muesli/termenv v0.15.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/openzipkin/zipkin-go v0.4.3 // indirect + github.com/pelletier/go-toml/v2 v2.0.9 // indirect + github.com/peterbourgon/diskv v2.0.1+incompatible // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/prometheus/statsd_exporter v0.22.8 // indirect + github.com/rickb777/date v1.20.0 // indirect + github.com/rickb777/plural v1.4.1 // indirect + github.com/rivo/uniseg v0.4.4 // indirect + github.com/robfig/cron/v3 v3.0.1 // indirect + github.com/sergi/go-diff v1.2.0 // indirect + github.com/spf13/cast v1.5.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/stretchr/objx v0.5.2 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + github.com/xlab/treeprint v1.2.0 // indirect + go.opencensus.io v0.24.0 // indirect + go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect + golang.org/x/net v0.28.0 // indirect + golang.org/x/oauth2 v0.22.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect + golang.org/x/time v0.6.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect + google.golang.org/api v0.183.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240808171019-573a1156607a // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a // indirect + google.golang.org/grpc v1.65.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/apiserver v0.30.3 // indirect + k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect + sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect +) diff --git a/pkg/go.sum b/pkg/go.sum new file mode 100644 index 0000000000..29ebc06ca1 --- /dev/null +++ b/pkg/go.sum @@ -0,0 +1,891 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d h1:LblfooH1lKOpp1hIhukktmSAxFkqMPFk9KR6iZ0MJNI= +contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY= +contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= +contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +emperror.dev/errors v0.8.1 h1:UavXZ5cSX/4u9iyvH6aDcuGkVjeexUGJ7Ij7G4VfQT0= +emperror.dev/errors v0.8.1/go.mod h1:YcRvLPh626Ubn2xqtoprejnA5nFha+TJ+2vew48kWuE= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves= +github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= +github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= +github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= +github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= +github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE= +github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= +github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/charmbracelet/bubbles v0.17.1 h1:0SIyjOnkrsfDo88YvPgAWvZMwXe26TP6drRvmkjyUu4= +github.com/charmbracelet/bubbles v0.17.1/go.mod h1:9HxZWlkCqz2PRwsCbYl7a3KXvGzFaDHpYbSYMJ+nE3o= +github.com/charmbracelet/bubbletea v0.25.0 h1:bAfwk7jRz7FKFl9RzlIULPkStffg5k6pNt5dywy4TcM= +github.com/charmbracelet/bubbletea v0.25.0/go.mod h1:EN3QDR1T5ZdWmdfDzYcqOCAps45+QIJbLOBxmVNWNNg= +github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ= +github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= +github.com/charmbracelet/lipgloss v0.9.1 h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg= +github.com/charmbracelet/lipgloss v0.9.1/go.mod h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudevents/sdk-go/sql/v2 v2.15.2 h1:TNaTeWIbDaci89xgXbmmNVGccawQOvEfWYLWrr7Fk/k= +github.com/cloudevents/sdk-go/sql/v2 v2.15.2/go.mod h1:us+PSk8OXdk8pDbRfvxy5w8ub5goKE7UP9PjKDY7TPw= +github.com/cloudevents/sdk-go/v2 v2.15.2 h1:54+I5xQEnI73RBhWHxbI1XJcqOFOVJN85vb41+8mHUc= +github.com/cloudevents/sdk-go/v2 v2.15.2/go.mod h1:lL7kSWAE/V8VI4Wh0jbL2v/jvqsm6tjmaQBSvxcv4uE= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY= +github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= +github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk= +github.com/coreos/go-oidc/v3 v3.9.0 h1:0J/ogVOd4y8P0f0xUh8l9t07xRP/d8tccvjHl2dcsSo= +github.com/coreos/go-oidc/v3 v3.9.0/go.mod h1:rTKz2PYwftcrtoCzV5g5kvfJoWcm0Mk8AF8y1iAQro4= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= +github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/erikgeiser/promptkit v0.9.0 h1:3qL1mS/ntCrXdb8sTP/ka82CJ9kEQaGuYXNrYJkWYBc= +github.com/erikgeiser/promptkit v0.9.0/go.mod h1:pU9dtogSe3Jlc2AY77EP7R4WFP/vgD4v+iImC83KsCo= +github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= +github.com/evanphx/json-patch v5.9.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/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= +github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= +github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-containerregistry v0.13.0 h1:y1C7Z3e149OJbOPDBxLYR8ITPz8dTKqQwjErKVHJC8k= +github.com/google/go-containerregistry v0.13.0/go.mod h1:J9FQ+eSS4a1aC2GNZxvNpbWhgp0487v+cgiilB4FqDo= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +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-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 h1:CWyXh/jylQWp2dtiV33mY4iSSp6yf4lmn+c7/tN+ObI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0/go.mod h1:nCLIt0w3Ept2NwF8ThLmrppXsfT07oC8k0XNDxd8sVU= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= +github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= +github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM= +github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= +github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75 h1:P8UmIzZMYDR+NGImiFvErt6VWfIRPuGM+vyjiEdkmIw= +github.com/mattn/go-localereader v0.0.2-0.20220822084749-2491eb6c1c75/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= +github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA= +github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= +github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= +github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= +github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= +github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= +github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= +github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= +github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= +github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo= +github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8= +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/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw= +github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg= +github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c= +github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= +github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= +github.com/prometheus/statsd_exporter v0.22.8 h1:Qo2D9ZzaQG+id9i5NYNGmbf1aa/KxKbB9aKfMS+Yib0= +github.com/prometheus/statsd_exporter v0.22.8/go.mod h1:/DzwbTEaFTE0Ojz5PqcSk6+PFHOPWGxdXVr6yC8eFOM= +github.com/rickb777/date v1.20.0 h1:oRGcq4b+ba12N/HnsVZuWSK/QJb/o/hnjOJEyRMGUT0= +github.com/rickb777/date v1.20.0/go.mod h1:8AR0TBrjDGUjwKToBI8L+RafzNg7gqlT0ox0cERCwEo= +github.com/rickb777/plural v1.4.1 h1:5MMLcbIaapLFmvDGRT5iPk8877hpTPt8Y9cdSKRw9sU= +github.com/rickb777/plural v1.4.1/go.mod h1:kdmXUpmKBJTS0FtG/TFumd//VBWsNTD7zOw7x4umxNw= +github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= +github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= +github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +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= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +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/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= +github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY= +go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +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.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +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= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= +golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +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.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +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-20181114220301-adae6a3d119a/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= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +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-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= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +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= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= +golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/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= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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-20191001151750-bb3f8db39f24/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-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +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.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +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= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +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.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +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= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +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-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.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +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= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.183.0 h1:PNMeRDwo1pJdgNcFQ9GstuLe/noWKIc89pRWRLMvLwE= +google.golang.org/api v0.183.0/go.mod h1:q43adC5/pHoSZTx5h2mSmdF7NcyfW9JuDyIOJAgS9ZQ= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto/googleapis/api v0.0.0-20240808171019-573a1156607a h1:KyUe15n7B1YCu+kMmPtlXxgkLQbp+Dw0tCRZf9Sd+CE= +google.golang.org/genproto/googleapis/api v0.0.0-20240808171019-573a1156607a/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a h1:EKiZZXueP9/T68B8Nl0GAx9cjbQnCId0yP3qPMgaaHs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +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/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/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/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.5/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= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo= +gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +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.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.3 h1:QZJndA9k2MjFqpnyYv/PH+9PE0SHhx3hBho4X0vE65g= +k8s.io/apiserver v0.30.3/go.mod h1:6Oa88y1CZqnzetd2JdepO0UXzQX4ZnOekx2/PtEjrOg= +k8s.io/cli-runtime v0.29.2 h1:smfsOcT4QujeghsNjECKN3lwyX9AwcFU0nvJ7sFN3ro= +k8s.io/cli-runtime v0.29.2/go.mod h1:KLisYYfoqeNfO+MkTWvpqIyb1wpJmmFJhioA0xd4MW8= +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/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf+qN6Sh/0JzznmeGPm1HnE= +k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +knative.dev/client-pkg v0.0.0-20240808015000-22f598931483 h1:jBfmxcR0H5Z9IzamelZtmmg9jfeOXfssllUVX5M4Xzs= +knative.dev/client-pkg v0.0.0-20240808015000-22f598931483/go.mod h1:Y56KfZx3gJJpju88l86jQ9csxywLiopR0GkxCWW3+Kg= +knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea h1:j3bFBE797vD6IZJsECQ5lEENumLp817rkQxANrbKxHs= +knative.dev/eventing v0.42.1-0.20240828134450-34f9cd384dea/go.mod h1:Clx8z37Nwg321H9+vGNxp5C6bVdo4l4XM5g6T5CgZVI= +knative.dev/networking v0.0.0-20240815142417-37fdbdd0854b h1:ws/Jeho6on84+5tfNKLAKriVVGIwivHbgPEtZjBfcs0= +knative.dev/networking v0.0.0-20240815142417-37fdbdd0854b/go.mod h1:2eMQVGLBZ5Kj1C4kKPuPhO7BsUeF6fkmhZFDQPIP+88= +knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c h1:2crXVk4FG0dSG6WHaIT+WKbUzn7qG2wn0AfYmvA22zs= +knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c/go.mod h1:cI2RPEEHZk+/dBpfHobs0aBdPA1mMZVUVWnGAc8NSzM= +knative.dev/serving v0.42.1-0.20240820122005-5f5f6d820b03 h1:Hf4+sVjiwnSiTyfeT5Z7A6DIYL1rpRPj2g0syRvivWM= +knative.dev/serving v0.42.1-0.20240820122005-5f5f6d820b03/go.mod h1:44XlkEfBXudhAX6jZEbr/VRVI81/TbEUX2elSyub1fs= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +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/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0= +sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3/go.mod h1:9n16EZKMhXBNSiUC5kSdFQJkdH3zbxS/JoO619G1VAY= +sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 h1:W6cLQc5pnqM7vh3b7HvGNfXrJ/xL6BDMS0v1V/HHg5U= +sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3/go.mod h1:JWP1Fj0VWGHyw3YUPjXSQnRnrwezrZSrApfX5S0nIag= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/output/context.go b/pkg/output/context.go new file mode 100644 index 0000000000..0341fc6409 --- /dev/null +++ b/pkg/output/context.go @@ -0,0 +1,37 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package output + +import "context" + +type printerKey struct{} + +func PrinterFrom(ctx context.Context) Printer { + p, ok := ctx.Value(printerKey{}).(Printer) + if !ok { + return defaultPrinter() + } + return p +} + +func WithContext(ctx context.Context, p Printer) context.Context { + return context.WithValue(ctx, printerKey{}, p) +} + +func defaultPrinter() Printer { + return OsPrinter +} diff --git a/pkg/output/environment/color.go b/pkg/output/environment/color.go new file mode 100644 index 0000000000..61ed1d7e06 --- /dev/null +++ b/pkg/output/environment/color.go @@ -0,0 +1,61 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package environment + +import ( + "os" + "strings" +) + +// SupportsColor returns true if the environment supports color output. +// +// See NonColorRequested and ColorIsForced functions for more information. +func SupportsColor() bool { + color := true + if NonColorRequested() { + color = false + } + if ColorIsForced() { + color = true + } + return color +} + +// NonColorRequested returns true if the NO_COLOR environment variable is set to a +// truthy value. +// +// See https://no-color.org/ for more information. +func NonColorRequested() bool { + return settingToBool(os.Getenv("NO_COLOR")) +} + +// ColorIsForced returns true if the FORCE_COLOR environment variable is set to +// a truthy value. +// +// See https://force-color.org/ for more information. +func ColorIsForced() bool { + return settingToBool(os.Getenv("FORCE_COLOR")) +} + +func settingToBool(s string) bool { + s = strings.ToLower(s) + return len(s) != 0 && + s != "0" && + s != "false" && + s != "no" && + s != "off" +} diff --git a/pkg/output/logging/context.go b/pkg/output/logging/context.go new file mode 100644 index 0000000000..c726db6700 --- /dev/null +++ b/pkg/output/logging/context.go @@ -0,0 +1,168 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package logging + +import ( + "context" + "fmt" + "os" + "time" + + "emperror.dev/errors" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" + "go.uber.org/zap/zaptest" + pkgcontext "knative.dev/client/pkg/context" + "knative.dev/client/pkg/output" + "knative.dev/client/pkg/output/environment" + "knative.dev/client/pkg/output/term" + "knative.dev/pkg/logging" +) + +// ErrCallEnsureLoggerFirst is returned when LoggerFrom() is called before EnsureLogger(). +var ErrCallEnsureLoggerFirst = errors.New("call EnsureLogger() before LoggerFrom() method") + +// EnsureLogger ensures that a logger is attached to the context. The returned +// context will have a logger attached to it. Given fields will be added to the +// logger, either new or existing. +func EnsureLogger(ctx context.Context, fields ...Fields) context.Context { + z, err := loggerFrom(ctx) + if errors.Is(err, ErrCallEnsureLoggerFirst) { + ctx = EnsureLogFile(ctx) + z = setupLogging(ctx) + } + l := &zapLogger{SugaredLogger: z} + for _, f := range fields { + l = l.WithFields(f).(*zapLogger) + } + return WithLogger(ctx, l) +} + +// LoggerFrom returns the logger from the context. If EnsureLogger() was not +// called before, it will panic. +func LoggerFrom(ctx context.Context) Logger { + z, err := loggerFrom(ctx) + if err != nil { + fatal(err) + } + + return &zapLogger{z} +} + +// WithLogger attaches the given logger to the context. +func WithLogger(ctx context.Context, l Logger) context.Context { + if z, ok := l.(*zapLogger); ok { + return logging.WithLogger(ctx, z.SugaredLogger) + } + fatal("unsupported logger type: " + fmt.Sprintf("%#v", l)) + return nil +} + +func loggerFrom(ctx context.Context) (*zap.SugaredLogger, error) { + l := logging.FromContext(ctx) + if l.Desugar().Name() == "fallback" { + return nil, ErrCallEnsureLoggerFirst + } + return l, nil +} + +func setupLogging(ctx context.Context) *zap.SugaredLogger { + var logger *zap.Logger + if t := pkgcontext.TestingTFromContext(ctx); t != nil { + logger = createTestingLogger(t) + } else { + logger = teeLoggers( + createDefaultLogger(ctx), + createFileLogger(ctx), + ) + } + return logger.Sugar() +} + +func teeLoggers(logger1 *zap.Logger, logger2 *zap.Logger) *zap.Logger { + return zap.New(zapcore.NewTee( + logger1.Core(), + logger2.Core(), + )) +} + +func createFileLogger(ctx context.Context) *zap.Logger { + ec := zap.NewProductionEncoderConfig() + ec.EncodeTime = zapcore.ISO8601TimeEncoder + + logFile := LogFileFrom(ctx) + if logFile == nil { + fatal(errors.New("no log file in context")) + } + return zap.New(zapcore.NewCore( + zapcore.NewJSONEncoder(ec), + zapcore.AddSync(logFile), + zapcore.DebugLevel, + )) +} + +func createDefaultLogger(ctx context.Context) *zap.Logger { + prtr := output.PrinterFrom(ctx) + errout := prtr.ErrOrStderr() + ec := zap.NewDevelopmentEncoderConfig() + ec.EncodeLevel = zapcore.CapitalLevelEncoder + if environment.SupportsColor() { + ec.EncodeLevel = zapcore.CapitalColorLevelEncoder + } + ec.EncodeTime = ElapsedMillisTimeEncoder(time.Now()) + ec.ConsoleSeparator = " " + + lvl := activeLogLevel(zapcore.WarnLevel) + logger := zap.New(zapcore.NewCore( + zapcore.NewConsoleEncoder(ec), + zapcore.AddSync(errout), + lvl, + )) + if !term.IsFancy(errout) { + ec = zap.NewProductionEncoderConfig() + logger = zap.New(zapcore.NewCore( + zapcore.NewJSONEncoder(ec), + zapcore.AddSync(errout), + lvl, + )) + } + return logger +} + +func createTestingLogger(t pkgcontext.TestingT) *zap.Logger { + lvl := activeLogLevel(zapcore.DebugLevel) + return zaptest.NewLogger(t, zaptest.WrapOptions( + zap.AddCaller(), + ), zaptest.Level(lvl)) +} + +func activeLogLevel(defaultLevel zapcore.Level) zapcore.Level { + if lvl := os.Getenv("LOG_LEVEL"); lvl != "" { + l, err := zapcore.ParseLevel(lvl) + if err != nil { + fatal(errors.WithStack(err)) + } + return l + } + return defaultLevel +} + +func ElapsedMillisTimeEncoder(setupTime time.Time) zapcore.TimeEncoder { + return func(t time.Time, enc zapcore.PrimitiveArrayEncoder) { + enc.AppendInt64(t.Sub(setupTime).Milliseconds()) + } +} diff --git a/pkg/output/logging/context_test.go b/pkg/output/logging/context_test.go new file mode 100644 index 0000000000..f928c8853b --- /dev/null +++ b/pkg/output/logging/context_test.go @@ -0,0 +1,71 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package logging_test + +import ( + "errors" + "testing" + + "knative.dev/client/pkg/context" + "knative.dev/client/pkg/output" + "knative.dev/client/pkg/output/logging" +) + +func TestEnsureLogger(t *testing.T) { + ctx := context.TestContext(t) + ctx = logging.EnsureLogger(ctx) + got := logging.LoggerFrom(ctx) + if got == nil { + t.Errorf("want logger, got nil") + } + got.Debug("test") +} + +func TestEnsureLoggerWithoutTestingT(t *testing.T) { + t.Setenv("LOG_LEVEL", "debug") + t.Setenv("FORCE_COLOR", "true") + ctx := context.TODO() + printer := output.NewTestPrinter() + ctx = output.WithContext(ctx, printer) + ctx = logging.EnsureLogger(ctx) + + l := logging.LoggerFrom(ctx) + if l == nil { + t.Errorf("want logger, got nil") + } + l.Debug("test") + out := printer.Outputs() + got := out.Err.String() + want := "0 \x1b[35mDEBUG\x1b[0m test\n" + if got != want { + t.Errorf("\nwant %q,\n got %q", want, got) + } +} + +func TestLoggerFrom(t *testing.T) { + ctx := context.TestContext(t) + args := logging.WithFatalCaptured(func() { + logging.LoggerFrom(ctx) + }) + if len(args) != 1 { + t.Errorf("want 1 arg, got %d", len(args)) + } + err := args[0].(error) + if !errors.Is(err, logging.ErrCallEnsureLoggerFirst) { + t.Errorf("want %v, got %v", logging.ErrCallEnsureLoggerFirst, err) + } +} diff --git a/pkg/output/logging/logfile.go b/pkg/output/logging/logfile.go new file mode 100644 index 0000000000..a0d9df03a6 --- /dev/null +++ b/pkg/output/logging/logfile.go @@ -0,0 +1,81 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package logging + +import ( + "context" + "log" + "os" + "path" + + configdir "knative.dev/client/pkg/config/dir" +) + +type logFileKey struct{} +type logFileCloserKey struct{} + +type Closer func() error + +// EnsureLogFile ensures that a log file is present in the context. If not, it +// creates one and adds it to the context. The file's Closer is also added to +// the context if not already present. +func EnsureLogFile(ctx context.Context) context.Context { + var file *os.File + if f := LogFileFrom(ctx); f == nil { + file = createLogFile(ctx) + ctx = WithLogFile(ctx, file) + } + var closer Closer + if c := LogFileCloserFrom(ctx); c == nil { + closer = file.Close + ctx = WithLogFileCloser(ctx, closer) + } + return ctx +} + +func LogFileFrom(ctx context.Context) *os.File { + if f, ok := ctx.Value(logFileKey{}).(*os.File); ok { + return f + } + return nil +} + +func WithLogFile(ctx context.Context, f *os.File) context.Context { + return context.WithValue(ctx, logFileKey{}, f) +} + +func LogFileCloserFrom(ctx context.Context) Closer { + if closer, ok := ctx.Value(logFileCloserKey{}).(Closer); ok { + return closer + } + return nil +} + +func WithLogFileCloser(ctx context.Context, closer Closer) context.Context { + return context.WithValue(ctx, logFileCloserKey{}, closer) +} + +func createLogFile(ctx context.Context) *os.File { + cachePath := configdir.Cache(ctx) + logPath := path.Join(cachePath, "last-exec.log.jsonl") + if logFile, err := os.Create(logPath); err != nil { + log.Fatal(err) + return nil + } else { + return logFile + } +} diff --git a/pkg/output/logging/logger.go b/pkg/output/logging/logger.go new file mode 100644 index 0000000000..8f49cb4898 --- /dev/null +++ b/pkg/output/logging/logger.go @@ -0,0 +1,52 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package logging + +// Logger is the interface for logging, similar to the Uber's zap.Logger. +type Logger interface { + // WithName returns a new Logger with the given name. + WithName(name string) Logger + + // WithFields returns a new Logger with the given fields. + WithFields(fields Fields) Logger + + // Debug logs a message at the debug level. + Debug(args ...any) + // Info logs a message at the info level. + Info(args ...any) + // Warn logs a message at the warn level. + Warn(args ...any) + // Error logs a message at the error level. + Error(args ...any) + // Fatal logs a message at the fatal level and then exit the program. + Fatal(args ...any) + + // Debugf logs a message at the debug level using given format. + Debugf(format string, args ...any) + // Infof logs a message at the info level using given format. + Infof(format string, args ...any) + // Warnf logs a message at the warn level using given format. + Warnf(format string, args ...any) + // Errorf logs a message at the error level using given format. + Errorf(format string, args ...any) + // Fatalf logs a message at the fatal level using given format and then + // exit the program. + Fatalf(format string, args ...any) +} + +// Fields is a map. It is used to add structured context to the logging output. +type Fields map[string]any diff --git a/pkg/output/logging/testing.go b/pkg/output/logging/testing.go new file mode 100644 index 0000000000..0b62a3c765 --- /dev/null +++ b/pkg/output/logging/testing.go @@ -0,0 +1,42 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package logging + +import ( + "log" + "testing" +) + +var fatal = log.Fatal + +// WithFatalCaptured runs the given function and captures the arguments passed +// to Fatal function. It is useful in tests to verify that the expected error +// was reported. +func WithFatalCaptured(fn func()) []any { + if !testing.Testing() { + panic("WithFatalCaptured should be used only in tests") + } + var captured []any + fatal = func(args ...any) { + captured = args + } + defer func() { + fatal = log.Fatal + }() + fn() + return captured +} diff --git a/pkg/output/logging/zap.go b/pkg/output/logging/zap.go new file mode 100644 index 0000000000..5aece2c253 --- /dev/null +++ b/pkg/output/logging/zap.go @@ -0,0 +1,40 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package logging + +import "go.uber.org/zap" + +type zapLogger struct { + *zap.SugaredLogger +} + +func (z zapLogger) WithName(name string) Logger { + return &zapLogger{ + SugaredLogger: z.SugaredLogger.Named(name), + } +} + +func (z zapLogger) WithFields(fields Fields) Logger { + a := make([]interface{}, 0, len(fields)*2) + for k, v := range fields { + a = append(a, k, v) + } + + return &zapLogger{ + SugaredLogger: z.SugaredLogger.With(a...), + } +} diff --git a/pkg/output/os.go b/pkg/output/os.go new file mode 100644 index 0000000000..64cab36db9 --- /dev/null +++ b/pkg/output/os.go @@ -0,0 +1,40 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package output + +import ( + "io" + "os" +) + +type OsInOut struct{} + +var OsPrinter = stdPrinter{OsInOut{}} //nolint:gochecknoglobals + +func (o OsInOut) InOrStdin() io.Reader { + return os.Stdin +} + +func (o OsInOut) OutOrStdout() io.Writer { + return os.Stdout +} + +func (o OsInOut) ErrOrStderr() io.Writer { + return os.Stderr +} + +var _ InputOutput = OsInOut{} diff --git a/pkg/output/printer.go b/pkg/output/printer.go new file mode 100644 index 0000000000..b22ead1c4f --- /dev/null +++ b/pkg/output/printer.go @@ -0,0 +1,61 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package output + +import "fmt" + +type Printer interface { + Print(i ...any) + Println(i ...any) + Printf(format string, i ...any) + + PrintErr(i ...any) + PrintErrln(i ...any) + PrintErrf(format string, i ...any) + + InputOutput +} + +type stdPrinter struct { + InputOutput +} + +func (p stdPrinter) Print(i ...any) { + _, _ = fmt.Fprint(p.OutOrStdout(), i...) +} + +func (p stdPrinter) Println(i ...any) { + p.Print(fmt.Sprintln(i...)) +} + +func (p stdPrinter) Printf(format string, i ...any) { + p.Print(fmt.Sprintf(format, i...)) +} + +func (p stdPrinter) PrintErr(i ...any) { + _, _ = fmt.Fprint(p.ErrOrStderr(), i...) +} + +func (p stdPrinter) PrintErrln(i ...any) { + p.PrintErr(fmt.Sprintln(i...)) +} + +func (p stdPrinter) PrintErrf(format string, i ...any) { + p.PrintErr(fmt.Sprintf(format, i...)) +} + +var _ Printer = stdPrinter{} diff --git a/pkg/output/std.go b/pkg/output/std.go new file mode 100644 index 0000000000..7d609e7de7 --- /dev/null +++ b/pkg/output/std.go @@ -0,0 +1,27 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package output + +import ( + "io" +) + +type InputOutput interface { + InOrStdin() io.Reader + OutOrStdout() io.Writer + ErrOrStderr() io.Writer +} diff --git a/pkg/output/term/io.go b/pkg/output/term/io.go new file mode 100644 index 0000000000..5285c45bc5 --- /dev/null +++ b/pkg/output/term/io.go @@ -0,0 +1,46 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package term + +import ( + "io" + "os" + + "golang.org/x/term" + "knative.dev/client/pkg/output/environment" +) + +// IsReaderTerminal returns true if the given reader is a real terminal. +func IsReaderTerminal(r io.Reader) bool { + f, ok := r.(*os.File) + return ok && term.IsTerminal(int(f.Fd())) +} + +// IsWriterTerminal returns true if the given writer is a real terminal. +func IsWriterTerminal(w io.Writer) bool { + f, ok := w.(*os.File) + return ok && term.IsTerminal(int(f.Fd())) +} + +// IsFancy returns true if the given writer is a real terminal, or the color +// is forced by the environment variables. +func IsFancy(w io.Writer) bool { + if environment.ColorIsForced() { + return true + } + return !environment.NonColorRequested() && IsWriterTerminal(w) +} diff --git a/pkg/output/testing.go b/pkg/output/testing.go new file mode 100644 index 0000000000..3dbc524715 --- /dev/null +++ b/pkg/output/testing.go @@ -0,0 +1,84 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package output + +import ( + "bytes" + "io" + "strings" + "testing" +) + +func NewTestPrinter() TestPrinter { + if !testing.Testing() { + panic("NewTestPrinter() can only be used in tests") + } + buf := bytes.NewBufferString("") + return NewTestPrinterWithInput(buf) +} + +func NewTestPrinterWithInput(input io.Reader) TestPrinter { + if !testing.Testing() { + panic("NewTestPrinterWithInput() can only be used in tests") + } + return TestPrinter{ + stdPrinter{ + testInOut{ + in: input, + TestOutputs: TestOutputs{ + Out: bytes.NewBufferString(""), + Err: bytes.NewBufferString(""), + }, + }, + }, + } +} + +func NewTestPrinterWithAnswers(answers []string) TestPrinter { + return NewTestPrinterWithInput(bytes.NewBufferString(strings.Join(answers, "\n"))) +} + +type TestPrinter struct { + stdPrinter +} + +func (p TestPrinter) Outputs() TestOutputs { + return p.InputOutput.(testInOut).TestOutputs //nolint:forcetypeassert +} + +type TestOutputs struct { + Out, Err *bytes.Buffer +} + +func (t TestOutputs) OutOrStdout() io.Writer { + return t.Out +} + +func (t TestOutputs) ErrOrStderr() io.Writer { + return t.Err +} + +type testInOut struct { + in io.Reader + TestOutputs +} + +func (t testInOut) InOrStdin() io.Reader { + return t.in +} + +var _ InputOutput = testInOut{} diff --git a/pkg/output/tui/bubbletea964.go b/pkg/output/tui/bubbletea964.go new file mode 100644 index 0000000000..cda1614879 --- /dev/null +++ b/pkg/output/tui/bubbletea964.go @@ -0,0 +1,57 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +import ( + "io" + "log" + "os" +) + +// safeguardBubbletea964 will safeguard the io.Reader by returning a new +// io.Reader that will prevent the +// https://github.com/charmbracelet/bubbletea/issues/964 issue. +// +// TODO: Remove this function once the issue is resolved. +func safeguardBubbletea964(in io.Reader) io.Reader { + if in == nil { + return in + } + if in == os.Stdin { + // this is not a *os.File, so it will not try to do the epoll stuff + return bubbletea964Input{Reader: in} + } + if f, ok := in.(*os.File); ok { + if st, err := f.Stat(); err != nil { + log.Fatal("unexpected: ", err) + } else { + if !st.Mode().IsRegular() { + if st.Name() != os.DevNull { + log.Println("WARN: non-regular file given as input: ", + st.Name(), " (mode: ", st.Mode(), + "). Using `nil` as input.") + } + return nil + } + } + } + return in +} + +type bubbletea964Input struct { + io.Reader +} diff --git a/pkg/output/tui/bubbletea964_test.go b/pkg/output/tui/bubbletea964_test.go new file mode 100644 index 0000000000..b651fc50a6 --- /dev/null +++ b/pkg/output/tui/bubbletea964_test.go @@ -0,0 +1,79 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +import ( + "io" + "os" + "testing" + + "gotest.tools/v3/assert" +) + +func TestSafeguardBubbletea964(t *testing.T) { + t.Parallel() + tmp := t.TempDir() + assert.NilError(t, os.WriteFile(tmp+"/file", []byte("test"), 0o600)) + td := openFile(t, tmp) + tf := openFile(t, tmp+"/file") + tcs := []safeguardBubbletea964TestCase{{ + name: "nil input", + in: nil, + want: nil, + }, { + name: "non-regular file", + in: os.NewFile(td.Fd(), "/"), + want: nil, + }, { + name: "regular file", + in: tf, + want: tf, + }, { + name: "dev null", + in: openFile(t, os.DevNull), + want: nil, + }, { + name: "stdin", + in: os.Stdin, + want: bubbletea964Input{Reader: os.Stdin}, + }} + for _, tc := range tcs { + tc := tc + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + got := safeguardBubbletea964(tc.in) + assert.Equal(t, got, tc.want) + }) + + } +} + +type safeguardBubbletea964TestCase struct { + name string + in io.Reader + want io.Reader +} + +func openFile(tb testing.TB, name string) *os.File { + tb.Helper() + f, err := os.Open(name) + assert.NilError(tb, err) + tb.Cleanup(func() { + assert.NilError(tb, f.Close()) + }) + return f +} diff --git a/pkg/output/tui/choose.go b/pkg/output/tui/choose.go new file mode 100644 index 0000000000..3fbfa82932 --- /dev/null +++ b/pkg/output/tui/choose.go @@ -0,0 +1,54 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +import ( + "context" + "fmt" + + "github.com/erikgeiser/promptkit/selection" + "knative.dev/client/pkg/output" + "knative.dev/client/pkg/output/logging" +) + +// NewChooser returns a new Chooser. +func NewChooser[T any](iw *InteractiveWidgets) Chooser[T] { + return &bubbleChooser[T]{iw.ctx} +} + +type Chooser[T any] interface { + Choose(options []T, format string, a ...any) T +} + +type bubbleChooser[T any] struct { + ctx context.Context +} + +func (c *bubbleChooser[T]) Choose(options []T, format string, a ...any) T { + ctx := c.ctx + prt := output.PrinterFrom(ctx) + l := logging.LoggerFrom(ctx) + sel := selection.New(fmt.Sprintf(format, a...), options) + sel.PageSize = 3 + sel.Input = prt.InOrStdin() + sel.Output = prt.OutOrStdout() + chosen, err := sel.RunPrompt() + if err != nil { + l.Fatal(err) + } + return chosen +} diff --git a/pkg/output/tui/io.go b/pkg/output/tui/io.go new file mode 100644 index 0000000000..33f70e554f --- /dev/null +++ b/pkg/output/tui/io.go @@ -0,0 +1,33 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +import ( + "os" + + tea "github.com/charmbracelet/bubbletea" + "knative.dev/client/pkg/output" +) + +func ioProgramOptions(io output.InputOutput) []tea.ProgramOption { + opts := make([]tea.ProgramOption, 0, 2) + opts = append(opts, tea.WithInput(safeguardBubbletea964(io.InOrStdin()))) + if io.OutOrStdout() != nil && io.OutOrStdout() != os.Stdout { + opts = append(opts, tea.WithOutput(io.OutOrStdout())) + } + return opts +} diff --git a/pkg/output/tui/print.go b/pkg/output/tui/print.go new file mode 100644 index 0000000000..e36bb90b9d --- /dev/null +++ b/pkg/output/tui/print.go @@ -0,0 +1,31 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +import ( + "strings" + + "knative.dev/client/pkg/output" +) + +func (w *widgets) Printf(format string, a ...any) { + printer := output.PrinterFrom(w.ctx) + if !strings.HasSuffix(format, "\n") { + format += "\n" + } + printer.Printf(format, a...) +} diff --git a/pkg/output/tui/progress.go b/pkg/output/tui/progress.go new file mode 100644 index 0000000000..120949dc32 --- /dev/null +++ b/pkg/output/tui/progress.go @@ -0,0 +1,309 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +import ( + "context" + "fmt" + "io" + "strings" + "time" + + "github.com/charmbracelet/bubbles/progress" + tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/lipgloss" + "go.uber.org/multierr" + "knative.dev/client/pkg/output" + "knative.dev/client/pkg/output/term" +) + +const speedInterval = time.Second / 5 + +type Progress interface { + Runnable[ProgressControl] +} + +type ProgressControl interface { + io.Writer + Error(err error) +} + +func (w *widgets) NewProgress(totalSize int, message Message) Progress { + return &BubbleProgress{ + InputOutput: output.PrinterFrom(w.ctx), + TotalSize: totalSize, + Message: message, + } +} + +type Message struct { + Text string + PaddingSize int +} + +func (m Message) BoundingBoxSize() int { + mSize := m.TextSize() + if mSize < m.PaddingSize { + mSize = m.PaddingSize + } + return mSize +} + +func (m Message) TextSize() int { + return len(m.Text) +} + +type BubbleProgress struct { + output.InputOutput + Message + TotalSize int + FinalPause time.Duration + + prog progress.Model + tea *tea.Program + downloaded int + speed int + prevSpeed []int + err error + quitChan chan struct{} + teaErr error +} + +func (b *BubbleProgress) With(fn func(ProgressControl) error) error { + b.start() + err := func() error { + defer b.stop() + return fn(b) + }() + return multierr.Combine(err, b.err, b.teaErr) +} + +func (b *BubbleProgress) Error(err error) { + b.err = err + b.tea.Send(tea.Quit()) +} + +func (b *BubbleProgress) Write(bytes []byte) (int, error) { + if b.err != nil { + return 0, b.err + } + noOfBytes := len(bytes) + b.downloaded += noOfBytes + b.speed += noOfBytes + if b.TotalSize > 0 { + percent := float64(b.downloaded) / float64(b.TotalSize) + b.onProgress(percent) + } + return noOfBytes, nil +} + +func (b *BubbleProgress) Init() tea.Cmd { + return b.tickSpeed() +} + +func (b *BubbleProgress) View() string { + return b.display(b.prog.View()) + + "\n" + helpStyle("Press Ctrl+C to cancel") +} + +func helpStyle(str string) string { + return lipgloss.NewStyle().Foreground(lipgloss.Color("#626262")).Render(str) +} + +func (b *BubbleProgress) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + handle := bubbleProgressHandler{b} + switch event := msg.(type) { + case tea.WindowSizeMsg: + return handle.windowSize(event) + + case tea.KeyMsg: + return handle.keyPressed(event) + + case speedChange: + return handle.speedChange() + + case percentChange: + return handle.percentChange(event) + + // FrameMsg is sent when the progress bar wants to animate itself + case progress.FrameMsg: + return handle.progressFrame(event) + + default: + return b, nil + } +} + +type bubbleProgressHandler struct { + *BubbleProgress +} + +func (b bubbleProgressHandler) windowSize(event tea.WindowSizeMsg) (tea.Model, tea.Cmd) { + const percentLen = 4 + b.prog.Width = event.Width - len(b.display("")) + percentLen + return b, nil +} + +func (b bubbleProgressHandler) keyPressed(event tea.KeyMsg) (tea.Model, tea.Cmd) { + if event.Type == tea.KeyCtrlC { + b.err = context.Canceled + return b, tea.Quit + } + return b, nil +} + +func (b bubbleProgressHandler) speedChange() (tea.Model, tea.Cmd) { + b.prevSpeed = append(b.prevSpeed, b.speed) + const speedAvgAmount = 4 + if len(b.prevSpeed) > speedAvgAmount { + b.prevSpeed = b.prevSpeed[1:] + } + b.speed = 0 + if b.downloaded < b.TotalSize { + return b, b.tickSpeed() + } + return b, nil +} + +func (b bubbleProgressHandler) percentChange(event percentChange) (tea.Model, tea.Cmd) { + cmds := make([]tea.Cmd, 0, 1) + cmds = append(cmds, b.prog.SetPercent(float64(event))) + + if event >= 1.0 { + cmds = append(cmds, b.quitSignal()) + } + + return b, tea.Batch(cmds...) +} + +func (b *BubbleProgress) quitSignal() tea.Cmd { + // The final pause is to give the progress bar a chance to finish its + // animation before quitting. Otherwise, it ends abruptly, and the user + // might not see the progress bar at 100%. + return tea.Sequence(b.finalPause(), tea.Quit) +} + +func (b bubbleProgressHandler) progressFrame(event progress.FrameMsg) (tea.Model, tea.Cmd) { + progressModel, cmd := b.prog.Update(event) + if m, ok := progressModel.(progress.Model); ok { + b.prog = m + } + return b, cmd +} + +func (b *BubbleProgress) display(bar string) string { + const padding = 2 + const pad = " ⋮ " + paddingLen := padding + b.Message.BoundingBoxSize() - b.Message.TextSize() + titlePad := strings.Repeat(" ", paddingLen) + total := humanizeBytes(float64(b.TotalSize), "") + totalFmt := fmt.Sprintf("%6.2f %-3s", total.num, total.unit) + return b.Message.Text + titlePad + bar + pad + b.speedFormatted() + + pad + totalFmt +} + +func (b *BubbleProgress) speedFormatted() string { + s := humanizeBytes(b.speedPerSecond(), "/s") + return fmt.Sprintf("%6.2f %-5s", s.num, s.unit) +} + +func (b *BubbleProgress) speedPerSecond() float64 { + speed := 0. + for _, s := range b.prevSpeed { + speed += float64(s) + } + if len(b.prevSpeed) > 0 { + speed /= float64(len(b.prevSpeed)) + } + return speed / float64(speedInterval.Microseconds()) * + float64(time.Second.Microseconds()) +} + +func (b *BubbleProgress) tickSpeed() tea.Cmd { + return tea.Every(speedInterval, func(ti time.Time) tea.Msg { + return speedChange{} + }) +} + +func (b *BubbleProgress) start() { + b.prog = progress.New(progress.WithDefaultGradient()) + b.tea = tea.NewProgram(b, ioProgramOptions(b.InputOutput)...) + b.quitChan = make(chan struct{}) + go func() { + t := b.tea + if _, err := t.Run(); err != nil { + b.teaErr = err + } + close(b.quitChan) + }() +} + +func (b *BubbleProgress) stop() { + if b.tea == nil { + return + } + + b.tea.Send(b.quitSignal()) + <-b.quitChan + + if term.IsWriterTerminal(b.OutOrStdout()) && b.teaErr == nil { + b.teaErr = b.tea.ReleaseTerminal() + } + + b.tea = nil + b.quitChan = nil +} + +func (b *BubbleProgress) onProgress(percent float64) { + b.tea.Send(percentChange(percent)) +} + +func (b *BubbleProgress) finalPause() tea.Cmd { + pause := b.FinalPause + if pause == 0 { + pause = speedInterval * 3 + } + return tea.Tick(pause, func(_ time.Time) tea.Msg { + return nil + }) +} + +type percentChange float64 + +type speedChange struct{} + +type humanByteSize struct { + num float64 + unit string +} + +func humanizeBytes(bytes float64, unitSuffix string) humanByteSize { + num := bytes + units := []string{ + "B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", + } + i := 0 + const kilo = 1024 + for num > kilo && i < len(units)-1 { + num /= kilo + i++ + } + return humanByteSize{ + num: num, + unit: units[i] + unitSuffix, + } +} diff --git a/pkg/output/tui/progress_test.go b/pkg/output/tui/progress_test.go new file mode 100644 index 0000000000..d1540fc610 --- /dev/null +++ b/pkg/output/tui/progress_test.go @@ -0,0 +1,69 @@ +//go:build !race + +// TODO: there is a race condition in the progress code that needs to be fixed +// somehow + +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui_test + +import ( + "crypto/rand" + "strings" + "testing" + "time" + + "knative.dev/client/pkg/context" + "knative.dev/client/pkg/output" + "knative.dev/client/pkg/output/tui" +) + +func TestProgress(t *testing.T) { + ctx := context.TestContext(t) + prt := output.NewTestPrinter() + ctx = output.WithContext(ctx, prt) + w := tui.NewWidgets(ctx) + p := w.NewProgress(42_000, tui.Message{Text: "message"}) + // This is a hack to make the test run faster + p.(*tui.BubbleProgress).FinalPause = 50 * time.Millisecond + if p == nil { + t.Errorf("want progress, got nil") + } + if err := p.With(func(pc tui.ProgressControl) error { + time.Sleep(20 * time.Millisecond) + for i := 0; i < 42; i++ { + buf := make([]byte, 1000) + if _, err := rand.Read(buf); err != nil { + return err + } + if _, err := pc.Write(buf); err != nil { + return err + } + } + + return nil + }); err != nil { + t.Errorf("want nil, got %v", err) + } + + got := prt.Outputs().Out.String() + want := "\x1b[?25lmessage ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ 0% ⋮ 0.00 B/s ⋮ 41.02 KiB\r\n" + + "Press Ctrl+C to cancel" + if !strings.HasPrefix(got, want) { + t.Errorf("prefix missmatch\nwant %q,\n got %q", want, got) + } +} diff --git a/pkg/output/tui/runnable.go b/pkg/output/tui/runnable.go new file mode 100644 index 0000000000..d79637ebf8 --- /dev/null +++ b/pkg/output/tui/runnable.go @@ -0,0 +1,21 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +type Runnable[T any] interface { + With(fn func(T) error) error +} diff --git a/pkg/output/tui/spinner.go b/pkg/output/tui/spinner.go new file mode 100644 index 0000000000..c55bbb51d7 --- /dev/null +++ b/pkg/output/tui/spinner.go @@ -0,0 +1,113 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +import ( + "fmt" + + "github.com/charmbracelet/bubbles/spinner" + tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/lipgloss" + "go.uber.org/multierr" + "knative.dev/client/pkg/output" + "knative.dev/client/pkg/output/term" +) + +const spinnerColor = lipgloss.Color("205") + +type Spinner interface { + Runnable[Spinner] +} + +func (w *widgets) NewSpinner(message string) Spinner { + return &BubbleSpinner{ + InputOutput: output.PrinterFrom(w.ctx), + Message: Message{Text: message}, + } +} + +type BubbleSpinner struct { + output.InputOutput + Message + + spin spinner.Model + tea *tea.Program + quitChan chan struct{} + teaErr error +} + +func (b *BubbleSpinner) With(fn func(Spinner) error) error { + b.start() + err := func() error { + defer b.stop() + return fn(b) + }() + return multierr.Combine(err, b.teaErr) +} + +func (b *BubbleSpinner) Init() tea.Cmd { + return b.spin.Tick +} + +func (b *BubbleSpinner) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + m, c := b.spin.Update(msg) + b.spin = m + return b, c +} + +func (b *BubbleSpinner) View() string { + return fmt.Sprintf("%s %s", b.Message.Text, b.spin.View()) +} + +func (b *BubbleSpinner) start() { + b.spin = spinner.New( + spinner.WithSpinner(spinner.Meter), + spinner.WithStyle(spinnerStyle()), + ) + b.tea = tea.NewProgram(b, ioProgramOptions(b.InputOutput)...) + b.quitChan = make(chan struct{}) + go func() { + t := b.tea + if _, err := t.Run(); err != nil { + b.teaErr = err + } + close(b.quitChan) + }() +} + +func (b *BubbleSpinner) stop() { + if b.tea == nil { + return + } + + b.tea.Quit() + <-b.quitChan + + if term.IsWriterTerminal(b.OutOrStdout()) && b.teaErr == nil { + b.teaErr = b.tea.ReleaseTerminal() + } + + b.tea = nil + b.quitChan = nil + endMsg := fmt.Sprintf("%s %s\n", + b.Message.Text, spinnerStyle().Render("Done")) + _, _ = b.OutOrStdout().Write([]byte(endMsg)) +} + +func spinnerStyle() lipgloss.Style { + return lipgloss.NewStyle().Foreground(spinnerColor) +} diff --git a/pkg/output/tui/spinner_test.go b/pkg/output/tui/spinner_test.go new file mode 100644 index 0000000000..a0f6a1a4fe --- /dev/null +++ b/pkg/output/tui/spinner_test.go @@ -0,0 +1,49 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui_test + +import ( + "testing" + "time" + + "knative.dev/client/pkg/context" + "knative.dev/client/pkg/output" + "knative.dev/client/pkg/output/tui" +) + +func TestSpinner(t *testing.T) { + ctx := context.TestContext(t) + prt := output.NewTestPrinter() + ctx = output.WithContext(ctx, prt) + w := tui.NewWidgets(ctx) + s := w.NewSpinner("message") + + if s == nil { + t.Errorf("want spinner, got nil") + } + if err := s.With(func(spinner tui.Spinner) error { + time.Sleep(20 * time.Millisecond) + return nil + }); err != nil { + t.Errorf("want nil, got %v", err) + } + got := prt.Outputs().Out.String() + want := "\x1b[?25lmessage ▰▱▱\x1b[0D\x1b[2K\x1b[?25h\x1b[?1002l\x1b[?1003l\x1b[?1006lmessage Done\n" + if got != want { + t.Errorf("text missmatch\nwant %q,\n got %q", want, got) + } +} diff --git a/pkg/output/tui/widgets.go b/pkg/output/tui/widgets.go new file mode 100644 index 0000000000..3a8ceb353d --- /dev/null +++ b/pkg/output/tui/widgets.go @@ -0,0 +1,68 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui + +import ( + "context" + + "emperror.dev/errors" + "knative.dev/client/pkg/output" + "knative.dev/client/pkg/output/term" +) + +// ErrNotInteractive is returned when the user is not in an interactive session. +var ErrNotInteractive = errors.New("not interactive session") + +// Widgets is a set of widgets that can be used to display progress, spinners, +// and other interactive elements. +type Widgets interface { + // Printf prints a formatted string to the output. + Printf(format string, a ...any) + // NewSpinner returns a new spinner with the given message. The spinner will + // be started when the With method is called and stopped when the function + // returns. + NewSpinner(message string) Spinner + // NewProgress returns a new progress bar with the given total size and + // message. The progress bar will be started when the With method is called + // and stopped when the function returns. The progress bar can be updated + // with the Write method. + NewProgress(totalSize int, message Message) Progress +} + +func NewWidgets(ctx context.Context) Widgets { + return &widgets{ctx: ctx} +} + +type widgets struct { + ctx context.Context +} + +// NewInteractiveWidgets returns a set of interactive widgets if the user is +// in an interactive session. If the user is not in an interactive session, +// ErrNotInteractive error is returned. +func NewInteractiveWidgets(ctx context.Context) (*InteractiveWidgets, error) { + prt := output.PrinterFrom(ctx) + if !term.IsReaderTerminal(prt.InOrStdin()) { + return nil, errors.WithStack(ErrNotInteractive) + } + + return &InteractiveWidgets{ctx: ctx}, nil +} + +type InteractiveWidgets struct { + ctx context.Context +} diff --git a/pkg/output/tui/widgets_test.go b/pkg/output/tui/widgets_test.go new file mode 100644 index 0000000000..52911b25c3 --- /dev/null +++ b/pkg/output/tui/widgets_test.go @@ -0,0 +1,45 @@ +/* + Copyright 2024 The Knative Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package tui_test + +import ( + "testing" + + "knative.dev/client/pkg/context" + "knative.dev/client/pkg/output/tui" +) + +func TestNewWidgets(t *testing.T) { + ctx := context.TestContext(t) + w := tui.NewWidgets(ctx) + + if w == nil { + t.Errorf("want widgets, got nil") + } +} + +func TestNewInteractiveWidgets(t *testing.T) { + ctx := context.TestContext(t) + w, err := tui.NewInteractiveWidgets(ctx) + + if err == nil { + t.Error("want error, got nil") + } + if w != nil { + t.Errorf("want nil, got %v", w) + } +} diff --git a/pkg/kn/plugin/context_sharing.go b/pkg/plugin/context_sharing.go similarity index 99% rename from pkg/kn/plugin/context_sharing.go rename to pkg/plugin/context_sharing.go index 35ea0a1666..b9751417c3 100644 --- a/pkg/kn/plugin/context_sharing.go +++ b/pkg/plugin/context_sharing.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - "knative.dev/client/pkg/kn/config" + "knative.dev/client/pkg/config" ) //--TYPES-- diff --git a/pkg/kn/plugin/context_sharing_test.go b/pkg/plugin/context_sharing_test.go similarity index 100% rename from pkg/kn/plugin/context_sharing_test.go rename to pkg/plugin/context_sharing_test.go diff --git a/pkg/kn/plugin/context_types.go b/pkg/plugin/context_types.go similarity index 100% rename from pkg/kn/plugin/context_types.go rename to pkg/plugin/context_types.go diff --git a/pkg/kn/plugin/manager.go b/pkg/plugin/manager.go similarity index 97% rename from pkg/kn/plugin/manager.go rename to pkg/plugin/manager.go index de26bbf498..3def550c2f 100644 --- a/pkg/kn/plugin/manager.go +++ b/pkg/plugin/manager.go @@ -27,31 +27,31 @@ import ( pkgplugin "knative.dev/client-pkg/pkg/plugin" - homedir "github.com/mitchellh/go-homedir" + "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" ) -// Allow plugins to register to this slice for inlining +// InternalPlugins allow plugins to register to this slice for inlining var InternalPlugins PluginList var synced bool -// Interface describing a plugin +// Plugin describes a plugin type Plugin interface { - // Get the name of the plugin (the file name without extensions) + // Name of the plugin (the file name without extensions) Name() string // Execute the plugin with the given arguments Execute(args []string) error - // Return a description of the plugin (if support by the plugin binary) + // Description of the plugin (if support by the plugin binary) Description() (string, error) - // The command path leading to this plugin. + // CommandParts leading to this plugin. // Eg. for a plugin "kn source github" this will be [ "source", "github" ] CommandParts() []string - // Location of the plugin where it is stored in the filesystem + // Path of the plugin where it is stored in the filesystem Path() string } diff --git a/pkg/kn/plugin/manager_test.go b/pkg/plugin/manager_test.go similarity index 100% rename from pkg/kn/plugin/manager_test.go rename to pkg/plugin/manager_test.go diff --git a/pkg/kn/plugin/stat.go b/pkg/plugin/stat.go similarity index 100% rename from pkg/kn/plugin/stat.go rename to pkg/plugin/stat.go diff --git a/pkg/kn/plugin/stat_windows.go b/pkg/plugin/stat_windows.go similarity index 100% rename from pkg/kn/plugin/stat_windows.go rename to pkg/plugin/stat_windows.go diff --git a/pkg/kn/plugin/verify.go b/pkg/plugin/verify.go similarity index 100% rename from pkg/kn/plugin/verify.go rename to pkg/plugin/verify.go diff --git a/pkg/kn/plugin/verify_test.go b/pkg/plugin/verify_test.go similarity index 100% rename from pkg/kn/plugin/verify_test.go rename to pkg/plugin/verify_test.go diff --git a/lib/printing/describe.go b/pkg/printers/describe/sink.go similarity index 86% rename from lib/printing/describe.go rename to pkg/printers/describe/sink.go index 66467d01af..f509ecdc92 100644 --- a/lib/printing/describe.go +++ b/pkg/printers/describe/sink.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package printing +package describe import ( "fmt" @@ -23,9 +23,9 @@ import ( duckv1 "knative.dev/pkg/apis/duck/v1" ) -// DescribeSink prints the given 'sink' for the given prefix writer 'dw', +// Sink prints the given 'sink' for the given prefix writer 'dw', // provide 'attribute' to print the section heading for this sink, -func DescribeSink(dw printers.PrefixWriter, attribute, namespace string, sink *duckv1.Destination) { +func Sink(dw printers.PrefixWriter, attribute, namespace string, sink *duckv1.Destination) { if sink == nil { return } diff --git a/pkg/kn/root/root.go b/pkg/root/root.go similarity index 87% rename from pkg/kn/root/root.go rename to pkg/root/root.go index 1b3abe1523..83f7179e21 100644 --- a/pkg/kn/root/root.go +++ b/pkg/root/root.go @@ -22,31 +22,31 @@ import ( "strings" "text/template" - "knative.dev/client/pkg/kn/commands/secret" + "knative.dev/client/pkg/commands/secret" + "knative.dev/client/pkg/config" "github.com/spf13/cobra" // Import & enable all auth providers at once _ "k8s.io/client-go/plugin/pkg/client/auth" - "knative.dev/client/pkg/kn/commands" - "knative.dev/client/pkg/kn/commands/broker" - "knative.dev/client/pkg/kn/commands/channel" - "knative.dev/client/pkg/kn/commands/completion" - "knative.dev/client/pkg/kn/commands/container" - "knative.dev/client/pkg/kn/commands/domain" - "knative.dev/client/pkg/kn/commands/eventtype" - "knative.dev/client/pkg/kn/commands/options" - "knative.dev/client/pkg/kn/commands/plugin" - "knative.dev/client/pkg/kn/commands/revision" - "knative.dev/client/pkg/kn/commands/route" - "knative.dev/client/pkg/kn/commands/service" - "knative.dev/client/pkg/kn/commands/source" - "knative.dev/client/pkg/kn/commands/subscription" - "knative.dev/client/pkg/kn/commands/trigger" - "knative.dev/client/pkg/kn/commands/version" - "knative.dev/client/pkg/kn/config" - "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/commands" + "knative.dev/client/pkg/commands/broker" + "knative.dev/client/pkg/commands/channel" + "knative.dev/client/pkg/commands/completion" + "knative.dev/client/pkg/commands/container" + "knative.dev/client/pkg/commands/domain" + "knative.dev/client/pkg/commands/eventtype" + "knative.dev/client/pkg/commands/options" + "knative.dev/client/pkg/commands/plugin" + "knative.dev/client/pkg/commands/revision" + "knative.dev/client/pkg/commands/route" + "knative.dev/client/pkg/commands/service" + "knative.dev/client/pkg/commands/source" + "knative.dev/client/pkg/commands/subscription" + "knative.dev/client/pkg/commands/trigger" + "knative.dev/client/pkg/commands/version" + "knative.dev/client/pkg/flags" "knative.dev/client/pkg/templates" ) diff --git a/pkg/kn/root/root_test.go b/pkg/root/root_test.go similarity index 100% rename from pkg/kn/root/root_test.go rename to pkg/root/root_test.go diff --git a/pkg/serving/config_changes.go b/pkg/serving/config_changes.go index 41287f072c..397ea38c8f 100644 --- a/pkg/serving/config_changes.go +++ b/pkg/serving/config_changes.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "knative.dev/client/pkg/kn/flags" + "knative.dev/client/pkg/flags" "knative.dev/pkg/ptr" "knative.dev/serving/pkg/apis/autoscaling" servingconfig "knative.dev/serving/pkg/apis/config" diff --git a/pkg/serving/v1/gitops_test.go b/pkg/serving/v1/gitops_test.go index 8095dccceb..bc3c45fb7c 100644 --- a/pkg/serving/v1/gitops_test.go +++ b/pkg/serving/v1/gitops_test.go @@ -21,15 +21,13 @@ import ( "time" "gotest.tools/v3/assert" - corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - servingtest "knative.dev/serving/pkg/testing/v1" - - libtest "knative.dev/client/lib/test" + "knative.dev/client/pkg/util/test" "knative.dev/pkg/ptr" servingv1 "knative.dev/serving/pkg/apis/serving/v1" + servingtest "knative.dev/serving/pkg/testing/v1" ) func TestGitOpsOperations(t *testing.T) { @@ -43,10 +41,10 @@ func TestGitOpsOperations(t *testing.T) { diffClusterClient := NewKnServingGitOpsClient("", "tmp") // set up test services - fooSvc := libtest.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration())) - barSvc := libtest.BuildServiceWithOptions("bar", servingtest.WithConfigSpec(buildConfiguration())) - fooUpdateSvc := libtest.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(corev1.EnvVar{Name: "a", Value: "mouse"})) - mockUpdateSvc := libtest.BuildServiceWithOptions("mock", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(corev1.EnvVar{Name: "a", Value: "mouse"})) + fooSvc := test.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration())) + barSvc := test.BuildServiceWithOptions("bar", servingtest.WithConfigSpec(buildConfiguration())) + fooUpdateSvc := test.BuildServiceWithOptions("foo", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(corev1.EnvVar{Name: "a", Value: "mouse"})) + mockUpdateSvc := test.BuildServiceWithOptions("mock", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(corev1.EnvVar{Name: "a", Value: "mouse"})) fooserviceList := getServiceList([]servingv1.Service{*barSvc, *fooSvc}) allServices := getServiceList([]servingv1.Service{*barSvc, *barSvc, *fooSvc}) @@ -145,8 +143,8 @@ func TestGitOpsSingleFile(t *testing.T) { mockDirclient := NewKnServingGitOpsClient("", tmpDir) // set up test services - testSvc := libtest.BuildServiceWithOptions("test", servingtest.WithConfigSpec(buildConfiguration())) - updateSvc := libtest.BuildServiceWithOptions("test", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(corev1.EnvVar{Name: "a", Value: "mouse"})) + testSvc := test.BuildServiceWithOptions("test", servingtest.WithConfigSpec(buildConfiguration())) + updateSvc := test.BuildServiceWithOptions("test", servingtest.WithConfigSpec(buildConfiguration()), servingtest.WithEnv(corev1.EnvVar{Name: "a", Value: "mouse"})) svcList := getServiceList([]servingv1.Service{*updateSvc}) diff --git a/pkg/templates/command_groups_test.go b/pkg/templates/command_groups_test.go index 0b7fcae66f..b21f7be844 100644 --- a/pkg/templates/command_groups_test.go +++ b/pkg/templates/command_groups_test.go @@ -21,9 +21,8 @@ import ( "github.com/spf13/cobra" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) var groups = CommandGroups{ diff --git a/pkg/templates/template_engine_test.go b/pkg/templates/template_engine_test.go index 4d5b4722c8..659f7eeaec 100644 --- a/pkg/templates/template_engine_test.go +++ b/pkg/templates/template_engine_test.go @@ -18,13 +18,11 @@ import ( "strings" "testing" - flag "github.com/spf13/pflag" - "github.com/spf13/cobra" + flag "github.com/spf13/pflag" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) type testData struct { diff --git a/pkg/kn/traffic/compute.go b/pkg/traffic/compute.go similarity index 99% rename from pkg/kn/traffic/compute.go rename to pkg/traffic/compute.go index 2a0caa443b..65724ccbe1 100644 --- a/pkg/kn/traffic/compute.go +++ b/pkg/traffic/compute.go @@ -20,11 +20,11 @@ import ( "strings" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands/revision" + "knative.dev/client/pkg/commands/revision" "knative.dev/pkg/ptr" servingv1 "knative.dev/serving/pkg/apis/serving/v1" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands/flags" ) var latestRevisionRef = "@latest" diff --git a/pkg/kn/traffic/compute_test.go b/pkg/traffic/compute_test.go similarity index 99% rename from pkg/kn/traffic/compute_test.go rename to pkg/traffic/compute_test.go index bd0067894c..1ce3f4262d 100644 --- a/pkg/kn/traffic/compute_test.go +++ b/pkg/traffic/compute_test.go @@ -18,14 +18,14 @@ import ( "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "knative.dev/client/pkg/kn/commands/revision" + "knative.dev/client/pkg/commands/revision" servingv1 "knative.dev/serving/pkg/apis/serving/v1" "testing" "github.com/spf13/cobra" - "knative.dev/client/pkg/kn/commands/flags" + "knative.dev/client/pkg/commands/flags" ) type trafficTestCase struct { diff --git a/lib/test/broker.go b/pkg/util/test/broker.go similarity index 100% rename from lib/test/broker.go rename to pkg/util/test/broker.go diff --git a/lib/test/capture_output.go b/pkg/util/test/capture_output.go similarity index 100% rename from lib/test/capture_output.go rename to pkg/util/test/capture_output.go diff --git a/lib/test/channel.go b/pkg/util/test/channel.go similarity index 100% rename from lib/test/channel.go rename to pkg/util/test/channel.go diff --git a/lib/test/cli.go b/pkg/util/test/cli.go similarity index 100% rename from lib/test/cli.go rename to pkg/util/test/cli.go diff --git a/lib/test/eventtype.go b/pkg/util/test/eventtype.go similarity index 100% rename from lib/test/eventtype.go rename to pkg/util/test/eventtype.go diff --git a/lib/test/flags.go b/pkg/util/test/flags.go similarity index 100% rename from lib/test/flags.go rename to pkg/util/test/flags.go diff --git a/lib/test/integration.go b/pkg/util/test/integration.go similarity index 100% rename from lib/test/integration.go rename to pkg/util/test/integration.go diff --git a/lib/test/result_collector.go b/pkg/util/test/result_collector.go similarity index 100% rename from lib/test/result_collector.go rename to pkg/util/test/result_collector.go diff --git a/lib/test/revision.go b/pkg/util/test/revision.go similarity index 100% rename from lib/test/revision.go rename to pkg/util/test/revision.go diff --git a/lib/test/service.go b/pkg/util/test/service.go similarity index 100% rename from lib/test/service.go rename to pkg/util/test/service.go diff --git a/lib/test/subscription.go b/pkg/util/test/subscription.go similarity index 100% rename from lib/test/subscription.go rename to pkg/util/test/subscription.go diff --git a/lib/test/utils.go b/pkg/util/test/utils.go similarity index 100% rename from lib/test/utils.go rename to pkg/util/test/utils.go diff --git a/test/common.sh b/test/common.sh index af54a37971..42bcfcc58a 100755 --- a/test/common.sh +++ b/test/common.sh @@ -59,7 +59,6 @@ function install_istio() { echo "Istio version: ${ISTIO_VERSION}" echo "Istio profile: ${ISTIO_PROFILE}" kubectl apply -f "${NET_ISTIO_DIR}/third_party/istio-${ISTIO_VERSION}/${ISTIO_PROFILE%%.*}/istio.yaml" - } function knative_setup() { diff --git a/test/e2e/basic_workflow_test.go b/test/e2e/basic_workflow_test.go index 199b285624..56b2e459f9 100644 --- a/test/e2e/basic_workflow_test.go +++ b/test/e2e/basic_workflow_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestBasicWorkflow(t *testing.T) { diff --git a/test/e2e/broker_test.go b/test/e2e/broker_test.go index 461dfad848..f4c0af384a 100644 --- a/test/e2e/broker_test.go +++ b/test/e2e/broker_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestBroker(t *testing.T) { diff --git a/test/e2e/channels_test.go b/test/e2e/channels_test.go index b3ad947b1f..c2bbac2a3a 100644 --- a/test/e2e/channels_test.go +++ b/test/e2e/channels_test.go @@ -21,8 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) const ( diff --git a/test/e2e/domain_mapping_test.go b/test/e2e/domain_mapping_test.go index e6f9f0ef87..049caf2c49 100644 --- a/test/e2e/domain_mapping_test.go +++ b/test/e2e/domain_mapping_test.go @@ -32,11 +32,9 @@ import ( "testing" "time" - "knative.dev/client/pkg/util" - "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" + "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestDomain(t *testing.T) { diff --git a/test/e2e/eventtype_test.go b/test/e2e/eventtype_test.go index 9172391067..c95d1ccc46 100644 --- a/test/e2e/eventtype_test.go +++ b/test/e2e/eventtype_test.go @@ -21,8 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) const ( diff --git a/test/e2e/extra_containers_test.go b/test/e2e/extra_containers_test.go index 4d09ddfad8..d91bc158d2 100644 --- a/test/e2e/extra_containers_test.go +++ b/test/e2e/extra_containers_test.go @@ -26,12 +26,10 @@ import ( "strings" "testing" + "gotest.tools/v3/assert" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" pkgtest "knative.dev/pkg/test" - - "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" ) func TestMultiContainers(t *testing.T) { diff --git a/test/e2e/ping_test.go b/test/e2e/ping_test.go index 80fa0b4202..78ba0ee083 100644 --- a/test/e2e/ping_test.go +++ b/test/e2e/ping_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestSourcePing(t *testing.T) { diff --git a/test/e2e/plugins_test.go b/test/e2e/plugins_test.go index f4404d75e6..d27b98d6ef 100644 --- a/test/e2e/plugins_test.go +++ b/test/e2e/plugins_test.go @@ -25,9 +25,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) const ( diff --git a/test/e2e/revision_test.go b/test/e2e/revision_test.go index fd9fb9a340..141cb81c4f 100644 --- a/test/e2e/revision_test.go +++ b/test/e2e/revision_test.go @@ -21,8 +21,7 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" + "knative.dev/client/pkg/util/test" ) func TestRevision(t *testing.T) { diff --git a/test/e2e/route_test.go b/test/e2e/route_test.go index 8880f9582b..8c6fc3c8cd 100644 --- a/test/e2e/route_test.go +++ b/test/e2e/route_test.go @@ -23,9 +23,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestRoute(t *testing.T) { diff --git a/test/e2e/service_apply_test.go b/test/e2e/service_apply_test.go index 64c9ca4e36..aef21ee025 100644 --- a/test/e2e/service_apply_test.go +++ b/test/e2e/service_apply_test.go @@ -21,11 +21,9 @@ import ( "testing" "gotest.tools/v3/assert" - - pkgtest "knative.dev/pkg/test" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" + pkgtest "knative.dev/pkg/test" ) func TestServiceApply(t *testing.T) { diff --git a/test/e2e/service_export_test.go b/test/e2e/service_export_test.go index f787329f0d..816cbbe207 100644 --- a/test/e2e/service_export_test.go +++ b/test/e2e/service_export_test.go @@ -23,16 +23,13 @@ import ( "testing" "gotest.tools/v3/assert" - - "sigs.k8s.io/yaml" - - "knative.dev/client/lib/test" - corev1 "k8s.io/api/core/v1" clientv1alpha1 "knative.dev/client/pkg/apis/client/v1alpha1" + "knative.dev/client/pkg/util/test" pkgtest "knative.dev/pkg/test" servingv1 "knative.dev/serving/pkg/apis/serving/v1" servingtest "knative.dev/serving/pkg/testing/v1" + "sigs.k8s.io/yaml" ) func TestServiceExport(t *testing.T) { diff --git a/test/e2e/service_file_test.go b/test/e2e/service_file_test.go index 266c84b29c..e330032ec6 100644 --- a/test/e2e/service_file_test.go +++ b/test/e2e/service_file_test.go @@ -22,12 +22,10 @@ import ( "path/filepath" "testing" - "gotest.tools/v3/assert/cmp" - "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" + "gotest.tools/v3/assert/cmp" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" pkgtest "knative.dev/pkg/test" ) diff --git a/test/e2e/service_import_test.go b/test/e2e/service_import_test.go index 9bbf343c0a..f5713cc38f 100644 --- a/test/e2e/service_import_test.go +++ b/test/e2e/service_import_test.go @@ -23,8 +23,8 @@ import ( "testing" "gotest.tools/v3/assert" - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestServiceImport(t *testing.T) { diff --git a/test/e2e/service_options_test.go b/test/e2e/service_options_test.go index ce1962c499..13041e9ab3 100644 --- a/test/e2e/service_options_test.go +++ b/test/e2e/service_options_test.go @@ -25,14 +25,12 @@ import ( "strings" "testing" - "knative.dev/serving/pkg/apis/autoscaling" - "gotest.tools/v3/assert" corev1 "k8s.io/api/core/v1" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" pkgtest "knative.dev/pkg/test" + "knative.dev/serving/pkg/apis/autoscaling" servingv1 "knative.dev/serving/pkg/apis/serving/v1" ) diff --git a/test/e2e/service_test.go b/test/e2e/service_test.go index 62e3c402c0..4389232434 100644 --- a/test/e2e/service_test.go +++ b/test/e2e/service_test.go @@ -26,8 +26,8 @@ import ( "gotest.tools/v3/assert" v1 "k8s.io/api/core/v1" - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" network "knative.dev/networking/pkg/apis/networking" pkgtest "knative.dev/pkg/test" "knative.dev/serving/pkg/apis/serving" diff --git a/test/e2e/sink_test.go b/test/e2e/sink_test.go index 118a7f8196..ed7469bcdd 100644 --- a/test/e2e/sink_test.go +++ b/test/e2e/sink_test.go @@ -21,8 +21,7 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" + "knative.dev/client/pkg/util/test" ) func TestSink(t *testing.T) { diff --git a/test/e2e/sinkprefix_test.go b/test/e2e/sinkprefix_test.go index bfaa55feac..db79314a7d 100644 --- a/test/e2e/sinkprefix_test.go +++ b/test/e2e/sinkprefix_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) const ( diff --git a/test/e2e/source_apiserver_test.go b/test/e2e/source_apiserver_test.go index d7db394163..fa1e0192f6 100644 --- a/test/e2e/source_apiserver_test.go +++ b/test/e2e/source_apiserver_test.go @@ -23,9 +23,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) const ( diff --git a/test/e2e/source_binding_test.go b/test/e2e/source_binding_test.go index c41894607c..97566c7c36 100644 --- a/test/e2e/source_binding_test.go +++ b/test/e2e/source_binding_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestSourceBinding(t *testing.T) { diff --git a/test/e2e/source_container_test.go b/test/e2e/source_container_test.go index 973d417472..fe6ed44627 100644 --- a/test/e2e/source_container_test.go +++ b/test/e2e/source_container_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" pkgtest "knative.dev/pkg/test" ) diff --git a/test/e2e/source_list_crd_test.go b/test/e2e/source_list_crd_test.go index 988a815827..b46c6ef073 100644 --- a/test/e2e/source_list_crd_test.go +++ b/test/e2e/source_list_crd_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) // This test requires cluster admin permissions due to working with CustomResourceDefinitions. diff --git a/test/e2e/source_list_test.go b/test/e2e/source_list_test.go index d5660cc595..80203e070c 100644 --- a/test/e2e/source_list_test.go +++ b/test/e2e/source_list_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestSourceListTypes(t *testing.T) { diff --git a/test/e2e/subscription_test.go b/test/e2e/subscription_test.go index 3242563145..c645042fdc 100644 --- a/test/e2e/subscription_test.go +++ b/test/e2e/subscription_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestSubscriptions(t *testing.T) { diff --git a/test/e2e/tekton_test.go b/test/e2e/tekton_test.go index 4d375e956d..997edea6c8 100644 --- a/test/e2e/tekton_test.go +++ b/test/e2e/tekton_test.go @@ -26,9 +26,8 @@ import ( "gotest.tools/v3/assert" "k8s.io/apimachinery/pkg/util/wait" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) const ( diff --git a/test/e2e/traffic_split_test.go b/test/e2e/traffic_split_test.go index 46d0204fcd..6634f721af 100644 --- a/test/e2e/traffic_split_test.go +++ b/test/e2e/traffic_split_test.go @@ -24,8 +24,7 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" + "knative.dev/client/pkg/util/test" ) var targetsSeparator = "|" diff --git a/test/e2e/trigger_test.go b/test/e2e/trigger_test.go index df037117ea..f9c7d04ada 100644 --- a/test/e2e/trigger_test.go +++ b/test/e2e/trigger_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestBrokerTrigger(t *testing.T) { diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index cd83696569..b09218e96c 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -21,9 +21,8 @@ import ( "testing" "gotest.tools/v3/assert" - - "knative.dev/client/lib/test" "knative.dev/client/pkg/util" + "knative.dev/client/pkg/util/test" ) func TestVersion(t *testing.T) { diff --git a/test/presubmit-tests.sh b/test/presubmit-tests.sh index 4c3c9abfc3..df29725fe4 100755 --- a/test/presubmit-tests.sh +++ b/test/presubmit-tests.sh @@ -51,10 +51,5 @@ function post_build_tests() { fi } -# Run the unit tests -function unit_tests() { - report_go_test -race ./... || failed=1 -} - # We use the default build and integration test runners. main "$@" diff --git a/tools/knb/pkg/plugin/distro.go b/tools/knb/pkg/plugin/distro.go index 55fe244899..a3f0064356 100644 --- a/tools/knb/pkg/plugin/distro.go +++ b/tools/knb/pkg/plugin/distro.go @@ -80,7 +80,7 @@ func NewDistroGenerateCmd() *cobra.Command { return fmt.Errorf("update-deps.sh failed failed: %w", err) } } else { - fmt.Println("⚠️ hack/update-dep.sh script doesn't exist, make sure to update vendor/ dir") + fmt.Println("⚠️ hack/update-dep.sh script doesn't exist") } return nil }, diff --git a/tools/knb/pkg/plugin/templates.go b/tools/knb/pkg/plugin/templates.go index c5a42af943..f8ef8068a1 100644 --- a/tools/knb/pkg/plugin/templates.go +++ b/tools/knb/pkg/plugin/templates.go @@ -53,7 +53,7 @@ import ( {{if .PluginImportPath}}"{{.PluginImportPath }}"{{else}}//TODO: add plugin import{{end}} - "knative.dev/client/pkg/kn/plugin" + "knative.dev/client/pkg/plugin" ) func init() {