WIP: Develop

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

controller/Makefile

@@ -41,10 +41,10 @@ controller-test: install-tools
 	ENVIRONMENT=testing ./$(TOOLS_DIR)/gotestsum --junitfile report.xml --format testname -- -race -v -run TestRun
 
 lint: install-tools
-	./$(TOOLS_DIR)/golangci-lint run --config .gitlab/ci/.golangci-config/.golangci.yml
+	./$(TOOLS_DIR)/golangci-lint run --config ../.golangci.yml | jq
 
 lint-fix: install-tools
-	./$(TOOLS_DIR)/golangci-lint run --config .gitlab/ci/.golangci-config/.golangci.yml --fix
+	./$(TOOLS_DIR)/golangci-lint run --config ../.golangci.yml --fix
 
 ci-lint:
 	golangci-lint run --config ../.gitlab/ci/.golangci-config/.golangci.yml --out-format code-climate | jq -r '.[] | "\(.location.path):\(.location.lines.begin) \(.description)"'
@@ -56,7 +56,7 @@ ci-controller-test: ci-install-tools
 	ENVIRONMENT=testing gotestsum --junitfile report.xml --format testname -- -race -v -run TestRun
 
 integration-test-nucleus:
-    ENVIRONMENT=testing  &&\
+	ENVIRONMENT=testing  &&\
 	cd ./test/integration &&\
 	go test -race -v -run TestGnmi_SetIntegration &&\
 	go test -race -v -run TestGnmi_GetIntegration &&\
@@ -64,6 +64,6 @@ integration-test-nucleus:
 	go test -race -v -run TestGnmi_CapabilitiesIntegration
 
 integration-test-api:
-    ENVIRONMENT=testing  &&\
+	ENVIRONMENT=testing  &&\
 	cd ./api &&\
 	go test -race -v -run TestApiIntegration