simplify the state iteration

josebalius · josebalius · commit 46ee45bcdd99 · 2021-08-24T17:46:24.000-04:00
diff --git a/cmd/ghcs/create.go b/cmd/ghcs/create.go
@@ -92,47 +92,43 @@ func Create() error {
 	var lastState codespaces.PostCreateState
 	var breakNextState bool
 
-PollStates:
 	for {
-		select {
-		case stateUpdate := <-states:
-			if stateUpdate.Err != nil {
-				return fmt.Errorf("receive state update: %v", err)
-			}
+		stateUpdate := <-states
+		if stateUpdate.Err != nil {
+			return fmt.Errorf("receive state update: %v", err)
+		}
 
-			var inProgress bool
-			for _, state := range stateUpdate.PostCreateStates {
-				switch state.Status {
-				case codespaces.PostCreateStateRunning:
-					if lastState != state {
-						lastState = state
-						fmt.Print(state.Name)
-					} else {
-						fmt.Print(".")
-					}
-
-					inProgress = true
-					break
-				case codespaces.PostCreateStateFailed:
-					if lastState.Name == state.Name && lastState.Status != state.Status {
-						lastState = state
-						fmt.Print(".Failed\n")
-					}
-				case codespaces.PostCreateStateSuccess:
-					if lastState.Name == state.Name && lastState.Status != state.Status {
-						lastState = state
-						fmt.Print(".Success\n")
-					}
+		var inProgress bool
+		for _, state := range stateUpdate.PostCreateStates {
+			switch state.Status {
+			case codespaces.PostCreateStateRunning:
+				if lastState != state {
+					lastState = state
+					log.Print(state.Name)
+				} else {
+					log.Print(".")
 				}
-			}
 
-			switch {
-			case !inProgress && !breakNextState:
-				breakNextState = true
-			case !inProgress && breakNextState:
-				break PollStates
+				inProgress = true
+				break
+			case codespaces.PostCreateStateFailed:
+				if lastState.Name == state.Name && lastState.Status != state.Status {
+					lastState = state
+					log.Print(".Failed\n")
+				}
+			case codespaces.PostCreateStateSuccess:
+				if lastState.Name == state.Name && lastState.Status != state.Status {
+					lastState = state
+					log.Print(".Success\n")
+				}
 			}
 		}
+
+		if !inProgress && !breakNextState {
+			breakNextState = true
+		} else if !inProgress && breakNextState {
+			break
+		}
 	}
 
 	log.Printf("Codespace created: %s\n", codespace.Name)
diff --git a/cmd/ghcs/ssh.go b/cmd/ghcs/ssh.go
@@ -64,7 +64,7 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {
 		return fmt.Errorf("error creating liveshare terminal: %v", err)
 	}
 
-	log.Println("Preparing SSH...")
+	log.Print("Preparing SSH...")
 	if sshProfile == "" {
 		containerID, err := getContainerID(ctx, log, terminal)
 		if err != nil {
diff --git a/internal/codespaces/codespaces.go b/internal/codespaces/codespaces.go
@@ -66,7 +66,7 @@ func ConnectToLiveshare(ctx context.Context, log logger, apiClient *api.API, use
 	var startedCodespace bool
 	if codespace.Environment.State != api.CodespaceEnvironmentStateAvailable {
 		startedCodespace = true
-		log.Println("Starting your codespace...")
+		log.Print("Starting your codespace...")
 		if err := apiClient.StartCodespace(ctx, token, codespace); err != nil {
 			return nil, fmt.Errorf("error starting codespace: %v", err)
 		}
@@ -97,6 +97,7 @@ func ConnectToLiveshare(ctx context.Context, log logger, apiClient *api.API, use
 	if startedCodespace {
 		fmt.Print("\n")
 	}
+
 	log.Println("Connecting to your codespace...")
 
 	lsclient, err := liveshare.NewClient(

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func SSH(sshProfile, codespaceName string, sshServerPort int) error {`
`64`	`64`	`return fmt.Errorf("error creating liveshare terminal: %v", err)`
`65`	`65`	`}`
`66`	`66`
`67`		`- log.Println("Preparing SSH...")`
	`67`	`+ log.Print("Preparing SSH...")`
`68`	`68`	`if sshProfile == "" {`
`69`	`69`	`containerID, err := getContainerID(ctx, log, terminal)`
`70`	`70`	`if err != nil {`