Merge pull request #323 from dwertent/fix-fabric-amd

[Fix]: Remove --platform flag from Docker commands in fabric_provider.go

Makefile

@@ -20,7 +20,9 @@ GITREF := $(shell git rev-parse --short HEAD)
 DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 LINT := $(GOBIN)/golangci-lint
 
-all: build lint test tidy
+all: format build lint test tidy
+format: ## Formats all go code
+		gofmt -s -w .
 test: deps
 		$(VGO) test ./internal/... ./pkg/... ./cmd/... -cover -coverprofile=coverage.txt -covermode=atomic -timeout=30s ${TEST_ARGS}
 build: ## Builds all go code

cmd/accounts_list_test.go

@@ -8,15 +8,15 @@ import (
 )
 
 func TestAccountListCmd(t *testing.T) {
-	testNames := []string{"stack-1", "stack-2", "stack-3","stack-4", "stack-5"}
+	testNames := []string{"stack-1", "stack-2", "stack-3", "stack-4", "stack-5"}
 	for _, stackNames := range testNames {
 		createCmd := accountsCreateCmd
 		createCmd.SetArgs([]string{"ff", "create", stackNames})
 		err := createCmd.Execute()
 		if err != nil {
 			t.Fatalf("Failed to create account for testing: %v", err)
 		}
-		Args := []string{ "ls"}
+		Args := []string{"ls"}
 		t.Run("Test-Account-List", func(t *testing.T) {
 			cmd := accountsListCmd
 			cmd.SetArgs(Args)

internal/blockchain/ethereum/connector/ethconnect/client.go

@@ -136,7 +136,7 @@ func (e *Ethconnect) DeployContract(contract *ethtypes.CompiledContract, contrac
 		return nil, err
 	}
 	if reply.Headers.Type != "TransactionSuccess" {
-		return nil, fmt.Errorf(reply.ErrorMessage)
+		return nil, fmt.Errorf("%s", reply.ErrorMessage)
 	}
 
 	result := &types.ContractDeploymentResult{

internal/blockchain/ethereum/connector/ethconnect/config_test.go

@@ -8,8 +8,8 @@ import (
 func TestWriteConfig(t *testing.T) {
 	dir := t.TempDir()
 	// Construct the paths for config files within the temporary directory
-    configFilename := filepath.Join(dir, "config.yaml")
-    extraEvmConfigPath := filepath.Join(dir, "conflate", "extra.yaml")
+	configFilename := filepath.Join(dir, "config.yaml")
+	extraEvmConfigPath := filepath.Join(dir, "conflate", "extra.yaml")
 	p := Config{}
 	t.Run("TestWriteConfig", func(t *testing.T) {
 		err := p.WriteConfig(configFilename, extraEvmConfigPath)

internal/blockchain/ethereum/geth/client.go

@@ -87,7 +87,7 @@ func (g *GethClient) UnlockAccount(address string, password string) error {
 		return err
 	}
 	if rpcResponse.Error != nil {
-		return fmt.Errorf(rpcResponse.Error.Message)
+		return fmt.Errorf("%s", rpcResponse.Error.Message)
 	}
 	return nil
 }

internal/blockchain/ethereum/quorum/client.go

@@ -87,7 +87,7 @@ func (g *QuorumClient) UnlockAccount(address string, password string) error {
 		return err
 	}
 	if rpcResponse.Error != nil {
-		return fmt.Errorf(rpcResponse.Error.Message)
+		return fmt.Errorf("%s", rpcResponse.Error.Message)
 	}
 	return nil
 }

internal/blockchain/fabric/constants.go

@@ -16,6 +16,9 @@
 
 package fabric
 
+// Note: Any change of image tag should be checked if it is published in arm64 format.
+// Refer to this commit for when arm64 support was added and the code workaround was removed:
+// https://github.com/hyperledger/firefly-cli/pull/323/commits/71237b73b07bfee72b355dea83af9cd874b2a2de
 var FabricToolsImageName = "hyperledger/fabric-tools:2.5.6"
 var FabricCAImageName = "hyperledger/fabric-ca:1.5"
 var FabricOrdererImageName = "hyperledger/fabric-orderer:2.5"

internal/blockchain/fabric/fabric_provider.go

@@ -109,7 +109,6 @@ func (p *FabricProvider) FirstTimeSetup() error {
 		// Run cryptogen to generate MSP
 		if err := docker.RunDockerCommand(p.ctx, blockchainDirectory,
 			"run",
-			"--platform", getDockerPlatform(),
 			"--rm",
 			"-v", fmt.Sprintf("%s:/etc/template.yml", cryptogenYamlPath),
 			"-v", fmt.Sprintf("%s:/etc/firefly", volumeName),
@@ -124,7 +123,6 @@ func (p *FabricProvider) FirstTimeSetup() error {
 		// Generate genesis block
 		if err := docker.RunDockerCommand(p.ctx, blockchainDirectory,
 			"run",
-			"--platform", getDockerPlatform(),
 			"--rm",
 			"-v", fmt.Sprintf("%s:/etc/firefly", volumeName),
 			"-v", fmt.Sprintf("%s:/etc/hyperledger/fabric/configtx.yaml", path.Join(blockchainDirectory, "configtx.yaml")),
@@ -335,7 +333,6 @@ func (p *FabricProvider) createChannel() error {
 	volumeName := fmt.Sprintf("%s_firefly_fabric", p.stack.Name)
 	return docker.RunDockerCommand(p.ctx, stackDir,
 		"run",
-		"--platform", getDockerPlatform(),
 		"--rm",
 		fmt.Sprintf("--network=%s_default", p.stack.Name),
 		"-v", fmt.Sprintf("%s:/etc/firefly", volumeName),
@@ -356,7 +353,6 @@ func (p *FabricProvider) joinChannel() error {
 	volumeName := fmt.Sprintf("%s_firefly_fabric", p.stack.Name)
 	return docker.RunDockerCommand(p.ctx, stackDir,
 		"run",
-		"--platform", getDockerPlatform(),
 		"--rm",
 		fmt.Sprintf("--network=%s_default", p.stack.Name),
 		"-v", fmt.Sprintf("%s:/etc/firefly", volumeName),
@@ -405,7 +401,6 @@ func (p *FabricProvider) installChaincode(packageFilename string) error {
 	volumeName := fmt.Sprintf("%s_firefly_fabric", p.stack.Name)
 	return docker.RunDockerCommand(p.ctx, contractsDir,
 		"run",
-		"--platform", getDockerPlatform(),
 		"--rm",
 		fmt.Sprintf("--network=%s_default", p.stack.Name),
 		"-e", "CORE_PEER_ADDRESS=fabric_peer:7051",
@@ -425,7 +420,6 @@ func (p *FabricProvider) queryInstalled() (*QueryInstalledResponse, error) {
 	volumeName := fmt.Sprintf("%s_firefly_fabric", p.stack.Name)
 	str, err := docker.RunDockerCommandBuffered(p.ctx, p.stack.RuntimeDir,
 		"run",
-		"--platform", getDockerPlatform(),
 		"--rm",
 		fmt.Sprintf("--network=%s_default", p.stack.Name),
 		"-e", "CORE_PEER_ADDRESS=fabric_peer:7051",
@@ -454,7 +448,6 @@ func (p *FabricProvider) approveChaincode(channel, chaincode, version, packageID
 	volumeName := fmt.Sprintf("%s_firefly_fabric", p.stack.Name)
 	return docker.RunDockerCommand(p.ctx, p.stack.RuntimeDir,
 		"run",
-		"--platform", getDockerPlatform(),
 		"--rm",
 		fmt.Sprintf("--network=%s_default", p.stack.Name),
 		"-e", "CORE_PEER_ADDRESS=fabric_peer:7051",
@@ -482,7 +475,6 @@ func (p *FabricProvider) commitChaincode(channel, chaincode, version string) err
 	volumeName := fmt.Sprintf("%s_firefly_fabric", p.stack.Name)
 	return docker.RunDockerCommand(p.ctx, p.stack.RuntimeDir,
 		"run",
-		"--platform", getDockerPlatform(),
 		"--rm",
 		fmt.Sprintf("--network=%s_default", p.stack.Name),
 		"-e", "CORE_PEER_ADDRESS=fabric_peer:7051",
@@ -617,11 +609,6 @@ func (p *FabricProvider) CreateAccount(args []string) (interface{}, error) {
 	}, nil
 }
 
-// As of release 2.4, Hyperledger Fabric only publishes amd64 images, but no arm64 specific images
-func getDockerPlatform() string {
-	return "linux/amd64"
-}
-
 func (p *FabricProvider) ParseAccount(account interface{}) interface{} {
 	accountMap := account.(map[string]interface{})
 	return &Account{

internal/blockchain/fabric/fabric_provider_test.go

@@ -259,12 +259,6 @@ func TestGetConnectorURL(t *testing.T) {
 
 }
 
-func TestGetDockerPlatform(t *testing.T) {
-	expectedString := "linux/amd64"
-	String := getDockerPlatform()
-	assert.Equal(t, expectedString, String)
-}
-
 func TestGetContracts(t *testing.T) {
 	FilePath := t.TempDir()
 	testContractFile := filepath.Join(FilePath, "/test_contracts.json")
@@ -410,4 +404,3 @@ func TestRegisterIdentity(t *testing.T) {
 	})
 
 }
-

internal/blockchain/tezos/remoterpc/remoterpc_provider_test.go

@@ -239,4 +239,4 @@ func TestGetConnectorExternalURL(t *testing.T) {
 			assert.Equal(t, tc.ExpectedURL, ExternalURL)
 		})
 	}
-}
+}

internal/docker/docker.go

@@ -93,7 +93,7 @@ func RunDockerCommand(ctx context.Context, workingDir string, command ...string)
 	dockerCmd.Dir = workingDir
 	output, err := runCommand(ctx, dockerCmd)
 	if err != nil && output != "" {
-		return fmt.Errorf(output)
+		return fmt.Errorf("%s", output)
 	}
 	return err
 }