@@ -7,10 +7,9 @@ import (
77 "os/exec"
88 "time"
99
10+ "github.com/pterm/pterm"
1011 k8serrors "k8s.io/apimachinery/pkg/api/errors"
1112
12- "github.com/manifoldco/promptui"
13-
1413 core_v1 "k8s.io/api/core/v1"
1514 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1615 "k8s.io/client-go/kubernetes"
@@ -45,6 +44,7 @@ func Setup(client kubernetes.Interface, cfg *Config) *Debug {
4544}
4645
4746func (d * Debug ) getPodsForWorkload () (* core_v1.PodList , error ) {
47+ pterm .Info .Println ("Fetching workload..." )
4848 var podList * core_v1.PodList
4949 var err error
5050 podList , err = d .client .CoreV1 ().Pods (d .cfg .Namespace ).List (d .ctx , metav1.ListOptions {
@@ -73,18 +73,19 @@ func (d *Debug) debugPod(podName string) error {
7373 pN := debuggerContainerName (podName )
7474 _ , err := d .client .CoreV1 ().Pods (d .cfg .Namespace ).Get (d .ctx , pN , metav1.GetOptions {})
7575 if err == nil {
76- fmt .Printf ("%s already exists, trying to attach...\n " , pN )
76+ pterm . Info .Printf ("%s already exists, trying to attach...\n " , pN )
7777
7878 // Polling loop to check if the debugger container is running
7979 for i := 0 ; i < maxRetries ; i ++ {
80- fmt . Printf ("attempt %d/%d: Time remaining: %d seconds\n " , i + 1 , maxRetries , (maxRetries - i )* pollInterval )
80+ pterm . Info . Printf ("Attempt %d/%d: Time remaining: %d seconds\n " , i + 1 , maxRetries , (maxRetries - i )* pollInterval )
8181 pod , err := d .client .CoreV1 ().Pods (d .cfg .Namespace ).Get (d .ctx , pN , metav1.GetOptions {})
8282 if err != nil {
8383 return fmt .Errorf ("failed to get debug pod copy %s: %v" , pN , err )
8484 }
8585
8686 for _ , c := range pod .Status .ContainerStatuses {
8787 if c .Name == debuggerContainerDefaultName && c .State .Running != nil {
88+ pterm .Success .Println ("Container is running. Attaching..." )
8889 return d .attachToExistingDebugContainer (pN )
8990 }
9091 }
@@ -103,8 +104,8 @@ func (d *Debug) debugPod(podName string) error {
103104 }
104105
105106 if len (pod .Spec .EphemeralContainers ) > 0 {
106- fmt . Printf ("the container %s already has %d terminated debug containers.\n " , podName , len (pod .Spec .EphemeralContainers ))
107- fmt . Printf ("please consider using 'nais debug tidy %s' to clean up\n " , d .cfg .WorkloadName )
107+ pterm . Warning . Printf ("The container %s already has %d terminated debug containers.\n " , podName , len (pod .Spec .EphemeralContainers ))
108+ pterm . Info . Printf ("Please consider using 'nais debug tidy %s' to clean up\n " , d .cfg .WorkloadName )
108109 }
109110 }
110111
@@ -130,7 +131,7 @@ func (d *Debug) attachToExistingDebugContainer(podName string) error {
130131 if err := cmd .Start (); err != nil {
131132 return fmt .Errorf ("failed to start attach command: %v" , err )
132133 }
133- fmt . Printf ("attached to pod %s\n " , podName )
134+ pterm . Success . Printf ("Attached to pod %s\n " , podName )
134135
135136 if err := cmd .Wait (); err != nil {
136137 return fmt .Errorf ("attach command failed: %v" , err )
@@ -170,18 +171,18 @@ func (d *Debug) createDebugPod(podName string) error {
170171 }
171172
172173 if d .cfg .CopyPod {
173- fmt . Printf ("debugging pod copy created, enable process namespace sharing in %s\n " , debuggerContainerName (podName ))
174+ pterm . Info . Printf ("Debugging pod copy created, enable process namespace sharing in %s\n " , debuggerContainerName (podName ))
174175 } else {
175- fmt . Printf ( "debugging container created...\n "
176+ pterm . Info . Println ( "Debugging container created..."
176177 }
177- fmt . Printf ("using debugger image %s\n " , d .cfg .DebugImage )
178+ pterm . Info . Printf ("Using debugger image %s\n " , d .cfg .DebugImage )
178179
179180 if err := cmd .Wait (); err != nil {
180181 return fmt .Errorf ("debug command failed: %v" , err )
181182 }
182183
183184 if d .cfg .CopyPod {
184- fmt .Printf ("Run 'nais debug -cp %s' command to attach to the debug pod\n " , d .cfg .WorkloadName )
185+ pterm . Info .Printf ("Run 'nais debug -cp %s' command to attach to the debug pod\n " , d .cfg .WorkloadName )
185186 }
186187
187188 return nil
@@ -199,26 +200,22 @@ func (d *Debug) Debug() error {
199200 }
200201
201202 if len (podNames ) == 0 {
202- fmt .Println ("No pods found." )
203+ pterm . Info .Println ("No pods found." )
203204 return nil
204205 }
205206
206207 podName := podNames [0 ]
207208 if d .cfg .ByPod {
208- prompt := promptui.Select {
209- Label : "Select pod to Debug" ,
210- Items : podNames ,
211- }
212-
213- _ , podName , err = prompt .Run ()
209+ result , err := pterm .DefaultInteractiveSelect .WithOptions (podNames ).Show ()
214210 if err != nil {
215- fmt . Printf ("prompt failed %v\n " , err )
211+ pterm . Error . Printf ("Prompt failed: %v\n " , err )
216212 return err
217213 }
214+ podName = result
218215 }
219216
220217 if err := d .debugPod (podName ); err != nil {
221- fmt . Printf ("failed to debug pod %s: %v\n " , podName , err )
218+ pterm . Error . Printf ("Failed to debug pod %s: %v\n " , podName , err )
222219 }
223220
224221 return nil
0 commit comments