fix receive command overwriting existing key files and save instance details

Author: atoniolo76

cmd/receive.go

@@ -102,23 +102,33 @@ var receiveCmd = &cobra.Command{
 			instanceName = strings.TrimSuffix(fileName, filepath.Ext(fileName))
 		}
 
-		targetPath := filepath.Join(sshDir, fileName)
-
-		// 4. Save file with secure permissions
-		// Open destination file with 0600 permissions (read/write owner)
-		err = os.WriteFile(targetPath, fileContent, 0600)
-		if err != nil {
-			log.Fatalf("Failed to write key file: %v", err)
+	targetPath := filepath.Join(sshDir, fileName)
+
+	// 4. Remove existing file if it exists (it might be read-only)
+	if _, err := os.Stat(targetPath); err == nil {
+		// File exists, make it writable first then remove it
+		os.Chmod(targetPath, 0600)
+		if err := os.Remove(targetPath); err != nil {
+			log.Fatalf("Failed to remove existing key file: %v", err)
 		}
+		fmt.Printf("Removed existing key file: %s\n", targetPath)
+	}
 
-		// Now lock it down to read-only (0400)
-		if err := os.Chmod(targetPath, 0400); err != nil {
-			log.Printf("Warning: failed to set secure permissions (0400): %v", err)
-		}
+	// 5. Save file with secure permissions
+	// Open destination file with 0600 permissions (read/write owner)
+	err = os.WriteFile(targetPath, fileContent, 0600)
+	if err != nil {
+		log.Fatalf("Failed to write key file: %v", err)
+	}
+
+	// Now lock it down to read-only (0400)
+	if err := os.Chmod(targetPath, 0400); err != nil {
+		log.Printf("Warning: failed to set secure permissions (0400): %v", err)
+	}
 
 	fmt.Printf("Successfully received key: %s\n", targetPath)
 
-	// 5. Save to database
+	// 6. Save to database
 	fmt.Println("Adding key to gotoni database...")
 	database, err := db.InitDB()
 	if err != nil {
@@ -131,7 +141,7 @@ var receiveCmd = &cobra.Command{
 		}
 	}
 
-	// 6. Update SSH config (~/.ssh/config)
+	// 7. Update SSH config (~/.ssh/config)
 	if instanceIP != "" {
 		fmt.Printf("Configuring SSH access for %s (%s)...\n", instanceName, instanceIP)
 		if err := client.UpdateSSHConfig(instanceName, instanceIP, targetPath); err != nil {

pkg/client/lambda_provider.go

@@ -171,13 +171,47 @@ func (p *LambdaProvider) LaunchAndWait(httpClient *http.Client, apiToken string,
 		return nil, fmt.Errorf("failed to launch instances: %w", err)
 	}
 
+	// Init DB for updating instance details
+	database, err := db.InitDB()
+	if err != nil {
+		return nil, fmt.Errorf("failed to init db: %w", err)
+	}
+	defer database.Close()
+
 	// Wait for each instance to become ready
-	for _, instance := range instances {
+	for i, instance := range instances {
 		fmt.Printf("Waiting for instance %s to become ready...\n", instance.ID)
 		if err := p.WaitForInstanceReady(httpClient, apiToken, instance.ID, timeout); err != nil {
 			return nil, fmt.Errorf("instance %s failed to become ready: %w", instance.ID, err)
 		}
 		fmt.Printf("Instance %s is now ready!\n", instance.ID)
+
+		// Get full instance details now that it's ready
+		instanceDetails, err := p.GetInstance(httpClient, apiToken, instance.ID)
+		if err != nil {
+			fmt.Printf("Warning: Failed to get instance details: %v\n", err)
+			continue
+		}
+
+		// Update database with full details
+		inst := &db.Instance{
+			ID:             instance.ID,
+			Name:           name,
+			Region:         region,
+			Status:         instanceDetails.Status,
+			SSHKeyName:     instance.SSHKeyName,
+			FilesystemName: filesystemName,
+			InstanceType:   instanceDetails.InstanceType.Name,
+			IPAddress:      instanceDetails.IP,
+		}
+		if err := database.SaveInstance(inst); err != nil {
+			fmt.Printf("Warning: Failed to update instance in db: %v\n", err)
+		}
+
+		// Update the returned instance with IP
+		instances[i].ID = instance.ID
+		instances[i].SSHKeyName = instance.SSHKeyName
+		instances[i].SSHKeyFile = instance.SSHKeyFile
 	}
 
 	return instances, nil