diff --git a/.gitignore b/.gitignore index 6fcce5ba..63055be1 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,4 @@ vendor *.swo *~ -# scope test logs -scope-go-*.log - dist diff --git a/Makefile b/Makefile index fb27c2d2..b984573f 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,6 @@ IMG ?= controller:latest export GO111MODULE=on export GOPROXY=https://proxy.golang.org -export SCOPE_LOG_ROOT_PATH=/dev/null SHELL := /bin/bash -o pipefail VERSION_PACKAGE = github.com/replicatedhq/troubleshoot/pkg/version diff --git a/go.mod b/go.mod index 1ab16666..1a608adf 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,6 @@ require ( github.com/tj/go-spin v1.1.0 github.com/ulikunitz/xz v0.5.6 // indirect go.opencensus.io v0.22.0 // indirect - go.undefinedlabs.com/scopeagent v0.1.7 golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect golang.org/x/tools v0.0.0-20191010075000-0337d82405ff // indirect @@ -51,5 +50,4 @@ require ( k8s.io/cli-runtime v0.18.0 k8s.io/client-go v0.18.2 sigs.k8s.io/controller-runtime v0.5.1-0.20200402191424-df180accb901 - sigs.k8s.io/controller-tools v0.3.0 // indirect ) diff --git a/go.sum b/go.sum index 37ccd489..05aee0bd 100644 --- a/go.sum +++ b/go.sum @@ -50,8 +50,6 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:l github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.25.18 h1:fMEkpli4r+FS4xZRqjgjYHP+uKaSwfk2MOcDUpLYwIE= github.com/aws/aws-sdk-go v1.25.18/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/beevik/ntp v0.2.0 h1:sGsd+kAXzT0bfVfzJfce04g+dSRfrs+tbQW8lweuYgw= -github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -129,8 +127,6 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= -github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= 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= @@ -191,8 +187,6 @@ github.com/go-redis/redis/v7 v7.2.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRf github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/flect v0.2.0 h1:EWCvMGGxOjsgwlWaP+f4+Hh6yrrte7JeFL2S6b+0hdM= -github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -327,7 +321,6 @@ github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7 github.com/manifoldco/promptui v0.3.2 h1:rir7oByTERac6jhpHUPErHuopoRDvO3jxS+FdadEns8= github.com/manifoldco/promptui v0.3.2/go.mod h1:8JU+igZ+eeiiRku4T5BjtKh2ms8sziGpSYl1gN8Bazw= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -378,10 +371,6 @@ github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= -github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= @@ -492,12 +481,8 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljT github.com/ulikunitz/xz v0.5.5/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= -github.com/undefinedlabs/go-mpatch v0.0.0-20200122175732-0044123dbb98 h1:Z/megzdoMbuZ0H/oLmfTw92PAEfyTi1DkvAr8AUzFgw= -github.com/undefinedlabs/go-mpatch v0.0.0-20200122175732-0044123dbb98/go.mod h1:TyJZDQ/5AgyN7FSLiBJ8RO9u2c6wbtRvK827b6AVqY4= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= -github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= -github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -517,8 +502,6 @@ go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.undefinedlabs.com/scopeagent v0.1.7 h1:TPALQQNkPah8NgVjPKKhaBNZL2hg+hY2GRPfRMSt48c= -go.undefinedlabs.com/scopeagent v0.1.7/go.mod h1:XCD8wnuBZ+eskhynYNP+uvBiFan9cFrWLwHnWOETXDU= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -554,14 +537,12 @@ golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn 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-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -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-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/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 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -599,7 +580,6 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/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 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -642,9 +622,8 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= -google.golang.org/appengine v1.6.5/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-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -683,16 +662,12 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 h1:yiW+nvdHb9LVqSHQBXfZCieqV4fzYhNBql77zY0ykqs= -gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637/go.mod h1:BHsqpu/nsuzkT5BpiH1EMZPLyqSMM8JbIavyFACoFNk= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= 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.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966 h1:B0J02caTR6tpSJozBJyiAzT6CtBzjclw4pgm9gg8Ys0= -gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -737,8 +712,6 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= sigs.k8s.io/controller-runtime v0.5.1-0.20200402191424-df180accb901 h1:qwHvTyQQBjATQeKPdJ0TwcXdtScjyI6GuiAQ5CSqEvM= sigs.k8s.io/controller-runtime v0.5.1-0.20200402191424-df180accb901/go.mod h1:j4echH3Y/UPHRpXS65rxGXujda8iWOheMQvDh1uNgaY= -sigs.k8s.io/controller-tools v0.3.0 h1:y3YD99XOyWaXkiF1kd41uRvfp/64teWcrEZFuHxPhJ4= -sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= diff --git a/pkg/analyze/ceph_test.go b/pkg/analyze/ceph_test.go index 0f2b5b84..8f4994d3 100644 --- a/pkg/analyze/ceph_test.go +++ b/pkg/analyze/ceph_test.go @@ -7,7 +7,6 @@ import ( troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func Test_cephStatus(t *testing.T) { @@ -144,8 +143,6 @@ func Test_cephStatus(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) getFile := func(n string) ([]byte, error) { diff --git a/pkg/analyze/cluster_version_test.go b/pkg/analyze/cluster_version_test.go index 28d9eae2..a77d10e1 100644 --- a/pkg/analyze/cluster_version_test.go +++ b/pkg/analyze/cluster_version_test.go @@ -6,7 +6,6 @@ import ( "github.com/blang/semver" troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" - "go.undefinedlabs.com/scopeagent" ) func Test_analyzeClusterVersionResult(t *testing.T) { @@ -93,8 +92,6 @@ func Test_analyzeClusterVersionResult(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() got, err := analyzeClusterVersionResult(tt.args.k8sVersion, tt.args.outcomes, tt.args.checkName) if (err != nil) != tt.wantErr { t.Errorf("analyzeClusterVersionResult() error = %v, wantErr %v", err, tt.wantErr) diff --git a/pkg/analyze/container_runtime_test.go b/pkg/analyze/container_runtime_test.go index dd565dc4..c59571f7 100644 --- a/pkg/analyze/container_runtime_test.go +++ b/pkg/analyze/container_runtime_test.go @@ -6,7 +6,6 @@ import ( troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func Test_compareRuntimeConditionalToActual(t *testing.T) { @@ -56,8 +55,6 @@ func Test_compareRuntimeConditionalToActual(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) actual, err := compareRuntimeConditionalToActual(test.conditional, test.actual) @@ -110,8 +107,6 @@ func Test_containerRuntime(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) getFiles := func(n string) ([]byte, error) { diff --git a/pkg/analyze/database_shared_test.go b/pkg/analyze/database_shared_test.go index b09f55cc..1aa450cc 100644 --- a/pkg/analyze/database_shared_test.go +++ b/pkg/analyze/database_shared_test.go @@ -6,7 +6,6 @@ import ( "github.com/replicatedhq/troubleshoot/pkg/collect" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func Test_compareDatabaseConditionalToActual(t *testing.T) { @@ -62,8 +61,6 @@ func Test_compareDatabaseConditionalToActual(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) actual, err := compareDatabaseConditionalToActual(test.conditional, &test.result) diff --git a/pkg/analyze/deployment_status_test.go b/pkg/analyze/deployment_status_test.go index 12af8442..34fedafc 100644 --- a/pkg/analyze/deployment_status_test.go +++ b/pkg/analyze/deployment_status_test.go @@ -6,7 +6,6 @@ import ( troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func Test_deploymentStatus(t *testing.T) { @@ -122,8 +121,6 @@ func Test_deploymentStatus(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) getFiles := func(n string) ([]byte, error) { diff --git a/pkg/analyze/distribution_test.go b/pkg/analyze/distribution_test.go index 684ee7ed..9f69fbb6 100644 --- a/pkg/analyze/distribution_test.go +++ b/pkg/analyze/distribution_test.go @@ -5,7 +5,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func Test_compareDistributionConditionalToActual(t *testing.T) { @@ -43,8 +42,6 @@ func Test_compareDistributionConditionalToActual(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) actual, err := compareDistributionConditionalToActual(test.conditional, test.input, &unknownDistribution) @@ -80,8 +77,6 @@ func Test_mustNormalizeDistributionName(t *testing.T) { for _, test := range tests { t.Run(test.raw, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() actual := mustNormalizeDistributionName(test.raw) assert.Equal(t, test.expected, actual) diff --git a/pkg/analyze/main_test.go b/pkg/analyze/main_test.go deleted file mode 100644 index fc50edad..00000000 --- a/pkg/analyze/main_test.go +++ /dev/null @@ -1,12 +0,0 @@ -package analyzer - -import ( - "os" - "testing" - - "go.undefinedlabs.com/scopeagent" -) - -func TestMain(m *testing.M) { - os.Exit(scopeagent.Run(m)) -} diff --git a/pkg/analyze/text_analyze_test.go b/pkg/analyze/text_analyze_test.go index 09b7c232..b35a45a8 100644 --- a/pkg/analyze/text_analyze_test.go +++ b/pkg/analyze/text_analyze_test.go @@ -9,7 +9,6 @@ import ( troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func Test_textAnalyze(t *testing.T) { @@ -308,8 +307,6 @@ func Test_textAnalyze(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) getFiles := func(n string) (map[string][]byte, error) { @@ -382,8 +379,6 @@ func Test_compareRegex(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) actual, err := compareRegex(test.conditional, test.foundMatches) diff --git a/pkg/collect/collector_test.go b/pkg/collect/collector_test.go index 282fe5fd..a11130f1 100644 --- a/pkg/collect/collector_test.go +++ b/pkg/collect/collector_test.go @@ -6,7 +6,6 @@ import ( troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" "github.com/replicatedhq/troubleshoot/pkg/multitype" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func TestCollector_RunCollectorSyncNoRedact(t *testing.T) { @@ -280,9 +279,6 @@ pwd=somethinggoeshere;`, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() - req := require.New(t) c := &Collector{ Collect: tt.Collect, @@ -343,9 +339,6 @@ pwd=somethinggoeshere;`, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() - req := require.New(t) c := &Collector{ Collect: tt.Collect, diff --git a/pkg/collect/main_test.go b/pkg/collect/main_test.go deleted file mode 100644 index 976ad72e..00000000 --- a/pkg/collect/main_test.go +++ /dev/null @@ -1,12 +0,0 @@ -package collect - -import ( - "os" - "testing" - - "go.undefinedlabs.com/scopeagent" -) - -func TestMain(m *testing.M) { - os.Exit(scopeagent.Run(m)) -} diff --git a/pkg/collect/postgres_test.go b/pkg/collect/postgres_test.go index a6ba01d2..1a963b22 100644 --- a/pkg/collect/postgres_test.go +++ b/pkg/collect/postgres_test.go @@ -5,7 +5,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func Test_parsePostgresVersion(t *testing.T) { @@ -36,9 +35,6 @@ func Test_parsePostgresVersion(t *testing.T) { } for _, test := range tests { t.Run(test.postgresVersion, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() - req := require.New(t) actual, err := parsePostgresVersion(test.postgresVersion) req.NoError(err) diff --git a/pkg/collect/util_test.go b/pkg/collect/util_test.go index 3a11e444..f54d7cfd 100644 --- a/pkg/collect/util_test.go +++ b/pkg/collect/util_test.go @@ -5,7 +5,6 @@ import ( troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" "github.com/stretchr/testify/assert" - "go.undefinedlabs.com/scopeagent" ) func Test_selectorToString(t *testing.T) { @@ -23,8 +22,6 @@ func Test_selectorToString(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() actual := selectorToString(test.selector) assert.Equal(t, test.expect, actual) }) @@ -75,8 +72,6 @@ func Test_DeterministicIDForCollector(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() actual := DeterministicIDForCollector(test.collector) assert.Equal(t, test.expect, actual) }) diff --git a/pkg/multitype/main_test.go b/pkg/multitype/main_test.go deleted file mode 100644 index 5e9f7788..00000000 --- a/pkg/multitype/main_test.go +++ /dev/null @@ -1,12 +0,0 @@ -package multitype - -import ( - "os" - "testing" - - "go.undefinedlabs.com/scopeagent" -) - -func TestMain(m *testing.M) { - os.Exit(scopeagent.Run(m)) -} diff --git a/pkg/multitype/quotedbool_test.go b/pkg/multitype/quotedbool_test.go index d8d20170..9bafec2a 100644 --- a/pkg/multitype/quotedbool_test.go +++ b/pkg/multitype/quotedbool_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" yaml "gopkg.in/yaml.v2" ) @@ -48,9 +47,6 @@ func TestQuotedBool_UnmarshalJSON(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() - req := require.New(t) var newQuotBool QuotedBool @@ -116,9 +112,6 @@ func TestQuotedBool_UnmarshalYAML(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() - req := require.New(t) var newQuotBool QuotedBool diff --git a/pkg/redact/main_test.go b/pkg/redact/main_test.go deleted file mode 100644 index a51c19e3..00000000 --- a/pkg/redact/main_test.go +++ /dev/null @@ -1,12 +0,0 @@ -package redact - -import ( - "os" - "testing" - - "go.undefinedlabs.com/scopeagent" -) - -func TestMain(m *testing.M) { - os.Exit(scopeagent.Run(m)) -} diff --git a/pkg/redact/redact_test.go b/pkg/redact/redact_test.go index 593b1c5a..b04d06b6 100644 --- a/pkg/redact/redact_test.go +++ b/pkg/redact/redact_test.go @@ -8,7 +8,6 @@ import ( troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func Test_Redactors(t *testing.T) { @@ -1624,8 +1623,6 @@ func Test_Redactors(t *testing.T) { wantRedactionsCount := 25 t.Run("test default redactors", func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) redactors, err := getRedactors("testpath") req.NoError(err) @@ -1767,8 +1764,6 @@ func Test_redactMatchesPath(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() req := require.New(t) got, err := redactMatchesPath(tt.args.path, tt.args.redact) diff --git a/pkg/redact/single_line_test.go b/pkg/redact/single_line_test.go index 41f0c184..46285db3 100644 --- a/pkg/redact/single_line_test.go +++ b/pkg/redact/single_line_test.go @@ -6,7 +6,6 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func TestNewSingleLineRedactor(t *testing.T) { @@ -104,9 +103,6 @@ func TestNewSingleLineRedactor(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() - req := require.New(t) reRunner, err := NewSingleLineRedactor(tt.re, MASK_TEXT, "testfile", tt.name, false) req.NoError(err) diff --git a/pkg/redact/yaml_test.go b/pkg/redact/yaml_test.go index 21d78b8e..5d4601ec 100644 --- a/pkg/redact/yaml_test.go +++ b/pkg/redact/yaml_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.undefinedlabs.com/scopeagent" ) func TestNewYamlRedactor(t *testing.T) { @@ -292,9 +291,6 @@ xyz: } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - scopetest := scopeagent.StartTest(t) - defer scopetest.End() - req := require.New(t) yamlRunner := NewYamlRedactor(strings.Join(tt.path, "."), "testfile", tt.name)