Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion server/neptune/workflows/internal/terraform/root_fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,19 @@ func (r *RootFetcher) Fetch(ctx workflow.Context) (*terraform.LocalRoot, func(wo
}

return fetchRootResponse.LocalRoot, func(c workflow.Context) error {
logger := workflow.GetLogger(c)
logger.Info("starting cleanup of deployment directory", "deploy_directory", fetchRootResponse.DeployDirectory)

var cleanupResponse activities.CleanupResponse
err = workflow.ExecuteActivity(c, r.Ta.Cleanup, activities.CleanupRequest{ //nolint:gosimple // unnecessary to add a method to convert reponses
DeployDirectory: fetchRootResponse.DeployDirectory,
}).Get(ctx, &cleanupResponse)
}).Get(c, &cleanupResponse) // Use `c` (disconnected context) instead of `ctx` which may be cancelled
if err != nil {
logger.Error("failed to cleanup deployment directory", "deploy_directory", fetchRootResponse.DeployDirectory, "error", err)
return errors.Wrap(err, "cleaning up")
}

logger.Info("successfully cleaned up deployment directory", "deploy_directory", fetchRootResponse.DeployDirectory)
return nil
}, nil
}