go modules , sdk 3.6.7 , go 1.16 , golanci-lint (#63)

Author: gsanchezgavier

.github/workflows/prerelease.yml

@@ -9,25 +9,22 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GO_VERSION: '1.9.7'
+  GO_VERSION: '1.16'
   INTEGRATION: "mssql"
   ORIGINAL_REPO_NAME: ${{ github.event.repository.full_name }}
   REPO_FULL_NAME: ${{ github.event.repository.full_name }}
   TAG: ${{ github.event.release.tag_name }}
 
 jobs:
-  validate:
-    name: Validate code via linters
+  golangci-lint:
+    name: Validate code via golangci
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
         with:
-          username: ${{ secrets.OHAI_DOCKER_HUB_ID }}
-          password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }}
-      - name: Validate code
-        run: make ci/validate
+          only-new-issues: true
 
   snyk:
     name: Run security checks via snyk
@@ -78,11 +75,31 @@ jobs:
         shell: pwsh
         run: |
           .\build\windows\unit_tests.ps1
+  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
-    needs: [validate, test-nix, test-windows, snyk]
+    needs: [golangci-lint, test-nix, test-windows, snyk]
     steps:
       - uses: actions/checkout@v2
       - name: Login to DockerHub

.github/workflows/push_pr.yml

@@ -11,24 +11,19 @@ env:
   TAG: "v0.0.0" # needed for goreleaser windows builds
   REPO_FULL_NAME: ${{ github.event.repository.full_name }}
   ORIGINAL_REPO_NAME: "newrelic/nri-mssql"
-  GO_VERSION: '1.9.7'
+  GO_VERSION: '1.16'
   DOCKER_LOGIN_AVAILABLE: ${{ secrets.OHAI_DOCKER_HUB_ID }}
 
 jobs:
-  validate:
-    name: Validate code via linters
+  golangci-lint:
+    name: Validate code via golangci
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: Login to DockerHub
-        if: ${{env.DOCKER_LOGIN_AVAILABLE}}
-        uses: docker/login-action@v1
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
         with:
-          username: ${{ secrets.OHAI_DOCKER_HUB_ID }}
-          password: ${{ secrets.OHAI_DOCKER_HUB_PASSWORD }}
-      - name: Validate code
-        run: make ci/validate
-
+          only-new-issues: true
   snyk:
     name: Run security checks via snyk
     runs-on: ubuntu-20.04
@@ -81,6 +76,26 @@ jobs:
         shell: pwsh
         run: |
           .\build\windows\unit_tests.ps1
+  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
 
   test-build:
     name: Test binary compilation for all platforms:arch

.gitignore

@@ -57,3 +57,5 @@ dist/
 # build files
 src/versioninfo.json
 src/resource.syso
+
+vendor/

.gometalinter.json

@@ -45,11 +45,11 @@ reject:
   - EPL-1.0
 
 exceptions:
-  - github.com/newrelic/nri-mssql/vendor/github.com/newrelic/infra-integrations-sdk/args
-  - github.com/newrelic/nri-mssql/vendor/github.com/newrelic/infra-integrations-sdk/data/event
-  - github.com/newrelic/nri-mssql/vendor/github.com/newrelic/infra-integrations-sdk/data/inventory
-  - github.com/newrelic/nri-mssql/vendor/github.com/newrelic/infra-integrations-sdk/data/metric
-  - github.com/newrelic/nri-mssql/vendor/github.com/newrelic/infra-integrations-sdk/integration
-  - github.com/newrelic/nri-mssql/vendor/github.com/newrelic/infra-integrations-sdk/log
-  - github.com/newrelic/nri-mssql/vendor/github.com/newrelic/infra-integrations-sdk/persist
+  - github.com/newrelic/infra-integrations-sdk/args
+  - github.com/newrelic/infra-integrations-sdk/data/event
+  - github.com/newrelic/infra-integrations-sdk/data/inventory
+  - github.com/newrelic/infra-integrations-sdk/data/metric
+  - github.com/newrelic/infra-integrations-sdk/integration
+  - github.com/newrelic/infra-integrations-sdk/log
+  - github.com/newrelic/infra-integrations-sdk/persist
 

.papers_config.yml

@@ -5,6 +5,12 @@ 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.6.0 (2021-06-05)
+## Changed
+- Update Go to v1.16.
+- Migrate to Go Modules
+- Update Infrastracture SDK to v3.6.7.
+- Update other dependecies.
 ## 2.5.4 (2021-04-06)
 ### Added
 - `ExtraConnectionURLArgs` argument allowing to specify custom connection strings

CHANGELOG.md

@@ -1,72 +1,40 @@
-WORKDIR      := $(shell pwd)
-NATIVEOS	 := $(shell go version | awk -F '[ /]' '{print $$4}')
-NATIVEARCH	 := $(shell go version | awk -F '[ /]' '{print $$5}')
-INTEGRATION  := mssql
-BINARY_NAME   = nri-$(INTEGRATION)
-GO_FILES     := ./src/
-GOTOOLS       = github.com/kardianos/govendor \
-		gopkg.in/alecthomas/gometalinter.v2 \
-		github.com/axw/gocov/gocov \
-		github.com/AlekSi/gocov-xml \
+WORKDIR         := $(shell pwd)
+INTEGRATION     := mssql
+BINARY_NAME      = nri-$(INTEGRATION)
+GO_FILES        := ./src/
+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
 
-build: check-version clean validate test compile
+build: clean validate test compile
 
 clean:
 	@echo "=== $(INTEGRATION) === [ clean ]: Removing binaries and coverage file..."
 	@rm -rfv bin coverage.xml
 
-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 $(GO_FILES)...
-
-validate-all: deps
-	@echo "=== $(INTEGRATION) === [ validate ]: Validating source code running gometalinter..."
-	@gometalinter.v2 --config=.gometalinter.json --enable=interfacer --enable=gosimple $(GO_FILES)...
+test:
+	@echo "=== $(INTEGRATION) === [ test ]: Running unit tests..."
+	@go run $(GOFLAGS) $(GOCOV) test ./... | go run $(GOFLAGS) $(GOCOV_XML) > coverage.xml
 
-compile: deps
-	@echo "=== $(INTEGRATION) === [ compile ]: Building $(BINARY_NAME)..."
-	@go build -o bin/$(BINARY_NAME) $(GO_FILES)
+integration-test:
+	@echo "=== $(INTEGRATION) === [ test ]: running integration tests..."
+	@docker-compose -f tests/docker-compose.yml pull
+	@go test -v -tags=integration ./tests/. || (ret=$$?; docker-compose -f tests/docker-compose.yml down && exit $$ret)
+	@docker-compose -f tests/docker-compose.yml down
 
-compile-only: deps-only
+compile: 
 	@echo "=== $(INTEGRATION) === [ compile ]: Building $(BINARY_NAME)..."
 	@go build -o bin/$(BINARY_NAME) $(GO_FILES)
 
-test: deps
-	@echo "=== $(INTEGRATION) === [ test ]: Running unit tests..."
-	@gocov test -race $(GO_FILES)... | gocov-xml > coverage.xml
-
 # Include thematic Makefiles
 include $(CURDIR)/build/ci.mk
 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)
-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)
-endif
-endif
-
-.PHONY: all build clean tools tools-update deps validate compile test check-version
+.PHONY: all build clean validate compile test 

Makefile

@@ -1,4 +1,4 @@
-[![New Relic Community Plus header](https://raw.githubusercontent.com/newrelic/open-source-office/master/examples/categories/images/Community_Plus.png)](https://opensource.newrelic.com/oss-category/#community-plus)
+[![Community Plus header](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Community_Plus.png)](https://opensource.newrelic.com/oss-category/#community-plus)
 
 # New Relic integration for Microsoft SQL Server
 
@@ -101,8 +101,6 @@ If you want to know more about usage of `./bin/nri-mssql`, pass the `-help` para
 $ ./bin/nri-mssql -help
 ```
 
-External dependencies are managed through the [govendor tool](https://github.com/kardianos/govendor). Locking all external dependencies to a specific version (if possible) into the vendor directory is required.
-
 ## Testing
 
 To run the tests execute: