refactor: output package return string

uselagoon · Aug 5, 2024 · 36c1fd7 · 36c1fd7
1 parent 8dea96d
commit 36c1fd7
Show file tree

Hide file tree

Showing 19 changed files with 263 additions and 139 deletions.
diff --git a/cmd/config.go b/cmd/config.go
@@ -129,10 +129,11 @@ var configLagoonsCmd = &cobra.Command{
 			tableHeader = append(tableHeader, "Kibana-URL")
 		}
 		tableHeader = append(tableHeader, "SSH-Key")
-		output.RenderOutput(output.Table{
+		r := output.RenderOutput(output.Table{
 			Header: tableHeader,
 			Data:   data,
 		}, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -176,7 +177,7 @@ var configAddCmd = &cobra.Command{
 			if err := writeLagoonConfig(&lagoonCLIConfig, filepath.Join(configFilePath, configName+configExtension)); err != nil {
 				return fmt.Errorf("couldn't write config: %v", err)
 			}
-			output.RenderOutput(output.Table{
+			r := output.RenderOutput(output.Table{
 				Header: []string{
 					"Name",
 					"GraphQL",
@@ -198,6 +199,7 @@ var configAddCmd = &cobra.Command{
 					},
 				},
 			}, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		} else {
 			return fmt.Errorf("must have Hostname, Port, and GraphQL endpoint")
 		}

diff --git a/cmd/deploytarget.go b/cmd/deploytarget.go
@@ -120,7 +120,7 @@ var addDeployTargetCmd = &cobra.Command{
 				returnNonEmptyString(fmt.Sprintf("%v", addDeployTargetResponse.Created)),
 				returnNonEmptyString(fmt.Sprintf("%v", addDeployTargetResponse.MonitoringConfig)),
 			})
-			output.RenderOutput(output.Table{
+			r := output.RenderOutput(output.Table{
 				Header: []string{
 					"ID",
 					"Name",
@@ -138,6 +138,7 @@ var addDeployTargetCmd = &cobra.Command{
 				},
 				Data: data,
 			}, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},
@@ -252,7 +253,7 @@ var updateDeployTargetCmd = &cobra.Command{
 				returnNonEmptyString(fmt.Sprintf("%v", updateDeployTargetResponse.Created)),
 				returnNonEmptyString(fmt.Sprintf("%v", updateDeployTargetResponse.MonitoringConfig)),
 			})
-			output.RenderOutput(output.Table{
+			r := output.RenderOutput(output.Table{
 				Header: []string{
 					"ID",
 					"Name",
@@ -270,6 +271,7 @@ var updateDeployTargetCmd = &cobra.Command{
 				},
 				Data: data,
 			}, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},
@@ -319,7 +321,8 @@ var deleteDeployTargetCmd = &cobra.Command{
 			resultData := output.Result{
 				Result: deleteDeployTargetResponse.DeleteDeployTarget,
 			}
-			output.RenderResult(resultData, outputOptions)
+			r := output.RenderResult(resultData, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},
@@ -383,7 +386,8 @@ var addDeployTargetToOrganizationCmd = &cobra.Command{
 				"Organization Name": deployTargetResponse.Name,
 			},
 		}
-		output.RenderResult(resultData, outputOptions)
+		r := output.RenderResult(resultData, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -447,7 +451,8 @@ var removeDeployTargetFromOrganizationCmd = &cobra.Command{
 					"Organization Name": organizationName,
 				},
 			}
-			output.RenderResult(resultData, outputOptions)
+			r := output.RenderResult(resultData, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},

diff --git a/cmd/deploytargetconfig.go b/cmd/deploytargetconfig.go
@@ -90,7 +90,7 @@ var addDeployTargetConfigCmd = &cobra.Command{
 				returnNonEmptyString(fmt.Sprintf("%v", deployTargetConfig.DeployTarget.CloudProvider)),
 				returnNonEmptyString(fmt.Sprintf("%v", deployTargetConfig.DeployTarget.CloudRegion)),
 			})
-			output.RenderOutput(output.Table{
+			r := output.RenderOutput(output.Table{
 				Header: []string{
 					"ID",
 					"Weight",
@@ -103,6 +103,7 @@ var addDeployTargetConfigCmd = &cobra.Command{
 				},
 				Data: data,
 			}, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},
@@ -184,7 +185,7 @@ var updateDeployTargetConfigCmd = &cobra.Command{
 				returnNonEmptyString(fmt.Sprintf("%v", deployTargetConfig.DeployTarget.CloudProvider)),
 				returnNonEmptyString(fmt.Sprintf("%v", deployTargetConfig.DeployTarget.CloudRegion)),
 			})
-			output.RenderOutput(output.Table{
+			r := output.RenderOutput(output.Table{
 				Header: []string{
 					"ID",
 					"Weight",
@@ -197,6 +198,7 @@ var updateDeployTargetConfigCmd = &cobra.Command{
 				},
 				Data: data,
 			}, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},
@@ -306,7 +308,7 @@ var listDeployTargetConfigsCmd = &cobra.Command{
 				returnNonEmptyString(fmt.Sprintf("%v", deployTargetConfig.DeployTarget.CloudRegion)),
 			})
 		}
-		output.RenderOutput(output.Table{
+		r := output.RenderOutput(output.Table{
 			Header: []string{
 				"ID",
 				"Weight",
@@ -319,6 +321,7 @@ var listDeployTargetConfigsCmd = &cobra.Command{
 			},
 			Data: data,
 		}, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }

diff --git a/cmd/environment.go b/cmd/environment.go
@@ -50,7 +50,8 @@ var deleteEnvCmd = &cobra.Command{
 			resultData := output.Result{
 				Result: environment.DeleteEnvironment,
 			}
-			output.RenderResult(resultData, outputOptions)
+			r := output.RenderResult(resultData, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},
@@ -172,7 +173,8 @@ var updateEnvironmentCmd = &cobra.Command{
 				"Environment Name": result.Name,
 			},
 		}
-		output.RenderResult(resultData, outputOptions)
+		r := output.RenderResult(resultData, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -233,7 +235,7 @@ var listBackupsCmd = &cobra.Command{
 				returnNonEmptyString(fmt.Sprintf("%v", backup.Restore.Status)),
 			})
 		}
-		output.RenderOutput(output.Table{
+		r := output.RenderOutput(output.Table{
 			Header: []string{
 				"BackupID",
 				"Source",
@@ -243,6 +245,7 @@ var listBackupsCmd = &cobra.Command{
 			},
 			Data: data,
 		}, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }

diff --git a/cmd/get.go b/cmd/get.go
@@ -64,7 +64,8 @@ var getProjectCmd = &cobra.Command{
 
 		if project.Name == "" {
 			outputOptions.Error = fmt.Sprintf("No details for project '%s'\n", cmdProjectName)
-			output.RenderOutput(output.Table{Data: []output.Data{[]string{}}}, outputOptions)
+			r := output.RenderOutput(output.Table{Data: []output.Data{[]string{}}}, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 			return nil
 		}
 
@@ -126,7 +127,8 @@ var getProjectCmd = &cobra.Command{
 			Header: projHeader,
 			Data:   data,
 		}
-		output.RenderOutput(dataMain, outputOptions)
+		r := output.RenderOutput(dataMain, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -177,7 +179,8 @@ This returns information about a deployment, the logs of this build can also be
 					},
 				},
 			}
-			output.RenderOutput(dataMain, outputOptions)
+			r := output.RenderOutput(dataMain, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 			return nil
 		}
 		dataMain := output.Table{
@@ -202,7 +205,8 @@ This returns information about a deployment, the logs of this build can also be
 				},
 			},
 		}
-		output.RenderOutput(dataMain, outputOptions)
+		r := output.RenderOutput(dataMain, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -278,7 +282,8 @@ var getEnvironmentCmd = &cobra.Command{
 			Header: envHeader,
 			Data:   data,
 		}
-		output.RenderOutput(dataMain, outputOptions)
+		r := output.RenderOutput(dataMain, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -328,14 +333,16 @@ var getProjectKeyCmd = &cobra.Command{
 
 		if len(dataMain.Data) == 0 {
 			outputOptions.Error = fmt.Sprintf("No project-key for project '%s'", cmdProjectName)
-			output.RenderOutput(output.Table{Data: []output.Data{[]string{}}}, outputOptions)
+			r := output.RenderOutput(output.Table{Data: []output.Data{[]string{}}}, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 			return nil
 		}
 
 		if projectKey.PrivateKey != "" {
 			dataMain.Header = append(dataMain.Header, "PrivateKey")
 		}
-		output.RenderOutput(dataMain, outputOptions)
+		r := output.RenderOutput(dataMain, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -405,7 +412,8 @@ var getOrganizationCmd = &cobra.Command{
 			Data:   data,
 		}
 
-		output.RenderOutput(dataMain, outputOptions)
+		r := output.RenderOutput(dataMain, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }

diff --git a/cmd/groups.go b/cmd/groups.go
@@ -89,7 +89,8 @@ var addGroupCmd = &cobra.Command{
 		if organizationName != "" {
 			resultData.ResultData["Organization"] = organizationName
 		}
-		output.RenderResult(resultData, outputOptions)
+		r := output.RenderResult(resultData, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -162,7 +163,8 @@ var addUserToGroupCmd = &cobra.Command{
 		resultData := output.Result{
 			Result: "success",
 		}
-		output.RenderResult(resultData, outputOptions)
+		r := output.RenderResult(resultData, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -224,7 +226,8 @@ var addProjectToGroupCmd = &cobra.Command{
 		resultData := output.Result{
 			Result: "success",
 		}
-		output.RenderResult(resultData, outputOptions)
+		r := output.RenderResult(resultData, outputOptions)
+		fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		return nil
 	},
 }
@@ -280,7 +283,8 @@ var deleteUserFromGroupCmd = &cobra.Command{
 					"id": result.ID,
 				},
 			}
-			output.RenderResult(resultData, outputOptions)
+			r := output.RenderResult(resultData, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},
@@ -345,7 +349,8 @@ var deleteProjectFromGroupCmd = &cobra.Command{
 			resultData := output.Result{
 				Result: "success",
 			}
-			output.RenderResult(resultData, outputOptions)
+			r := output.RenderResult(resultData, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},
@@ -384,7 +389,8 @@ var deleteGroupCmd = &cobra.Command{
 			resultData := output.Result{
 				Result: "success",
 			}
-			output.RenderResult(resultData, outputOptions)
+			r := output.RenderResult(resultData, outputOptions)
+			fmt.Fprintf(cmd.OutOrStdout(), "%s", r)
 		}
 		return nil
 	},