Skip to content

Commit 5cb289b

Browse files
outofcoffeeoutofcoffee
committed
Bumps Imposter dependency.
1 parent 0d8f9de commit 5cb289b

3 files changed

Lines changed: 33 additions & 38 deletions

File tree

‎cmd/mock.go‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package cmd
1818
import (
1919
"fmt"
2020
"gatehill.io/imposter/engine"
21+
"gatehill.io/imposter/engine/docker"
2122
"github.com/sirupsen/logrus"
2223
"github.com/spf13/cobra"
2324
"opendeps.org/opendeps/fileutil"
@@ -50,14 +51,15 @@ by this tool.`,
5051
stagingDir := generateMockConfig(specFile, spec)
5152
defer os.Remove(stagingDir)
5253

53-
containerId := engine.StartMockEngine(stagingDir, engine.EngineStartOptions{
54-
Port: 8080,
55-
ImageTag: "latest",
56-
ForceImagePull: false,
57-
LogLevel: "DEBUG",
54+
mockEngine := docker.BuildEngine(stagingDir, engine.StartOptions{
55+
Port: 8080,
56+
ImageTag: "latest",
57+
ImagePullPolicy: engine.ImagePullIfNotPresent,
58+
LogLevel: "DEBUG",
5859
})
59-
trapExit(containerId)
60-
engine.BlockUntilStopped(containerId)
60+
mockEngine.Start()
61+
trapExit(mockEngine)
62+
mockEngine.BlockUntilStopped()
6163
},
6264
}
6365

@@ -115,12 +117,12 @@ specFile: "%v"
115117
}
116118

117119
// listen for an interrupt from the OS, then attempt engine cleanup
118-
func trapExit(containerId string) {
120+
func trapExit(mockEngine engine.MockEngine) {
119121
c := make(chan os.Signal)
120122
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
121123
go func() {
122124
<-c
123-
engine.StopMockEngine(containerId)
125+
mockEngine.Stop()
124126
os.Exit(0)
125127
}()
126128
}

‎go.mod‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,17 @@ module opendeps.org/opendeps
22

33
go 1.17
44

5-
replace gatehill.io/imposter => github.com/gatehill/imposter-cli v0.3.10
5+
replace gatehill.io/imposter => github.com/gatehill/imposter-cli v0.4.2
66

77
require (
8-
gatehill.io/imposter v0.3.10
9-
github.com/Microsoft/go-winio v0.5.0 // indirect
10-
github.com/containerd/containerd v1.5.5 // indirect
11-
github.com/docker/distribution v2.7.1+incompatible // indirect
12-
github.com/docker/go-units v0.4.0 // indirect
8+
gatehill.io/imposter v0.4.2
139
github.com/fsnotify/fsnotify v1.5.1 // indirect
14-
github.com/gogo/protobuf v1.3.2 // indirect
15-
github.com/golang/protobuf v1.5.2 // indirect
16-
github.com/gorilla/mux v1.8.0 // indirect
1710
github.com/hashicorp/hcl v1.0.0 // indirect
1811
github.com/inconshreveable/mousetrap v1.0.0 // indirect
1912
github.com/magiconair/properties v1.8.5 // indirect
2013
github.com/mitchellh/go-homedir v1.1.0
2114
github.com/mitchellh/mapstructure v1.4.1 // indirect
22-
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
23-
github.com/opencontainers/go-digest v1.0.0 // indirect
24-
github.com/opencontainers/image-spec v1.0.1 // indirect
2515
github.com/pelletier/go-toml v1.9.3 // indirect
26-
github.com/pkg/errors v0.9.1 // indirect
2716
github.com/sirupsen/logrus v1.8.1
2817
github.com/spf13/afero v1.6.0 // indirect
2918
github.com/spf13/cast v1.4.1 // indirect
@@ -35,18 +24,27 @@ require (
3524
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
3625
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
3726
github.com/xeipuuv/gojsonschema v1.2.0
38-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
3927
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
4028
golang.org/x/text v0.3.7 // indirect
41-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
42-
google.golang.org/grpc v1.40.0 // indirect
43-
google.golang.org/protobuf v1.27.1 // indirect
4429
gopkg.in/ini.v1 v1.62.0 // indirect
4530
gopkg.in/yaml.v2 v2.4.0
4631
sigs.k8s.io/yaml v1.2.0
4732
)
4833

4934
require (
35+
github.com/Microsoft/go-winio v0.5.0 // indirect
36+
github.com/containerd/containerd v1.5.5 // indirect
37+
github.com/docker/distribution v2.7.1+incompatible // indirect
5038
github.com/docker/docker v20.10.8+incompatible // indirect
5139
github.com/docker/go-connections v0.4.0 // indirect
40+
github.com/docker/go-units v0.4.0 // indirect
41+
github.com/gogo/protobuf v1.3.2 // indirect
42+
github.com/golang/protobuf v1.5.2 // indirect
43+
github.com/opencontainers/go-digest v1.0.0 // indirect
44+
github.com/opencontainers/image-spec v1.0.1 // indirect
45+
github.com/pkg/errors v0.9.1 // indirect
46+
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
47+
google.golang.org/genproto v0.0.0-20210830153122-0bac4d21c8ea // indirect
48+
google.golang.org/grpc v1.40.0 // indirect
49+
google.golang.org/protobuf v1.27.1 // indirect
5250
)

‎go.sum‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
3939
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
4040
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
4141
github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
42+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
4243
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
43-
github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795 h1:q4kDoSrHgRoD6okimjwWJOVKyxEUNS2JIuwt+EqcIqQ=
44-
github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
4544
github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
4645
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
4746
github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
@@ -227,7 +226,6 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
227226
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
228227
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
229228
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
230-
github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
231229
github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
232230
github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
233231
github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
@@ -281,8 +279,8 @@ github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWp
281279
github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
282280
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
283281
github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
284-
github.com/gatehill/imposter-cli v0.3.10 h1:TCvMnrSx9xa7uWcwz+FRqZmWT/QgDw/gWoAOJTLf8Ds=
285-
github.com/gatehill/imposter-cli v0.3.10/go.mod h1:cbjLJTt2Dh2fbzVHBjQii+X4QWRVQ/PGkdB7VByXKoY=
282+
github.com/gatehill/imposter-cli v0.4.2 h1:yCyVRA+qJZ/tdD0VmOKle2TW2UzMDt8G6oC8m3yIrh0=
283+
github.com/gatehill/imposter-cli v0.4.2/go.mod h1:1cvFX7e8yvBhldJKnIMFV276eLsbtO6LmrHGx4bN+IQ=
286284
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
287285
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
288286
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -390,9 +388,8 @@ github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3i
390388
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
391389
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
392390
github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
391+
github.com/gorilla/mux v1.7.2 h1:zoNxOV7WjqXptQOVngLmcSQgXmgk4NMz1HibBchjl/I=
393392
github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
394-
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
395-
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
396393
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
397394
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
398395
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -500,9 +497,8 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ
500497
github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
501498
github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
502499
github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
500+
github.com/moby/term v0.0.0-20200312100748-672ec06f55cd h1:aY7OQNf2XqY/JQ6qREWamhI/81os/agb2BAGpcx5yWI=
503501
github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
504-
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 h1:yH0SvLzcbZxcJXho2yh7CqdENGMQe73Cw3woZBpPli0=
505-
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A=
506502
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
507503
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
508504
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -600,6 +596,7 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
600596
github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
601597
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
602598
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
599+
github.com/radovskyb/watcher v1.0.7/go.mod h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg=
603600
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
604601
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
605602
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -905,7 +902,6 @@ golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7w
905902
golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
906903
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
907904
golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
908-
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
909905
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
910906
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
911907
golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1085,9 +1081,8 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D
10851081
google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
10861082
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
10871083
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
1084+
google.golang.org/genproto v0.0.0-20210830153122-0bac4d21c8ea h1:5eMUso2GVOxypVH1fR4oKgDobrvi4DHctJ4fVk66s/4=
10881085
google.golang.org/genproto v0.0.0-20210830153122-0bac4d21c8ea/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
1089-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 h1:NHN4wOCScVzKhPenJ2dt+BTs3X/XkBVI/Rh4iDt55T8=
1090-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
10911086
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
10921087
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
10931088
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=

0 commit comments

Comments
 (0)