check error on set env

nitrictech · Nov 7, 2023 · f420661 · f420661
1 parent 7b18253
commit f420661
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 10 deletions.
diff --git a/cloud/aws/deploy/down.go b/cloud/aws/deploy/down.go
@@ -49,7 +49,11 @@ func (d *DeployServer) Down(request *deploy.DeployDownRequest, stream deploy.Dep
 
 	if request.Interactive {
 		pulumiEventChan := make(chan events.EngineEvent)
-		deployModel := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		deployModel, err := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		if err != nil {
+			return err
+		}
+
 		teaProgram := tea.NewProgram(deployModel, tea.WithOutput(outputStream))
 		pulumiDestroyOpts = []optdestroy.Option{
 			optdestroy.ProgressStreams(deployModel),

diff --git a/cloud/aws/deploy/up.go b/cloud/aws/deploy/up.go
@@ -66,7 +66,11 @@ func (d *DeployServer) Up(request *deploy.DeployUpRequest, stream deploy.DeployS
 
 	if request.Interactive {
 		pulumiEventChan := make(chan events.EngineEvent)
-		deployModel := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		deployModel, err := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		if err != nil {
+			return err
+		}
+
 		teaProgram := tea.NewProgram(deployModel, tea.WithOutput(&pulumiutils.UpStreamMessageWriter{
 			Stream: stream,
 		}))

diff --git a/cloud/azure/deploy/down.go b/cloud/azure/deploy/down.go
@@ -46,7 +46,11 @@ func (d *DeployServer) Down(request *deploy.DeployDownRequest, stream deploy.Dep
 
 	if request.Interactive {
 		pulumiEventChan := make(chan events.EngineEvent)
-		deployModel := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		deployModel, err := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		if err != nil {
+			return err
+		}
+
 		teaProgram := tea.NewProgram(deployModel, tea.WithOutput(outputStream))
 		pulumiDestroyOpts = []optdestroy.Option{
 			optdestroy.ProgressStreams(deployModel),

diff --git a/cloud/azure/deploy/up.go b/cloud/azure/deploy/up.go
@@ -56,7 +56,11 @@ func (d *DeployServer) Up(request *deploy.DeployUpRequest, stream deploy.DeployS
 
 	if request.Interactive {
 		pulumiEventChan := make(chan events.EngineEvent)
-		deployModel := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		deployModel, err := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		if err != nil {
+			return err
+		}
+
 		teaProgram := tea.NewProgram(deployModel, tea.WithOutput(&pulumiutils.UpStreamMessageWriter{
 			Stream: stream,
 		}))

diff --git a/cloud/common/deploy/output/interactive/model.go b/cloud/common/deploy/output/interactive/model.go
@@ -205,11 +205,14 @@ func (m DeployModel) View() string {
 	return fmt.Sprintf("\n%s\n", t.View())
 }
 
-func NewOutputModel(sub chan tea.Msg, pulumiSub chan events.EngineEvent) DeployModel {
+func NewOutputModel(sub chan tea.Msg, pulumiSub chan events.EngineEvent) (*DeployModel, error) {
 	// FIXME: Set this according to the connected output preferences
-	os.Setenv("CLICOLOR_FORCE", "1")
+	err := os.Setenv("CLICOLOR_FORCE", "1")
+	if err != nil {
+		return nil, err
+	}
 
-	return DeployModel{
+	return &DeployModel{
 		pulumiSub: pulumiSub,
 		sub:       sub,
 		logs:      make([]string, 0),
@@ -225,5 +228,5 @@ func NewOutputModel(sub chan tea.Msg, pulumiSub chan events.EngineEvent) DeployM
 				Children: []*Node[PulumiData]{},
 			},
 		},
-	}
+	}, nil
 }
diff --git a/cloud/gcp/deploy/down.go b/cloud/gcp/deploy/down.go
@@ -49,7 +49,11 @@ func (d *DeployServer) Down(request *deploy.DeployDownRequest, stream deploy.Dep
 
 	if request.Interactive {
 		pulumiEventChan := make(chan events.EngineEvent)
-		deployModel := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		deployModel, err := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		if err != nil {
+			return err
+		}
+
 		teaProgram := tea.NewProgram(deployModel, tea.WithOutput(outputStream))
 		pulumiDestroyOpts = []optdestroy.Option{
 			optdestroy.ProgressStreams(deployModel),

diff --git a/cloud/gcp/deploy/up.go b/cloud/gcp/deploy/up.go
@@ -64,7 +64,11 @@ func (d *DeployServer) Up(request *deploy.DeployUpRequest, stream deploy.DeployS
 
 	if request.Interactive {
 		pulumiEventChan := make(chan events.EngineEvent)
-		deployModel := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		deployModel, err := interactive.NewOutputModel(make(chan tea.Msg), pulumiEventChan)
+		if err != nil {
+			return err
+		}
+
 		teaProgram := tea.NewProgram(deployModel, tea.WithOutput(&pulumiutils.UpStreamMessageWriter{
 			Stream: stream,
 		}))