Fix travis tests and changes to pass linting (#10)

Author: markpeek

.golangci.yml

@@ -0,0 +1,27 @@
+issues:
+  max-per-linter: 0
+  max-same-issues: 0
+
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - errcheck
+    - gofmt
+    - gosimple
+    - ineffassign
+    - misspell
+    - staticcheck
+    - structcheck
+    - unconvert
+    - unused
+    - varcheck
+    - vet
+
+linters-settings:
+  errcheck:
+    ignore: github.com/hashicorp/terraform/helper/schema:ForceNew|Set,fmt:.*,io:Close
+
+run:
+  deadline: 5m
+  modules-download-mode: vendor

GNUmakefile

@@ -40,6 +40,14 @@ errcheck:
 vendor-status:
 	@govendor status
 
+lint:
+	@echo "==> Checking source code against linters..."
+	@GOGC=30 golangci-lint run ./$(PKG_NAME)
+
+tools:
+	GO111MODULE=off go get -u github.com/client9/misspell/cmd/misspell
+	GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
+
 test-compile:
 	@if [ "$(TEST)" = "./..." ]; then \
 		echo "ERROR: Set TEST to a specific package. For example,"; \

vra7/provider_test.go

@@ -26,7 +26,7 @@ var (
 func init() {
 
 	fmt.Println("init")
-	testAccProvider := Provider()
+	testAccProvider = Provider().(*schema.Provider)
 	testAccProviders = map[string]terraform.ResourceProvider{
 		"vra7": testAccProvider,
 	}

vra7/resource_vra7_deployment.go

@@ -281,8 +281,8 @@ func resourceVra7DeploymentUpdate(d *schema.ResourceData, meta interface{}) erro
 							return fmt.Errorf("Error retrieving reconfigure action template for the component %v: %v ", componentName, err.Error())
 						}
 						configChanged := false
-						returnFlag := false
 						for configKey := range p.ResourceConfiguration {
+							var returnFlag bool
 							//compare resource list (resource_name) with user configuration fields
 							if strings.HasPrefix(configKey, componentName+".") {
 								//If user_configuration contains resource_list element
@@ -295,14 +295,14 @@ func resourceVra7DeploymentUpdate(d *schema.ResourceData, meta interface{}) erro
 									resourceActionTemplate.Data,
 									nameList[1],
 									p.ResourceConfiguration[configKey])
-								if returnFlag == true {
+								if returnFlag {
 									configChanged = true
 								}
 							}
 						}
 						oldData, _ := d.GetChange("resource_configuration")
 						// If template value got changed then set post call and update resource child
-						if configChanged != false {
+						if configChanged {
 							// This request id is for the reconfigure action on this machine and
 							// will be used to track the status of the reconfigure request for this resource.
 							// It will not replace the initial catalog item request id
@@ -377,9 +377,8 @@ func resourceVra7DeploymentRead(d *schema.ResourceData, meta interface{}) error
 		}
 	}
 	resourceConfiguration, _ := d.Get("resource_configuration").(map[string]interface{})
-	changed := false
 
-	resourceConfiguration, changed = utils.UpdateResourceConfigurationMap(resourceConfiguration, resourceDataMap)
+	resourceConfiguration, changed := utils.UpdateResourceConfigurationMap(resourceConfiguration, resourceDataMap)
 
 	if changed {
 		setError := d.Set("resource_configuration", resourceConfiguration)

vra7/resource_vra7_deployment_test.go

@@ -23,7 +23,8 @@ func init() {
 
 func TestConfigValidityFunction(t *testing.T) {
 
-	mockRequestTemplate := GetMockRequestTemplate()
+	mockRequestTemplate, err := GetMockRequestTemplate()
+	utils.AssertNilError(t, err)
 
 	// a resource_configuration map is created with valid components
 	// all combinations of components name and properties are created with dots
@@ -43,7 +44,7 @@ func TestConfigValidityFunction(t *testing.T) {
 	p := readProviderConfiguration(mockResourceData)
 
 	readProviderConfiguration(mockResourceData)
-	err := p.checkResourceConfigValidity(mockRequestTemplate)
+	err = p.checkResourceConfigValidity(mockRequestTemplate)
 	utils.AssertNilError(t, err)
 
 	mockConfigResourceMap["machine2.mock.cpu"] = 2
@@ -81,12 +82,15 @@ func TestConfigValidityFunction(t *testing.T) {
 }
 
 // creates a mock request template from a request template template json file
-func GetMockRequestTemplate() *sdk.CatalogItemRequestTemplate {
+func GetMockRequestTemplate() (*sdk.CatalogItemRequestTemplate, error) {
 
 	mockRequestTemplateStruct := sdk.CatalogItemRequestTemplate{}
-	json.Unmarshal([]byte(mockRequestTemplate), &mockRequestTemplateStruct)
+	err := json.Unmarshal([]byte(mockRequestTemplate), &mockRequestTemplateStruct)
+	if err != nil {
+		return nil, err
+	}
 
-	return &mockRequestTemplateStruct
+	return &mockRequestTemplateStruct, nil
 
 }