Replace deprecated RunMain in integration tests

Also moved the cmd package under internal.

Now that a return int is no longer required, it would be nice to
remove that package completely and use the cmd main methods directly
but I'm not sure how!

Signed-off-by: James Taylor <[email protected]>

Author: jt-nti

cmd/build/main.go

@@ -2,12 +2,8 @@
 
 package main
 
-import (
-	"os"
-
-	"github.com/hyperledger-labs/fabric-builder-k8s/cmd"
-)
+import "github.com/hyperledger-labs/fabric-builder-k8s/internal/cmd"
 
 func main() {
-	os.Exit(cmd.Build())
+	cmd.Build()
 }

cmd/detect/main.go

@@ -2,12 +2,8 @@
 
 package main
 
-import (
-	"os"
-
-	"github.com/hyperledger-labs/fabric-builder-k8s/cmd"
-)
+import "github.com/hyperledger-labs/fabric-builder-k8s/internal/cmd"
 
 func main() {
-	os.Exit(cmd.Detect())
+	cmd.Detect()
 }

cmd/release/main.go

@@ -2,12 +2,8 @@
 
 package main
 
-import (
-	"os"
-
-	"github.com/hyperledger-labs/fabric-builder-k8s/cmd"
-)
+import "github.com/hyperledger-labs/fabric-builder-k8s/internal/cmd"
 
 func main() {
-	os.Exit(cmd.Release())
+	cmd.Release()
 }

cmd/run/main.go

@@ -2,12 +2,8 @@
 
 package main
 
-import (
-	"os"
-
-	"github.com/hyperledger-labs/fabric-builder-k8s/cmd"
-)
+import "github.com/hyperledger-labs/fabric-builder-k8s/internal/cmd"
 
 func main() {
-	os.Exit(cmd.Run())
+	cmd.Run()
 }

cmd/build.go renamed to internal/cmd/build.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
 )
 
-func Build() int {
+func Build() {
 	const (
 		expectedArgsLength            = 4
 		chaincodeSourceDirectoryArg   = 1
@@ -29,7 +29,7 @@ func Build() int {
 			"Expected CHAINCODE_SOURCE_DIR, CHAINCODE_METADATA_DIR and BUILD_OUTPUT_DIR arguments",
 		)
 
-		return 1
+		os.Exit(1)
 	}
 
 	chaincodeSourceDirectory := os.Args[chaincodeSourceDirectoryArg]
@@ -49,8 +49,8 @@ func Build() int {
 	if err := build.Run(ctx); err != nil {
 		logger.Printf("Error building chaincode: %+v", err)
 
-		return 1
+		os.Exit(1)
 	}
 
-	return 0
+	os.Exit(0)
 }

cmd/detect.go renamed to internal/cmd/detect.go

@@ -13,7 +13,7 @@ import (
 	"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
 )
 
-func Detect() int {
+func Detect() {
 	const (
 		expectedArgsLength            = 3
 		chaincodeSourceDirectoryArg   = 1
@@ -27,7 +27,7 @@ func Detect() int {
 	if len(os.Args) != expectedArgsLength {
 		logger.Println("Expected CHAINCODE_SOURCE_DIR and CHAINCODE_METADATA_DIR arguments")
 
-		return 1
+		os.Exit(1)
 	}
 
 	chaincodeSourceDirectory := os.Args[chaincodeSourceDirectoryArg]
@@ -47,8 +47,8 @@ func Detect() int {
 			logger.Printf("Error detecting chaincode: %+v", err)
 		}
 
-		return 1
+		os.Exit(1)
 	}
 
-	return 0
+	os.Exit(0)
 }

cmd/release.go renamed to internal/cmd/release.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
 )
 
-func Release() int {
+func Release() {
 	const (
 		expectedArgsLength        = 3
 		buildOutputDirectoryArg   = 1
@@ -26,7 +26,7 @@ func Release() int {
 	if len(os.Args) != expectedArgsLength {
 		logger.Println("Expected BUILD_OUTPUT_DIR and RELEASE_OUTPUT_DIR arguments")
 
-		return 1
+		os.Exit(1)
 	}
 
 	buildOutputDirectory := os.Args[buildOutputDirectoryArg]
@@ -43,8 +43,8 @@ func Release() int {
 	if err := release.Run(ctx); err != nil {
 		logger.Printf("Error releasing chaincode: %+v", err)
 
-		return 1
+		os.Exit(1)
 	}
 
-	return 0
+	os.Exit(0)
 }

cmd/run.go renamed to internal/cmd/run.go

@@ -113,7 +113,7 @@ func getChaincodeStartTimeout(logger *log.CmdLogger) (chaincodeStartTimeoutDurat
 	return chaincodeStartTimeoutDuration, true
 }
 
-func Run() int {
+func Run() {
 	const (
 		expectedArgsLength      = 3
 		buildOutputDirectoryArg = 1
@@ -127,7 +127,7 @@ func Run() int {
 	if len(os.Args) != expectedArgsLength {
 		logger.Println("Expected BUILD_OUTPUT_DIR and RUN_METADATA_DIR arguments")
 
-		return 1
+		os.Exit(1)
 	}
 
 	buildOutputDirectory := os.Args[buildOutputDirectoryArg]
@@ -141,27 +141,27 @@ func Run() int {
 
 	peerID, ok := getPeerID(logger)
 	if !ok {
-		return 1
+		os.Exit(1)
 	}
 
 	kubeconfigPath := getKubeconfigPath(logger)
 	kubeNamespace := getKubeNamespace(logger)
 
 	kubeNodeRole, ok := getKubeNodeRole(logger)
 	if !ok {
-		return 1
+		os.Exit(1)
 	}
 
 	kubeServiceAccount := getKubeServiceAccount(logger)
 
 	kubeNamePrefix, ok := getKubeNamePrefix(logger)
 	if !ok {
-		return 1
+		os.Exit(1)
 	}
 
 	chaincodeStartTimeout, ok := getChaincodeStartTimeout(logger)
 	if !ok {
-		return 1
+		os.Exit(1)
 	}
 
 	run := &builder.Run{
@@ -179,8 +179,8 @@ func Run() int {
 	if err := run.Run(ctx); err != nil {
 		logger.Printf("Error running chaincode: %+v", err)
 
-		return 1
+		os.Exit(1)
 	}
 
-	return 0
+	os.Exit(0)
 }

test/integration/main_test.go

@@ -8,10 +8,9 @@ package integration_test
 import (
 	"context"
 	"fmt"
-	"os"
 	"testing"
 
-	"github.com/hyperledger-labs/fabric-builder-k8s/cmd"
+	"github.com/hyperledger-labs/fabric-builder-k8s/internal/cmd"
 	"github.com/hyperledger-labs/fabric-builder-k8s/test"
 	"github.com/rogpeppe/go-internal/testscript"
 	batchv1 "k8s.io/api/batch/v1"
@@ -71,7 +70,7 @@ func TestMain(m *testing.M) {
 	})
 
 	wm := test.NewWrappedM(m, testenv)
-	os.Exit(testscript.RunMain(wm, map[string]func() int{
+	testscript.Main(wm, map[string]func(){
 		"run": cmd.Run,
-	}))
+	})
 }