Call container instance's Close() in container isolation's Close() (c…

…irruslabs#769) * Call container instance's Close() in container isolation's Close() * Fix linter errors
0xB10C · Aug 14, 2024 · 6faa293 · 6faa293
1 parent 8ae0752
commit 6faa293
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/internal/commands/internal/test/test.go b/internal/commands/internal/test/test.go
@@ -280,7 +280,7 @@ func logDifferenceIfAny(logger *echelon.Logger, where string, a, b string) *Comp
 	}
 
 	logger.Warnf("Detected difference in %s:", where)
-	logger.Warnf(dmp.DiffPrettyText(diffs))
+	logger.Warnf("%s", dmp.DiffPrettyText(diffs))
 
 	return &Comparison{
 		FoundDifference: true,

diff --git a/internal/evaluator/evaluator.go b/internal/evaluator/evaluator.go
@@ -221,7 +221,7 @@ func (r *ConfigurationEvaluatorServiceServer) EvaluateFunction(
 	result, err := lrk.Hook(ctx, request.StarlarkConfig, request.FunctionName, request.Arguments.AsSlice())
 	if err != nil {
 		if errors.Is(err, larker.ErrNotFound) {
-			return nil, status.Errorf(codes.NotFound, err.Error())
+			return nil, status.Errorf(codes.NotFound, "%s", err.Error())
 		}
 
 		if ee, ok := err.(*larker.ExtendedError); ok {
@@ -231,7 +231,7 @@ func (r *ConfigurationEvaluatorServiceServer) EvaluateFunction(
 			}, nil
 		}
 
-		return nil, status.Errorf(codes.Internal, err.Error())
+		return nil, status.Errorf(codes.Internal, "%s", err.Error())
 	}
 
 	response := &api.EvaluateFunctionResponse{

diff --git a/internal/executor/executor.go b/internal/executor/executor.go
@@ -250,7 +250,7 @@ func (e *Executor) runSingleTask(ctx context.Context, task *build.Task) (err err
 				task.Timeout)
 			task.SetStatus(taskstatus.TimedOut)
 		case errors.Is(err, instance.ErrUnsupportedInstance):
-			taskLogger.Warnf(err.Error())
+			taskLogger.Warnf("%s", err.Error())
 			task.SetStatus(taskstatus.Skipped)
 		default:
 			cancel(context.Canceled)

diff --git a/internal/executor/instance/persistentworker/isolation/container/container.go b/internal/executor/instance/persistentworker/isolation/container/container.go
@@ -58,6 +58,10 @@ func (cont *Container) WorkingDirectory(projectDir string, dirtyMode bool) strin
 	return cont.instance.WorkingDirectory(projectDir, dirtyMode)
 }
 
-func (cont *Container) Close(context.Context) error {
+func (cont *Container) Close(ctx context.Context) error {
+	if err := cont.instance.Close(ctx); err != nil {
+		return err
+	}
+
 	return cont.cleanup()
 }
diff --git a/internal/executor/instance/prebuilt.go b/internal/executor/instance/prebuilt.go
@@ -147,7 +147,7 @@ Outer:
 		case line := <-logChan:
 			logger.Infof("%s", line)
 		case err := <-errChan:
-			if errors.Is(containerbackend.ErrDone, err) {
+			if errors.Is(err, containerbackend.ErrDone) {
 				break Outer
 			}
 

diff --git a/internal/executor/instance/volume/volume_test.go b/internal/executor/instance/volume/volume_test.go
@@ -2,7 +2,6 @@ package volume_test
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"github.com/cirruslabs/cirrus-cli/internal/executor/instance/containerbackend"
 	"github.com/cirruslabs/cirrus-cli/internal/executor/instance/volume"
@@ -80,10 +79,8 @@ func TestCleanupOnFailure(t *testing.T) {
 	require.Error(t, err)
 
 	err = backend.VolumeInspect(context.Background(), agentVolumeName)
-	require.Error(t, err)
-	require.True(t, errors.Is(containerbackend.ErrNotFound, err))
+	require.ErrorIs(t, err, containerbackend.ErrNotFound)
 
 	err = backend.VolumeInspect(context.Background(), workingVolumeName)
-	require.Error(t, err)
-	require.True(t, errors.Is(containerbackend.ErrNotFound, err))
+	require.ErrorIs(t, err, containerbackend.ErrNotFound)
 }