Merge pull request #98 from newrelic/jthurman/goreleaser

Automated Releases via goreleaser

Author: Jonathan Thurman

.circleci/config.yml

@@ -16,29 +16,29 @@ workflows:
       - security-scan:
           requires:
             - checkout_code
-      - build:
+      - compile:
           requires:
             - lint
             - test
             - security-scan
-      - hold-for-deploy:
+      - hold-for-release:
           type: approval
           filters:
             branches:
               ignore: /.*/
             tags:
-              only: /^\d+\.\d+\.\d+$/
+              only: /^v\d+\.\d+\.\d+$/
           require:
-            - build
-      - docker-push:
+            - compile
+      - release:
           filters:
             branches:
               ignore: /.*/
             tags:
-              only: /^\d+\.\d+\.\d+$/
+              only: /^v\d+\.\d+\.\d+$/
           requires:
-            - build
-            - hold-for-deploy
+            - compile
+            - hold-for-release
 
 jobs:
   checkout_code:
@@ -54,7 +54,7 @@ jobs:
 
   lint:
     docker:
-      - image: circleci/golang:1.13
+      - image: circleci/golang:1.14
     working_directory: /go/src/github.com/newrelic/newrelic-cli
     steps:
       - restore_cache:
@@ -65,7 +65,7 @@ jobs:
 
   test:
     docker:
-      - image: circleci/golang:1.13
+      - image: circleci/golang:1.14
     working_directory: /go/src/github.com/newrelic/newrelic-cli
     steps:
       - restore_cache:
@@ -77,35 +77,32 @@ jobs:
           name: Integration Tests
           command: make test-integration
 
-  build:
+  security-scan:
     docker:
-      - image: circleci/golang:1.13
+      - image: circleci/golang:1.14
     working_directory: /go/src/github.com/newrelic/newrelic-cli
     steps:
       - restore_cache:
           key: repo-{{ .Environment.CIRCLE_SHA1 }}
-      - run: make build-ci
-
+      - snyk/scan:
+          severity-threshold: high
+          fail-on-issues: false
+          monitor-on-build: true
 
-  security-scan:
+  compile:
     docker:
-      - image: circleci/golang:1.13
+      - image: circleci/golang:1.14
     working_directory: /go/src/github.com/newrelic/newrelic-cli
     steps:
       - restore_cache:
           key: repo-{{ .Environment.CIRCLE_SHA1 }}
-      - snyk/scan:
-          severity-threshold: high
-          fail-on-issues: false
-          monitor-on-build: true
+      - run: make compile-only
 
-  docker-push:
+  release:
     docker:
-      - image: circleci/golang:1.13
+      - image: circleci/golang:1.14
     working_directory: /go/src/github.com/newrelic/newrelic-cli
     steps:
       - checkout
-      - run:
-          name: Push Docker Container
-          command: make docker-push
+      - run: make release-publish
 

.gitignore

@@ -1,6 +1,7 @@
-tmp/*
 bin/*
 coverage/*
+dist/*
+tmp/*
 vendor/*
 
 .vscode/

.goreleaser.yml

@@ -0,0 +1,69 @@
+project_name: newrelic-cli
+
+env:
+  - GO111MODULE=on
+
+before:
+  hooks:
+    - make clean
+    - go mod download
+
+builds:
+  -
+    id: newrelic
+    dir: cmd/newrelic
+    binary: newrelic
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - darwin
+      - windows
+    goarch:
+      - amd64
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.AppName={{.Binary}}
+        -X github.com/newrelic/newrelic-cli/internal/client.version={{.Version}}
+
+release:
+  # Mark as a pre-release for now
+  prerelease: true
+  name_template: "{{.ProjectName}} v{{.Version}}"
+
+archives:
+  -
+    id: "default"
+    builds:
+      - newrelic
+    replacements:
+      darwin: Darwin
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
+    format_overrides:
+      - goos: windows
+        format: zip
+    files:
+      - CHANGELOG.md
+      - LICENSE
+      - README.md
+
+dockers:
+  -
+    image_templates:
+      - 'newrelic/cli:{{ .Tag }}'
+      - 'newrelic/cli:v{{ .Major }}.{{ .Minor }}'
+      - 'newrelic/cli:latest'
+    dockerfile: Dockerfile
+    binaries:
+      - newrelic
+    build_flag_templates:
+      - "--pull"
+      - "--label=repository=http://github.com/newrelic/newrelic-cli"
+      - "--label=homepage=https://developer.newrelic.com/"
+      - "--label=maintainer=Developer Toolkit <opensource@newrelic.com>"
+
+# Already using git-chglog
+changelog:
+  skip: true

Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.11
 
 # Add the binary
-COPY ./bin/linux/newrelic /bin
+COPY newrelic /bin/newrelic
 
 ENTRYPOINT ["/bin/newrelic"]

Makefile

@@ -21,7 +21,7 @@ build: check-version clean lint test cover-report compile
 build-ci: check-version clean lint test compile-only
 
 # All clean commands
-clean: clean-cover clean-compile
+clean: cover-clean compile-clean release-clean
 
 # Import fragments
 include build/compile.mk

README.md

@@ -59,7 +59,7 @@ $ docker pull newrelic/cli
 # Run the container interactively, remove it once the command exists
 # Also must pass $NEW_RELIC_API_KEY to the container
 $ docker run -it --rm \
-    -e NEW_RELIC_API_KEY="$NEW_RELIC_API_KEY" \
+    -e NEW_RELIC_API_KEY \
     newrelic/cli \
     apm application get --name WebPortal --accountId 2508259
 

build/compile.mk

@@ -4,7 +4,8 @@
 
 GO         ?= go
 BUILD_DIR  ?= ./bin/
-LDFLAGS    ?= "-s -w -X main.Version=$(PROJECT_VER) -X main.AppName=$$b" # $b replaced by the binary name in the compile loop, -s/w remove debug symbols
+# $b replaced by the binary name in the compile loop, -s/w remove debug symbols
+LDFLAGS    ?= "-s -w -X main.version=$(PROJECT_VER) -X main.appName=$$b -X github.com/newrelic/newrelic-cli/internal/client.version=$(PROJECT_VER)"
 SRCDIR     ?= .
 COMPILE_OS ?= darwin linux windows
 
@@ -15,8 +16,8 @@ COMMANDS   ?= $(wildcard ${SRCDIR}/cmd/*)
 BINS       := $(foreach cmd,${COMMANDS},$(notdir ${cmd}))
 
 
-clean-compile:
-	@echo "=== $(PROJECT_NAME) === [ clean-compile    ]: removing binaries..."
+compile-clean:
+	@echo "=== $(PROJECT_NAME) === [ compile-clean    ]: removing binaries..."
 	@rm -rfv $(BUILD_DIR)/*
 
 compile: deps compile-only

build/release.mk

@@ -1,6 +1,21 @@
 RELEASE_SCRIPT ?= ./tools/release.sh
 
+GOTOOLS += github.com/goreleaser/goreleaser
+
+REL_CMD ?= goreleaser
+DIST_DIR ?= ./dist
+
 # Example usage: make release version=0.11.0
 release:
 	@echo "=== $(PROJECT_NAME) === [ release          ]: Generating release."
 	$(RELEASE_SCRIPT) $(version)
+
+release-clean:
+	@echo "=== $(PROJECT_NAME) === [ release-clean    ]: distribution files..."
+	@rm -rfv $(DIST_DIR)/*
+
+release-publish: clean tools docker-login
+	@echo "=== $(PROJECT_NAME) === [ release-publish  ]: Publishing release via $(REL_CMD)"
+	$(REL_CMD)
+
+.PHONY: release release-clean release-publish

build/test.mk

@@ -13,27 +13,29 @@ SRCDIR       ?= .
 GO_PKGS      ?= $(shell ${GO} list ./... | grep -v -e "/vendor/" -e "/example")
 FILES        ?= $(shell find ${SRCDIR} -type f | grep -v -e '.git/' -e '/vendor/')
 
-LDFLAGS_UNIT ?= '-X github.com/newrelic/newrelic-cli/internal/version.GitTag=$(PROJECT_VER_TAGGED)'
-
 GOTOOLS += github.com/stretchr/testify/assert
 
-clean-cover:
-	@echo "=== $(PROJECT_NAME) === [ clean-cover      ]: removing coverage files..."
-	@rm -rfv $(COVERAGE_DIR)/*
-
 test: test-only
 test-only: test-unit test-integration
 
 test-unit:
 	@echo "=== $(PROJECT_NAME) === [ test-unit        ]: running unit tests..."
 	@mkdir -p $(COVERAGE_DIR)
-	@$(GO) test -v -ldflags=$(LDFLAGS_UNIT) -parallel 4 -tags unit -covermode=$(COVERMODE) -coverprofile $(COVERAGE_DIR)/unit.tmp $(GO_PKGS)
+	@$(GO) test -v -ldflags=$(LDFLAGS) -parallel 4 -tags unit -covermode=$(COVERMODE) -coverprofile $(COVERAGE_DIR)/unit.tmp $(GO_PKGS)
 
 test-integration:
 	@echo "=== $(PROJECT_NAME) === [ test-integration ]: running integration tests..."
 	@mkdir -p $(COVERAGE_DIR)
 	@$(GO) test -v -parallel 4 -tags integration -covermode=$(COVERMODE) -coverprofile $(COVERAGE_DIR)/integration.tmp $(GO_PKGS)
 
+
+#
+# Coverage
+#
+cover-clean:
+	@echo "=== $(PROJECT_NAME) === [ cover-clean      ]: removing coverage files..."
+	@rm -rfv $(COVERAGE_DIR)/*
+
 cover-report:
 	@echo "=== $(PROJECT_NAME) === [ cover-report     ]: generating coverage results..."
 	@mkdir -p $(COVERAGE_DIR)

cmd/newrelic/command.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/newrelic/newrelic-cli/internal/version"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -75,18 +74,15 @@ var versionCmd = &cobra.Command{
 `,
 	Example: "newrelic version",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Printf("newrelic version %s\n", version.Version)
+		fmt.Printf("newrelic version %s\n", version)
 	},
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the RootCmd.
-func Execute(appName string) error {
-	if appName != "" {
-		Command.Use = appName
-	}
-
-	Command.Version = version.Version
+func Execute() error {
+	Command.Use = appName
+	Command.Version = version
 
 	return Command.Execute()
 }