Skip to content

Commit b750873

Browse files
committed
keep core untouched and drop the inert dnshelper root replace
Review follow-ups: (1) go work sync had bumped modules/core's x/sys and left its go.sum incomplete, breaking core's standalone GOWORK=off build; revert core/go.mod+go.sum to main so the helpers PR does not modify the already-merged core module (ssh legitimately needs the newer x/sys; the workspace resolves the max). (2) Root replaced dnshelper/v2 without requiring it (dnshelper is test-only, not imported by root); drop the inert replace so root replaces match its requires.
1 parent b075bf9 commit b750873

3 files changed

Lines changed: 3 additions & 4 deletions

File tree

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,5 +255,3 @@ replace github.com/gruntwork-io/terratest/modules/core/v2 => ./modules/core
255255
replace github.com/gruntwork-io/terratest/modules/ssh/v2 => ./modules/ssh
256256

257257
replace github.com/gruntwork-io/terratest/modules/httphelper/v2 => ./modules/httphelper
258-
259-
replace github.com/gruntwork-io/terratest/modules/dnshelper/v2 => ./modules/dnshelper

modules/core/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/rogpeppe/go-internal v1.14.1 // indirect
2020
github.com/russross/blackfriday/v2 v2.1.0 // indirect
2121
github.com/urfave/cli v1.22.16 // indirect
22-
golang.org/x/sys v0.45.0 // indirect
22+
golang.org/x/sys v0.42.0 // indirect
2323
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2424
gopkg.in/yaml.v3 v3.0.1 // indirect
2525
)

modules/core/go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
6666
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6767
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6868
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
69-
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
69+
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
70+
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
7071
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7172
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
7273
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

0 commit comments

Comments
 (0)