Skip to content

Commit a0b8eda

Browse files
authored
cmd/build-lambda-zip: remove dependency on github.com/urfave/cli/v2 (#439)
* main.go fix copyright * cmd/build-lambda-zip: remove dependency on github.com/urfave/cli/v2
1 parent 138d021 commit a0b8eda

File tree

3 files changed

+27
-50
lines changed

3 files changed

+27
-50
lines changed

cmd/build-lambda-zip/main.go

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,44 @@
1-
// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved
1+
// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved
22

33
package main
44

55
import (
66
"archive/zip"
7-
"errors"
7+
"flag"
88
"fmt"
99
"io/ioutil"
1010
"log"
1111
"os"
1212
"path/filepath"
13-
14-
"github.com/urfave/cli/v2"
1513
)
1614

17-
func main() {
18-
app := &cli.App{
19-
Name: "build-lambda-zip",
20-
Usage: "Put an executable and supplemental files into a zip file that works with AWS Lambda.",
21-
Flags: []cli.Flag{
22-
&cli.StringFlag{
23-
Name: "output",
24-
Aliases: []string{"o"},
25-
Value: "",
26-
Usage: "output file path for the zip. Defaults to the first input file name.",
27-
},
28-
},
29-
Action: func(c *cli.Context) error {
30-
if !c.Args().Present() {
31-
return errors.New("no input provided")
32-
}
33-
34-
inputExe := c.Args().First()
35-
outputZip := c.String("output")
36-
if outputZip == "" {
37-
outputZip = fmt.Sprintf("%s.zip", filepath.Base(inputExe))
38-
}
15+
const usage = `build-lambda-zip - Puts an executable and supplemental files into a zip file that works with AWS Lambda.
16+
usage:
17+
build-lambda-zip [options] handler-exe [paths...]
18+
options:
19+
-o, --output output file path for the zip. (default: ${handler-exe}.zip)
20+
-h, --help prints usage
21+
`
3922

40-
if err := compressExeAndArgs(outputZip, inputExe, c.Args().Tail()); err != nil {
41-
return fmt.Errorf("failed to compress file: %v", err)
42-
}
43-
log.Print("wrote " + outputZip)
44-
return nil
45-
},
23+
func main() {
24+
var outputZip string
25+
flag.StringVar(&outputZip, "o", "", "")
26+
flag.StringVar(&outputZip, "output", "", "")
27+
flag.Usage = func() {
28+
fmt.Fprint(os.Stderr, usage)
4629
}
47-
48-
if err := app.Run(os.Args); err != nil {
49-
fmt.Fprintf(os.Stderr, "%v\n", err)
50-
os.Exit(1)
30+
flag.Parse()
31+
if len(flag.Args()) == 0 {
32+
log.Fatal("no input provided")
33+
}
34+
inputExe := flag.Arg(0)
35+
if outputZip == "" {
36+
outputZip = fmt.Sprintf("%s.zip", filepath.Base(inputExe))
37+
}
38+
if err := compressExeAndArgs(outputZip, inputExe, flag.Args()[1:]); err != nil {
39+
log.Fatalf("failed to compress file: %v", err)
5140
}
41+
log.Printf("wrote %s", outputZip)
5242
}
5343

5444
func writeExe(writer *zip.Writer, pathInZip string, data []byte) error {

go.mod

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ module github.com/aws/aws-lambda-go
22

33
go 1.18
44

5-
require (
6-
github.com/stretchr/testify v1.6.1
7-
github.com/urfave/cli/v2 v2.4.0
8-
)
5+
require github.com/stretchr/testify v1.6.1
96

107
require (
11-
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
128
github.com/davecgh/go-spew v1.1.1 // indirect
139
github.com/pmezard/go-difflib v1.0.0 // indirect
14-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
1510
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
1611
)

go.sum

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
2-
github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
3-
github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
41
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
52
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
63
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
74
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
85
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
9-
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
10-
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
116
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
127
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
138
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
14-
github.com/urfave/cli/v2 v2.4.0 h1:m2pxjjDFgDxSPtO8WSdbndj17Wu2y8vOT86wE/tjr+I=
15-
github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg=
169
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1710
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
18-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
1911
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2012
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
2113
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)