Add test for generate-secret command

cli/base_internal_test.go

@@ -0,0 +1,31 @@
+package cli
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/suite"
+)
+
+type BaseTestSuite struct {
+	suite.Suite
+
+	b base
+}
+
+func (suite *BaseTestSuite) SetupTest() {
+	suite.b = base{}
+}
+
+func (suite *BaseTestSuite) TestReadConfigNok() {
+	suite.Error(suite.b.ReadConfig(filepath.Join("testdata", "unknown"), "dev"))
+}
+
+func (suite *BaseTestSuite) TestReadConfig() {
+	suite.NoError(suite.b.ReadConfig(filepath.Join("testdata", "minimal.toml"), "dev"))
+}
+
+func TestBase(t *testing.T) {
+	t.Parallel()
+	suite.Run(t, &BaseTestSuite{})
+}

cli/generate_secret_test.go

@@ -0,0 +1,50 @@
+package cli_test
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/9seconds/mtg/v2/mtglib"
+	"github.com/stretchr/testify/suite"
+)
+
+type GenerateSecretTestSuite struct {
+	CommonTestSuite
+}
+
+func (suite *GenerateSecretTestSuite) SetupTest() {
+	suite.CommonTestSuite.SetupTest()
+
+	suite.cli.GenerateSecret.HostName = "google.com"
+}
+
+func (suite *GenerateSecretTestSuite) TestDefault() {
+	output := suite.CaptureStdout(func() {
+		suite.NoError(suite.cli.GenerateSecret.Run(suite.cli, "dev"))
+	})
+	suite.True(strings.HasPrefix(output, "7"))
+
+	secret, err := mtglib.ParseSecret(output)
+	suite.NoError(err)
+	suite.True(secret.Valid())
+	suite.Equal("google.com", secret.Host)
+}
+
+func (suite *GenerateSecretTestSuite) TestHex() {
+	suite.cli.GenerateSecret.Hex = true
+
+	output := suite.CaptureStdout(func() {
+		suite.NoError(suite.cli.GenerateSecret.Run(suite.cli, "dev"))
+	})
+	suite.True(strings.HasPrefix(output, "ee"))
+
+	secret, err := mtglib.ParseSecret(output)
+	suite.NoError(err)
+	suite.True(secret.Valid())
+	suite.Equal("google.com", secret.Host)
+}
+
+func TestGenerateSecret(t *testing.T) {
+	t.Parallel()
+	suite.Run(t, &GenerateSecretTestSuite{})
+}

cli/init_test.go

@@ -0,0 +1,112 @@
+package cli_test
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"net"
+	"net/http"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/9seconds/mtg/v2/cli"
+	"github.com/9seconds/mtg/v2/mtglib/network"
+	"github.com/jarcoal/httpmock"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/suite"
+)
+
+type NetworkMock struct {
+	mock.Mock
+}
+
+func (n *NetworkMock) Dial(network, address string) (net.Conn, error) {
+	args := n.Called(network, address)
+
+	return args.Get(0).(net.Conn), args.Error(1)
+}
+
+func (n *NetworkMock) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
+	args := n.Called(ctx, network, address)
+
+	return args.Get(0).(net.Conn), args.Error(1)
+}
+
+func (n *NetworkMock) DNSResolve(network, hostname string) ([]string, error) {
+	args := n.Called(network, hostname)
+
+	return args.Get(0).([]string), args.Error(1)
+}
+
+func (n *NetworkMock) MakeHTTPClient(dialFunc network.DialFunc) *http.Client {
+	return n.Called(dialFunc).Get(0).(*http.Client)
+}
+
+func (n *NetworkMock) IdleTimeout() time.Duration {
+	return n.Called().Get(0).(time.Duration)
+}
+
+func (n *NetworkMock) HTTPTimeout() time.Duration {
+	return n.Called().Get(0).(time.Duration)
+}
+
+type CommonTestSuite struct {
+	suite.Suite
+
+	cli         *cli.CLI
+	networkMock *NetworkMock
+	httpClient  *http.Client
+}
+
+func (suite *CommonTestSuite) SetupTest() {
+	suite.networkMock = &NetworkMock{}
+	suite.httpClient = &http.Client{}
+	suite.cli = &cli.CLI{}
+
+	httpmock.ActivateNonDefault(suite.httpClient)
+
+	suite.networkMock.
+		On("MakeHTTPClient", mock.Anything).
+		Maybe().
+		Return(suite.httpClient)
+}
+
+func (suite *CommonTestSuite) TearDownTest() {
+	suite.networkMock.AssertExpectations(suite.T())
+	httpmock.DeactivateAndReset()
+}
+
+func (suite *CommonTestSuite) CaptureStdout(callback func()) string {
+	return suite.captureOutput(&os.Stdout, callback)
+}
+
+func (suite *CommonTestSuite) CaptureStderr(callback func()) string {
+	return suite.captureOutput(&os.Stderr, callback)
+}
+
+func (suite *CommonTestSuite) captureOutput(filefp **os.File, callback func()) string {
+	oldFp := *filefp
+
+	defer func() {
+		*filefp = oldFp
+	}()
+
+	reader, writer, _ := os.Pipe()
+	buf := &bytes.Buffer{}
+	closeChan := make(chan bool)
+
+	go func() {
+		io.Copy(buf, reader) // nolint: errcheck
+		close(closeChan)
+	}()
+
+	*filefp = writer
+
+	callback()
+
+	writer.Close()
+	<-closeChan
+
+	return strings.TrimSpace(buf.String())
+}

cli/testdata/minimal.toml

@@ -0,0 +1,2 @@
+secret = "7mqFMMq3P2Tvvt_rPx5qhmFnb29nbGUuY29t"
+bind-to = "0.0.0.0:80"

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6
+	github.com/jarcoal/httpmock v1.0.8 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/libp2p/go-reuseport v0.0.2
 	github.com/mccutchen/go-httpbin v1.1.1

go.sum

@@ -9,6 +9,8 @@ github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6/go.mod h1
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/jarcoal/httpmock v1.0.8 h1:8kI16SoO6LQKgPE7PvQuV+YuD/inwHd7fOOe2zMbo4k=
+github.com/jarcoal/httpmock v1.0.8/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

mtglib/network/init.go

@@ -40,4 +40,5 @@ type Network interface {
 	DNSResolve(network, hostname string) (ips []string, err error)
 	MakeHTTPClient(DialFunc) *http.Client
 	IdleTimeout() time.Duration
+	HTTPTimeout() time.Duration
 }

mtglib/network/network.go

@@ -115,10 +115,6 @@ func (n *network) DNSResolve(protocol, address string) ([]string, error) {
 	return ips, nil
 }
 
-func (n *network) IdleTimeout() time.Duration {
-	return n.idleTimeout
-}
-
 func (n *network) MakeHTTPClient(dialFunc DialFunc) *http.Client {
 	if dialFunc == nil {
 		dialFunc = n.DialContext
@@ -127,6 +123,14 @@ func (n *network) MakeHTTPClient(dialFunc DialFunc) *http.Client {
 	return makeHTTPClient(n.userAgent, n.httpTimeout, dialFunc)
 }
 
+func (n *network) IdleTimeout() time.Duration {
+	return n.idleTimeout
+}
+
+func (n *network) HTTPTimeout() time.Duration {
+	return n.httpTimeout
+}
+
 func NewNetwork(dialer Dialer,
 	userAgent, dohHostname string,
 	httpTimeout, idleTimeout time.Duration) (Network, error) {