Merge pull request runatlantis#167 from hootsuite/pegomock

Update to latest version of pegomock library

server/events/event_parser.go

@@ -10,7 +10,6 @@ import (
 )
 
 //go:generate pegomock generate --use-experimental-model-gen --package mocks -o mocks/mock_event_parsing.go EventParsing
-//go:generate sed -i "" -e "s#github.com/hootsuite/atlantis/vendor/github.com/google/go-github/github#github.com/google/go-github/github#" mocks/mock_event_parsing.go
 
 type Command struct {
 	Name        CommandName

server/events/mocks/mock_event_parsing.go

@@ -4,9 +4,9 @@
 package mocks
 
 import (
+	github "github.com/google/go-github/github"
 	events "github.com/hootsuite/atlantis/server/events"
 	models "github.com/hootsuite/atlantis/server/events/models"
-	github "github.com/google/go-github/github"
 	pegomock "github.com/petergtz/pegomock"
 	"reflect"
 )

server/events/mocks/mock_project_config_reader.go

@@ -17,8 +17,8 @@ func NewMockProjectConfigReader() *MockProjectConfigReader {
 	return &MockProjectConfigReader{fail: pegomock.GlobalFailHandler}
 }
 
-func (mock *MockProjectConfigReader) Exists(execPath string) bool {
-	params := []pegomock.Param{execPath}
+func (mock *MockProjectConfigReader) Exists(projectPath string) bool {
+	params := []pegomock.Param{projectPath}
 	result := pegomock.GetGenericMockFrom(mock).Invoke("Exists", params, []reflect.Type{reflect.TypeOf((*bool)(nil)).Elem()})
 	var ret0 bool
 	if len(result) != 0 {
@@ -29,8 +29,8 @@ func (mock *MockProjectConfigReader) Exists(execPath string) bool {
 	return ret0
 }
 
-func (mock *MockProjectConfigReader) Read(execPath string) (events.ProjectConfig, error) {
-	params := []pegomock.Param{execPath}
+func (mock *MockProjectConfigReader) Read(projectPath string) (events.ProjectConfig, error) {
+	params := []pegomock.Param{projectPath}
 	result := pegomock.GetGenericMockFrom(mock).Invoke("Read", params, []reflect.Type{reflect.TypeOf((*events.ProjectConfig)(nil)).Elem(), reflect.TypeOf((*error)(nil)).Elem()})
 	var ret0 events.ProjectConfig
 	var ret1 error
@@ -63,8 +63,8 @@ type VerifierProjectConfigReader struct {
 	inOrderContext         *pegomock.InOrderContext
 }
 
-func (verifier *VerifierProjectConfigReader) Exists(execPath string) *ProjectConfigReader_Exists_OngoingVerification {
-	params := []pegomock.Param{execPath}
+func (verifier *VerifierProjectConfigReader) Exists(projectPath string) *ProjectConfigReader_Exists_OngoingVerification {
+	params := []pegomock.Param{projectPath}
 	methodInvocations := pegomock.GetGenericMockFrom(verifier.mock).Verify(verifier.inOrderContext, verifier.invocationCountMatcher, "Exists", params)
 	return &ProjectConfigReader_Exists_OngoingVerification{mock: verifier.mock, methodInvocations: methodInvocations}
 }
@@ -75,8 +75,8 @@ type ProjectConfigReader_Exists_OngoingVerification struct {
 }
 
 func (c *ProjectConfigReader_Exists_OngoingVerification) GetCapturedArguments() string {
-	execPath := c.GetAllCapturedArguments()
-	return execPath[len(execPath)-1]
+	projectPath := c.GetAllCapturedArguments()
+	return projectPath[len(projectPath)-1]
 }
 
 func (c *ProjectConfigReader_Exists_OngoingVerification) GetAllCapturedArguments() (_param0 []string) {
@@ -90,8 +90,8 @@ func (c *ProjectConfigReader_Exists_OngoingVerification) GetAllCapturedArguments
 	return
 }
 
-func (verifier *VerifierProjectConfigReader) Read(execPath string) *ProjectConfigReader_Read_OngoingVerification {
-	params := []pegomock.Param{execPath}
+func (verifier *VerifierProjectConfigReader) Read(projectPath string) *ProjectConfigReader_Read_OngoingVerification {
+	params := []pegomock.Param{projectPath}
 	methodInvocations := pegomock.GetGenericMockFrom(verifier.mock).Verify(verifier.inOrderContext, verifier.invocationCountMatcher, "Read", params)
 	return &ProjectConfigReader_Read_OngoingVerification{mock: verifier.mock, methodInvocations: methodInvocations}
 }
@@ -102,8 +102,8 @@ type ProjectConfigReader_Read_OngoingVerification struct {
 }
 
 func (c *ProjectConfigReader_Read_OngoingVerification) GetCapturedArguments() string {
-	execPath := c.GetAllCapturedArguments()
-	return execPath[len(execPath)-1]
+	projectPath := c.GetAllCapturedArguments()
+	return projectPath[len(projectPath)-1]
 }
 
 func (c *ProjectConfigReader_Read_OngoingVerification) GetAllCapturedArguments() (_param0 []string) {

server/events/run/mocks/mock_runner.go

@@ -4,8 +4,8 @@
 package mocks
 
 import (
-	logging "github.com/hootsuite/atlantis/server/logging"
 	go_version "github.com/hashicorp/go-version"
+	logging "github.com/hootsuite/atlantis/server/logging"
 	pegomock "github.com/petergtz/pegomock"
 	"reflect"
 )

server/events/run/run.go

@@ -18,7 +18,6 @@ import (
 const inlineShebang = "#!/bin/sh -e"
 
 //go:generate pegomock generate --use-experimental-model-gen --package mocks -o mocks/mock_runner.go Runner
-//go:generate sed -i "" -e "s#go_version \"github.com/hootsuite/atlantis/vendor/github.com/hashicorp/go-version\"#go_version \"github.com/hashicorp/go-version\"#" mocks/mock_runner.go
 type Runner interface {
 	Execute(log *logging.SimpleLogger, commands []string, path string, environment string, terraformVersion *version.Version, stage string) (string, error)
 }

server/events/terraform/mocks/mock_runner.go

@@ -4,8 +4,8 @@
 package mocks
 
 import (
-	logging "github.com/hootsuite/atlantis/server/logging"
 	go_version "github.com/hashicorp/go-version"
+	logging "github.com/hootsuite/atlantis/server/logging"
 	pegomock "github.com/petergtz/pegomock"
 	"reflect"
 )

server/events/terraform/terraform_client.go

@@ -15,7 +15,6 @@ import (
 )
 
 //go:generate pegomock generate --use-experimental-model-gen --package mocks -o mocks/mock_runner.go Runner
-//go:generate sed -i "" -e "s#go_version \"github.com/hootsuite/atlantis/vendor/github.com/hashicorp/go-version\"#go_version \"github.com/hashicorp/go-version\"#" mocks/mock_runner.go
 type Runner interface {
 	Version() *version.Version
 	RunCommandWithVersion(log *logging.SimpleLogger, path string, args []string, v *version.Version, env string) (string, error)