Ran gofmt against all files

Author: davepgreene

Makefile

@@ -56,3 +56,6 @@ lint-setup: _bin
 
 _bin:
 	mkdir -p "$(GO_BIN)"
+
+format:
+	gofmt -w -e .

driver/driver.go

@@ -49,9 +49,10 @@ func init() { //nolint:gochecknoinits
 // Note: Register behaves similarly to database/sql.Register except that it doesn't
 // panic on duplicate registrations, it just ignores them and continues.
 // The reason we Register drivers separately from database/sql is because
-// 	a) most DB drivers already call database/sql.Register in an init() func
-// 	b) we need to carry a lot more information along with the driver to ensure our
-// 	   connector logic works correctly.
+//
+//	a) most DB drivers already call database/sql.Register in an init() func
+//	b) we need to carry a lot more information along with the driver to ensure our
+//	   connector logic works correctly.
 func Register(name string, f factory) error {
 	driverMu.Lock()
 	defer driverMu.Unlock()

store/awsrds/store.go

@@ -37,10 +37,10 @@ type Store struct {
 
 // Config contains configuration information.
 type Config struct {
+	Credentials aws.CredentialsProvider
 	Endpoint    string // Endpoint takes the form of host:port
 	Region      string
 	User        string
-	Credentials aws.CredentialsProvider
 }
 
 // NewStore creates a new RDS-backed store.
@@ -61,7 +61,7 @@ func NewStore(c *Config) (*Store, error) {
 		return nil, &errMissingConfigItem{item: "user"}
 	}
 
-	if !(strings.HasPrefix(c.Endpoint, "http://") || strings.HasPrefix(c.Endpoint, "https://")) {
+	if !strings.HasPrefix(c.Endpoint, "http://") && !strings.HasPrefix(c.Endpoint, "https://") {
 		c.Endpoint = "http://" + c.Endpoint
 	}
 

store/awsrds/store_test.go

@@ -22,9 +22,9 @@ func TestStoreValidation(t *testing.T) {
 	}
 
 	testCases := []struct {
-		description string
-		fields      map[string]interface{}
 		expectedErr error
+		fields      map[string]interface{}
+		description string
 	}{
 		{
 			description: "missing endpoint",
@@ -108,13 +108,15 @@ func TestStoreValidation(t *testing.T) {
 			}
 
 			// If we have a pointer to an error we need to compare error strings
-			if reflect.ValueOf(testCase.expectedErr).Kind() == reflect.Ptr && err.Error() != testCase.expectedErr.Error() {
+			if reflect.ValueOf(testCase.expectedErr).Kind() == reflect.Ptr &&
+				err.Error() != testCase.expectedErr.Error() {
 				t.Fatalf("expected '%v' but got '%v' instead", testCase.expectedErr, err)
 
 				return
 			}
 
-			if reflect.ValueOf(testCase.expectedErr).Kind() != reflect.Ptr && err != testCase.expectedErr {
+			if reflect.ValueOf(testCase.expectedErr).Kind() != reflect.Ptr &&
+				err != testCase.expectedErr {
 				t.Fatalf("expected '%T' but got '%T' instead", testCase.expectedErr, err)
 			}
 		})
@@ -206,6 +208,7 @@ func TestStoreCachesCredentials(t *testing.T) {
 	// NOTE: This is hacky as hell but necessary because the rdsutil.BuildAuthToken has a hard-coded
 	// 15 minute expiration for each signed token. To ensure we don't repeatedly generate the same signing
 	// token we need to wind the clock forward past the 15 minute window.
+	// See https://github.com/aws/aws-sdk-go-v2/blob/main/feature/rds/auth/connect.go#L86
 	var patch *monkey.PatchGuard
 
 	patch = monkey.Patch(time.Now, func() time.Time {
@@ -236,6 +239,10 @@ func TestStoreCachesCredentials(t *testing.T) {
 	}
 
 	if password == refreshedCreds.GetPassword() {
-		t.Fatal("cached password and refreshed password were the same but expected them not to be", password, refreshedCreds.GetPassword())
+		t.Fatal(
+			"cached password and refreshed password were the same but expected them not to be",
+			password,
+			refreshedCreds.GetPassword(),
+		)
 	}
 }

store/vault/example/helpers.go

@@ -20,7 +20,11 @@ import (
 
 // setupVault sets up a Vault server running in Docker then enables the plugins/configs we need for
 // this example.
-func setupVault(ctx context.Context, dbHost string, dbPort int) (*vault.Client, func() error, error) {
+func setupVault(
+	ctx context.Context,
+	dbHost string,
+	dbPort int,
+) (*vault.Client, func() error, error) {
 	fmt.Println("Creating testcontainers Vault instance")
 
 	client, vaultContainer, err := vaulttest.CreateTestVault(ctx)
@@ -46,7 +50,11 @@ func setupVault(ctx context.Context, dbHost string, dbPort int) (*vault.Client,
 		return nil, nil, err
 	}
 
-	uri := fmt.Sprintf("postgresql://{{username}}:{{password}}@%s:%d/?sslmode=disable", dbHost, dbPort)
+	uri := fmt.Sprintf(
+		"postgresql://{{username}}:{{password}}@%s:%d/?sslmode=disable",
+		dbHost,
+		dbPort,
+	)
 
 	fmt.Println("Configuring the postgres database and role")
 	// TODO: Switch this to using generated methods once the vault client implements the db-specific options
@@ -81,8 +89,8 @@ func setupVault(ctx context.Context, dbHost string, dbPort int) (*vault.Client,
 
 // setupDb sets up a test postgres database for use in the example.
 func setupDb(ctx context.Context) (*postgres.PostgresContainer, error) {
-	return postgres.RunContainer(ctx,
-		testcontainers.WithImage("docker.io/postgres:15.2-alpine"),
+	return postgres.Run(ctx,
+		"docker.io/postgres:15.2-alpine",
 		postgres.WithDatabase(dbName),
 		postgres.WithUsername(username),
 		postgres.WithPassword(password),
@@ -94,7 +102,10 @@ func setupDb(ctx context.Context) (*postgres.PostgresContainer, error) {
 }
 
 // generateDriverConfig is a convenience method for generating a driver config from a testcontainer db
-func generateDriverConfig(ctx context.Context, dbc *postgres.PostgresContainer) (*driver.Config, error) {
+func generateDriverConfig(
+	ctx context.Context,
+	dbc *postgres.PostgresContainer,
+) (*driver.Config, error) {
 	connStr, err := dbc.ConnectionString(ctx, "sslmode=disable")
 	if err != nil {
 		return nil, err

store/vault/vaulttest/vault.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	vaultclient "github.com/hashicorp/vault-client-go"
-	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/vault"
 )
 
@@ -22,10 +21,13 @@ type TokenCarryingClient struct {
 func CreateTestVault(ctx context.Context) (*TokenCarryingClient, *vault.VaultContainer, error) {
 	rootToken := RandString(tokenLength)
 
-	vaultContainer, err := vault.RunContainer(ctx, vault.WithToken(rootToken), vault.WithInitCommand(
-		"auth enable kubernetes", // Enable the kubernetes auth method
-	),
-		testcontainers.WithImage("hashicorp/vault:1.15.4"),
+	vaultContainer, err := vault.Run(
+		ctx,
+		"hashicorp/vault:1.15.4",
+		vault.WithToken(rootToken),
+		vault.WithInitCommand(
+			"auth enable kubernetes", // Enable the kubernetes auth method
+		),
 	)
 	if err != nil {
 		return nil, nil, err