Improve integration tests

.github/workflows/go.yml

@@ -44,7 +44,6 @@ jobs:
       run: go test -v ./...
       env:
         FABRIC_K8S_BUILDER_DEBUG: 'true'
-        INCLUDE_KIND_TESTS: ${{ matrix.os == 'ubuntu-latest' && 'true' || 'false' }}
 
     - name: Package
       run: |

.github/workflows/golangci-lint.yml

@@ -28,6 +28,6 @@ jobs:
           go-version: 1.22
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8
+        uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
         with:
-          version: v1.56.2
+          version: v1.62

.golangci.yml

@@ -8,6 +8,7 @@ linters:
     - bodyclose
     - containedctx
     - contextcheck
+    - copyloopvar
     - cyclop
     - decorder
     - dogsled
@@ -17,9 +18,7 @@ linters:
     - errchkjson
     - errname
     - errorlint
-    - execinquery
     - exhaustive
-    - exportloopref
     - forbidigo
     - forcetypeassert
     - funlen
@@ -35,7 +34,6 @@ linters:
     - gofumpt
     - goheader
     - goimports
-    - gomnd
     - gomoddirectives
     - gomodguard
     - goprintffuncname
@@ -49,6 +47,7 @@ linters:
     - maintidx
     - makezero
     - misspell
+    - mnd
     - nakedret
     - nestif
     - nilerr

cmd/build.go

@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd
+
+import (
+	"context"
+	"os"
+	"strconv"
+
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
+)
+
+func Build() int {
+	const (
+		expectedArgsLength            = 4
+		chaincodeSourceDirectoryArg   = 1
+		chaincodeMetadataDirectoryArg = 2
+		buildOutputDirectoryArg       = 3
+	)
+
+	debug, _ := strconv.ParseBool(util.GetOptionalEnv(util.DebugVariable, "false"))
+	ctx := log.NewCmdContext(context.Background(), debug)
+	logger := log.New(ctx)
+
+	if len(os.Args) != expectedArgsLength {
+		logger.Println(
+			"Expected CHAINCODE_SOURCE_DIR, CHAINCODE_METADATA_DIR and BUILD_OUTPUT_DIR arguments",
+		)
+
+		return 1
+	}
+
+	chaincodeSourceDirectory := os.Args[chaincodeSourceDirectoryArg]
+	chaincodeMetadataDirectory := os.Args[chaincodeMetadataDirectoryArg]
+	buildOutputDirectory := os.Args[buildOutputDirectoryArg]
+
+	logger.Debugf("Chaincode source directory: %s", chaincodeSourceDirectory)
+	logger.Debugf("Chaincode metadata directory: %s", chaincodeMetadataDirectory)
+	logger.Debugf("Build output directory: %s", buildOutputDirectory)
+
+	build := &builder.Build{
+		ChaincodeSourceDirectory:   chaincodeSourceDirectory,
+		ChaincodeMetadataDirectory: chaincodeMetadataDirectory,
+		BuildOutputDirectory:       buildOutputDirectory,
+	}
+
+	if err := build.Run(ctx); err != nil {
+		logger.Printf("Error building chaincode: %+v", err)
+
+		return 1
+	}
+
+	return 0
+}

cmd/build/main.go

@@ -3,49 +3,11 @@
 package main
 
 import (
-	"context"
 	"os"
 
-	"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
-	"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
-	"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
-)
-
-const (
-	expectedArgsLength            = 4
-	chaincodeSourceDirectoryArg   = 1
-	chaincodeMetadataDirectoryArg = 2
-	buildOutputDirectoryArg       = 3
+	"github.com/hyperledger-labs/fabric-builder-k8s/cmd"
 )
 
 func main() {
-	debug := util.GetOptionalEnv(util.DebugVariable, "false")
-	ctx := log.NewCmdContext(context.Background(), debug == "true")
-	logger := log.New(ctx)
-
-	if len(os.Args) != expectedArgsLength {
-		logger.Println(
-			"Expected CHAINCODE_SOURCE_DIR, CHAINCODE_METADATA_DIR and BUILD_OUTPUT_DIR arguments",
-		)
-		os.Exit(1)
-	}
-
-	chaincodeSourceDirectory := os.Args[chaincodeSourceDirectoryArg]
-	chaincodeMetadataDirectory := os.Args[chaincodeMetadataDirectoryArg]
-	buildOutputDirectory := os.Args[buildOutputDirectoryArg]
-
-	logger.Debugf("Chaincode source directory: %s", chaincodeSourceDirectory)
-	logger.Debugf("Chaincode metadata directory: %s", chaincodeMetadataDirectory)
-	logger.Debugf("Build output directory: %s", buildOutputDirectory)
-
-	build := &builder.Build{
-		ChaincodeSourceDirectory:   chaincodeSourceDirectory,
-		ChaincodeMetadataDirectory: chaincodeMetadataDirectory,
-		BuildOutputDirectory:       buildOutputDirectory,
-	}
-
-	if err := build.Run(ctx); err != nil {
-		logger.Printf("Error building chaincode: %+v", err)
-		os.Exit(1)
-	}
+	os.Exit(cmd.Build())
 }

cmd/detect.go

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd
+
+import (
+	"context"
+	"errors"
+	"os"
+	"strconv"
+
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
+)
+
+func Detect() int {
+	const (
+		expectedArgsLength            = 3
+		chaincodeSourceDirectoryArg   = 1
+		chaincodeMetadataDirectoryArg = 2
+	)
+
+	debug, _ := strconv.ParseBool(util.GetOptionalEnv(util.DebugVariable, "false"))
+	ctx := log.NewCmdContext(context.Background(), debug)
+	logger := log.New(ctx)
+
+	if len(os.Args) != expectedArgsLength {
+		logger.Println("Expected CHAINCODE_SOURCE_DIR and CHAINCODE_METADATA_DIR arguments")
+
+		return 1
+	}
+
+	chaincodeSourceDirectory := os.Args[chaincodeSourceDirectoryArg]
+	chaincodeMetadataDirectory := os.Args[chaincodeMetadataDirectoryArg]
+
+	logger.Debugf("Chaincode source directory: %s", chaincodeSourceDirectory)
+	logger.Debugf("Chaincode metadata directory: %s", chaincodeMetadataDirectory)
+
+	detect := &builder.Detect{
+		ChaincodeSourceDirectory:   chaincodeSourceDirectory,
+		ChaincodeMetadataDirectory: chaincodeMetadataDirectory,
+	}
+
+	if err := detect.Run(ctx); err != nil {
+		if !errors.Is(err, builder.ErrUnsupportedChaincodeType) {
+			// don't spam the peer log if it's just chaincode we don't recognise
+			logger.Printf("Error detecting chaincode: %+v", err)
+		}
+
+		return 1
+	}
+
+	return 0
+}

cmd/detect/main.go

@@ -3,48 +3,11 @@
 package main
 
 import (
-	"context"
-	"errors"
 	"os"
 
-	"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
-	"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
-	"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
-)
-
-const (
-	expectedArgsLength            = 3
-	chaincodeSourceDirectoryArg   = 1
-	chaincodeMetadataDirectoryArg = 2
+	"github.com/hyperledger-labs/fabric-builder-k8s/cmd"
 )
 
 func main() {
-	debug := util.GetOptionalEnv(util.DebugVariable, "false")
-	ctx := log.NewCmdContext(context.Background(), debug == "true")
-	logger := log.New(ctx)
-
-	if len(os.Args) != expectedArgsLength {
-		logger.Println("Expected CHAINCODE_SOURCE_DIR and CHAINCODE_METADATA_DIR arguments")
-		os.Exit(1)
-	}
-
-	chaincodeSourceDirectory := os.Args[chaincodeSourceDirectoryArg]
-	chaincodeMetadataDirectory := os.Args[chaincodeMetadataDirectoryArg]
-
-	logger.Debugf("Chaincode source directory: %s", chaincodeSourceDirectory)
-	logger.Debugf("Chaincode metadata directory: %s", chaincodeMetadataDirectory)
-
-	detect := &builder.Detect{
-		ChaincodeSourceDirectory:   chaincodeSourceDirectory,
-		ChaincodeMetadataDirectory: chaincodeMetadataDirectory,
-	}
-
-	if err := detect.Run(ctx); err != nil {
-		if !errors.Is(err, builder.ErrUnsupportedChaincodeType) {
-			// don't spam the peer log if it's just chaincode we don't recognise
-			logger.Printf("Error detecting chaincode: %+v", err)
-		}
-
-		os.Exit(1)
-	}
+	os.Exit(cmd.Detect())
 }

cmd/release.go

@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd
+
+import (
+	"context"
+	"os"
+	"strconv"
+
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
+)
+
+func Release() int {
+	const (
+		expectedArgsLength        = 3
+		buildOutputDirectoryArg   = 1
+		releaseOutputDirectoryArg = 2
+	)
+
+	debug, _ := strconv.ParseBool(util.GetOptionalEnv(util.DebugVariable, "false"))
+	ctx := log.NewCmdContext(context.Background(), debug)
+	logger := log.New(ctx)
+
+	if len(os.Args) != expectedArgsLength {
+		logger.Println("Expected BUILD_OUTPUT_DIR and RELEASE_OUTPUT_DIR arguments")
+
+		return 1
+	}
+
+	buildOutputDirectory := os.Args[buildOutputDirectoryArg]
+	releaseOutputDirectory := os.Args[releaseOutputDirectoryArg]
+
+	logger.Debugf("Build output directory: %s", buildOutputDirectory)
+	logger.Debugf("Release output directory: %s", releaseOutputDirectory)
+
+	release := &builder.Release{
+		BuildOutputDirectory:   buildOutputDirectory,
+		ReleaseOutputDirectory: releaseOutputDirectory,
+	}
+
+	if err := release.Run(ctx); err != nil {
+		logger.Printf("Error releasing chaincode: %+v", err)
+
+		return 1
+	}
+
+	return 0
+}

cmd/release/main.go

@@ -3,43 +3,11 @@
 package main
 
 import (
-	"context"
 	"os"
 
-	"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
-	"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
-	"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
-)
-
-const (
-	expectedArgsLength        = 3
-	buildOutputDirectoryArg   = 1
-	releaseOutputDirectoryArg = 2
+	"github.com/hyperledger-labs/fabric-builder-k8s/cmd"
 )
 
 func main() {
-	debug := util.GetOptionalEnv(util.DebugVariable, "false")
-	ctx := log.NewCmdContext(context.Background(), debug == "true")
-	logger := log.New(ctx)
-
-	if len(os.Args) != expectedArgsLength {
-		logger.Println("Expected BUILD_OUTPUT_DIR and RELEASE_OUTPUT_DIR arguments")
-		os.Exit(1)
-	}
-
-	buildOutputDirectory := os.Args[buildOutputDirectoryArg]
-	releaseOutputDirectory := os.Args[releaseOutputDirectoryArg]
-
-	logger.Debugf("Build output directory: %s", buildOutputDirectory)
-	logger.Debugf("Release output directory: %s", releaseOutputDirectory)
-
-	release := &builder.Release{
-		BuildOutputDirectory:   buildOutputDirectory,
-		ReleaseOutputDirectory: releaseOutputDirectory,
-	}
-
-	if err := release.Run(ctx); err != nil {
-		logger.Printf("Error releasing chaincode: %+v", err)
-		os.Exit(1)
-	}
+	os.Exit(cmd.Release())
 }