Skip to content
This repository was archived by the owner on Nov 1, 2025. It is now read-only.

Commit 81f027e

Browse files
author
Dan Vittegleo
committed
golint
1 parent 839df2c commit 81f027e

File tree

13 files changed

+100
-96
lines changed

13 files changed

+100
-96
lines changed

‎cmd/awslambdaproxy/cmd/run.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ export AWS_SECRET_ACCESS_KEY=YYYYYYYYYYYYYYYYYYYYYY
4242
./awslambdaproxy run -r us-west-2 -m 512
4343
`,
4444
Run: func(cmd *cobra.Command, args []string) {
45-
aSshUser := viper.GetString("ssh-user")
46-
aSshPort := viper.GetString("ssh-port")
45+
aSSHUser := viper.GetString("ssh-user")
46+
aSSHPort := viper.GetString("ssh-port")
4747
aRegions := strings.Split(viper.GetString("regions"), ",")
4848
aMemory := viper.GetInt64("memory")
4949
aFrequency := viper.GetDuration("frequency")
@@ -78,7 +78,7 @@ export AWS_SECRET_ACCESS_KEY=YYYYYYYYYYYYYYYYYYYYYY
7878
os.Exit(1)
7979
}
8080

81-
awslambdaproxy.ServerInit(aSshUser, aSshPort, aRegions, aMemory, aFrequency, aListeners, aTimeout)
81+
awslambdaproxy.ServerInit(aSSHUser, aSSHPort, aRegions, aMemory, aFrequency, aListeners, aTimeout)
8282
},
8383
}
8484

‎infrastructure.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ const (
2323
lambdaFunctionZipLocation = "data/lambda.zip"
2424
)
2525

26-
type LambdaInfrastructure struct {
26+
type lambdaInfrastructure struct {
2727
config *aws.Config
2828
regions []string
2929
lambdaTimeout int64
3030
lambdaMemorySize int64
3131
}
3232

33+
// SetupLambdaInfrastructure sets up IAM role needed to run awslambdaproxy
3334
func SetupLambdaInfrastructure() error {
3435
svc := iam.New(session.New(), &aws.Config{})
3536

@@ -90,7 +91,7 @@ func SetupLambdaInfrastructure() error {
9091
return nil
9192
}
9293

93-
func (infra *LambdaInfrastructure) setup() error {
94+
func (infra *lambdaInfrastructure) setup() error {
9495
svc := iam.New(session.New(), infra.config)
9596
resp, err := svc.GetRole(&iam.GetRoleInput{
9697
RoleName: aws.String(lambdaFunctionIamRole),
@@ -114,7 +115,7 @@ func (infra *LambdaInfrastructure) setup() error {
114115
}
115116

116117
func setupLambdaInfrastructure(regions []string, memorySize int64, timeout int64) error {
117-
infra := LambdaInfrastructure{
118+
infra := lambdaInfrastructure{
118119
regions: regions,
119120
config: &aws.Config{},
120121
lambdaTimeout: timeout,
@@ -126,7 +127,7 @@ func setupLambdaInfrastructure(regions []string, memorySize int64, timeout int64
126127
return nil
127128
}
128129

129-
func (infra *LambdaInfrastructure) createOrUpdateLambdaFunction(region, roleArn string, payload []byte) error {
130+
func (infra *lambdaInfrastructure) createOrUpdateLambdaFunction(region, roleArn string, payload []byte) error {
130131
config := infra.config.WithRegion(region)
131132
svc := lambda.New(session.New(), config)
132133

@@ -145,7 +146,7 @@ func (infra *LambdaInfrastructure) createOrUpdateLambdaFunction(region, roleArn
145146
return infra.createLambdaFunction(svc, roleArn, payload)
146147
}
147148

148-
func (infra *LambdaInfrastructure) deleteLambdaFunction(svc *lambda.Lambda) error {
149+
func (infra *lambdaInfrastructure) deleteLambdaFunction(svc *lambda.Lambda) error {
149150
_, err := svc.DeleteFunction(&lambda.DeleteFunctionInput{
150151
FunctionName: aws.String(lambdaFunctionName),
151152
})
@@ -155,7 +156,7 @@ func (infra *LambdaInfrastructure) deleteLambdaFunction(svc *lambda.Lambda) erro
155156
return nil
156157
}
157158

158-
func (infra *LambdaInfrastructure) createLambdaFunction(svc *lambda.Lambda, roleArn string, payload []byte) error {
159+
func (infra *lambdaInfrastructure) createLambdaFunction(svc *lambda.Lambda, roleArn string, payload []byte) error {
159160
function, err := svc.CreateFunction(&lambda.CreateFunctionInput{
160161
Code: &lambda.FunctionCode{
161162
ZipFile: payload,
@@ -180,7 +181,7 @@ func (infra *LambdaInfrastructure) createLambdaFunction(svc *lambda.Lambda, role
180181
return createLambdaAlias(svc, function.Version)
181182
}
182183

183-
func (infra *LambdaInfrastructure) updateLambdaFunction(svc *lambda.Lambda, roleArn string, payload []byte) error {
184+
func (infra *lambdaInfrastructure) updateLambdaFunction(svc *lambda.Lambda, roleArn string, payload []byte) error {
184185
function, err := svc.UpdateFunctionCode(&lambda.UpdateFunctionCodeInput{
185186
ZipFile: payload,
186187
FunctionName: aws.String(lambdaFunctionName),
@@ -218,7 +219,7 @@ func createLambdaAlias(svc *lambda.Lambda, functionVersion *string) error {
218219
return err
219220
}
220221

221-
func (infra *LambdaInfrastructure) createIAMLambdaRole(roleName string) (arn string, err error) {
222+
func (infra *lambdaInfrastructure) createIAMLambdaRole(roleName string) (arn string, err error) {
222223
svc := iam.New(session.New(), infra.config)
223224

224225
resp, err := svc.GetRole(&iam.GetRoleInput{
@@ -254,7 +255,7 @@ func (infra *LambdaInfrastructure) createIAMLambdaRole(roleName string) (arn str
254255
return *resp.Role.Arn, nil
255256
}
256257

257-
func (infra *LambdaInfrastructure) createIAMLambdaRolePolicy(roleName string) error {
258+
func (infra *lambdaInfrastructure) createIAMLambdaRolePolicy(roleName string) error {
258259
svc := iam.New(session.New(), infra.config)
259260

260261
_, err := svc.PutRolePolicy(&iam.PutRolePolicyInput{

‎init.go‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import (
66
"time"
77
)
88

9+
// ServerInit is the main entrypoint for the server portion of awslambdaproxy
910
func ServerInit(sshUser string, sshPort string, regions []string, memory int64, frequency time.Duration,
1011
listeners []string, timeout int64) {
11-
publicIp, err := getPublicIp()
12+
publicIP, err := getPublicIP()
1213
if err != nil {
1314
log.Fatal("Error getting public IP address", err.Error())
1415
}
@@ -19,32 +20,32 @@ func ServerInit(sshUser string, sshPort string, regions []string, memory int64,
1920
log.Fatal("Failed to setup Lambda infrastructure", err.Error())
2021
}
2122

22-
log.Println("Starting SSHManager")
23+
log.Println("Starting sshManager")
2324
privateKey, err := NewSSHManager()
2425
if err != nil {
25-
log.Fatal("Failed to setup SSHManager", err.Error())
26+
log.Fatal("Failed to setup sshManager", err.Error())
2627
}
2728

2829
localProxy, err := NewLocalProxy(listeners)
2930
if err != nil {
3031
log.Fatal("Failed to setup LocalProxy", err.Error())
3132
}
3233

33-
log.Println("Starting ConnectionManager")
34+
log.Println("Starting connectionManager")
3435
tunnelConnectionManager, err := newTunnelConnectionManager(frequency, localProxy)
3536
if err != nil {
36-
log.Fatal("Failed to setup ConnectionManager", err.Error())
37+
log.Fatal("Failed to setup connectionManager", err.Error())
3738
}
3839

39-
log.Println("Starting LambdaExecutionManager")
40-
_, err = newLambdaExecutionManager(publicIp, regions, frequency,
40+
log.Println("Starting lambdaExecutionManager")
41+
_, err = newLambdaExecutionManager(publicIP, regions, frequency,
4142
sshUser, sshPort, privateKey, tunnelConnectionManager.tunnelRedeployNeeded)
4243
if err != nil {
43-
log.Fatal("Failed to setup LambdaExecutionManager", err.Error())
44+
log.Fatal("Failed to setup lambdaExecutionManager", err.Error())
4445
}
4546

4647
log.Println("#######################################")
47-
log.Println("Proxy IP: ", publicIp)
48+
log.Println("Proxy IP: ", publicIP)
4849
log.Println("Listeners: ", listeners)
4950
log.Println("#######################################")
5051

‎lambda/lambda.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"os"
77
)
88

9-
func LambdaInit(tunnelHost string, sshPort string, sshPrivateKeyFile string, sshUsername string) {
10-
log.Println("Starting LambdaProxyServer")
9+
func lambdaInit(tunnelHost string, sshPort string, sshPrivateKeyFile string, sshUsername string) {
10+
log.Println("Starting lambdaProxyServer")
1111
lambdaProxyServer := startLambdaProxyServer()
1212

1313
log.Println("Establishing tunnel connection to", tunnelHost)
@@ -16,7 +16,7 @@ func LambdaInit(tunnelHost string, sshPort string, sshPrivateKeyFile string, ssh
1616
log.Fatal("Failed to establish connection to "+tunnelHost, err)
1717
}
1818

19-
log.Println("Starting LambdaDataCopyManager")
19+
log.Println("Starting lambdaDataCopyManager")
2020
dataCopyManager := newLambdaDataCopyManager(lambdaProxyServer, lambdaTunnelConnection)
2121
dataCopyManager.run()
2222
}
@@ -46,5 +46,5 @@ func main() {
4646
os.Exit(1)
4747
}
4848

49-
LambdaInit(*addressPtr, *sshPortPtr, *sshPrivateKeyFilePtr, *sshUsernamePtr)
49+
lambdaInit(*addressPtr, *sshPortPtr, *sshPrivateKeyFilePtr, *sshUsernamePtr)
5050
}

‎lambda/lambdadatacopy.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"time"
1010
)
1111

12-
type LambdaDataCopyManager struct {
13-
lambdaTunnelConnection *LambdaTunnelConnection
14-
lambdaProxyServer *LambdaProxyServer
12+
type lambdaDataCopyManager struct {
13+
lambdaTunnelConnection *lambdaTunnelConnection
14+
lambdaProxyServer *lambdaProxyServer
1515
}
1616

17-
func (l *LambdaDataCopyManager) run() {
17+
func (l *lambdaDataCopyManager) run() {
1818
for {
1919
proxySocketConn, proxySocketErr := net.Dial("tcp", l.lambdaProxyServer.port)
2020
if proxySocketErr != nil {
@@ -35,8 +35,8 @@ func (l *LambdaDataCopyManager) run() {
3535
}
3636
}
3737

38-
func newLambdaDataCopyManager(p *LambdaProxyServer, t *LambdaTunnelConnection) *LambdaDataCopyManager {
39-
return &LambdaDataCopyManager{
38+
func newLambdaDataCopyManager(p *lambdaProxyServer, t *lambdaTunnelConnection) *lambdaDataCopyManager {
39+
return &lambdaDataCopyManager{
4040
lambdaTunnelConnection: t,
4141
lambdaProxyServer: p,
4242
}

‎lambda/lambdaproxyserver.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"github.com/ginuerzh/gost"
77
)
88

9-
type LambdaProxyServer struct {
9+
type lambdaProxyServer struct {
1010
port string
1111
}
1212

13-
func (l *LambdaProxyServer) run() {
13+
func (l *lambdaProxyServer) run() {
1414
chain := gost.NewProxyChain()
1515
if err := chain.AddProxyNodeString(); err != nil {
1616
log.Fatal(err)
@@ -26,9 +26,9 @@ func (l *LambdaProxyServer) run() {
2626
log.Fatal(server.Serve())
2727
}
2828

29-
func startLambdaProxyServer() *LambdaProxyServer {
29+
func startLambdaProxyServer() *lambdaProxyServer {
3030
port := ":8080"
31-
server := &LambdaProxyServer{
31+
server := &lambdaProxyServer{
3232
port: port,
3333
}
3434
go server.run()

‎lambda/lambdatunnelconnection.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ const (
1414
remoteTunnelPort = "localhost:8081"
1515
)
1616

17-
type LambdaTunnelConnection struct {
17+
type lambdaTunnelConnection struct {
1818
tunnelHost string
1919
sshUsername string
2020
sshSigner ssh.Signer
2121
conn net.Conn
2222
sess *yamux.Session
2323
}
2424

25-
func (l *LambdaTunnelConnection) publicKeyFile() ssh.AuthMethod {
25+
func (l *lambdaTunnelConnection) publicKeyFile() ssh.AuthMethod {
2626
return ssh.PublicKeys(l.sshSigner)
2727
}
2828

29-
func (l *LambdaTunnelConnection) setup() {
29+
func (l *lambdaTunnelConnection) setup() {
3030
sshConfig := &ssh.ClientConfig{
3131
User: l.sshUsername,
3232
HostKeyCallback: ssh.InsecureIgnoreHostKey(),
@@ -60,7 +60,7 @@ func (l *LambdaTunnelConnection) setup() {
6060
}
6161

6262
func setupLambdaTunnelConnection(tunnelHost string, sshPort string, sshUsername string,
63-
sshPrivateKeyFile string) (*LambdaTunnelConnection, error) {
63+
sshPrivateKeyFile string) (*lambdaTunnelConnection, error) {
6464
data, err := ioutil.ReadFile(sshPrivateKeyFile)
6565
if err != nil {
6666
log.Println("Failed to read private key file", sshPrivateKeyFile)
@@ -72,7 +72,7 @@ func setupLambdaTunnelConnection(tunnelHost string, sshPort string, sshUsername
7272
return nil, err
7373
}
7474

75-
tunnel := &LambdaTunnelConnection{
75+
tunnel := &lambdaTunnelConnection{
7676
tunnelHost: tunnelHost + ":" + sshPort,
7777
sshUsername: sshUsername,
7878
sshSigner: signer,

‎lambdaexecution.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ import (
1111
"github.com/pkg/errors"
1212
)
1313

14-
type LambdaExecutionManager struct {
14+
type lambdaExecutionManager struct {
1515
regions []string
1616
frequency time.Duration
17-
publicIp string
17+
publicIP string
1818
sshPort string
1919
sshKey string
2020
sshUser string
2121
}
2222

23-
type LambdaPayload struct {
23+
type lambdaPayload struct {
2424
ConnectBackAddress string
2525
SSHPort string
2626
SSHKey string
2727
SSHUser string
2828
}
2929

30-
func (l *LambdaExecutionManager) run() {
31-
log.Println("Using public IP", l.publicIp)
30+
func (l *lambdaExecutionManager) run() {
31+
log.Println("Using public IP", l.publicIP)
3232
log.Println("Lambda execution frequency", l.frequency)
3333
for {
3434
for region := range l.regions {
@@ -38,12 +38,12 @@ func (l *LambdaExecutionManager) run() {
3838
}
3939
}
4040

41-
func (l *LambdaExecutionManager) executeFunction(region int) error {
41+
func (l *lambdaExecutionManager) executeFunction(region int) error {
4242
log.Println("Executing Lambda function in region", l.regions[region])
4343
sess := session.New(&aws.Config{})
4444
svc := lambda.New(sess, &aws.Config{Region: aws.String(l.regions[region])})
45-
lambdaPayload := LambdaPayload{
46-
ConnectBackAddress: l.publicIp,
45+
lambdaPayload := lambdaPayload{
46+
ConnectBackAddress: l.publicIP,
4747
SSHPort: l.sshPort,
4848
SSHKey: l.sshKey,
4949
SSHUser: l.sshUser,
@@ -61,12 +61,12 @@ func (l *LambdaExecutionManager) executeFunction(region int) error {
6161
return nil
6262
}
6363

64-
func newLambdaExecutionManager(publicIp string, regions []string, frequency time.Duration, sshUser string, sshPort string,
65-
privateKey []byte, onDemandExecution chan bool) (*LambdaExecutionManager, error) {
66-
executionManager := &LambdaExecutionManager{
64+
func newLambdaExecutionManager(publicIP string, regions []string, frequency time.Duration, sshUser string, sshPort string,
65+
privateKey []byte, onDemandExecution chan bool) (*lambdaExecutionManager, error) {
66+
executionManager := &lambdaExecutionManager{
6767
regions: regions,
6868
frequency: frequency,
69-
publicIp: publicIp,
69+
publicIP: publicIP,
7070
sshPort: sshPort,
7171
sshKey: string(privateKey[:]),
7272
sshUser: sshUser,

‎localproxy.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const (
99
forwardProxy = "socks5://localhost:8082"
1010
)
1111

12+
// LocalProxy is proxy listener and where to forward
1213
type LocalProxy struct {
1314
listeners []string
1415
forwardProxy string
@@ -34,6 +35,7 @@ func (l *LocalProxy) run() {
3435
}
3536
}
3637

38+
// NewLocalProxy starts a local proxy that will forward to proxy running in Lambda
3739
func NewLocalProxy(listeners []string) (*LocalProxy, error) {
3840
l := &LocalProxy{
3941
listeners: listeners,

0 commit comments

Comments
 (0)