rm

Author: skudasov

framework/cmd/main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"embed"
 	"fmt"
-	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/s3provider"
 	"io/fs"
 	"log"
 	"os"
@@ -244,68 +243,6 @@ func main() {
 					return err
 				},
 			},
-			{
-				Name:  "s3",
-				Usage: "Controls local S3",
-				Subcommands: []*cli.Command{
-					{
-						Name:        "up",
-						Usage:       "ctf s3 up",
-						Aliases:     []string{"u"},
-						Description: "Spins up a local S3 provider (minio)",
-						Flags: []cli.Flag{
-							&cli.StringFlag{
-								Name:     "access-key",
-								Aliases:  []string{"a"},
-								Usage:    "set access key (default: randomly generated)",
-								Required: false,
-							},
-							&cli.StringFlag{
-								Name:     "secret-key",
-								Aliases:  []string{"s"},
-								Usage:    "set secret key (default: randomly generated)",
-								Required: false,
-							},
-						},
-						Action: func(c *cli.Context) error {
-							accessKey := c.String("access-key")
-							secretKey := c.String("secret-key")
-
-							var myS3 s3provider.Provider
-							var err error
-							if accessKey != "" && secretKey != "" {
-								myS3, err = s3provider.NewMinioFactory().New(
-									s3provider.WithPort(9000),
-									s3provider.WithConsolePort(9001),
-									s3provider.WithAccessKey(accessKey),
-									s3provider.WithSecretKey(secretKey),
-									s3provider.WithKeep(),
-								)
-							} else {
-								myS3, err = s3provider.NewMinioFactory().New(
-									s3provider.WithPort(9000),
-									s3provider.WithConsolePort(9001),
-									s3provider.WithKeep(),
-								)
-							}
-
-							if err != nil {
-								L.Error().Msg(err.Error())
-								return err
-							}
-							framework.L.Info().Msg(fmt.Sprintf(
-								"S3 provider running:\tEndpoint: %s\tConsole URL: %s\tAccessKey: %s\tSecretKey: %s\tBucket: %s",
-								myS3.GetEndpoint(),
-								myS3.GetConsoleURL(),
-								myS3.GetAccessKey(),
-								myS3.GetSecretKey(),
-								myS3.GetBucket(),
-							))
-							return nil
-						},
-					},
-				},
-			},
 		},
 	}
 

framework/components/blockchain/anvil.go

@@ -45,7 +45,7 @@ func newAnvil(in *Input) (*Output, error) {
 	entryPoint = append(entryPoint, in.DockerCmdParamsOverrides...)
 	req.Entrypoint = entryPoint
 
-	framework.L.Info().Any("Cmd", strings.Join(entryPoint, " ")).Bool("HostNetworkMode", in.HostNetworkMode).Msg("Creating anvil with command")
+	framework.L.Info().Any("Cmd", strings.Join(entryPoint, " ")).Msg("Creating anvil with command")
 
 	return createGenericEvmContainer(in, req, false)
 }

framework/components/s3provider/interfaces.go

@@ -598,8 +598,8 @@ github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 h1:BpJ2o0OR5FV7vrkDYf
 github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026/go.mod h1:5Scbynm8dF1XAPwIwkGPqzkM/shndPm79Jd1003hTjE=
 github.com/hashicorp/consul/api v1.31.2 h1:NicObVJHcCmyOIl7Z9iHPvvFrocgTYo9cITSGg0/7pw=
 github.com/hashicorp/consul/api v1.31.2/go.mod h1:Z8YgY0eVPukT/17ejW+l+C7zJmKwgPHtjU1q16v/Y40=
-github.com/hashicorp/consul/sdk v0.16.2 h1:cGX/djeEe9r087ARiKVWwVWCF64J+yW0G6ftZMZYbj0=
-github.com/hashicorp/consul/sdk v0.16.2/go.mod h1:onxcZjYVsPx5XMveAC/OtoIsdr32fykB7INFltDoRE8=
+github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg=
+github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s=
 github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A=
 github.com/hashicorp/cronexpr v1.1.2/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=