Remove backend and ref to s3

Author: tobidae-cb

benchmark/cmd/main.go

@@ -9,8 +9,6 @@ import (
 	"github.com/base/base-bench/benchmark/config"
 	"github.com/base/base-bench/benchmark/flags"
 	"github.com/base/base-bench/runner"
-	"github.com/base/base-bench/runner/aws"
-	"github.com/base/base-bench/runner/benchmark"
 	"github.com/base/base-bench/runner/importer"
 	"github.com/urfave/cli/v2"
 
@@ -44,16 +42,9 @@ func main() {
 			Name:        "import-runs",
 			Flags:       cliapp.ProtectFlags(flags.ImportRunsFlags),
 			Action:      ImportMain(Version),
-			Usage:       "import runs from metadata file, URL, or S3",
-			Description: "Import benchmark runs from local metadata.json, remote URL, or S3 bucket into existing output metadata.json. Use --s3-bucket and --s3-directory to import from S3, or provide a file/URL as argument. Use --src-tag and --dest-tag to apply tags to runs, or use interactive mode.",
-			ArgsUsage:   "[metadata-file-or-url] (optional when using S3)",
-		},
-		{
-			Name:        "export-to-cloud",
-			Flags:       cliapp.ProtectFlags(flags.ExportFlags),
-			Action:      ExportMain(Version),
-			Usage:       "export output directory to S3",
-			Description: "Export the entire output directory to AWS S3 bucket and sync with remote metadata.json.",
+			Usage:       "import runs from metadata file, URL",
+			Description: "Import benchmark runs from local metadata.json, remote URL into existing output metadata.json. Use --src-tag and --dest-tag to apply tags to runs, or use interactive mode.",
+			ArgsUsage:   "[metadata-file-or-url]",
 		},
 	}
 	app.Flags = flags.Flags
@@ -95,19 +86,10 @@ func ImportMain(version string) cli.ActionFunc {
 
 		service := importer.NewService(cfg, l)
 
-		// Load source metadata - from S3 if bucket is specified, otherwise from file/URL
-		var srcMetadata *benchmark.RunGroup
-		var err error
-		if cfg.S3Bucket() != "" {
-			srcMetadata, err = service.LoadSourceMetadataFromS3()
-			if err != nil {
-				return fmt.Errorf("failed to load source metadata from S3: %w", err)
-			}
-		} else {
-			srcMetadata, err = service.LoadSourceMetadata(cfg.SourceFile())
-			if err != nil {
-				return fmt.Errorf("failed to load source metadata: %w", err)
-			}
+		// Load source metadata from file/URL
+		srcMetadata, err := service.LoadSourceMetadata(cfg.SourceFile())
+		if err != nil {
+			return fmt.Errorf("failed to load source metadata: %w", err)
 		}
 
 		// Load destination metadata
@@ -181,13 +163,8 @@ func ImportMain(version string) cli.ActionFunc {
 		fmt.Printf("   • Imported: %d runs\n", result.ImportedRuns)
 		fmt.Printf("   • Total runs: %d\n", result.TotalRuns)
 
-		// Show if we downloaded files from URL or S3
-		if cfg.S3Bucket() != "" {
-			fmt.Printf("   • Downloaded output files from S3 bucket: %s\n", cfg.S3Bucket())
-			if cfg.S3Directory() != "" && cfg.S3Directory() != "." {
-				fmt.Printf("   • S3 directory: %s\n", cfg.S3Directory())
-			}
-		} else if strings.HasPrefix(cfg.SourceFile(), "http://") || strings.HasPrefix(cfg.SourceFile(), "https://") {
+		// Show if we downloaded files from URL
+		if strings.HasPrefix(cfg.SourceFile(), "http://") || strings.HasPrefix(cfg.SourceFile(), "https://") {
 			fmt.Printf("   • Downloaded output files from URL\n")
 		}
 
@@ -208,33 +185,3 @@ func ImportMain(version string) cli.ActionFunc {
 		return nil
 	}
 }
-
-func ExportMain(version string) cli.ActionFunc {
-	return func(cliCtx *cli.Context) error {
-		cfg := config.NewExportCmdConfig(cliCtx)
-		if err := cfg.Check(); err != nil {
-			return fmt.Errorf("invalid CLI flags: %w", err)
-		}
-
-		l := oplog.NewLogger(oplog.AppOut(cliCtx), oplog.DefaultCLIConfig())
-		oplog.SetGlobalLogHandler(l.Handler())
-
-		// Initialize S3 service
-		s3Service, err := aws.NewS3Service(cfg.S3Bucket(), l)
-		if err != nil {
-			return fmt.Errorf("failed to initialize S3 service: %w", err)
-		}
-
-		// Export output directory to S3
-		err = s3Service.ExportOutputDirectory(cfg.OutputDir())
-		if err != nil {
-			return fmt.Errorf("failed to export output directory to S3: %w", err)
-		}
-
-		fmt.Printf("✅ Export completed successfully!\n")
-		fmt.Printf("   • Output directory: %s\n", cfg.OutputDir())
-		fmt.Printf("   • S3 bucket: %s\n", cfg.S3Bucket())
-
-		return nil
-	}
-}

benchmark/config/export_config.go

@@ -10,13 +10,11 @@ import (
 
 // ImportCmdConfig holds configuration for the import-runs command
 type ImportCmdConfig struct {
-	sourceFile  string
-	srcTag      *TagConfig
-	destTag     *TagConfig
-	noConfirm   bool
-	outputDir   string
-	s3Bucket    string
-	s3Directory string
+	sourceFile string
+	srcTag     *TagConfig
+	destTag    *TagConfig
+	noConfirm  bool
+	outputDir  string
 }
 
 // TagConfig represents a key-value tag
@@ -28,11 +26,9 @@ type TagConfig struct {
 // NewImportCmdConfig creates a new import command configuration from CLI context
 func NewImportCmdConfig(cliCtx *cli.Context) *ImportCmdConfig {
 	cfg := &ImportCmdConfig{
-		sourceFile:  cliCtx.Args().First(), // First positional argument
-		noConfirm:   cliCtx.Bool(flags.NoConfirmFlagName),
-		outputDir:   cliCtx.String(flags.OutputDirFlagName),
-		s3Bucket:    cliCtx.String(flags.S3BucketFlagName),
-		s3Directory: cliCtx.String(flags.S3DirectoryFlagName),
+		sourceFile: cliCtx.Args().First(), // First positional argument
+		noConfirm:  cliCtx.Bool(flags.NoConfirmFlagName),
+		outputDir:  cliCtx.String(flags.OutputDirFlagName),
 	}
 
 	// Parse src-tag flag
@@ -85,36 +81,13 @@ func (c *ImportCmdConfig) OutputDir() string {
 	return c.outputDir
 }
 
-// S3Bucket returns the S3 bucket name
-func (c *ImportCmdConfig) S3Bucket() string {
-	return c.s3Bucket
-}
-
-// S3Directory returns the S3 directory/prefix
-func (c *ImportCmdConfig) S3Directory() string {
-	return c.s3Directory
-}
-
 // Check validates the import configuration
 func (c *ImportCmdConfig) Check() error {
-	// Check if we're using S3 mode
-	if c.s3Bucket != "" {
-		// S3 mode: bucket is required, source file becomes optional (defaults to metadata.json)
-		if c.outputDir == "" {
-			return fmt.Errorf("output directory is required")
-		}
-		// If no source file specified in S3 mode, default to metadata.json
-		if c.sourceFile == "" {
-			c.sourceFile = "metadata.json"
-		}
-	} else {
-		// Non-S3 mode: source file is required
-		if c.sourceFile == "" {
-			return fmt.Errorf("source file path or URL is required")
-		}
-		if c.outputDir == "" {
-			return fmt.Errorf("output directory is required")
-		}
+	if c.sourceFile == "" {
+		return fmt.Errorf("source file path or URL is required")
+	}
+	if c.outputDir == "" {
+		return fmt.Errorf("output directory is required")
 	}
 	return nil
 }

benchmark/config/import_config.go

@@ -15,14 +15,12 @@ func prefixEnvVars(name string) []string {
 }
 
 const (
-	ConfigFlagName         = "config"
-	RootDirFlagName        = "root-dir"
-	OutputDirFlagName      = "output-dir"
-	EnableS3FlagName       = "enable-s3"
-	S3BucketFlagName       = "s3-bucket"
-	TxFuzzBinFlagName      = "tx-fuzz-bin"
-	ProxyPortFlagName      = "proxy-port"
-	BenchmarkRunIDFlagName = "benchmark-run-id"
+	ConfigFlagName          = "config"
+	RootDirFlagName         = "root-dir"
+	OutputDirFlagName       = "output-dir"
+	TxFuzzBinFlagName       = "tx-fuzz-bin"
+	ProxyPortFlagName       = "proxy-port"
+	BenchmarkRunIDFlagName  = "benchmark-run-id"
 	MachineTypeFlagName     = "machine-type"
 	MachineProviderFlagName = "machine-provider"
 	MachineRegionFlagName   = "machine-region"
@@ -70,19 +68,6 @@ var (
 		EnvVars: prefixEnvVars("PROXY_PORT"),
 	}
 
-	EnableS3Flag = &cli.BoolFlag{
-		Name:    EnableS3FlagName,
-		Usage:   "Enable S3 upload of benchmark results",
-		EnvVars: prefixEnvVars("ENABLE_S3"),
-		Value:   false,
-	}
-
-	S3BucketFlag = &cli.StringFlag{
-		Name:    S3BucketFlagName,
-		Usage:   "S3 bucket name for storing benchmark results",
-		EnvVars: prefixEnvVars("S3_BUCKET"),
-	}
-
 	BenchmarkRunIDFlag = &cli.StringFlag{
 		Name:    BenchmarkRunIDFlagName,
 		Usage:   "Custom benchmark run ID (auto-generated if not provided)",
@@ -124,8 +109,6 @@ var RunFlags = []cli.Flag{
 	OutputDirFlag,
 	TxFuzzBinFlag,
 	ProxyPortFlag,
-	EnableS3Flag,
-	S3BucketFlag,
 	BenchmarkRunIDFlag,
 	MachineTypeFlag,
 	MachineProviderFlag,

benchmark/flags/export_flags.go

@@ -5,10 +5,9 @@ import (
 )
 
 const (
-	SrcTagFlagName      = "src-tag"
-	DestTagFlagName     = "dest-tag"
-	NoConfirmFlagName   = "no-confirm"
-	S3DirectoryFlagName = "s3-directory"
+	SrcTagFlagName    = "src-tag"
+	DestTagFlagName   = "dest-tag"
+	NoConfirmFlagName = "no-confirm"
 )
 
 var (
@@ -27,11 +26,6 @@ var (
 		Usage: "Skip confirmation prompts",
 		Value: false,
 	}
-
-	S3DirectoryFlag = &cli.StringFlag{
-		Name:  S3DirectoryFlagName,
-		Usage: "S3 directory/prefix to download from (use '.' for root directory)",
-	}
 )
 
 // ImportRunsFlags contains the list of flags for the import-runs command
@@ -40,6 +34,4 @@ var ImportRunsFlags = []cli.Flag{
 	SrcTagFlag,
 	DestTagFlag,
 	NoConfirmFlag,
-	S3BucketFlag,
-	S3DirectoryFlag,
 }