refactor: ApplyClusterCmd clearly returns results

cmd/kops/update_cluster.go

@@ -305,14 +305,15 @@ func RunUpdateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Up
 		DeletionProcessing: deletionProcessing,
 	}
 
-	if err := applyCmd.Run(ctx); err != nil {
+	applyResults, err := applyCmd.Run(ctx)
+	if err != nil {
 		return results, err
 	}
 
 	results.Target = applyCmd.Target
 	results.TaskMap = applyCmd.TaskMap
-	results.ImageAssets = applyCmd.ImageAssets
-	results.FileAssets = applyCmd.FileAssets
+	results.ImageAssets = applyResults.AssetBuilder.ImageAssets
+	results.FileAssets = applyResults.AssetBuilder.FileAssets
 	results.Cluster = cluster
 
 	if isDryrun && !c.GetAssets {

examples/kops-api-example/apply.go

@@ -37,8 +37,7 @@ func apply(vfsContext *vfs.VFSContext, ctx context.Context) error {
 		Clientset:  clientset,
 		TargetName: cloudup.TargetDirect,
 	}
-	err = applyCmd.Run(ctx)
-	if err != nil {
+	if _, err = applyCmd.Run(ctx); err != nil {
 		return err
 	}
 

pkg/instancegroups/instancegroups.go

@@ -497,7 +497,8 @@ func (c *RollingUpdateCluster) reconcileInstanceGroup() error {
 		DeletionProcessing: fi.DeletionProcessingModeDeleteIfNotDeferrred,
 	}
 
-	return applyCmd.Run(c.Ctx)
+	_, err := applyCmd.Run(c.Ctx)
+	return err
 }
 
 func (c *RollingUpdateCluster) maybeValidate(operation string, validateCount int, group *cloudinstances.CloudInstanceGroup) error {