fix lints and even better context passing

Tofel · Tofel · commit 85285202474d · 2025-10-28T18:17:54.000+01:00
diff --git a/framework/components/blockchain/aptos.go b/framework/components/blockchain/aptos.go
@@ -128,12 +128,12 @@ func newAptos(ctx context.Context, in *Input) (*Output, error) {
 		return nil, err
 	}
 	cmdStr := []string{"aptos", "init", "--network=local", "--assume-yes", fmt.Sprintf("--private-key=%s", DefaultAptosPrivateKey)}
-	_, err = dc.ExecContainer(containerName, cmdStr)
+	_, err = dc.ExecContainerWithContext(ctx, containerName, cmdStr)
 	if err != nil {
 		return nil, err
 	}
 	fundCmd := []string{"aptos", "account", "fund-with-faucet", "--account", DefaultAptosAccount, "--amount", "1000000000000"}
-	_, err = dc.ExecContainer(containerName, fundCmd)
+	_, err = dc.ExecContainerWithContext(ctx, containerName, fundCmd)
 	if err != nil {
 		return nil, err
 	}
diff --git a/framework/components/blockchain/containers.go b/framework/components/blockchain/containers.go
@@ -74,7 +74,7 @@ func createGenericEvmContainer(ctx context.Context, in *Input, req testcontainer
 		return nil, err
 	}
 
-	host, err := framework.GetHost(c)
+	host, err := framework.GetHostWithContext(ctx, c)
 	if err != nil {
 		return nil, err
 	}
diff --git a/framework/components/blockchain/solana.go b/framework/components/blockchain/solana.go
@@ -139,7 +139,7 @@ func newSolana(ctx context.Context, in *Input) (*Output, error) {
 	if err != nil {
 		return nil, err
 	}
-	host, err := framework.GetHost(c)
+	host, err := framework.GetHostWithContext(ctx, c)
 	if err != nil {
 		return nil, err
 	}
diff --git a/framework/components/blockchain/sui.go b/framework/components/blockchain/sui.go
@@ -54,13 +54,13 @@ func fundAccount(url string, address string) error {
 }
 
 // generateKeyData generates a wallet and returns all the data
-func generateKeyData(containerName string, keyCipherType string) (*SuiWalletInfo, error) {
+func generateKeyData(ctx context.Context, containerName string, keyCipherType string) (*SuiWalletInfo, error) {
 	cmdStr := []string{"sui", "keytool", "generate", keyCipherType, "--json"}
 	dc, err := framework.NewDockerClient()
 	if err != nil {
 		return nil, err
 	}
-	keyOut, err := dc.ExecContainer(containerName, cmdStr)
+	keyOut, err := dc.ExecContainerWithContext(ctx, containerName, cmdStr)
 	if err != nil {
 		return nil, err
 	}
@@ -166,7 +166,7 @@ func newSui(ctx context.Context, in *Input) (*Output, error) {
 	if err != nil {
 		return nil, err
 	}
-	suiAccount, err := generateKeyData(containerName, "ed25519")
+	suiAccount, err := generateKeyData(ctx, containerName, "ed25519")
 	if err != nil {
 		return nil, err
 	}
diff --git a/framework/components/clnode/clnode.go b/framework/components/clnode/clnode.go
@@ -97,7 +97,7 @@ func NewNodeWithDBAndContext(ctx context.Context, in *Input) (*Output, error) {
 	if in.Out != nil && in.Out.UseCache {
 		return in.Out, nil
 	}
-	pgOut, err := postgres.NewPostgreSQL(in.DbInput)
+	pgOut, err := postgres.NewWithContext(ctx, in.DbInput)
 	if err != nil {
 		return nil, err
 	}
@@ -365,7 +365,7 @@ func newNode(ctx context.Context, in *Input, pgOut *postgres.Output) (*NodeOut,
 	if err != nil {
 		return nil, err
 	}
-	host, err := framework.GetHost(c)
+	host, err := framework.GetHostWithContext(ctx, c)
 	if err != nil {
 		return nil, err
 	}
diff --git a/framework/components/jd/grpc_wait_strategy.go b/framework/components/jd/grpc_wait_strategy.go
@@ -64,7 +64,7 @@ func (g *GRPCHealthStrategy) WaitUntilReady(ctx context.Context, target tcwait.S
 			}
 
 			// Get host and port
-			host, err := framework.GetHost(target.(tc.Container)) //nolint:contextcheck //don't want modify the signature of GetHost() yet
+			host, err := framework.GetHostWithContext(ctx, target.(tc.Container))
 			if err != nil {
 				continue
 			}
diff --git a/framework/components/jd/jd.go b/framework/components/jd/jd.go
@@ -88,7 +88,7 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) {
 		in.DBInput = defaultJDDB()
 	}
 	in.DBInput.JDSQLDumpPath = in.JDSQLDumpPath
-	pgOut, err := postgres.NewPostgreSQL(in.DBInput)
+	pgOut, err := postgres.NewWithContext(ctx, in.DBInput)
 	if err != nil {
 		return nil, err
 	}
@@ -140,7 +140,7 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) {
 	if err != nil {
 		return nil, err
 	}
-	host, err := framework.GetHost(c)
+	host, err := framework.GetHostWithContext(ctx, c)
 	if err != nil {
 		return nil, err
 	}
diff --git a/framework/components/postgres/postgres.go b/framework/components/postgres/postgres.go
@@ -163,7 +163,7 @@ func NewWithContext(ctx context.Context, in *Input) (*Output, error) {
 	if err != nil {
 		return nil, err
 	}
-	host, err := framework.GetHost(c)
+	host, err := framework.GetHostWithContext(ctx, c)
 	if err != nil {
 		return nil, err
 	}
diff --git a/framework/components/s3provider/minio.go b/framework/components/s3provider/minio.go
@@ -227,7 +227,7 @@ func (mf MinioFactory) run(ctx context.Context, m *Minio) (Provider, error) {
 		return nil, err
 	}
 
-	m.Host, err = framework.GetHost(c)
+	m.Host, err = framework.GetHostWithContext(ctx, c)
 	if err != nil {
 		return nil, err
 	}
diff --git a/framework/components/simple_node_set/fund.go b/framework/components/simple_node_set/fund.go
@@ -87,7 +87,7 @@ func FundNodesWithContext(ctx context.Context, c *ethclient.Client, nodes []*clc
 		if err != nil {
 			return err
 		}
-		if err := SendETH(c, pkey, ek.Attributes.Address, big.NewFloat(ethAmount)); err != nil {
+		if err := SendETHWithContext(ctx, c, pkey, ek.Attributes.Address, big.NewFloat(ethAmount)); err != nil {
 			return er.Wrapf(err, "failed to fund CL node %s", ek.Attributes.Address)
 		}
 	}
diff --git a/framework/docker.go b/framework/docker.go
@@ -42,7 +42,11 @@ func IsDockerRunning() bool {
 }
 
 func GetHost(container tc.Container) (string, error) {
-	host, err := container.Host(context.Background())
+	return GetHostWithContext(context.Background(), container)
+}
+
+func GetHostWithContext(ctx context.Context, container tc.Container) (string, error) {
+	host, err := container.Host(ctx)
 	if err != nil {
 		return "", err
 	}
@@ -114,19 +118,28 @@ func NewDockerClient() (*DockerClient, error) {
 
 // ExecContainer executes a command inside a running container by name and returns the combined stdout/stderr.
 func (dc *DockerClient) ExecContainer(containerName string, command []string) (string, error) {
+	return dc.ExecContainerWithContext(context.Background(), containerName, command)
+}
+
+// ExecContainerWithContext executes a command inside a running container by name and returns the combined stdout/stderr.
+func (dc *DockerClient) ExecContainerWithContext(ctx context.Context, containerName string, command []string) (string, error) {
 	execConfig := container.ExecOptions{
 		Cmd:          command,
 		AttachStdout: true,
 		AttachStderr: true,
 	}
 
-	return dc.ExecContainerOptions(containerName, execConfig)
+	return dc.ExecContainerOptionsWithContext(ctx, containerName, execConfig)
 }
 
 // ExecContainer executes a command inside a running container by name and returns the combined stdout/stderr.
 func (dc *DockerClient) ExecContainerOptions(containerName string, execConfig container.ExecOptions) (string, error) {
+	return dc.ExecContainerOptionsWithContext(context.Background(), containerName, execConfig)
+}
+
+// ExecContainerOptionsWithContext executes a command inside a running container by name and returns the combined stdout/stderr.
+func (dc *DockerClient) ExecContainerOptionsWithContext(ctx context.Context, containerName string, execConfig container.ExecOptions) (string, error) {
 	L.Info().Strs("Command", execConfig.Cmd).Str("ContainerName", containerName).Msg("Executing command")
-	ctx := context.Background()
 	containers, err := dc.cli.ContainerList(ctx, container.ListOptions{
 		All: true,
 	})

Original file line number	Diff line number	Diff line change
`@@ -128,12 +128,12 @@ func newAptos(ctx context.Context, in Input) (Output, error) {`
`128`	`128`	`return nil, err`
`129`	`129`	`}`
`130`	`130`	`cmdStr := []string{"aptos", "init", "--network=local", "--assume-yes", fmt.Sprintf("--private-key=%s", DefaultAptosPrivateKey)}`
`131`		`- _, err = dc.ExecContainer(containerName, cmdStr)`
	`131`	`+ _, err = dc.ExecContainerWithContext(ctx, containerName, cmdStr)`
`132`	`132`	`if err != nil {`
`133`	`133`	`return nil, err`
`134`	`134`	`}`
`135`	`135`	`fundCmd := []string{"aptos", "account", "fund-with-faucet", "--account", DefaultAptosAccount, "--amount", "1000000000000"}`
`136`		`- _, err = dc.ExecContainer(containerName, fundCmd)`
	`136`	`+ _, err = dc.ExecContainerWithContext(ctx, containerName, fundCmd)`
`137`	`137`	`if err != nil {`
`138`	`138`	`return nil, err`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func createGenericEvmContainer(ctx context.Context, in *Input, req testcontainer`
`74`	`74`	`return nil, err`
`75`	`75`	`}`
`76`	`76`
`77`		`- host, err := framework.GetHost(c)`
	`77`	`+ host, err := framework.GetHostWithContext(ctx, c)`
`78`	`78`	`if err != nil {`
`79`	`79`	`return nil, err`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func newSolana(ctx context.Context, in Input) (Output, error) {`
`139`	`139`	`if err != nil {`
`140`	`140`	`return nil, err`
`141`	`141`	`}`
`142`		`- host, err := framework.GetHost(c)`
	`142`	`+ host, err := framework.GetHostWithContext(ctx, c)`
`143`	`143`	`if err != nil {`
`144`	`144`	`return nil, err`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@ func fundAccount(url string, address string) error {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// generateKeyData generates a wallet and returns all the data`
`57`		`-func generateKeyData(containerName string, keyCipherType string) (*SuiWalletInfo, error) {`
	`57`	`+func generateKeyData(ctx context.Context, containerName string, keyCipherType string) (*SuiWalletInfo, error) {`
`58`	`58`	`cmdStr := []string{"sui", "keytool", "generate", keyCipherType, "--json"}`
`59`	`59`	`dc, err := framework.NewDockerClient()`
`60`	`60`	`if err != nil {`
`61`	`61`	`return nil, err`
`62`	`62`	`}`
`63`		`- keyOut, err := dc.ExecContainer(containerName, cmdStr)`
	`63`	`+ keyOut, err := dc.ExecContainerWithContext(ctx, containerName, cmdStr)`
`64`	`64`	`if err != nil {`
`65`	`65`	`return nil, err`
`66`	`66`	`}`
`@@ -166,7 +166,7 @@ func newSui(ctx context.Context, in Input) (Output, error) {`
`166`	`166`	`if err != nil {`
`167`	`167`	`return nil, err`
`168`	`168`	`}`
`169`		`- suiAccount, err := generateKeyData(containerName, "ed25519")`
	`169`	`+ suiAccount, err := generateKeyData(ctx, containerName, "ed25519")`
`170`	`170`	`if err != nil {`
`171`	`171`	`return nil, err`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func NewNodeWithDBAndContext(ctx context.Context, in Input) (Output, error) {`
`97`	`97`	`if in.Out != nil && in.Out.UseCache {`
`98`	`98`	`return in.Out, nil`
`99`	`99`	`}`
`100`		`- pgOut, err := postgres.NewPostgreSQL(in.DbInput)`
	`100`	`+ pgOut, err := postgres.NewWithContext(ctx, in.DbInput)`
`101`	`101`	`if err != nil {`
`102`	`102`	`return nil, err`
`103`	`103`	`}`
`@@ -365,7 +365,7 @@ func newNode(ctx context.Context, in Input, pgOut postgres.Output) (*NodeOut,`
`365`	`365`	`if err != nil {`
`366`	`366`	`return nil, err`
`367`	`367`	`}`
`368`		`- host, err := framework.GetHost(c)`
	`368`	`+ host, err := framework.GetHostWithContext(ctx, c)`
`369`	`369`	`if err != nil {`
`370`	`370`	`return nil, err`
`371`	`371`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func (g *GRPCHealthStrategy) WaitUntilReady(ctx context.Context, target tcwait.S`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// Get host and port`
`67`		`- host, err := framework.GetHost(target.(tc.Container)) //nolint:contextcheck //don't want modify the signature of GetHost() yet`
	`67`	`+ host, err := framework.GetHostWithContext(ctx, target.(tc.Container))`
`68`	`68`	`if err != nil {`
`69`	`69`	`continue`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func NewWithContext(ctx context.Context, in Input) (Output, error) {`
`88`	`88`	`in.DBInput = defaultJDDB()`
`89`	`89`	`}`
`90`	`90`	`in.DBInput.JDSQLDumpPath = in.JDSQLDumpPath`
`91`		`- pgOut, err := postgres.NewPostgreSQL(in.DBInput)`
	`91`	`+ pgOut, err := postgres.NewWithContext(ctx, in.DBInput)`
`92`	`92`	`if err != nil {`
`93`	`93`	`return nil, err`
`94`	`94`	`}`
`@@ -140,7 +140,7 @@ func NewWithContext(ctx context.Context, in Input) (Output, error) {`
`140`	`140`	`if err != nil {`
`141`	`141`	`return nil, err`
`142`	`142`	`}`
`143`		`- host, err := framework.GetHost(c)`
	`143`	`+ host, err := framework.GetHostWithContext(ctx, c)`
`144`	`144`	`if err != nil {`
`145`	`145`	`return nil, err`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func NewWithContext(ctx context.Context, in Input) (Output, error) {`
`163`	`163`	`if err != nil {`
`164`	`164`	`return nil, err`
`165`	`165`	`}`
`166`		`- host, err := framework.GetHost(c)`
	`166`	`+ host, err := framework.GetHostWithContext(ctx, c)`
`167`	`167`	`if err != nil {`
`168`	`168`	`return nil, err`
`169`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ func (mf MinioFactory) run(ctx context.Context, m *Minio) (Provider, error) {`
`227`	`227`	`return nil, err`
`228`	`228`	`}`
`229`	`229`
`230`		`- m.Host, err = framework.GetHost(c)`
	`230`	`+ m.Host, err = framework.GetHostWithContext(ctx, c)`
`231`	`231`	`if err != nil {`
`232`	`232`	`return nil, err`
`233`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func FundNodesWithContext(ctx context.Context, c ethclient.Client, nodes []clc`
`87`	`87`	`if err != nil {`
`88`	`88`	`return err`
`89`	`89`	`}`
`90`		`- if err := SendETH(c, pkey, ek.Attributes.Address, big.NewFloat(ethAmount)); err != nil {`
	`90`	`+ if err := SendETHWithContext(ctx, c, pkey, ek.Attributes.Address, big.NewFloat(ethAmount)); err != nil {`
`91`	`91`	`return er.Wrapf(err, "failed to fund CL node %s", ek.Attributes.Address)`
`92`	`92`	`}`
`93`	`93`	`}`