chore(build): rm pegomock experimental feature for smooth mock genera…

…tion (runatlantis#2886)

* disable pegomock --use-experimental-model-gen, cause random fail by segv

* make regen-mocks

* fix mock code which uses non experimental pegomock codes

CONTRIBUTING.md

@@ -143,7 +143,7 @@ Then you've likely modified an interface and now need to update the mocks.
 
 Each interface that is mocked has a `go:generate` command above it, e.g.
 ```go
-//go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_project_command_builder.go ProjectCommandBuilder
+//go:generate pegomock generate -m --package mocks -o mocks/mock_project_command_builder.go ProjectCommandBuilder
 
 type ProjectCommandBuilder interface {
 	BuildAutoplanCommands(ctx *command.Context) ([]command.ProjectContext, error)

server/controllers/api_controller_test.go

@@ -37,8 +37,8 @@ func TestAPIController_Plan(t *testing.T) {
 	w := httptest.NewRecorder()
 	ac.Plan(w, req)
 	ResponseContains(t, w, http.StatusOK, "")
-	projectCommandBuilder.VerifyWasCalledOnce().BuildPlanCommands(AnyPtrToEventsCommandContext(), AnyPtrToEventsCommentCommand())
-	projectCommandRunner.VerifyWasCalledOnce().Plan(AnyModelsProjectCommandContext())
+	projectCommandBuilder.VerifyWasCalledOnce().BuildPlanCommands(AnyPtrToCommandContext(), AnyPtrToEventsCommentCommand())
+	projectCommandRunner.VerifyWasCalledOnce().Plan(AnyCommandProjectContext())
 }
 
 func TestAPIController_Apply(t *testing.T) {
@@ -54,9 +54,9 @@ func TestAPIController_Apply(t *testing.T) {
 	w := httptest.NewRecorder()
 	ac.Apply(w, req)
 	ResponseContains(t, w, http.StatusOK, "")
-	projectCommandBuilder.VerifyWasCalledOnce().BuildApplyCommands(AnyPtrToEventsCommandContext(), AnyPtrToEventsCommentCommand())
-	projectCommandRunner.VerifyWasCalledOnce().Plan(AnyModelsProjectCommandContext())
-	projectCommandRunner.VerifyWasCalledOnce().Apply(AnyModelsProjectCommandContext())
+	projectCommandBuilder.VerifyWasCalledOnce().BuildApplyCommands(AnyPtrToCommandContext(), AnyPtrToEventsCommentCommand())
+	projectCommandRunner.VerifyWasCalledOnce().Plan(AnyCommandProjectContext())
+	projectCommandRunner.VerifyWasCalledOnce().Apply(AnyCommandProjectContext())
 }
 
 func setup(t *testing.T) (controllers.APIController, *MockProjectCommandBuilder, *MockProjectCommandRunner) {
@@ -70,20 +70,20 @@ func setup(t *testing.T) (controllers.APIController, *MockProjectCommandBuilder,
 	Ok(t, err)
 
 	projectCommandBuilder := NewMockProjectCommandBuilder()
-	When(projectCommandBuilder.BuildPlanCommands(AnyPtrToEventsCommandContext(), AnyPtrToEventsCommentCommand())).
+	When(projectCommandBuilder.BuildPlanCommands(AnyPtrToCommandContext(), AnyPtrToEventsCommentCommand())).
 		ThenReturn([]command.ProjectContext{{
 			CommandName: command.Plan,
 		}}, nil)
-	When(projectCommandBuilder.BuildApplyCommands(AnyPtrToEventsCommandContext(), AnyPtrToEventsCommentCommand())).
+	When(projectCommandBuilder.BuildApplyCommands(AnyPtrToCommandContext(), AnyPtrToEventsCommentCommand())).
 		ThenReturn([]command.ProjectContext{{
 			CommandName: command.Apply,
 		}}, nil)
 
 	projectCommandRunner := NewMockProjectCommandRunner()
-	When(projectCommandRunner.Plan(AnyModelsProjectCommandContext())).ThenReturn(command.ProjectResult{
+	When(projectCommandRunner.Plan(AnyCommandProjectContext())).ThenReturn(command.ProjectResult{
 		PlanSuccess: &models.PlanSuccess{},
 	})
-	When(projectCommandRunner.Apply(AnyModelsProjectCommandContext())).ThenReturn(command.ProjectResult{
+	When(projectCommandRunner.Apply(AnyCommandProjectContext())).ThenReturn(command.ProjectResult{
 		ApplySuccess: "success",
 	})
 

server/controllers/events/azuredevops_request_validator.go

@@ -8,7 +8,7 @@ import (
 	"github.com/mcdafydd/go-azuredevops/azuredevops"
 )
 
-//go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_azuredevops_request_validator.go AzureDevopsRequestValidator
+//go:generate pegomock generate -m --package mocks -o mocks/mock_azuredevops_request_validator.go AzureDevopsRequestValidator
 
 // AzureDevopsRequestValidator handles checking if Azure DevOps requests
 // contain a valid Basic authentication username and password.

server/controllers/events/events_controller_e2e_test.go

@@ -35,6 +35,7 @@ import (
 	"github.com/runatlantis/atlantis/server/events/models"
 	"github.com/runatlantis/atlantis/server/events/vcs"
 	vcsmocks "github.com/runatlantis/atlantis/server/events/vcs/mocks"
+	vcsmatchers "github.com/runatlantis/atlantis/server/events/vcs/mocks/matchers"
 	"github.com/runatlantis/atlantis/server/events/webhooks"
 	jobmocks "github.com/runatlantis/atlantis/server/jobs/mocks"
 	"github.com/runatlantis/atlantis/server/logging"
@@ -534,9 +535,9 @@ func TestGitHubWorkflow(t *testing.T) {
 
 			if c.ExpAutomerge {
 				// Verify that the merge API call was made.
-				vcsClient.VerifyWasCalledOnce().MergePull(matchers.AnyModelsPullRequest(), matchers.AnyModelsPullRequestOptions())
+				vcsClient.VerifyWasCalledOnce().MergePull(matchers.AnyModelsPullRequest(), vcsmatchers.AnyModelsPullRequestOptions())
 			} else {
-				vcsClient.VerifyWasCalled(Never()).MergePull(matchers.AnyModelsPullRequest(), matchers.AnyModelsPullRequestOptions())
+				vcsClient.VerifyWasCalled(Never()).MergePull(matchers.AnyModelsPullRequest(), vcsmatchers.AnyModelsPullRequestOptions())
 			}
 		})
 	}
@@ -932,9 +933,9 @@ func TestGitHubWorkflowWithPolicyCheck(t *testing.T) {
 
 			if c.ExpAutomerge {
 				// Verify that the merge API call was made.
-				vcsClient.VerifyWasCalledOnce().MergePull(matchers.AnyModelsPullRequest(), matchers.AnyModelsPullRequestOptions())
+				vcsClient.VerifyWasCalledOnce().MergePull(matchers.AnyModelsPullRequest(), vcsmatchers.AnyModelsPullRequestOptions())
 			} else {
-				vcsClient.VerifyWasCalled(Never()).MergePull(matchers.AnyModelsPullRequest(), matchers.AnyModelsPullRequestOptions())
+				vcsClient.VerifyWasCalled(Never()).MergePull(matchers.AnyModelsPullRequest(), vcsmatchers.AnyModelsPullRequestOptions())
 			}
 		})
 	}

server/controllers/events/github_request_validator.go

@@ -22,7 +22,7 @@ import (
 	"github.com/google/go-github/v48/github"
 )
 
-//go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_github_request_validator.go GithubRequestValidator
+//go:generate pegomock generate -m --package mocks -o mocks/mock_github_request_validator.go GithubRequestValidator
 
 // GithubRequestValidator handles checking if GitHub requests are signed
 // properly by the secret.

server/controllers/events/gitlab_request_parser_validator.go

@@ -25,7 +25,7 @@ import (
 
 const secretHeader = "X-Gitlab-Token" // #nosec
 
-//go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_gitlab_request_parser_validator.go GitlabRequestParserValidator
+//go:generate pegomock generate -m --package mocks -o mocks/mock_gitlab_request_parser_validator.go GitlabRequestParserValidator
 
 // GitlabRequestParserValidator parses and validates GitLab requests.
 type GitlabRequestParserValidator interface {

server/controllers/templates/web_templates.go

@@ -19,7 +19,7 @@ import (
 	"time"
 )
 
-//go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_template_writer.go TemplateWriter
+//go:generate pegomock generate -m --package mocks -o mocks/mock_template_writer.go TemplateWriter
 
 // TemplateWriter is an interface over html/template that's used to enable
 // mocking.

server/core/locking/apply_locking.go

@@ -7,15 +7,15 @@ import (
 	"github.com/runatlantis/atlantis/server/events/command"
 )
 
-//go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_apply_lock_checker.go ApplyLockChecker
+//go:generate pegomock generate -m --package mocks -o mocks/mock_apply_lock_checker.go ApplyLockChecker
 
 // ApplyLockChecker is an implementation of the global apply lock retrieval.
 // It returns an object that contains information about apply locks status.
 type ApplyLockChecker interface {
 	CheckApplyLock() (ApplyCommandLock, error)
 }
 
-//go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_apply_locker.go ApplyLocker
+//go:generate pegomock generate -m --package mocks -o mocks/mock_apply_locker.go ApplyLocker
 
 // ApplyLocker interface that manages locks for apply command runner
 type ApplyLocker interface {

server/core/locking/locking.go

@@ -26,7 +26,7 @@ import (
 	"github.com/runatlantis/atlantis/server/events/models"
 )
 
-//go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_backend.go Backend
+//go:generate pegomock generate -m --package mocks -o mocks/mock_backend.go Backend
 
 // Backend is an implementation of the locking API we require.
 type Backend interface {
@@ -60,7 +60,7 @@ type Client struct {
 	backend Backend
 }
 
-//go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_locker.go Locker
+//go:generate pegomock generate -m --package mocks -o mocks/mock_locker.go Locker
 
 type Locker interface {
 	TryLock(p models.Project, workspace string, pull models.PullRequest, user models.User) (TryLockResponse, error)