fixup

.golangci.yml

@@ -174,8 +174,8 @@ issues:
       linters:
         - noctx
     # local to tink: kubebuilder needs the stdlib invalid `inline` json struct tag
-    - path: pkg/apis/.*
-      text: "struct-tag"
+    - path: api/.*
+      text: "struct-tag: unknown option 'inline'"
     - path: main\.go
       linters:
         - noctx

internal/server/kubernetes_api_workflow.go

@@ -54,13 +54,13 @@ func (s *KubernetesBackedServer) getCurrentAssignedNonTerminalWorkflowsForWorker
 }
 
 func (s *KubernetesBackedServer) getWorkflowByName(ctx context.Context, workflowID, namespace string) (*v1alpha1.Workflow, error) {
-	workflow := &v1alpha1.Workflow{}
-	err := s.ClientFunc().Get(ctx, types.NamespacedName{Name: workflowID, Namespace: namespace}, workflow)
+	wflw := &v1alpha1.Workflow{}
+	err := s.ClientFunc().Get(ctx, types.NamespacedName{Name: workflowID, Namespace: namespace}, wflw)
 	if err != nil {
 		s.logger.With("workflow", workflowID).Error(err)
 		return nil, err
 	}
-	return workflow, nil
+	return wflw, nil
 }
 
 // The following APIs are used by the worker.
@@ -90,7 +90,7 @@ func (s *KubernetesBackedServer) GetWorkflowActions(ctx context.Context, req *pr
 	if err != nil {
 		return nil, err
 	}
-	return workflow.WorkflowActionListCRDToProto(wf), nil
+	return workflow.ActionListCRDToProto(wf), nil
 }
 
 // Modifies a workflow for a given workflowContext.

internal/workflow/controller.go

@@ -118,7 +118,7 @@ func (c *Controller) processNewWorkflow(ctx context.Context, logger logr.Logger,
 	}
 
 	// populate Task and Action data
-	stored.Status = *WorkflowYAMLToStatus(tinkWf)
+	stored.Status = *YAMLToStatus(tinkWf)
 
 	stored.Status.State = v1alpha1.WorkflowStatePending
 	return reconcile.Result{}, nil

internal/workflow/convert.go

@@ -8,7 +8,7 @@ import (
 	"github.com/tinkerbell/tink/internal/proto"
 )
 
-func WorkflowToWorkflowContext(wf *v1alpha1.Workflow) *proto.WorkflowContext {
+func ToWorkflowContext(wf *v1alpha1.Workflow) *proto.WorkflowContext {
 	if wf == nil {
 		return nil
 	}
@@ -23,7 +23,7 @@ func WorkflowToWorkflowContext(wf *v1alpha1.Workflow) *proto.WorkflowContext {
 	}
 }
 
-func WorkflowYAMLToStatus(wf *Workflow) *v1alpha1.WorkflowStatus {
+func YAMLToStatus(wf *Workflow) *v1alpha1.WorkflowStatus {
 	if wf == nil {
 		return nil
 	}
@@ -56,7 +56,7 @@ func WorkflowYAMLToStatus(wf *Workflow) *v1alpha1.WorkflowStatus {
 	}
 }
 
-func WorkflowActionListCRDToProto(wf *v1alpha1.Workflow) *proto.WorkflowActionList {
+func ActionListCRDToProto(wf *v1alpha1.Workflow) *proto.WorkflowActionList {
 	if wf == nil {
 		return nil
 	}

internal/workflow/convert_test.go

@@ -14,7 +14,7 @@ import (
 
 var convertTestTime = testtime.NewFrozenTimeUnix(1637361794)
 
-func TestWorkflowToWorkflowContext(t *testing.T) {
+func TestToWorkflowContext(t *testing.T) {
 	cases := []struct {
 		name  string
 		input *v1alpha1.Workflow
@@ -82,15 +82,15 @@ func TestWorkflowToWorkflowContext(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			got := WorkflowToWorkflowContext(tc.input)
+			got := ToWorkflowContext(tc.input)
 			if !reflect.DeepEqual(got, tc.want) {
 				t.Errorf("Unexpedted response: wanted\n\t%#v\ngot\n\t%#v", tc.want, got)
 			}
 		})
 	}
 }
 
-func TestWorkflowActionListCRDToProto(t *testing.T) {
+func TestActionListCRDToProto(t *testing.T) {
 	cases := []struct {
 		name  string
 		input *v1alpha1.Workflow
@@ -229,15 +229,15 @@ func TestWorkflowActionListCRDToProto(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			got := WorkflowActionListCRDToProto(tc.input)
+			got := ActionListCRDToProto(tc.input)
 			if diff := cmp.Diff(tc.want, got, protocmp.Transform()); diff != "" {
 				t.Errorf("unexpected difference:\n%v", diff)
 			}
 		})
 	}
 }
 
-func TestWorkflowYAMLToStatus(t *testing.T) {
+func TestYAMLToStatus(t *testing.T) {
 	cases := []struct {
 		name    string
 		inputWf *Workflow
@@ -315,7 +315,7 @@ func TestWorkflowYAMLToStatus(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			got := WorkflowYAMLToStatus(tc.inputWf)
+			got := YAMLToStatus(tc.inputWf)
 			if diff := cmp.Diff(got, tc.want, protocmp.Transform()); diff != "" {
 				t.Errorf("unexpected difference:\n%v", diff)
 			}