go fmt

Author: Dan Vittegleo

cmd/awslambdaproxy/awslambdaproxy.go

@@ -2,13 +2,13 @@ package main
 
 import (
 	"fmt"
-	"os"
 	"github.com/dan-v/awslambdaproxy/cmd/awslambdaproxy/cmd"
+	"os"
 )
 
 func main() {
 	if err := cmd.RootCmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(-1)
 	}
-}
+}

cmd/awslambdaproxy/cmd/root.go

@@ -40,8 +40,8 @@ func initConfig() {
 	}
 
 	viper.SetConfigName(".awslambdaproxy") // name of config file (without extension)
-	viper.AddConfigPath("$HOME")  // adding home directory as first search path
-	viper.AutomaticEnv()          // read in environment variables that match
+	viper.AddConfigPath("$HOME")           // adding home directory as first search path
+	viper.AutomaticEnv()                   // read in environment variables that match
 
 	// If a config file is found, read it in.
 	if err := viper.ReadInConfig(); err == nil {

cmd/awslambdaproxy/cmd/run.go

@@ -1,25 +1,25 @@
 package cmd
 
 import (
-	"github.com/spf13/cobra"
-	"os/user"
+	"fmt"
 	"github.com/dan-v/awslambdaproxy"
-	"time"
+	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"strings"
 	"os"
-	"fmt"
+	"os/user"
 	"strconv"
+	"strings"
+	"time"
 )
 
 var (
-	frequency time.Duration
-	memory int64
+	frequency                            time.Duration
+	memory                               int64
 	sshUser, sshPort, regions, listeners string
 	// Max execution time on lambda is 300 seconds currently
-	lambdaMaxFrequency 	  = time.Duration(290 * time.Second) // leave 10 seconds of leeway
-	lambdaMinMemorySize       = 128
-	lambdaMaxMemorySize       = 1536
+	lambdaMaxFrequency  = time.Duration(290 * time.Second) // leave 10 seconds of leeway
+	lambdaMinMemorySize = 128
+	lambdaMaxMemorySize = 1536
 )
 
 // runCmd represents the run command
@@ -93,19 +93,19 @@ func getCurrentUserName() string {
 func init() {
 	RootCmd.AddCommand(runCmd)
 
-	runCmd.Flags().StringVarP(&regions, "regions", "r",  "us-west-2","Regions to " +
+	runCmd.Flags().StringVarP(&regions, "regions", "r", "us-west-2", "Regions to "+
 		"run proxy.")
-	runCmd.Flags().DurationVarP(&frequency, "frequency", "f", time.Duration(time.Second * 260), "Frequency " +
-		"to execute Lambda function.  Maximum is " + lambdaMaxFrequency.String() + ". If multiple " +
-		"lambda-regions are specified, this will cause traffic to rotate round robin at the interval " +
+	runCmd.Flags().DurationVarP(&frequency, "frequency", "f", time.Duration(time.Second*260), "Frequency "+
+		"to execute Lambda function.  Maximum is "+lambdaMaxFrequency.String()+". If multiple "+
+		"lambda-regions are specified, this will cause traffic to rotate round robin at the interval "+
 		"specified here.")
-	runCmd.Flags().Int64VarP(&memory, "memory", "m", 128, "Memory size in MB for Lambda function. " +
+	runCmd.Flags().Int64VarP(&memory, "memory", "m", 128, "Memory size in MB for Lambda function. "+
 		"Higher memory may allow for faster network throughput.")
-	runCmd.Flags().StringVarP(&listeners, "listeners", "l",  "admin:awslambdaproxy@:8080","Add as many listeners" +
+	runCmd.Flags().StringVarP(&listeners, "listeners", "l", "admin:awslambdaproxy@:8080", "Add as many listeners"+
 		"as you'd like.")
-	runCmd.Flags().StringVarP(&sshUser, "ssh-user", "",  getCurrentUserName(),"SSH user for tunnel " +
+	runCmd.Flags().StringVarP(&sshUser, "ssh-user", "", getCurrentUserName(), "SSH user for tunnel "+
 		"connections from Lambda.")
-	runCmd.Flags().StringVarP(&sshPort, "ssh-port", "",  "22","SSH port for tunnel " +
+	runCmd.Flags().StringVarP(&sshPort, "ssh-port", "", "22", "SSH port for tunnel "+
 		"connections from Lambda.")
 
 	viper.BindPFlag("regions", runCmd.Flags().Lookup("regions"))

cmd/awslambdaproxy/cmd/setup.go

@@ -1,9 +1,9 @@
 package cmd
 
 import (
-	"github.com/spf13/cobra"
-	"github.com/dan-v/awslambdaproxy"
 	"fmt"
+	"github.com/dan-v/awslambdaproxy"
+	"github.com/spf13/cobra"
 	"os"
 )
 

infrastructure.go

@@ -3,24 +3,24 @@ package awslambdaproxy
 // majority of this is borrowed from https://github.com/goadapp/goad/blob/master/infrastructure/infrastructure.go
 
 import (
-	"time"
 	"log"
+	"time"
 
-	"github.com/pkg/errors"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/aws/aws-sdk-go/service/lambda"
+	"github.com/pkg/errors"
 )
 
 const (
-	lambdaFunctionName = "awslambdaproxy"
-	lambdaFunctionHandler = "main.handler"
-	lambdaFunctionRuntime = "python2.7"
-	lambdaFunctionIamRole = "awslambdaproxy-role"
+	lambdaFunctionName              = "awslambdaproxy"
+	lambdaFunctionHandler           = "main.handler"
+	lambdaFunctionRuntime           = "python2.7"
+	lambdaFunctionIamRole           = "awslambdaproxy-role"
 	lambdaFunctionIamRolePolicyName = "awslambdaproxy-role-policy"
-	lambdaFunctionZipLocation = "data/lambda.zip"
+	lambdaFunctionZipLocation       = "data/lambda.zip"
 )
 
 type LambdaInfrastructure struct {
@@ -30,7 +30,7 @@ type LambdaInfrastructure struct {
 	lambdaMemorySize int64
 }
 
-func SetupLambdaInfrastructure() (error) {
+func SetupLambdaInfrastructure() error {
 	svc := iam.New(session.New(), &aws.Config{})
 
 	_, err := svc.GetRole(&iam.GetRoleInput{
@@ -96,24 +96,24 @@ func (infra *LambdaInfrastructure) setup() error {
 		RoleName: aws.String(lambdaFunctionIamRole),
 	})
 	if err != nil {
-		return errors.Wrap(err, "Could not find IAM role " + lambdaFunctionIamRole + ". Probably need to run setup.")
+		return errors.Wrap(err, "Could not find IAM role "+lambdaFunctionIamRole+". Probably need to run setup.")
 	}
 	roleArn := *resp.Role.Arn
 	zip, err := Asset(lambdaFunctionZipLocation)
 	if err != nil {
-		return errors.Wrap(err, "Could not read ZIP file: " + lambdaFunctionZipLocation)
+		return errors.Wrap(err, "Could not read ZIP file: "+lambdaFunctionZipLocation)
 	}
 	for _, region := range infra.regions {
 		log.Println("Setting up Lambda function in region: " + region)
 		err = infra.createOrUpdateLambdaFunction(region, roleArn, zip)
 		if err != nil {
-			return errors.Wrap(err, "Could not create Lambda function in region " + region)
+			return errors.Wrap(err, "Could not create Lambda function in region "+region)
 		}
 	}
 	return nil
 }
 
-func setupLambdaInfrastructure(regions []string, memorySize int64, timeout int64) (error) {
+func setupLambdaInfrastructure(regions []string, memorySize int64, timeout int64) error {
 	infra := LambdaInfrastructure{
 		regions:          regions,
 		config:           &aws.Config{},
@@ -276,4 +276,4 @@ func (infra *LambdaInfrastructure) createIAMLambdaRolePolicy(roleName string) er
 		RoleName:   aws.String(roleName),
 	})
 	return err
-}
+}

init.go

@@ -1,13 +1,13 @@
 package awslambdaproxy
 
 import (
-	"time"
 	"log"
 	"runtime"
+	"time"
 )
 
 func ServerInit(sshUser string, sshPort string, regions []string, memory int64, frequency time.Duration,
-		listeners []string, timeout int64) {
+	listeners []string, timeout int64) {
 	publicIp, err := getPublicIp()
 	if err != nil {
 		log.Fatal("Error getting public IP address", err.Error())
@@ -49,4 +49,4 @@ func ServerInit(sshUser string, sshPort string, regions []string, memory int64,
 	log.Println("#######################################")
 
 	runtime.Goexit()
-}
+}

lambda/lambda.go

@@ -1,9 +1,9 @@
 package main
 
 import (
+	"flag"
 	"log"
 	"os"
-	"flag"
 )
 
 func LambdaInit(tunnelHost string, sshPort string, sshPrivateKeyFile string, sshUsername string) {
@@ -13,7 +13,7 @@ func LambdaInit(tunnelHost string, sshPort string, sshPrivateKeyFile string, ssh
 	log.Println("Establishing tunnel connection to", tunnelHost)
 	lambdaTunnelConnection, err := setupLambdaTunnelConnection(tunnelHost, sshPort, sshUsername, sshPrivateKeyFile)
 	if err != nil {
-		log.Fatal("Failed to establish connection to " + tunnelHost,  err)
+		log.Fatal("Failed to establish connection to "+tunnelHost, err)
 	}
 
 	log.Println("Starting LambdaDataCopyManager")
@@ -48,4 +48,3 @@ func main() {
 
 	LambdaInit(*addressPtr, *sshPortPtr, *sshPrivateKeyFilePtr, *sshUsernamePtr)
 }
-

lambda/lambdadatacopy.go

@@ -1,17 +1,17 @@
 package main
 
 import (
-	"os"
+	"io"
 	"log"
 	"net"
-	"io"
+	"os"
 	"sync"
 	"time"
 )
 
 type LambdaDataCopyManager struct {
 	lambdaTunnelConnection *LambdaTunnelConnection
-	lambdaProxyServer *LambdaProxyServer
+	lambdaProxyServer      *LambdaProxyServer
 }
 
 func (l *LambdaDataCopyManager) run() {
@@ -38,7 +38,7 @@ func (l *LambdaDataCopyManager) run() {
 func newLambdaDataCopyManager(p *LambdaProxyServer, t *LambdaTunnelConnection) *LambdaDataCopyManager {
 	return &LambdaDataCopyManager{
 		lambdaTunnelConnection: t,
-		lambdaProxyServer: p,
+		lambdaProxyServer:      p,
 	}
 }
 
@@ -59,4 +59,4 @@ func bidirectionalCopy(src io.ReadWriteCloser, dst io.ReadWriteCloser) {
 		wg.Done()
 	}()
 	wg.Wait()
-}
+}

lambda/lambdaproxyserver.go

@@ -33,4 +33,4 @@ func startLambdaProxyServer() *LambdaProxyServer {
 	}
 	go server.run()
 	return server
-}
+}

lambda/lambdatunnelconnection.go

@@ -1,9 +1,9 @@
 package main
 
 import (
+	"log"
 	"net"
 	"os"
-	"log"
 
 	"github.com/hashicorp/yamux"
 	"golang.org/x/crypto/ssh"
@@ -15,11 +15,11 @@ const (
 )
 
 type LambdaTunnelConnection struct {
-	tunnelHost string
+	tunnelHost  string
 	sshUsername string
-	sshSigner ssh.Signer
-	conn net.Conn
-	sess *yamux.Session
+	sshSigner   ssh.Signer
+	conn        net.Conn
+	sess        *yamux.Session
 }
 
 func (l *LambdaTunnelConnection) publicKeyFile() ssh.AuthMethod {
@@ -28,7 +28,7 @@ func (l *LambdaTunnelConnection) publicKeyFile() ssh.AuthMethod {
 
 func (l *LambdaTunnelConnection) setup() {
 	sshConfig := &ssh.ClientConfig{
-		User: l.sshUsername,
+		User:            l.sshUsername,
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 		Auth: []ssh.AuthMethod{
 			l.publicKeyFile(),
@@ -37,14 +37,14 @@ func (l *LambdaTunnelConnection) setup() {
 
 	tunnelConn, err := ssh.Dial("tcp", l.tunnelHost, sshConfig)
 	if err != nil {
-		log.Println("Failed to start SSH tunnel to: " + l.tunnelHost + ". Error: ", err)
+		log.Println("Failed to start SSH tunnel to: "+l.tunnelHost+". Error: ", err)
 		os.Exit(1)
 	}
 	log.Println("Created SSH tunnel to: " + l.tunnelHost)
 
 	localConn, err := tunnelConn.Dial("tcp", remoteTunnelPort)
 	if err != nil {
-		log.Println("Failed to create local tunnel to " + remoteTunnelPort, err)
+		log.Println("Failed to create local tunnel to "+remoteTunnelPort, err)
 		os.Exit(1)
 	}
 	l.conn = localConn
@@ -60,7 +60,7 @@ func (l *LambdaTunnelConnection) setup() {
 }
 
 func setupLambdaTunnelConnection(tunnelHost string, sshPort string, sshUsername string,
-					sshPrivateKeyFile string) (*LambdaTunnelConnection, error) {
+	sshPrivateKeyFile string) (*LambdaTunnelConnection, error) {
 	data, err := ioutil.ReadFile(sshPrivateKeyFile)
 	if err != nil {
 		log.Println("Failed to read private key file", sshPrivateKeyFile)
@@ -73,11 +73,11 @@ func setupLambdaTunnelConnection(tunnelHost string, sshPort string, sshUsername
 	}
 
 	tunnel := &LambdaTunnelConnection{
-		tunnelHost: tunnelHost + ":" + sshPort,
+		tunnelHost:  tunnelHost + ":" + sshPort,
 		sshUsername: sshUsername,
-		sshSigner: signer,
+		sshSigner:   signer,
 	}
 
 	tunnel.setup()
 	return tunnel, nil
-}
+}