Skip to content

Commit

Permalink
Check for 0-length volumes before accessing volume array
Browse files Browse the repository at this point in the history
  • Loading branch information
sevagh committed Mar 10, 2019
1 parent 3a5987e commit 09f2427
Show file tree
Hide file tree
Showing 454 changed files with 292,192 additions and 19 deletions.
15 changes: 6 additions & 9 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
FROM golang:1.11-stretch as build

ENV REPO sevagh/goat
ENV GO111MODULE=on
FROM golang:1.12-stretch as build

RUN apt-get update -y &&\
apt-get install -y zip

COPY . /go/src/github.com/$REPO
WORKDIR /go/src/github.com/$REPO
COPY . /goat
WORKDIR /goat

RUN make build zip tarball

Expand All @@ -18,8 +15,8 @@ RUN dnf update -y &&\

COPY ./rpm /goat-rpm-pkg/

COPY --from=build /go/src/github.com/sevagh/goat/bin/goat /goat-rpm-pkg/goat
COPY --from=build /go/src/github.com/sevagh/goat/bin/version-file /goat-rpm-pkg/version-file
COPY --from=build /goat/bin/goat /goat-rpm-pkg/goat
COPY --from=build /goat/bin/version-file /goat-rpm-pkg/version-file

WORKDIR goat-rpm-pkg

Expand All @@ -31,7 +28,7 @@ RUN alien ./*.rpm

FROM alpine

COPY --from=build /go/src/github.com/sevagh/goat/pkg /_goat-pkg
COPY --from=build /goat/pkg /_goat-pkg
COPY --from=rpmbuild /root/rpmbuild/RPMS/x86_64/* /_goat-pkg/

CMD cp _goat-pkg/* goat-pkg/
10 changes: 5 additions & 5 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ all: build

docker-build:
mkdir -p $(PKGDIR)
docker build --no-cache -t "goat-builder" -f Dockerfile.build .
docker build -q -t "goat-builder" -f Dockerfile.build .
docker run -v $(PKGDIR):/goat-pkg goat-builder

build:
CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -a -tags netgo -ldflags '-w -extldflags "-static" -X main.VERSION=$(VERSION)' -o $(BINPATH)/$(NAME)
CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -mod=vendor -a -tags netgo -ldflags '-w -extldflags "-static" -X main.VERSION=$(VERSION)' -o $(BINPATH)/$(NAME)
strip $(BINPATH)/$(NAME)
echo $(VERSION) > $(BINPATH)/version-file

Expand All @@ -36,9 +36,9 @@ fmt:

dev-env: ## Build a local development environment using Docker
@docker run -it --rm \
-v $(shell pwd):/go/src/github.com/sevagh/$(NAME) \
-w /go/src/github.com/sevagh/$(NAME) \
golang:1.11 \
-v $(shell pwd):/$(NAME) \
-w /$(NAME) \
golang:1.12 \
/bin/bash -c 'make install; bash'

install: ## Build and install locally the binary (dev purpose)
Expand Down
13 changes: 8 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ module github.com/sevagh/goat

require (
github.com/aws/aws-sdk-go v0.0.0-20181005211221-1accf06a4370
github.com/go-ini/ini v1.38.3
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8
github.com/konsorten/go-windows-terminal-sequences v1.0.1
github.com/go-ini/ini v1.38.3 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
github.com/mvisonneau/go-ebsnvme v0.0.0-20181106145828-712c1897902b
github.com/sirupsen/logrus v0.0.0-20181006134200-3f90cee1e41a
golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e
github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff // indirect
golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4 // indirect
golang.org/x/net v0.0.0-20190310074541-c10a0554eabf // indirect
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e // indirect
golang.org/x/text v0.3.0 // indirect
gopkg.in/ini.v1 v1.42.0 // indirect
)
18 changes: 18 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,22 +1,40 @@
github.com/aws/aws-sdk-go v0.0.0-20181005211221-1accf06a4370 h1:9CNHNe6hzV4PyQy0nMoQ+8xVVlmfThJslGoUMpQRYqc=
github.com/aws/aws-sdk-go v0.0.0-20181005211221-1accf06a4370/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
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/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/go-ini/ini v1.38.3 h1:CclkQtfmOJadMVMYepq1DkVSYw2jf/0BTvjNBHth5xY=
github.com/go-ini/ini v1.38.3/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE=
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/konsorten/go-windows-terminal-sequences v0.0.0-20180402223658-b729f2633dfe/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/mvisonneau/go-ebsnvme v0.0.0-20181106145828-712c1897902b h1:DTqtdPJ1zPK6en2unW3XXzXaBEq3mj6KGpxVmji98qU=
github.com/mvisonneau/go-ebsnvme v0.0.0-20181106145828-712c1897902b/go.mod h1:1fIXG7XlmadNopsWdn6DON85DI95MU4qlVXsp6bn5kU=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v0.0.0-20181006134200-3f90cee1e41a h1:2nECf0RFJfCnO13fUtl6dALna8VaiBKoRiXVn91+Z3Y=
github.com/sirupsen/logrus v0.0.0-20181006134200-3f90cee1e41a/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff h1:86HlEv0yBCry9syNuylzqznKXDK11p6D0DT596yNMys=
github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff/go.mod h1:KSQcGKpxUMHk3nbYzs/tIBAM2iDooCn0BmttHOJEbLs=
github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4 h1:Vk3wNqEZwyGyei9yq5ekj7frek2u7HUfffJ1/opblzc=
golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net v0.0.0-20190310074541-c10a0554eabf h1:J7RqX9u0J9ZB37CGaFc2VC+QZZT6E6jnDbrboEFVo0U=
golang.org/x/net v0.0.0-20190310074541-c10a0554eabf/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e h1:EfdBzeKbFSvOjoIqSZcfS8wp0FBLokGBEs9lz1OtSg0=
golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/ini.v1 v1.42.0 h1:7N3gPTt50s8GuLortA00n8AqRTk75qOP98+mTPpgzRk=
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
202 changes: 202 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/NOTICE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 09f2427

Please sign in to comment.