Merge pull request #292 from kaleido-io/permission-fixes

More fixes for directory permissions
hyperledger · Mar 4, 2024 · a766617 · a766617
2 parents 99626b3 + 9685bc7
commit a766617
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 2 deletions.
diff --git a/internal/blockchain/ethereum/besu/besu_provider.go b/internal/blockchain/ethereum/besu/besu_provider.go
@@ -100,6 +100,10 @@ func (p *BesuProvider) FirstTimeSetup() error {
 		return err
 	}
 
+	if err := p.connector.FirstTimeSetup(p.stack); err != nil {
+		return err
+	}
+
 	if err := docker.CreateVolume(p.ctx, besuVolumeName); err != nil {
 		return err
 	}

diff --git a/internal/blockchain/ethereum/connector/connector_interface.go b/internal/blockchain/ethereum/connector/connector_interface.go
@@ -23,6 +23,7 @@ import (
 )
 
 type Connector interface {
+	FirstTimeSetup(stack *types.Stack) error
 	GetServiceDefinitions(s *types.Stack, dependentServices map[string]string) []*docker.ServiceDefinition
 	DeployContract(contract *ethtypes.CompiledContract, contractName string, member *types.Organization, extraArgs []string) (*types.ContractDeploymentResult, error)
 	GenerateConfig(stack *types.Stack, member *types.Organization, blockchainServiceName string) Config

diff --git a/internal/blockchain/ethereum/connector/ethconnect/client.go b/internal/blockchain/ethereum/connector/ethconnect/client.go
@@ -162,3 +162,7 @@ func getReply(ctx context.Context, ethconnectURL, id string) (*EthconnectReply,
 	err = core.RequestWithRetry(ctx, "GET", requestURL, nil, reply)
 	return reply, err
 }
+
+func (e *Ethconnect) FirstTimeSetup(stack *types.Stack) error {
+	return nil
+}
diff --git a/internal/blockchain/ethereum/connector/evmconnect/client.go b/internal/blockchain/ethereum/connector/evmconnect/client.go
@@ -26,6 +26,7 @@ import (
 	"github.com/hyperledger/firefly-cli/internal/blockchain/ethereum"
 	"github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/ethtypes"
 	"github.com/hyperledger/firefly-cli/internal/core"
+	"github.com/hyperledger/firefly-cli/internal/docker"
 	"github.com/hyperledger/firefly-cli/pkg/types"
 )
 
@@ -146,3 +147,12 @@ func (e *Evmconnect) getTransactionStatus(evmconnectURL, id string) (*Evmconnect
 	err = core.RequestWithRetry(e.ctx, "GET", requestURL, nil, reply)
 	return reply, err
 }
+
+func (e *Evmconnect) FirstTimeSetup(stack *types.Stack) error {
+	for _, member := range stack.Members {
+		if err := docker.MkdirInVolume(e.ctx, fmt.Sprintf("%s_evmconnect_data_%s", stack.Name, member.ID), "/leveldb"); err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/internal/blockchain/ethereum/connector/evmconnect/docker.go b/internal/blockchain/ethereum/connector/evmconnect/docker.go
@@ -30,6 +30,7 @@ func (e *Evmconnect) GetServiceDefinitions(s *types.Stack, dependentServices map
 	}
 	serviceDefinitions := make([]*docker.ServiceDefinition, len(s.Members))
 	for i, member := range s.Members {
+		dataVolumeName := fmt.Sprintf("evmconnect_data_%s", member.ID)
 		serviceDefinitions[i] = &docker.ServiceDefinition{
 			ServiceName: "evmconnect_" + member.ID,
 			Service: &docker.Service{
@@ -40,12 +41,12 @@ func (e *Evmconnect) GetServiceDefinitions(s *types.Stack, dependentServices map
 				Ports:         []string{fmt.Sprintf("%d:%v", member.ExposedConnectorPort, e.Port())},
 				Volumes: []string{
 					fmt.Sprintf("%s/config/evmconnect_%s.yaml:/evmconnect/config.yaml", s.RuntimeDir, member.ID),
-					fmt.Sprintf("evmconnect_data_%s:/evmconnect/data", member.ID),
+					fmt.Sprintf("%s:/evmconnect/data", dataVolumeName),
 				},
 				Logging: docker.StandardLogOptions,
 			},
 			VolumeNames: []string{
-				fmt.Sprintf("evmconnect_data_%s", member.ID),
+				dataVolumeName,
 			},
 		}
 	}

diff --git a/internal/blockchain/ethereum/geth/geth_provider.go b/internal/blockchain/ethereum/geth/geth_provider.go
@@ -93,6 +93,10 @@ func (p *GethProvider) FirstTimeSetup() error {
 	blockchainDir := path.Join(p.stack.RuntimeDir, "blockchain")
 	contractsDir := path.Join(p.stack.RuntimeDir, "contracts")
 
+	if err := p.connector.FirstTimeSetup(p.stack); err != nil {
+		return err
+	}
+
 	if err := os.MkdirAll(contractsDir, 0755); err != nil {
 		return err
 	}

diff --git a/internal/blockchain/ethereum/remoterpc/remoterpc_provider.go b/internal/blockchain/ethereum/remoterpc/remoterpc_provider.go
@@ -75,6 +75,10 @@ func (p *RemoteRPCProvider) FirstTimeSetup() error {
 		return err
 	}
 
+	if err := p.connector.FirstTimeSetup(p.stack); err != nil {
+		return err
+	}
+
 	for i := range p.stack.Members {
 		// Copy connector config to each member's volume
 		connectorConfigPath := filepath.Join(p.stack.StackDir, "runtime", "config", fmt.Sprintf("%s_%v.yaml", p.connector.Name(), i))

diff --git a/internal/stacks/stack_manager.go b/internal/stacks/stack_manager.go
@@ -529,6 +529,9 @@ func (s *StackManager) copyDataExchangeConfigToVolumes() error {
 		if err := docker.MkdirInVolume(s.ctx, volumeName, "peer-certs"); err != nil {
 			return err
 		}
+		if err := docker.MkdirInVolume(s.ctx, volumeName, "blobs"); err != nil {
+			return err
+		}
 		if err := docker.CopyFileToVolume(s.ctx, volumeName, path.Join(memberDXDir, "config.json"), "/config.json"); err != nil {
 			return err
 		}