From e7558d2adfc907789f4257cbc44c90af8ad944fe Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Sun, 8 Jul 2018 23:36:21 -0700
Subject: [PATCH] installer/pkg/workflow: Change public 'Step' to private
 'step'

The *metadata argument is private, and Workflow.steps is private, so
there's not much use in having a public Step type.
---
 installer/pkg/workflow/convert.go       |  2 +-
 installer/pkg/workflow/destroy.go       |  2 +-
 installer/pkg/workflow/init.go          |  2 +-
 installer/pkg/workflow/install.go       | 10 +++++-----
 installer/pkg/workflow/workflow.go      |  6 +++---
 installer/pkg/workflow/workflow_test.go |  6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/installer/pkg/workflow/convert.go b/installer/pkg/workflow/convert.go
index 448f8b85f4a..16435af1dd8 100644
--- a/installer/pkg/workflow/convert.go
+++ b/installer/pkg/workflow/convert.go
@@ -13,7 +13,7 @@ import (
 func ConvertWorkflow(configFilePath string) Workflow {
 	return Workflow{
 		metadata: metadata{configFilePath: configFilePath},
-		steps: []Step{
+		steps: []step{
 			readTFVarsConfigStep,
 			printYAMLConfigStep,
 		},
diff --git a/installer/pkg/workflow/destroy.go b/installer/pkg/workflow/destroy.go
index a3d78b8770a..21cf5dccd99 100644
--- a/installer/pkg/workflow/destroy.go
+++ b/installer/pkg/workflow/destroy.go
@@ -6,7 +6,7 @@ package workflow
 func DestroyWorkflow(clusterDir string) Workflow {
 	return Workflow{
 		metadata: metadata{clusterDir: clusterDir},
-		steps: []Step{
+		steps: []step{
 			refreshConfigStep,
 			destroyJoinMastersStep,
 			destroyJoinWorkersStep,
diff --git a/installer/pkg/workflow/init.go b/installer/pkg/workflow/init.go
index fe0a5c0571a..a816e7ddc59 100644
--- a/installer/pkg/workflow/init.go
+++ b/installer/pkg/workflow/init.go
@@ -31,7 +31,7 @@ const (
 func InitWorkflow(configFilePath string) Workflow {
 	return Workflow{
 		metadata: metadata{configFilePath: configFilePath},
-		steps: []Step{
+		steps: []step{
 			prepareWorspaceStep,
 			refreshConfigStep,
 		},
diff --git a/installer/pkg/workflow/install.go b/installer/pkg/workflow/install.go
index 10dad1438ca..e3d6bc39ebf 100644
--- a/installer/pkg/workflow/install.go
+++ b/installer/pkg/workflow/install.go
@@ -13,7 +13,7 @@ import (
 func InstallFullWorkflow(clusterDir string) Workflow {
 	return Workflow{
 		metadata: metadata{clusterDir: clusterDir},
-		steps: []Step{
+		steps: []step{
 			refreshConfigStep,
 			generateClusterConfigMaps,
 			readClusterConfigStep,
@@ -36,7 +36,7 @@ func InstallFullWorkflow(clusterDir string) Workflow {
 func InstallTLSNewWorkflow(clusterDir string) Workflow {
 	return Workflow{
 		metadata: metadata{clusterDir: clusterDir},
-		steps: []Step{
+		steps: []step{
 			refreshConfigStep,
 			generateClusterConfigMaps,
 			generateTLSConfigStep,
@@ -49,7 +49,7 @@ func InstallTLSNewWorkflow(clusterDir string) Workflow {
 func InstallAssetsWorkflow(clusterDir string) Workflow {
 	return Workflow{
 		metadata: metadata{clusterDir: clusterDir},
-		steps: []Step{
+		steps: []step{
 			refreshConfigStep,
 			generateClusterConfigMaps,
 			installAssetsStep,
@@ -63,7 +63,7 @@ func InstallAssetsWorkflow(clusterDir string) Workflow {
 func InstallBootstrapWorkflow(clusterDir string) Workflow {
 	return Workflow{
 		metadata: metadata{clusterDir: clusterDir},
-		steps: []Step{
+		steps: []step{
 			refreshConfigStep,
 			installTopologyStep,
 			installTNCCNAMEStep,
@@ -79,7 +79,7 @@ func InstallBootstrapWorkflow(clusterDir string) Workflow {
 func InstallJoinWorkflow(clusterDir string) Workflow {
 	return Workflow{
 		metadata: metadata{clusterDir: clusterDir},
-		steps: []Step{
+		steps: []step{
 			refreshConfigStep,
 			installJoinMastersStep,
 			installJoinWorkersStep,
diff --git a/installer/pkg/workflow/workflow.go b/installer/pkg/workflow/workflow.go
index e4319385247..508ebf43d9e 100644
--- a/installer/pkg/workflow/workflow.go
+++ b/installer/pkg/workflow/workflow.go
@@ -14,16 +14,16 @@ type metadata struct {
 	clusterDir     string
 }
 
-// Step is the entrypoint of a workflow step implementation.
+// step is the entrypoint of a workflow step implementation.
 // To add a new step, put your logic in a function that matches this signature.
 // Next, add a reference to this new function in a Workflow's steps list.
-type Step func(*metadata) error
+type step func(*metadata) error
 
 // Workflow is a high-level representation
 // of a set of actions performed in a predictable order.
 type Workflow struct {
 	metadata metadata
-	steps    []Step
+	steps    []step
 }
 
 // Execute runs all steps in order.
diff --git a/installer/pkg/workflow/workflow_test.go b/installer/pkg/workflow/workflow_test.go
index 71a35eaadf5..ad02879712f 100644
--- a/installer/pkg/workflow/workflow_test.go
+++ b/installer/pkg/workflow/workflow_test.go
@@ -22,19 +22,19 @@ func TestWorkflowTypeExecute(t *testing.T) {
 
 	testCases := []struct {
 		test          string
-		steps         []Step
+		steps         []step
 		m             metadata
 		expectedError bool
 	}{
 		{
 			test:          "All steps succeed",
-			steps:         []Step{test1Step, test2Step},
+			steps:         []step{test1Step, test2Step},
 			m:             m,
 			expectedError: false,
 		},
 		{
 			test:          "At least one step fails",
-			steps:         []Step{test1Step, test2Step, test3Step},
+			steps:         []step{test1Step, test2Step, test3Step},
 			m:             m,
 			expectedError: true,
 		},