Merge pull request #60 from patrickcping/bump-go-version-202506

Bump go version

Author: patrickcping

.github/workflows/code-check.yml

@@ -73,12 +73,12 @@ jobs:
         run: >-
           echo "version=$(
             go list -m all |
-            grep github.com/golangci/golangci-lint |
+            grep github.com/golangci/golangci-lint/v2 |
             awk '{print $2}'
           )" >> $GITHUB_OUTPUT
 
       - name: lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
           version: "${{ steps.golangci-lint-version.outputs.version }}"
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/patrickcping/dvtf-pingctl
 
-go 1.23.3
+go 1.24.3
 
 require (
 	github.com/fatih/color v1.18.0

go.work

@@ -1,4 +1,4 @@
-go 1.23.3
+go 1.24.3
 
 use (
     ./

go.work.sum

@@ -66,15 +66,20 @@ func (d *DaVinciExport) Validate(providerField terraform.ProviderField) (ok, war
 func (d *DaVinciExport) readJSONFile() error {
 
 	if d.ExportPath == nil {
-		return errors.New("No export path provided")
+		return errors.New("no export path provided")
 	}
 
 	// Open the JSON file
 	file, err := os.Open(*d.ExportPath)
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+	defer func() {
+		if err := file.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	// Read the file contents
 	bytes, err := io.ReadAll(file)

internal/flow/export.go

@@ -152,7 +152,7 @@ func (d *DaVinciGenerator) buildData(data any, parsedIntf map[string]interface{}
 			return err
 		}
 	default:
-		return fmt.Errorf("Unknown data type: %T", data)
+		return fmt.Errorf("unknown data type: %T", data)
 	}
 
 	return nil
@@ -180,7 +180,7 @@ func (d *DaVinciGenerator) buildDataSingleFlow(flow davinci.Flow, parsedIntf map
 	for _, variable := range flow.Variables {
 
 		if variable.Context == nil || variable.Fields == nil || variable.Fields.Type == nil {
-			return fmt.Errorf("Potentially corrupt DaVinci export file.  Variable %s is missing required fields", variable.Name)
+			return fmt.Errorf("potentially corrupt DaVinci export file.  Variable %s is missing required fields", variable.Name)
 		}
 
 		reg := regexp.MustCompile(`^([a-zA-Z0-9-_]*)[[#]{2}.+]*$`)
@@ -195,7 +195,7 @@ func (d *DaVinciGenerator) buildDataSingleFlow(flow davinci.Flow, parsedIntf map
 			// matches[1] is the first capture group
 			variableName = matches[1]
 		} else {
-			return fmt.Errorf("No match found for variable name parsing: %s", variable.Name)
+			return fmt.Errorf("no match found for variable name parsing: %s", variable.Name)
 		}
 
 		resourceName := sanitiseResourceName(variableName)
@@ -261,7 +261,7 @@ func (d *DaVinciGenerator) buildDataSingleFlow(flow davinci.Flow, parsedIntf map
 				}) {
 					connectionProperties, err := getConnectionProperties(*nodeData.ConnectorID)
 					if err != nil {
-						return fmt.Errorf("Failed to get connection properties for connector ID %s: %s", *nodeData.ConnectorID, err)
+						return fmt.Errorf("failed to get connection properties for connector ID %s: %s", *nodeData.ConnectorID, err)
 					}
 
 					d.ConnectionsData = append(d.ConnectionsData, connectionData{
@@ -289,7 +289,7 @@ func (d *DaVinciGenerator) buildDataSingleFlow(flow davinci.Flow, parsedIntf map
 					subflowID := nodeData.Properties.SubFlowID.Value
 
 					if subflowID.Label == nil || subflowID.Value == nil {
-						return fmt.Errorf("Potentially corrupt DaVinci export file.  Subflow connector with ID %s is missing required fields", *nodeData.ID)
+						return fmt.Errorf("potentially corrupt DaVinci export file.  Subflow connector with ID %s is missing required fields", *nodeData.ID)
 					}
 
 					if !slices.ContainsFunc(subflowLinks, func(v flowSubflowLink) bool {
@@ -453,7 +453,12 @@ func (d *DaVinciGenerator) writeBaseVars(version string, overwrite bool) error {
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	err = hclTemplate.Execute(outputFile, nil)
 	if err != nil {
@@ -494,7 +499,12 @@ func (d *DaVinciGenerator) writeBaseVersions(version string, overwrite bool) err
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	err = hclTemplate.Execute(outputFile, nil)
 	if err != nil {
@@ -535,7 +545,12 @@ func (d *DaVinciGenerator) writeVariables(version string, overwrite bool) error
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	for _, variableData := range d.VariablesData {
 		err = hclTemplate.Execute(outputFile, variableData)
@@ -578,7 +593,12 @@ func (d *DaVinciGenerator) writeVariableVars(version string, overwrite bool) err
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	for _, variableData := range d.VariablesData {
 		err = hclTemplate.Execute(outputFile, variableData)
@@ -621,7 +641,12 @@ func (d *DaVinciGenerator) writeConnections(version string, overwrite bool) erro
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	for _, connectionData := range d.ConnectionsData {
 		err = hclTemplate.Execute(outputFile, connectionData)
@@ -664,7 +689,12 @@ func (d *DaVinciGenerator) writeConnectionsPropertyVars(version string, overwrit
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	for _, connectionData := range d.ConnectionsData {
 		err = hclTemplate.Execute(outputFile, connectionData)
@@ -706,7 +736,12 @@ func (d *DaVinciGenerator) writeFlows(version string, overwrite bool) error {
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	for _, flowData := range d.FlowsData {
 		err = hclTemplate.Execute(outputFile, flowData)
@@ -748,7 +783,12 @@ func (d *DaVinciGenerator) writeFlowVars(version string, overwrite bool) error {
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	for _, flowData := range d.FlowsData {
 		err = hclTemplate.Execute(outputFile, flowData)
@@ -790,7 +830,12 @@ func (d *DaVinciGenerator) writeFlowOutputs(version string, overwrite bool) erro
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	for _, flowData := range d.FlowsData {
 		err = hclTemplate.Execute(outputFile, flowData)
@@ -832,7 +877,12 @@ func (d *DaVinciGenerator) writeReadme(version string, overwrite bool) error {
 	if err != nil {
 		return err
 	}
-	defer outputFile.Close()
+	defer func() {
+		if err := outputFile.Close(); err != nil {
+			l := logger.Get()
+			l.Error().Err(err).Msg("Failed to close file")
+		}
+	}()
 
 	err = readmeTemplate.Execute(outputFile, d)
 	if err != nil {
@@ -865,12 +915,12 @@ func (d *DaVinciGenerator) writeAsset(flowAsset flowAssetData) error {
 
 	fileData, err := json.MarshalIndent(flowAsset.flowMap, "", "  ")
 	if err != nil {
-		return fmt.Errorf("Cannot marshal asset data: %s", err)
+		return fmt.Errorf("cannot marshal asset data: %s", err)
 	}
 
 	err = os.WriteFile(fmt.Sprintf("%s/%s", d.outputPath, flowAsset.path), fileData, 0600)
 	if err != nil {
-		return fmt.Errorf("Cannot write asset file %s: %s", flowAsset.path, err)
+		return fmt.Errorf("cannot write asset file %s: %s", flowAsset.path, err)
 	}
 
 	return nil

internal/generate/generate.go

@@ -90,10 +90,10 @@ func (d *DaVinciValidator) Validate() error {
 		return d.terraformCustomTypeValidator(flowExportJsonCmpOptsConfiguration)
 	}
 
-	return errors.New("Invalid field type")
+	return errors.New("invalid field type")
 }
 
-var ErrSubflowsPresent = errors.New("Subflows are present in the export.  Subflows should be managed separately as their own independent flows.")
+var ErrSubflowsPresent = errors.New("subflows are present in the export.  Subflows should be managed separately as their own independent flows")
 
 // Replicated from the Terraform provider https://github.com/pingidentity/terraform-provider-davinci/blob/007d4dd02f01438b0f28feee44ad03b6325e3263/internal/framework/customtypes/davinciexporttype/parsed_value.go#L96
 func (d *DaVinciValidator) terraformCustomTypeValidator(fieldOpts davinci.ExportCmpOpts) error {