Merge pull request #74 from newrelic/acabanas/update_sdk_go_modules

Upgraded github.com/newrelic/infra-integrations-sdk to v3.6.7
Switched to go modules
Upgraded pipeline to go 1.16
Replaced gometalinter with golangci-lint
Added integration tests

Author: alvarocabanas

.github/workflows/prerelease.yml

@@ -9,7 +9,8 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO_VERSION: '1.9.7'
+  GO_VERSION: '1.16'
+  NRJMX_VERSION: '1.5.3'
   INTEGRATION: "jmx"
   ORIGINAL_REPO_NAME: 'newrelic/nri-jmx'
   REPO_FULL_NAME: ${{ github.event.repository.full_name }}
@@ -80,6 +81,28 @@ jobs:
         run: |
           .\build\windows\unit_tests.ps1
 
+  # can't run this step inside of container because of tests specific
+  test-integration-nix:
+    name: Run integration tests on *Nix
+    runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: src/github.com/${{env.ORIGINAL_REPO_NAME}}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+          path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{env.GO_VERSION}}
+      - name: Integration test
+        env:
+          GOPATH: ${{ github.workspace }}
+        run: make integration-test
+
   prerelease:
     name: Build binary for *Nix/Win, create archives for *Nix/Win, create packages for *Nix, upload all artifacts into GH Release assets
     runs-on: ubuntu-20.04

.github/workflows/push_pr.yml

@@ -11,7 +11,8 @@ env:
   TAG: "v0.0.0" # needed for goreleaser windows builds
   REPO_FULL_NAME: ${{ github.event.repository.full_name }}
   ORIGINAL_REPO_NAME: "newrelic/nri-jmx"
-  GO_VERSION: '1.9.7'
+  GO_VERSION: '1.16'
+  NRJMX_VERSION: '1.5.3'
   DOCKER_LOGIN_AVAILABLE: ${{ secrets.OHAI_DOCKER_HUB_ID }}
 
 jobs:
@@ -83,6 +84,34 @@ jobs:
         run: |
           .\build\windows\unit_tests.ps1
 
+  # can't run this step inside of container because of tests specific
+  test-integration-nix:
+    name: Run integration tests on *Nix
+    runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: src/github.com/${{env.ORIGINAL_REPO_NAME}}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+          path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{env.GO_VERSION}}
+      - name: Login to DockerHub
+        if: ${{env.DOCKER_LOGIN_AVAILABLE}}
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.OHAI_DOCKER_HUB_ID }}
+          password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }}
+      - name: Integration test
+        env:
+          GOPATH: ${{ github.workspace }}
+        run: make integration-test
+
   test-build:
     name: Test binary compilation for all platforms:arch
     runs-on: ubuntu-20.04

.gometalinter.json

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.4.6 (2021-04-26)
+### Changed
+- Upgraded github.com/newrelic/infra-integrations-sdk to v3.6.7
+- Switched to go modules
+- Upgraded pipeline to go 1.16
+- Replaced gometalinter with golangci-lint
+
+## 2.4.5 (2021-01-13)
+### Changed
+- This fixes scenario where warnings received from nrjmx tool discarded data subsequent data. Now all warnings get logged and all data get processed.
+- Bundles previous non jlinked nrjmx tool version, due to issue when querying.
+
 ## 2.4.4 (2020-01-22)
 ## Changed
 - Username and password now default to empty to support no auth

CHANGELOG.md

@@ -7,10 +7,10 @@ INTEGRATION := jmx
 BINARY_NAME  = nri-$(INTEGRATION)
 GO_PKGS     := $(shell go list ./... | grep -v "/vendor/")
 GO_FILES    := ./src/
-GOTOOLS      =  github.com/kardianos/govendor \
-								gopkg.in/alecthomas/gometalinter.v2 \
-								github.com/axw/gocov/gocov \
-								github.com/AlekSi/gocov-xml \
+GOFLAGS			= -mod=readonly
+GOLANGCI_LINT	= github.com/golangci/golangci-lint/cmd/golangci-lint
+GOCOV           = github.com/axw/gocov/gocov
+GOCOV_XML		= github.com/AlekSi/gocov-xml
 
 all: build
 
@@ -20,41 +20,26 @@ clean:
 	@echo "=== $(INTEGRATION) === [ clean ]: Removing binaries and coverage file..."
 	@rm -rfv bin coverage.xml $(TARGET)
 
-tools: check-version
-	@echo "=== $(INTEGRATION) === [ tools ]: Installing tools required by the project..."
-	@go get $(GOTOOLS)
-	@gometalinter.v2 --install
+validate:
+	@echo "=== $(INTEGRATION) === [ validate ]: Validating source code running golangci-lint..."
+	@go run $(GOFLAGS) $(GOLANGCI_LINT) run --verbose
 
-tools-update: check-version
-	@echo "=== $(INTEGRATION) === [ tools-update ]: Updating tools required by the project..."
-	@go get -u $(GOTOOLS)
-	@gometalinter.v2 --install
-
-deps: tools deps-only
-
-deps-only:
-	@echo "=== $(INTEGRATION) === [ deps ]: Installing package dependencies required by the project..."
-	@govendor sync
-
-validate: deps
-	@echo "=== $(INTEGRATION) === [ validate ]: Validating source code running gometalinter..."
-	@gometalinter.v2 --config=.gometalinter.json ./...
-
-validate-all: deps
-	@echo "=== $(INTEGRATION) === [ validate ]: Validating source code running gometalinter..."
-	@gometalinter.v2 --config=.gometalinter.json --enable=interfacer --enable=gosimple ./...
-
-compile: deps
+compile:
 	@echo "=== $(INTEGRATION) === [ compile ]: Building $(BINARY_NAME)..."
 	@go build -o bin/$(BINARY_NAME) ./src
 
-compile-only: deps-only
-	@echo "=== $(INTEGRATION) === [ compile ]: Building $(BINARY_NAME)..."
-	@go build -o bin/$(BINARY_NAME) ./src
-
-test: deps
+test:
 	@echo "=== $(INTEGRATION) === [ test ]: Running unit tests..."
-	@gocov test -race $(GO_PKGS) | gocov-xml > coverage.xml
+	@go run $(GOFLAGS) $(GOCOV) test -race ./... | go run $(GOFLAGS) $(GOCOV_XML) > coverage.xml
+
+integration-test:
+	@echo "=== $(INTEGRATION) === [ test ]: running integration tests..."
+	@if [ "$(NRJMX_VERSION)" = "" ]; then \
+	    echo "Error: missing required env-var: NRJMX_VERSION\n" ;\
+        exit 1 ;\
+	fi
+	@docker-compose -f test/integration/docker-compose.yml up -d --build
+	@go test -v -tags=integration ./test/integration/. -count=1 ; (ret=$$?; docker-compose -f test/integration/docker-compose.yml down && exit $$ret)
 
 # Include thematic Makefiles
 include $(CURDIR)/build/ci.mk
@@ -63,13 +48,13 @@ include $(CURDIR)/build/release.mk
 check-version:
 ifdef GOOS
 ifneq "$(GOOS)" "$(NATIVEOS)"
-	$(error GOOS is not $(NATIVEOS). Cross-compiling is only allowed for 'clean', 'deps-only' and 'compile-only' targets)
+	$(error GOOS is not $(NATIVEOS). Cross-compiling is only allowed for 'clean' target)
 endif
 endif
 ifdef GOARCH
 ifneq "$(GOARCH)" "$(NATIVEARCH)"
-	$(error GOARCH variable is not $(NATIVEARCH). Cross-compiling is only allowed for 'clean', 'deps-only' and 'compile-only' targets)
+	$(error GOARCH variable is not $(NATIVEARCH). Cross-compiling is only allowed for 'clean' target)
 endif
 endif
 
-.PHONY: all build clean tools tools-update deps validate compile test check-version
+.PHONY: all build clean validate compile test integration-test check-version