Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: fix linter
Kyle Mendelld2f8e0eb5677
diff --git a/backend/internal/project/children/lifecycle/service.go b/backend/internal/project/children/lifecycle/service.goindex 41031e4d7..e97a5d2d1 100644--- a/backend/internal/project/children/lifecycle/service.go+++ b/backend/internal/project/children/lifecycle/service.go@@ -83,7 +83,10 @@ func drainLifecycleLogs(ctx context.Context, logsCancel context.CancelFunc, logstimer := time.NewTimer(lifecycleStreamDrainTimeout)defer timer.Stop()select {- case <-logDone:+ case err := <-logDone:+ if err != nil {+ slog.DebugContext(ctx, "lifecycle log copy ended with error", "error", err)+ }case <-timer.C:slog.DebugContext(ctx, "lifecycle log stream did not close after container exit; force-closing")}diff --git a/backend/internal/volume/children/workspace/service.go b/backend/internal/volume/children/workspace/service.goindex 063051788..78d89ac89 100644--- a/backend/internal/volume/children/workspace/service.go+++ b/backend/internal/volume/children/workspace/service.go@@ -382,7 +382,9 @@ func (s *Service) startVolumeWorkspaceReadInternal(ctx context.Context, containeif payloadSize > uint64(1<<63-1) {cancel()_ = pipeReader.Close()- <-done+ if execErr := <-done; execErr != nil && !errors.Is(execErr, context.Canceled) {+ slog.DebugContext(ctx, "volume workspace read exec failed after rejecting oversized file", "error", execErr)+ }cleanup()return nil, 0, errors.New("volume workspace file is too large")}diff --git a/backend/pkg/libarcane/edge/client_test.go b/backend/pkg/libarcane/edge/client_test.goindex 5f7c6ee71..9273fa0ec 100644--- a/backend/pkg/libarcane/edge/client_test.go+++ b/backend/pkg/libarcane/edge/client_test.go@@ -1340,7 +1340,8 @@ func TestTunnelClient_connectAndServeManagedTunnel_AutoFallsBackToWebSocketWhenGcancel()select {- case <-errCh:+ case err := <-errCh:+ require.Error(t, err)case <-time.After(2 * time.Second):require.FailNow(t, "timeout waiting for auto fallback tunnel shutdown")}@@ -1378,7 +1379,8 @@ func TestTunnelClient_connectAndServeManagedTunnel_AutoFallsBackToWebSocketWhenGcancel()select {- case <-errCh:+ case err := <-errCh:+ require.Error(t, err)case <-time.After(2 * time.Second):require.FailNow(t, "timeout waiting for auto fallback tunnel shutdown")}@@ -2333,7 +2335,8 @@ func TestConnectAndServeWebSocket_CancelUnblocksMessageLoop(t *testing.T) {cancel()select {- case <-done:+ case err := <-done:+ require.Error(t, err)// Cancellation must close the socket and unblock the message loop well// under the poll-managed teardown timeout.case <-time.After(defaultPollManagedSessionStopTimeout):diff --git a/backend/pkg/libarcane/edge/ws_proxy.go b/backend/pkg/libarcane/edge/ws_proxy.goindex 8b90b9336..1d71809d5 100644--- a/backend/pkg/libarcane/edge/ws_proxy.go+++ b/backend/pkg/libarcane/edge/ws_proxy.go@@ -97,7 +97,8 @@ func ProxyWebSocketRequest(c *echo.Context, tunnel *AgentTunnel, targetPath strireturn nilcase <-tunnel.done:return nil- case <-pending.failureCh:+ case failErr := <-pending.failureCh:+ slog.DebugContext(ctx, "Edge WebSocket stream failed", "streamId", streamID, "error", failErr)return nilcase <-clientDone:return nildiff --git a/backend/pkg/libarcane/ws/proxy_test.go b/backend/pkg/libarcane/ws/proxy_test.goindex c0b51e1de..ecb5c5f54 100644--- a/backend/pkg/libarcane/ws/proxy_test.go+++ b/backend/pkg/libarcane/ws/proxy_test.go@@ -106,8 +106,8 @@ func TestProxyHTTP_RemoteClose(t *testing.T) {// The proxy should complete (not hang)select {- case <-proxyDone:- // OK+ case proxyErr := <-proxyDone:+ require.NoError(t, proxyErr)case <-time.After(5 * time.Second):require.FailNow(t, "ProxyHTTP did not return after remote closed")}diff --git a/backend/pkg/scheduler/image_update_watcher.go b/backend/pkg/scheduler/image_update_watcher.goindex 0ea1025f8..6a34989e9 100644--- a/backend/pkg/scheduler/image_update_watcher.go+++ b/backend/pkg/scheduler/image_update_watcher.go@@ -153,7 +153,7 @@ func (w *ImageUpdateWatcher) runEventLoopInternal(runCtx context.Context) errordefer timer.Stop()var workers sync.WaitGroupdefer workers.Wait()- metadata := make(chan error, 1)+ metadata := make(chan struct{}, 1)submitted := make(chan error, 1)submitting := falseworkers.Go(func() { w.runMetadataBackfillInternal(runCtx, metadata) })@@ -220,7 +220,7 @@ func (w *ImageUpdateWatcher) reconnectEventsInternal(eventCh <-chan events.Messareturn eventCh, unsubscribe}-func (w *ImageUpdateWatcher) runMetadataBackfillInternal(ctx context.Context, metadata chan<- error) {+func (w *ImageUpdateWatcher) runMetadataBackfillInternal(ctx context.Context, metadata chan<- struct{}) {for attempt := 1; ctx.Err() == nil; attempt++ {var err errorfunc() {@@ -229,7 +229,7 @@ func (w *ImageUpdateWatcher) runMetadataBackfillInternal(ctx context.Context, me}()if err == nil {select {- case metadata <- nil:+ case metadata <- struct{}{}:case <-ctx.Done():}returndiff --git a/cli/pkg/backups/cmd.go b/cli/pkg/backups/cmd.goindex 572fb914d..3aab0bc79 100644--- a/cli/pkg/backups/cmd.go+++ b/cli/pkg/backups/cmd.go@@ -395,7 +395,12 @@ Alternatively, --file replaces all policies from a raw JSON payload.`,return err}- req, err := opts.request(cmd, c)+ var req backup.UpdateSystemBackupPolicies+ if opts.file != "" {+ req, err = opts.requestFromFile()+ } else {+ req, err = opts.requestFromFlags(cmd, c)+ }if err != nil {return err}@@ -589,92 +594,96 @@ type policiesUpdateOptions struct {s3Destination string}-func (opts policiesUpdateOptions) request(cmd *cobra.Command, c *client.Client) (backup.UpdateSystemBackupPolicies, error) {+func (opts policiesUpdateOptions) requestFromFile() (backup.UpdateSystemBackupPolicies, error) {var req backup.UpdateSystemBackupPolicies+ var data []bytevar err error- if opts.file != "" {- var data []byte- if opts.file == "-" {- data, err = io.ReadAll(os.Stdin)- if err != nil {- return req, fmt.Errorf("failed to read policies from stdin: %w", err)- }- } else {- data, err = os.ReadFile(opts.file)- if err != nil {- return req, fmt.Errorf("failed to read file %s: %w", opts.file, err)- }- }- if unmarshalErr := json.Unmarshal(data, &req); unmarshalErr != nil {- return req, fmt.Errorf("failed to parse policies file: %w", unmarshalErr)+ if opts.file == "-" {+ data, err = io.ReadAll(os.Stdin)+ if err != nil {+ return req, fmt.Errorf("failed to read policies from stdin: %w", err)}} else {- current, getPoliciesErr := c.DoJSON[backup.SystemBackupPolicyCollection](cmd.Context(), http.MethodGet, types.BackupsPolicies(), nil)- if getPoliciesErr != nil {- return req, fmt.Errorf("failed to get current backup policies: %w", getPoliciesErr)- }-- req.Policies = make([]backup.UpdateSystemBackupPolicy, len(current.Policies))- targetIndex := -1- for i, p := range current.Policies {- req.Policies[i] = backup.UpdateSystemBackupPolicy{- ID: p.ID,- Enabled: p.Enabled,- Schedule: p.Schedule,- RetentionCount: p.RetentionCount,- LocalEnabled: p.LocalEnabled,- S3Enabled: p.S3Enabled,- S3DestinationID: p.S3DestinationID,- }- if opts.id != "" && p.ID == opts.id {- targetIndex = i- }+ data, err = os.ReadFile(opts.file)+ if err != nil {+ return req, fmt.Errorf("failed to read file %s: %w", opts.file, err)}+ }+ if err = json.Unmarshal(data, &req); err != nil {+ return req, fmt.Errorf("failed to parse policies file: %w", err)+ }+ return req, nil+}- switch {- case opts.id != "" && targetIndex == -1:- return req, fmt.Errorf("policy %q not found; run `arcane admin backups policies`", opts.id)- case opts.id == "" && len(req.Policies) > 1:- return req, fmt.Errorf("%d backup policies exist; select one with --policy-id", len(req.Policies))- case opts.id == "" && len(req.Policies) == 1:- targetIndex = 0- case targetIndex == -1:- if !cmd.Flags().Changed("schedule") {- return req, errors.New("--schedule is required when creating a new backup policy")- }- // New policies default to local storage unless --local was set explicitly.- req.Policies = append(req.Policies, backup.UpdateSystemBackupPolicy{LocalEnabled: !cmd.Flags().Changed("local") || opts.local})- targetIndex = len(req.Policies) - 1- }+func (opts policiesUpdateOptions) requestFromFlags(cmd *cobra.Command, c *client.Client) (backup.UpdateSystemBackupPolicies, error) {+ var req backup.UpdateSystemBackupPolicies+ current, err := c.DoJSON[backup.SystemBackupPolicyCollection](cmd.Context(), http.MethodGet, types.BackupsPolicies(), nil)+ if err != nil {+ return req, fmt.Errorf("failed to get current backup policies: %w", err)+ }- target := &req.Policies[targetIndex]- // TODO(v3): drop the deprecated flag handling.- if cmd.Flags().Changed("enabled") || cmd.Flags().Changed("disabled") {- target.Enabled = opts.enabled && !opts.disabled+ req.Policies = make([]backup.UpdateSystemBackupPolicy, len(current.Policies))+ targetIndex := -1+ for i, p := range current.Policies {+ req.Policies[i] = backup.UpdateSystemBackupPolicy{+ ID: p.ID,+ Enabled: p.Enabled,+ Schedule: p.Schedule,+ RetentionCount: p.RetentionCount,+ LocalEnabled: p.LocalEnabled,+ S3Enabled: p.S3Enabled,+ S3DestinationID: p.S3DestinationID,}- if cmd.Flags().Changed("schedule") {- target.Schedule = opts.schedule+ if opts.id != "" && p.ID == opts.id {+ targetIndex = i}- if cmd.Flags().Changed("retention") {- target.RetentionCount = opts.retention- }- if cmd.Flags().Changed("local") {- target.LocalEnabled = opts.local+ }++ switch {+ case opts.id != "" && targetIndex == -1:+ return req, fmt.Errorf("policy %q not found; run `arcane admin backups policies`", opts.id)+ case opts.id == "" && len(req.Policies) > 1:+ return req, fmt.Errorf("%d backup policies exist; select one with --policy-id", len(req.Policies))+ case opts.id == "" && len(req.Policies) == 1:+ targetIndex = 0+ case targetIndex == -1:+ if !cmd.Flags().Changed("schedule") {+ return req, errors.New("--schedule is required when creating a new backup policy")}- if cmd.Flags().Changed("s3") {- target.S3Enabled = opts.s3+ // New policies default to local storage unless --local was set explicitly.+ req.Policies = append(req.Policies, backup.UpdateSystemBackupPolicy{LocalEnabled: !cmd.Flags().Changed("local") || opts.local})+ targetIndex = len(req.Policies) - 1+ }++ return req, opts.applyFlags(cmd, c, &req.Policies[targetIndex])+}++func (opts policiesUpdateOptions) applyFlags(cmd *cobra.Command, c *client.Client, target *backup.UpdateSystemBackupPolicy) error {+ // TODO(v3): drop the deprecated flag handling.+ if cmd.Flags().Changed("enabled") || cmd.Flags().Changed("disabled") {+ target.Enabled = opts.enabled && !opts.disabled+ }+ if cmd.Flags().Changed("schedule") {+ target.Schedule = opts.schedule+ }+ if cmd.Flags().Changed("retention") {+ target.RetentionCount = opts.retention+ }+ if cmd.Flags().Changed("local") {+ target.LocalEnabled = opts.local+ }+ if cmd.Flags().Changed("s3") {+ target.S3Enabled = opts.s3+ }+ if cmd.Flags().Changed("s3-destination") {+ resolved, _, err := s3DestinationRef.Resolve(cmd.Context(), c, opts.s3Destination, cmdutil.AllowPrompt(cmd))+ if err != nil {+ return err}- if cmd.Flags().Changed("s3-destination") {- resolved, _, resolveErr := s3DestinationRef.Resolve(cmd.Context(), c, opts.s3Destination, cmdutil.AllowPrompt(cmd))- if resolveErr != nil {- return req, resolveErr- }- target.S3DestinationID = resolved.ID- if !cmd.Flags().Changed("s3") {- target.S3Enabled = true- }+ target.S3DestinationID = resolved.ID+ if !cmd.Flags().Changed("s3") {+ target.S3Enabled = true}}-- return req, nil+ return nil}