fix: extract printPreviewFlags to reduce waitForPreview complexity
- commit
- 82775f18109bce98892771445697b5117559e30c
- author
- brice · · 2026-03-18 20:42 UTC
- committer
- brice · · 2026-03-18 18:19 UTC
- parent
- abad6c0
- signature
- unsigned
1 file · +8 -3
M internal/adapters/in/cli/preview.go +8 -3
| @@ -275,8 +275,7 @@ func buildAndPushPreview(ctx context.Context, out io.Writer, previewRef, preview | |||
| 275 | 275 | return nil | |
| 276 | 276 | } | |
| 277 | 277 | ||
| 278 | - | func waitForPreview(ctx context.Context, out io.Writer, name, ttl string, noData bool) error { | |
| 279 | - | // Print TTL/no-data info upfront | |
| 278 | + | func printPreviewFlags(out io.Writer, ttl string, noData bool) error { | |
| 280 | 279 | if ttl != "" { | |
| 281 | 280 | if err := cliWritef(out, "Requested TTL: %s (server config controls actual TTL)\n", ttl); err != nil { | |
| 282 | 281 | return err | |
| @@ -287,6 +286,13 @@ func waitForPreview(ctx context.Context, out io.Writer, name, ttl string, noData | |||
| 287 | 286 | return err | |
| 288 | 287 | } | |
| 289 | 288 | } | |
| 289 | + | return nil | |
| 290 | + | } | |
| 291 | + | ||
| 292 | + | func waitForPreview(ctx context.Context, out io.Writer, name, ttl string, noData bool) error { | |
| 293 | + | if err := printPreviewFlags(out, ttl, noData); err != nil { | |
| 294 | + | return err | |
| 295 | + | } | |
| 290 | 296 | ||
| 291 | 297 | client, isRemote := GetRemoteClient() | |
| 292 | 298 | if !isRemote { | |
| @@ -297,7 +303,6 @@ func waitForPreview(ctx context.Context, out io.Writer, name, ttl string, noData | |||
| 297 | 303 | return err | |
| 298 | 304 | } | |
| 299 | 305 | ||
| 300 | - | // Poll every 2s for up to 3 minutes | |
| 301 | 306 | ticker := time.NewTicker(2 * time.Second) | |
| 302 | 307 | defer ticker.Stop() | |
| 303 | 308 | timeout := time.After(3 * time.Minute) | |
| @@ -275,8 +275,7 @@ func buildAndPushPreview(ctx context.Context, out io.Writer, previewRef, preview | |||||
| 275 | return nil | 275 | return nil | ||
| 276 | } | 276 | } | ||
| 277 | 277 | ||||
| 278 | - | func waitForPreview(ctx context.Context, out io.Writer, name, ttl string, noData bool) error { | 278 | + | func printPreviewFlags(out io.Writer, ttl string, noData bool) error { |
| 279 | - | // Print TTL/no-data info upfront | |||
| 280 | if ttl != "" { | 279 | if ttl != "" { | ||
| 281 | if err := cliWritef(out, "Requested TTL: %s (server config controls actual TTL)\n", ttl); err != nil { | 280 | if err := cliWritef(out, "Requested TTL: %s (server config controls actual TTL)\n", ttl); err != nil { | ||
| 282 | return err | 281 | return err | ||
| @@ -287,6 +286,13 @@ func waitForPreview(ctx context.Context, out io.Writer, name, ttl string, noData | |||||
| 287 | return err | 286 | return err | ||
| 288 | } | 287 | } | ||
| 289 | } | 288 | } | ||
| 289 | + | return nil | |||
| 290 | + | } | |||
| 291 | + | ||||
| 292 | + | func waitForPreview(ctx context.Context, out io.Writer, name, ttl string, noData bool) error { | |||
| 293 | + | if err := printPreviewFlags(out, ttl, noData); err != nil { | |||
| 294 | + | return err | |||
| 295 | + | } | |||
| 290 | 296 | ||||
| 291 | client, isRemote := GetRemoteClient() | 297 | client, isRemote := GetRemoteClient() | ||
| 292 | if !isRemote { | 298 | if !isRemote { | ||
| @@ -297,7 +303,6 @@ func waitForPreview(ctx context.Context, out io.Writer, name, ttl string, noData | |||||
| 297 | return err | 303 | return err | ||
| 298 | } | 304 | } | ||
| 299 | 305 | ||||
| 300 | - | // Poll every 2s for up to 3 minutes | |||
| 301 | ticker := time.NewTicker(2 * time.Second) | 306 | ticker := time.NewTicker(2 * time.Second) | ||
| 302 | defer ticker.Stop() | 307 | defer ticker.Stop() | ||
| 303 | timeout := time.After(3 * time.Minute) | 308 | timeout := time.After(3 * time.Minute) | ||