Skip to content

Commit f340b3a

Browse files
joonas-fijoonas-fi
committed
update gokit, use CreateEmptyFile() from it
also work on some test helper deprecation chores
1 parent 583cad6 commit f340b3a

5 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎cmd/bob/bobfile_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ func TestAssertUniqueBuilderNames(t *testing.T) {
3131

3232
assert.Ok(t, validateBuilders(bobfileEmpty))
3333
assert.Ok(t, validateBuilders(bobfileUniques))
34-
assert.EqualString(t,
35-
validateBuilders(bobfileNonUniques).Error(),
36-
"duplicate builder name: foobar")
34+
assert.Equal(t, validateBuilders(bobfileNonUniques).Error(), "duplicate builder name: foobar")
3735
}
3836

3937
func TestConsentToBreakage(t *testing.T) {
@@ -63,5 +61,5 @@ func TestConsentToBreakage(t *testing.T) {
6361
}
6462

6563
assert.Ok(t, validateBuilders(properConsent))
66-
assert.EqualString(t, validateBuilders(missingConsent).Error(), "foobar: you need to opt-in to prepare_step experiment")
64+
assert.Equal(t, validateBuilders(missingConsent).Error(), "foobar: you need to opt-in to prepare_step experiment")
6765
}

‎cmd/bob/devshim.go‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func shimSetup() error {
111111
if !alreadyDone {
112112
// set up flag, so the next session logging in to this container will not try to
113113
// do setup steps that must be done only once
114-
if err := makeEmptyFile(shimSetupDoneFlagPath()); err != nil {
114+
if err := osutil.CreateEmptyFile(shimSetupDoneFlagPath()); err != nil {
115115
return err
116116
}
117117
}
@@ -238,13 +238,3 @@ func readShimConfig() (*shimConfig, error) {
238238
func shimSetupDoneFlagPath() string {
239239
return filepath.Join(os.TempDir(), "bob-shim-setup-done.flag")
240240
}
241-
242-
// "$ touch"
243-
func makeEmptyFile(path string) error {
244-
f, err := os.Create(path)
245-
if err != nil {
246-
return err
247-
}
248-
249-
return f.Close()
250-
}

‎go.mod‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ module github.com/function61/turbobob
33
go 1.13
44

55
require (
6-
github.com/function61/gokit v0.0.0-20220129122644-a8596b4bad8c
6+
github.com/cubewise-code/go-mime v0.0.0-20190322015324-9c5316ef3e8e // indirect
7+
github.com/function61/gokit v0.0.0-20230408192420-6f1204d63c2b
78
github.com/mattn/go-runewidth v0.0.13 // indirect
89
github.com/moby/buildkit v0.10.4
910
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
1011
github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4
11-
github.com/spf13/cobra v1.3.0
12+
github.com/spf13/cobra v1.6.1
13+
github.com/spf13/viper v1.10.0 // indirect
1214
go.i3wm.org/i3/v4 v4.18.0
1315
)

‎go.sum‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc
412412
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
413413
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
414414
github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
415+
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
415416
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
416417
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
417418
github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -513,6 +514,8 @@ github.com/function61/gokit v0.0.0-20220129120223-5bc364fcaea9 h1:YI696ONlr72WJ1
513514
github.com/function61/gokit v0.0.0-20220129120223-5bc364fcaea9/go.mod h1:xXf3guLmxHiZ4iVcmo3rfeMHIotBUNAge+zswrzQoqI=
514515
github.com/function61/gokit v0.0.0-20220129122644-a8596b4bad8c h1:WRA9Im/mJZa2MGF0qDgLHzmyDtByEAGp38rP6bIt6nU=
515516
github.com/function61/gokit v0.0.0-20220129122644-a8596b4bad8c/go.mod h1:xXf3guLmxHiZ4iVcmo3rfeMHIotBUNAge+zswrzQoqI=
517+
github.com/function61/gokit v0.0.0-20230408192420-6f1204d63c2b h1:qUd+dMkYFT6ZDzCrFoQxgnYqq4qPi8R/aiVXR77Zh/E=
518+
github.com/function61/gokit v0.0.0-20230408192420-6f1204d63c2b/go.mod h1:EsjrjWdM7Jt5k3txTdgSFDjWeoderMjwRWtXWJpwkg4=
516519
github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
517520
github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
518521
github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
@@ -821,6 +824,8 @@ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
821824
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
822825
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
823826
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
827+
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
828+
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
824829
github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
825830
github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=
826831
github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
@@ -1212,6 +1217,8 @@ github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHN
12121217
github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
12131218
github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0=
12141219
github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
1220+
github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
1221+
github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
12151222
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
12161223
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
12171224
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -1252,6 +1259,7 @@ github.com/tetafro/godot v0.4.2/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQx
12521259
github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
12531260
github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
12541261
github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=
1262+
github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk=
12551263
github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0=
12561264
github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao=
12571265
github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4=
@@ -2028,9 +2036,11 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
20282036
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
20292037
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
20302038
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2039+
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
20312040
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
20322041
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
20332042
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2043+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
20342044
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
20352045
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
20362046
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=

‎pkg/dockertag/parse_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,37 @@ import (
88
)
99

1010
func TestParseDockerTag(t *testing.T) {
11-
assert.EqualString(
11+
assert.Equal(
1212
t,
1313
serialize(Parse("redis")),
1414
"registry<> namespace<> repository<redis> tag<>")
1515

16-
assert.EqualString(
16+
assert.Equal(
1717
t,
1818
serialize(Parse("redis:1.2.3.4")),
1919
"registry<> namespace<> repository<redis> tag<1.2.3.4>")
2020

21-
assert.EqualString(
21+
assert.Equal(
2222
t,
2323
serialize(Parse("joonas/redis:1.2.3.4")),
2424
"registry<> namespace<joonas> repository<redis> tag<1.2.3.4>")
2525

26-
assert.EqualString(
26+
assert.Equal(
2727
t,
2828
serialize(Parse("docker.io/joonas/redis:1.2.3.4")),
2929
"registry<docker.io> namespace<joonas> repository<redis> tag<1.2.3.4>")
3030

31-
assert.EqualString(
31+
assert.Equal(
3232
t,
3333
serialize(Parse("123456.dkr.ecr.us-east-1.amazonaws.com/joonas.fi-blog")),
3434
"registry<123456.dkr.ecr.us-east-1.amazonaws.com> namespace<> repository<joonas.fi-blog> tag<>")
3535

36-
assert.EqualString(
36+
assert.Equal(
3737
t,
3838
serialize(Parse("registry.gitlab.com/function61/project/subcomponent:1.2.3.4")),
3939
"registry<registry.gitlab.com> namespace<function61> repository<project/subcomponent> tag<1.2.3.4>")
4040

41-
assert.EqualString(
41+
assert.Equal(
4242
t,
4343
serialize(Parse("")),
4444
"(failed to parse)")

0 commit comments

Comments
 (0)