2018 overhaul

* Refactor to pkg/cmd convention * Add static compilation flags
sevagh · Mar 5, 2018 · 3efc37b · 3efc37b
1 parent e67304a
commit 3efc37b
Show file tree

Hide file tree

Showing 29 changed files with 59 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor/
+dist/
 goat
diff --git a/GNUmakefile b/GNUmakefile
@@ -0,0 +1,43 @@
+VERSION:=0.4.0
+GOAT_FILES?=$$(find . -name '*.go' | grep -v vendor)
+GOAT_NAME=$(notdir $(shell pwd))
+
+STATIC_ENV:=CGO_ENABLED=0 GOOS=linux GOARCH=amd64
+STATIC_FLAGS:=-a -tags netgo -ldflags '-extldflags "-static" -X main.VERSION=$(VERSION)'
+RELEASE_FLAGS:=-a -tags netgo -ldflags '-w -extldflags "-static" -X main.VERSION=$(VERSION)'
+
+DIST_DIR=dist/
+BIN_DIR=dist/bin
+
+all: build_static
+
+builddir:
+	@mkdir -p $(DIST_DIR) $(BIN_DIR)
+
+build:
+	@cd cmd/goat && go build $(DYNAMIC_FLAGS) -o ../../$(BIN_DIR)/$(GOAT_NAME)
+
+build_static: builddir
+	@cd cmd/goat && go build $(STATIC_FLAGS) -o ../../$(BIN_DIR)/$(GOAT_NAME)
+
+release: builddir
+	@cd cmd/goat && go build $(RELEASE_FLAGS) -o ../../$(BIN_DIR)/$(GOAT_NAME)
+
+deps:
+	@go get -u github.com/golang/dep
+	@dep ensure
+
+test: build lint
+	@go vet .
+	@go test -v ./...
+
+lint:
+	@gofmt -s -w $(GOAT_FILES)
+
+clean:
+	-rm -rf build
+
+package:
+	@GOAT_VERSION=$(VERSION) $(MAKE) -C ./centos-package/
+
+.PHONY: clean test
diff --git a/Makefile b/Makefile
diff --git a/centos-package/.gitignore b/centos-package/.gitignore
@@ -0,0 +1 @@
+./goat
diff --git a/.pkg/Makefile → centos-package/GNUmakefile b/.pkg/Makefile → centos-package/GNUmakefile
@@ -1,4 +1,4 @@
 rpm:
-	@make -C ../ build && cp ../goat ./
+	@make -C ../ release && cp ../dist/bin/goat ./
 	@rpmlint specfile.spec
 	@rpmbuild -ba specfile.spec --define "_sourcedir $$PWD" --define "_version $$GOAT_VERSION"
diff --git a/.pkg/goat@.service → centos-package/goat@.service b/.pkg/goat@.service → centos-package/goat@.service
diff --git a/.pkg/specfile.spec → centos-package/specfile.spec b/.pkg/specfile.spec → centos-package/specfile.spec
diff --git a/main.go → cmd/goat/main.go b/main.go → cmd/goat/main.go
@@ -6,8 +6,8 @@ import (
 	log "github.com/sirupsen/logrus"
 	"os"
 
-	"github.com/sevagh/goat/commands/ebs"
-	"github.com/sevagh/goat/commands/eni"
+	"github.com/sevagh/goat/pkg/commands/ebs"
+	"github.com/sevagh/goat/pkg/commands/eni"
 )
 
 //Goat version substituted by the Makefile

diff --git a/awsutil/attach.go → pkg/awsutil/attach.go b/awsutil/attach.go → pkg/awsutil/attach.go
@@ -4,7 +4,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/sevagh/goat/driveutil"
+	"github.com/sevagh/goat/pkg/driveutil"
 )
 
 //AttachEbsVolumes attaches the given map of {'VolumeName':[]EbsVol} with the EC2 client in the provided ec2Instance

diff --git a/awsutil/ebs.go → pkg/awsutil/ebs.go b/awsutil/ebs.go → pkg/awsutil/ebs.go
diff --git a/awsutil/ec2.go → pkg/awsutil/ec2.go b/awsutil/ec2.go → pkg/awsutil/ec2.go
diff --git a/awsutil/eni.go → pkg/awsutil/eni.go b/awsutil/eni.go → pkg/awsutil/eni.go
diff --git a/commands/ebs/README.md → pkg/commands/ebs/README.md b/commands/ebs/README.md → pkg/commands/ebs/README.md
diff --git a/commands/ebs/ebs.go → pkg/commands/ebs/ebs.go b/commands/ebs/ebs.go → pkg/commands/ebs/ebs.go
@@ -4,10 +4,10 @@ import (
 	log "github.com/sirupsen/logrus"
 	"os"
 
-	"github.com/sevagh/goat/awsutil"
-	"github.com/sevagh/goat/driveutil"
-	"github.com/sevagh/goat/fsutil"
-	"github.com/sevagh/goat/raidutil"
+	"github.com/sevagh/goat/pkg/awsutil"
+	"github.com/sevagh/goat/pkg/driveutil"
+	"github.com/sevagh/goat/pkg/fsutil"
+	"github.com/sevagh/goat/pkg/raidutil"
 )
 
 //GoatEbs runs Goat for your EBS volumes - attach, mount, mkfs, etc.

diff --git a/commands/eni/README.md → pkg/commands/eni/README.md b/commands/eni/README.md → pkg/commands/eni/README.md
diff --git a/commands/eni/eni.go → pkg/commands/eni/eni.go b/commands/eni/eni.go → pkg/commands/eni/eni.go
@@ -4,7 +4,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"os"
 
-	"github.com/sevagh/goat/awsutil"
+	"github.com/sevagh/goat/pkg/awsutil"
 )
 
 //GoatEni runs Goat for your ENIs - attach

diff --git a/driveutil/drive_exists.go → pkg/driveutil/drive_exists.go b/driveutil/drive_exists.go → pkg/driveutil/drive_exists.go
@@ -3,7 +3,7 @@ package driveutil
 import (
 	"time"
 
-	"github.com/sevagh/goat/execute"
+	"github.com/sevagh/goat/pkg/execute"
 )
 
 //DoesDriveExistWithTimeout makes 10 attempts, 2 second sleep between each, to stat a drive to check for its existence

diff --git a/driveutil/drive_picker.go → pkg/driveutil/drive_picker.go b/driveutil/drive_picker.go → pkg/driveutil/drive_picker.go
diff --git a/driveutil/drive_picker_test.go → pkg/driveutil/drive_picker_test.go b/driveutil/drive_picker_test.go → pkg/driveutil/drive_picker_test.go
diff --git a/execute/execute.go → pkg/execute/execute.go b/execute/execute.go → pkg/execute/execute.go
diff --git a/execute/execute_test.go → pkg/execute/execute_test.go b/execute/execute_test.go → pkg/execute/execute_test.go
diff --git a/fsutil/filesystem.go → pkg/fsutil/filesystem.go b/fsutil/filesystem.go → pkg/fsutil/filesystem.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/sevagh/goat/execute"
+	"github.com/sevagh/goat/pkg/execute"
 )
 
 //CheckFilesystem checks for a filesystem on a given drive using blkid. It returns ok if there is no filesystem or the filesystem is the correct type. Error if there's a different filesystem

diff --git a/fsutil/filesystem_test.go → pkg/fsutil/filesystem_test.go b/fsutil/filesystem_test.go → pkg/fsutil/filesystem_test.go
diff --git a/fsutil/fstab.go → pkg/fsutil/fstab.go b/fsutil/fstab.go → pkg/fsutil/fstab.go
diff --git a/fsutil/fstab_test.go → pkg/fsutil/fstab_test.go b/fsutil/fstab_test.go → pkg/fsutil/fstab_test.go
diff --git a/fsutil/mount.go → pkg/fsutil/mount.go b/fsutil/mount.go → pkg/fsutil/mount.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/sevagh/goat/execute"
+	"github.com/sevagh/goat/pkg/execute"
 )
 
 //Mount calls mount with no parameters. It relies on there being a correct fstab entry on the provided mountpoint. In the case of a dryRun it doesn't actually execute it, just logs what it would have executed

diff --git a/fsutil/mount_test.go → pkg/fsutil/mount_test.go b/fsutil/mount_test.go → pkg/fsutil/mount_test.go
diff --git a/raidutil/raid.go → pkg/raidutil/raid.go b/raidutil/raid.go → pkg/raidutil/raid.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/sevagh/goat/driveutil"
-	"github.com/sevagh/goat/execute"
+	"github.com/sevagh/goat/pkg/driveutil"
+	"github.com/sevagh/goat/pkg/execute"
 )
 
 //CreateRaidArray runs the appropriate mdadm command for the given list of EbsVol that should be raided together. It takes dryRun as a boolean, where it tells you which mdadm it would have run

diff --git a/raidutil/raid_test.go → pkg/raidutil/raid_test.go b/raidutil/raid_test.go → pkg/raidutil/raid_test.go