From ceeefcd48de17d2b515f1aa160c6dba890a9e556 Mon Sep 17 00:00:00 2001
From: ivinokur <ivinokur@redhat.com>
Date: Fri, 16 Aug 2024 16:04:58 +0300
Subject: [PATCH] fixup! Apply ssh askpass flow for the workspace container

---
 controllers/workspace/devworkspace_controller.go | 3 ++-
 pkg/library/env/workspaceenv.go                  | 3 ++-
 pkg/provision/automount/ssh.go                   | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/controllers/workspace/devworkspace_controller.go b/controllers/workspace/devworkspace_controller.go
index 08cf8bd62..825c8d0a2 100644
--- a/controllers/workspace/devworkspace_controller.go
+++ b/controllers/workspace/devworkspace_controller.go
@@ -18,11 +18,12 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"github.com/devfile/devworkspace-operator/pkg/library/ssh"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/devfile/devworkspace-operator/pkg/library/ssh"
+
 	devfilevalidation "github.com/devfile/api/v2/pkg/validation"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/controllers/workspace/metrics"
diff --git a/pkg/library/env/workspaceenv.go b/pkg/library/env/workspaceenv.go
index 6be651be8..9c0dff7b1 100644
--- a/pkg/library/env/workspaceenv.go
+++ b/pkg/library/env/workspaceenv.go
@@ -17,9 +17,10 @@ package env
 
 import (
 	"fmt"
-	"github.com/devfile/devworkspace-operator/pkg/provision/automount"
 	"os"
 
+	"github.com/devfile/devworkspace-operator/pkg/provision/automount"
+
 	dw "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	devfileConstants "github.com/devfile/devworkspace-operator/pkg/library/constants"
diff --git a/pkg/provision/automount/ssh.go b/pkg/provision/automount/ssh.go
index f0487384d..26e10a9f9 100644
--- a/pkg/provision/automount/ssh.go
+++ b/pkg/provision/automount/ssh.go
@@ -17,6 +17,7 @@ package automount
 
 import (
 	_ "embed"
+
 	"github.com/devfile/devworkspace-operator/pkg/constants"
 	"github.com/devfile/devworkspace-operator/pkg/dwerrors"
 	"github.com/devfile/devworkspace-operator/pkg/provision/sync"