simplyfy

cmd/zfs-client/main.go

@@ -1,5 +1,4 @@
-// Command zfs-client is the CLI tool for creating and uploading ZFS snapshots.
-// It provides commands for backup, status checking, snapshot rotation, and incremental backups.
+// Command zfs-client is a simple CLI tool for creating and sending ZFS snapshots.
 package main
 
 import (
@@ -22,190 +21,29 @@ func main() {
 	command := os.Args[1]
 
 	switch command {
-	case "backup":
-		// Default: create manual backup (full or incremental)
-		fmt.Println("=== Creating and sending backup ===\n")
+	case "snap", "snapshot":
+		// Create snapshot and send to server (auto full/incremental)
+		fmt.Println("=== Creating and sending snapshot ===\n")
 
-		snapshot, err := c.CreateSnapshot()
+		snapshot, err := c.CreateAndSend()
 		if err != nil {
-			fmt.Printf("Error creating snapshot: %v\n", err)
+			fmt.Printf("Error: %v\n", err)
 			os.Exit(1)
 		}
 
-		if err := c.SendSnapshot(snapshot); err != nil {
-			fmt.Printf("Error sending snapshot: %v\n", err)
-			os.Exit(1)
-		}
-
-		fmt.Println("\n✓ Backup completed successfully!")
-
-	case "backup-full":
-		// Force full backup (no incremental)
-		fmt.Println("=== Creating full backup ===\n")
-
-		snapshot, err := c.CreateSnapshot()
-		if err != nil {
-			fmt.Printf("Error creating snapshot: %v\n", err)
-			os.Exit(1)
-		}
-
-		if err := c.SendIncremental(snapshot, ""); err != nil {
-			fmt.Printf("Error sending snapshot: %v\n", err)
-			os.Exit(1)
-		}
-
-		// Create bookmark for future incremental backups
-		if err := c.CreateBookmark(snapshot); err != nil {
-			fmt.Printf("Warning: failed to create bookmark: %v\n", err)
-		}
-
-		fmt.Println("\n✓ Full backup completed successfully!")
-
-	case "backup-incremental":
-		// Incremental backup from last bookmark
-		fmt.Println("=== Creating incremental backup ===\n")
-
-		// Check for existing bookmark
-		lastBookmark, err := c.GetLastBookmark()
-		if err != nil {
-			fmt.Printf("Error checking bookmarks: %v\n", err)
-			os.Exit(1)
-		}
-
-		if lastBookmark == "" {
-			fmt.Println("No existing bookmark found. Use 'backup-full' for initial backup.")
-			os.Exit(1)
-		}
-
-		snapshot, err := c.CreateSnapshot()
-		if err != nil {
-			fmt.Printf("Error creating snapshot: %v\n", err)
-			os.Exit(1)
-		}
-
-		if err := c.SendIncremental(snapshot, lastBookmark); err != nil {
-			fmt.Printf("Error sending incremental snapshot: %v\n", err)
-			os.Exit(1)
-		}
-
-		// Create bookmark for future incremental backups
-		if err := c.CreateBookmark(snapshot); err != nil {
-			fmt.Printf("Warning: failed to create bookmark: %v\n", err)
-		}
-
-		fmt.Println("\n✓ Incremental backup completed successfully!")
-
-	case "snapshot":
-		// Create typed snapshots (hourly, daily, weekly, monthly)
-		if len(os.Args) < 3 {
-			fmt.Println("Usage: zfs-client snapshot <hourly|daily|weekly|monthly>")
-			os.Exit(1)
-		}
-
-		snapType := client.SnapshotType(os.Args[2])
-		switch snapType {
-		case client.SnapshotHourly, client.SnapshotDaily, client.SnapshotWeekly, client.SnapshotMonthly:
-			// Valid type
-		default:
-			fmt.Printf("Invalid snapshot type: %s\n", snapType)
-			fmt.Println("Valid types: hourly, daily, weekly, monthly")
-			os.Exit(1)
-		}
-
-		fmt.Printf("=== Creating %s snapshot ===\n\n", snapType)
-
-		snapshot, err := c.CreateSnapshotWithType(snapType)
-		if err != nil {
-			fmt.Printf("Error creating snapshot: %v\n", err)
-			os.Exit(1)
-		}
-
-		// Check for existing bookmark for incremental
-		lastBookmark, _ := c.GetLastBookmark()
-
-		if err := c.SendIncremental(snapshot, lastBookmark); err != nil {
-			fmt.Printf("Error sending snapshot: %v\n", err)
-			os.Exit(1)
-		}
-
-		// Create bookmark
-		if err := c.CreateBookmark(snapshot); err != nil {
-			fmt.Printf("Warning: failed to create bookmark: %v\n", err)
-		}
-
-		// Rotate local snapshots using server policy if available
-		policy, err := getRotationPolicy(c)
-		if err != nil {
-			fmt.Printf("Warning: failed to get rotation policy: %v\n", err)
-			policy = client.DefaultPolicy()
-		}
-		if err := c.RotateLocalSnapshots(policy); err != nil {
-			fmt.Printf("Warning: failed to rotate snapshots: %v\n", err)
-		}
-
-		fmt.Printf("\n✓ %s snapshot completed successfully!\n", snapType)
-
-	case "rotate":
-		// Rotate local snapshots using server policy if available
-		fmt.Println("=== Rotating local snapshots ===\n")
-
-		policy, err := getRotationPolicy(c)
-		if err != nil {
-			fmt.Printf("Warning: failed to get rotation policy: %v\n", err)
-			policy = client.DefaultPolicy()
-		}
-		if err := c.RotateLocalSnapshots(policy); err != nil {
-			fmt.Printf("Error rotating snapshots: %v\n", err)
-			os.Exit(1)
-		}
-
-		fmt.Println("\n✓ Rotation completed!")
-
-	case "rotate-remote":
-		// Request server to rotate remote snapshots
-		if err := c.RequestRotation(); err != nil {
-			fmt.Printf("Error requesting rotation: %v\n", err)
-			os.Exit(1)
+		if snapshot.FullBackup {
+			fmt.Println("\n✓ Full backup completed!")
+		} else {
+			fmt.Println("\n✓ Incremental backup completed!")
 		}
 
 	case "status":
+		// Check server connection and quota
 		if err := c.GetStatus(); err != nil {
-			fmt.Printf("Error getting status: %v\n", err)
-			os.Exit(1)
-		}
-
-	case "bookmarks":
-		// List bookmarks
-		fmt.Println("=== ZFS Bookmarks ===\n")
-
-		bookmark, err := c.GetLastBookmark()
-		if err != nil {
 			fmt.Printf("Error: %v\n", err)
 			os.Exit(1)
 		}
 
-		if bookmark == "" {
-			fmt.Println("No bookmarks found")
-		} else {
-			fmt.Printf("Last bookmark: %s\n", bookmark)
-		}
-
-	case "change-password":
-		// Change client API key/password
-		if len(os.Args) < 3 {
-			fmt.Println("Usage: zfs-client change-password <new-api-key>")
-			os.Exit(1)
-		}
-		newKey := os.Args[2]
-
-		fmt.Println("=== Changing API Key ===\n")
-		if err := c.ChangePassword(newKey); err != nil {
-			fmt.Printf("Error: %v\n", err)
-			os.Exit(1)
-		}
-		fmt.Println("\n✓ API key changed successfully!")
-		fmt.Println("Update your .env file with the new API_KEY value.")
-
 	case "help", "-h", "--help":
 		printUsage()
 
@@ -216,56 +54,26 @@ func main() {
 	}
 }
 
-// getRotationPolicy fetches the rotation policy from the server.
-// If the server has a policy configured, it must be used.
-// Otherwise, the default policy is returned.
-func getRotationPolicy(c *client.Client) (*client.SnapshotPolicy, error) {
-	serverPolicy, err := c.GetRotationPolicy()
-	if err != nil {
-		return nil, err
-	}
-
-	if serverPolicy.ServerManaged && serverPolicy.RotationPolicy != nil {
-		fmt.Println("  Using server-managed rotation policy")
-		return serverPolicy.RotationPolicy, nil
-	}
-
-	// No server policy, use default
-	fmt.Println("  Using default rotation policy")
-	return client.DefaultPolicy(), nil
-}
-
 func printUsage() {
-	fmt.Println("ZFS Snapshot Backup Client")
+	fmt.Println("ZFS Snapshot Backup Client - Simple Version")
 	fmt.Println("\nUsage: zfs-client [command]")
 	fmt.Println("\nCommands:")
-	fmt.Println("  backup              - Create snapshot and send (auto incremental if bookmark exists)")
-	fmt.Println("  backup-full         - Create full backup (no incremental)")
-	fmt.Println("  backup-incremental  - Create incremental backup from last bookmark")
-	fmt.Println("  snapshot <type>     - Create typed snapshot (hourly|daily|weekly|monthly)")
-	fmt.Println("  rotate              - Rotate local snapshots based on retention policy")
-	fmt.Println("  rotate-remote       - Request server to rotate old remote snapshots")
-	fmt.Println("  status              - Check server status and quota")
-	fmt.Println("  bookmarks           - List ZFS bookmarks")
-	fmt.Println("  change-password <new-key> - Change client API key")
-	fmt.Println("  help                - Show this help message")
-	fmt.Println("\nSnapshot Retention Policy (default):")
-	fmt.Println("  Hourly:  24 snapshots")
-	fmt.Println("  Daily:   7 snapshots")
-	fmt.Println("  Weekly:  4 snapshots")
-	fmt.Println("  Monthly: 12 snapshots")
+	fmt.Println("  snap       - Create snapshot and send to server (auto full/incremental)")
+	fmt.Println("  status     - Check server connection and quota")
+	fmt.Println("  help       - Show this help message")
 	fmt.Println("\nEnvironment Variables (can be set in .env file):")
 	fmt.Println("  CLIENT_ID      - Client identifier (default: client1)")
 	fmt.Println("  API_KEY        - API key for authentication (default: secret123)")
 	fmt.Println("  SERVER_URL     - Backup server URL (default: http://localhost:8080)")
 	fmt.Println("  LOCAL_DATASET  - ZFS dataset to backup (default: tank/data)")
 	fmt.Println("  COMPRESS       - Enable LZ4 compression (default: true)")
-	fmt.Println("  STORAGE_TYPE   - Storage type: s3 or local (default: s3)")
+	fmt.Println("\nS3 Configuration (for direct S3 uploads):")
+	fmt.Println("  S3_ENDPOINT    - S3 endpoint URL (e.g., https://s3.amazonaws.com)")
+	fmt.Println("  S3_REGION      - AWS region (default: us-east-1)")
+	fmt.Println("  S3_BUCKET      - S3 bucket name (default: zfs-backups)")
+	fmt.Println("  S3_ACCESS_KEY  - AWS access key")
+	fmt.Println("  S3_SECRET_KEY  - AWS secret key")
 	fmt.Println("\nExamples:")
-	fmt.Println("  zfs-client backup")
-	fmt.Println("  zfs-client backup-full")
-	fmt.Println("  zfs-client snapshot hourly")
-	fmt.Println("  zfs-client rotate")
-	fmt.Println("  zfs-client change-password mynewsecretkey")
-	fmt.Println("  CLIENT_ID=myclient zfs-client backup")
+	fmt.Println("  zfs-client snap")
+	fmt.Println("  zfs-client status")
 }

cmd/zfs-server/main.go

@@ -19,7 +19,7 @@ func main() {
 	var err error
 
 	if cfg.S3Enabled {
-		s3Backend, err = server.NewS3Backend(cfg.S3Endpoint, cfg.S3AccessKey, cfg.S3SecretKey, cfg.S3BucketName, cfg.S3UseSSL)
+		s3Backend, err = server.NewS3Backend(cfg.S3Endpoint, cfg.S3AccessKey, cfg.S3SecretKey, cfg.S3BucketName, cfg.S3UseSSL, cfg.S3Region)
 		if err != nil {
 			log.Fatalf("Failed to initialize S3 backend: %v", err)
 		}