From b4cd7a06c297012542d29afcf31f8fddca53c280 Mon Sep 17 00:00:00 2001 From: coffeegoddd Date: Tue, 12 Nov 2024 14:02:08 -0800 Subject: [PATCH] /go/libraries/doltcore/env/actions/dolt_ci: fix types --- .../env/actions/dolt_ci/workflow_config.go | 14 +++++++------- .../actions/dolt_ci/workflow_config_test.go | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go/libraries/doltcore/env/actions/dolt_ci/workflow_config.go b/go/libraries/doltcore/env/actions/dolt_ci/workflow_config.go index 1b06f483bc..6194a5ed56 100644 --- a/go/libraries/doltcore/env/actions/dolt_ci/workflow_config.go +++ b/go/libraries/doltcore/env/actions/dolt_ci/workflow_config.go @@ -97,7 +97,7 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error { for _, branch := range workflow.On.Push.Branches { _, ok := branches[branch.Value] if ok { - return fmt.Errorf("invalid config: on push branch duplicated: %s", branch) + return fmt.Errorf("invalid config: on push branch duplicated: %s", branch.Value) } else { branches[branch.Value] = true } @@ -109,7 +109,7 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error { for _, branch := range workflow.On.PullRequest.Branches { _, ok := branches[branch.Value] if ok { - return fmt.Errorf("invalid config: on pull request branch duplicated: %s", branch) + return fmt.Errorf("invalid config: on pull request branch duplicated: %s", branch.Value) } else { branches[branch.Value] = true } @@ -119,7 +119,7 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error { for _, activity := range workflow.On.PullRequest.Activities { _, ok := activities[activity.Value] if ok { - return fmt.Errorf("invalid config: on pull request activities duplicated: %s", activity) + return fmt.Errorf("invalid config: on pull request activities duplicated: %s", activity.Value) } else { activities[activity.Value] = true } @@ -130,17 +130,17 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error { steps := make(map[string]bool) if len(workflow.Jobs) == 0 { - return fmt.Errorf("invalid config: no jobs defined for workflow: %s", workflow.Name) + return fmt.Errorf("invalid config: no jobs defined for workflow: %s", workflow.Name.Value) } for _, job := range workflow.Jobs { if len(job.Steps) == 0 { - return fmt.Errorf("invalid config: no steps defined for job: %s", job.Name) + return fmt.Errorf("invalid config: no steps defined for job: %s", job.Name.Value) } _, ok := jobs[job.Name.Value] if ok { - return fmt.Errorf("invalid config: job duplicated: %s", job.Name) + return fmt.Errorf("invalid config: job duplicated: %s", job.Name.Value) } else { jobs[job.Name.Value] = true } @@ -148,7 +148,7 @@ func ValidateWorkflowConfig(workflow *WorkflowConfig) error { for _, step := range job.Steps { _, ok := steps[step.Name.Value] if ok { - return fmt.Errorf("invalid config: step duplicated: %s", step.Name) + return fmt.Errorf("invalid config: step duplicated: %s", step.Name.Value) } else { steps[step.Name.Value] = true } diff --git a/go/libraries/doltcore/env/actions/dolt_ci/workflow_config_test.go b/go/libraries/doltcore/env/actions/dolt_ci/workflow_config_test.go index d5c2e7cd48..cdc267fd56 100644 --- a/go/libraries/doltcore/env/actions/dolt_ci/workflow_config_test.go +++ b/go/libraries/doltcore/env/actions/dolt_ci/workflow_config_test.go @@ -78,20 +78,20 @@ jobs: require.NoError(t, err) require.NotNil(t, wf) - require.Equal(t, workflowName, wf.Name) + require.Equal(t, workflowName, wf.Name.Value) require.Equal(t, len(wf.On.Push.Branches), 2) require.Equal(t, len(wf.On.PullRequest.Branches), 2) require.Equal(t, len(wf.On.PullRequest.Activities), 2) - require.Equal(t, wf.On.Push.Branches[0], mainBranch) - require.Equal(t, wf.On.Push.Branches[1], altBranch) - require.Equal(t, wf.On.PullRequest.Branches[0], mainBranch) - require.Equal(t, wf.On.PullRequest.Branches[1], alt2Branch) - require.Equal(t, wf.On.PullRequest.Activities[0], opened) - require.Equal(t, wf.On.PullRequest.Activities[1], synchronized) + require.Equal(t, wf.On.Push.Branches[0].Value, mainBranch) + require.Equal(t, wf.On.Push.Branches[1].Value, altBranch) + require.Equal(t, wf.On.PullRequest.Branches[0].Value, mainBranch) + require.Equal(t, wf.On.PullRequest.Branches[1].Value, alt2Branch) + require.Equal(t, wf.On.PullRequest.Activities[0].Value, opened) + require.Equal(t, wf.On.PullRequest.Activities[1].Value, synchronized) require.Equal(t, len(wf.Jobs), 1) - require.Equal(t, wf.Jobs[0].Name, jobName) + require.Equal(t, wf.Jobs[0].Name.Value, jobName) require.Equal(t, len(wf.Jobs[0].Steps), 1) - require.Equal(t, wf.Jobs[0].Steps[0].Name, stepName) + require.Equal(t, wf.Jobs[0].Steps[0].Name.Value, stepName) // todo: check expected stuff }