Extract helpers (ssh, httphelper, dnshelper) into /v2 modules (#1864)

* extract ssh/httphelper/dnshelper into their own /v2 modules

Second tier (helpers) of the v2 modularization, on top of core. Each helper gets its own module (github.com/gruntwork-io/terratest/modules/<name>/v2) with go.mod seeded to root versions, imports rewritten to /v2, and a root replace + go.work use line. The helpers depend only on core/v2. Same pattern as the core extraction.

* tidy helper go.mods to their real dependency sets

The initial extraction seeded each helper with the root dependency graph, but go mod tidy could not prune it because the cross-module core/v2 pseudo-version is unresolvable outside the workspace. Regenerating each helper go.mod with a throwaway replace so tidy can resolve core, then dropping the replace, shrinks them to their actual deps (ssh 11, httphelper 6, dnshelper 13 requires) with a real go.sum, matching core's shape. Also reconcile the runbook: submodule go.mods do carry a sibling require at the local zero placeholder that go.work resolves; only the real-version pin waits for release-prep.

* 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.

Author: james00012

docs/v2-release-runbook.md

@@ -16,8 +16,9 @@ directives during normal development.
 
 ## Why pinning is a release-time step (do not commit it early)
 
-The submodules' `go.mod` files are deliberately left without cross-module
-`require` lines on `main`. Pinning a sibling `require` to the to-be-published
+On `main`, a submodule's cross-module `require` sits at the local zero
+placeholder (e.g. `core/v2 v2.0.0-00010101000000-000000000000`) that `go.work`
+resolves; it is never pinned to a real, to-be-published version. Pinning a sibling `require` to the to-be-published
 version (e.g. `core/v2 v2.0.0-beta.1`) BREAKS the workspace build until that tag
 actually exists: `go.work` does not shadow an unpublished required version, so
 `go build` and `go work sync` try to fetch the missing revision and fail. The pin

go.mod

@@ -18,7 +18,6 @@ require (
 	github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
 	github.com/magiconair/properties v1.8.7
 	github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326
-	github.com/miekg/dns v1.1.62
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/pquerna/otp v1.4.0
 	github.com/sirupsen/logrus v1.9.3 // indirect
@@ -94,6 +93,8 @@ require (
 	github.com/aws/smithy-go v1.27.1
 	github.com/gonvenience/ytbx v1.4.4
 	github.com/gruntwork-io/terratest/modules/core/v2 v2.0.0-00010101000000-000000000000
+	github.com/gruntwork-io/terratest/modules/httphelper/v2 v2.0.0-00010101000000-000000000000
+	github.com/gruntwork-io/terratest/modules/ssh/v2 v2.0.0-00010101000000-000000000000
 	github.com/hashicorp/go-getter/v2 v2.2.3
 	github.com/homeport/dyff v1.6.0
 	github.com/jackc/pgx/v5 v5.9.0
@@ -157,7 +158,6 @@ require (
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/go-test/deep v1.1.1 // indirect
 	github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
@@ -251,3 +251,7 @@ require (
 // (consumers import the submodules directly), and this replace is never part of
 // a release tag. As more tiers split out, the root gains one replace per submodule.
 replace github.com/gruntwork-io/terratest/modules/core/v2 => ./modules/core
+
+replace github.com/gruntwork-io/terratest/modules/ssh/v2 => ./modules/ssh
+
+replace github.com/gruntwork-io/terratest/modules/httphelper/v2 => ./modules/httphelper

go.sum

@@ -271,8 +271,8 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
-github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
+github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
+github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
 github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
@@ -406,8 +406,6 @@ github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 h1:ofNAzWCcyTALn2
 github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo=
 github.com/microsoft/go-mssqldb v1.9.8 h1:d4IFMvF/o+HdpXUqbBfzHvn/NlFA75YGcfHUUvDFJEM=
 github.com/microsoft/go-mssqldb v1.9.8/go.mod h1:eGSRSGAW4hKMy5YcAenhCDjIRm2rhqIdmmwgciMzLus=
-github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
-github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 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/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=

go.work

@@ -11,4 +11,7 @@ go 1.26.0
 use (
 	.
 	./modules/core
+	./modules/dnshelper
+	./modules/httphelper
+	./modules/ssh
 )

go.work.sum

@@ -1,3 +1,5 @@
 cloud.google.com/go/compute v1.54.0 h1:4CKmnpO+40z44bKG5bdcKxQ7ocNpRtOc9SCLLUzze1w=
 cloud.google.com/go/pubsub v1.50.1 h1:fzbXpPyJnSGvWXF1jabhQeXyxdbCIkXTpjXHy7xviBM=
+github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
+github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=

modules/aws/ec2-files.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/gruntwork-io/terratest/modules/core/v2/files"
 	"github.com/gruntwork-io/terratest/modules/core/v2/testing"
-	"github.com/gruntwork-io/terratest/modules/ssh"
+	"github.com/gruntwork-io/terratest/modules/ssh/v2"
 	"github.com/hashicorp/go-multierror"
 	"github.com/stretchr/testify/require"
 )

modules/aws/keypair.go

@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	"github.com/gruntwork-io/terratest/modules/core/v2/logger"
 	"github.com/gruntwork-io/terratest/modules/core/v2/testing"
-	"github.com/gruntwork-io/terratest/modules/ssh"
+	"github.com/gruntwork-io/terratest/modules/ssh/v2"
 	"github.com/stretchr/testify/require"
 )
 

modules/dnshelper/dns_local_server_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gruntwork-io/terratest/modules/dnshelper"
+	"github.com/gruntwork-io/terratest/modules/dnshelper/v2"
 	"github.com/miekg/dns"
 )
 

modules/dnshelper/dnshelper_test.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/gruntwork-io/terratest/modules/core/v2/retry"
-	"github.com/gruntwork-io/terratest/modules/dnshelper"
+	"github.com/gruntwork-io/terratest/modules/dnshelper/v2"
 	"github.com/stretchr/testify/require"
 )
 

modules/dnshelper/go.mod

@@ -0,0 +1,22 @@
+module github.com/gruntwork-io/terratest/modules/dnshelper/v2
+
+go 1.26.0
+
+require (
+	github.com/gruntwork-io/terratest/modules/core/v2 v2.0.0-00010101000000-000000000000
+	github.com/miekg/dns v1.1.62
+	github.com/stretchr/testify v1.11.1
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	golang.org/x/mod v0.35.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sys v0.45.0 // indirect
+	golang.org/x/tools v0.44.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)