diff --git a/cmd/server.go b/cmd/server.go index d2dbd3881..29da0783f 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -15,18 +15,17 @@ package cmd import ( "fmt" - "github.com/runatlantis/atlantis/server/events/yaml/valid" "net/url" "os" "path/filepath" "strings" - "github.com/runatlantis/atlantis/server/logging" - - "github.com/mitchellh/go-homedir" + homedir "github.com/mitchellh/go-homedir" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server" "github.com/runatlantis/atlantis/server/events/vcs/bitbucketcloud" + "github.com/runatlantis/atlantis/server/events/yaml/valid" + "github.com/runatlantis/atlantis/server/logging" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/server_test.go b/cmd/server_test.go index 0d32e0533..153757586 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/mitchellh/go-homedir" + homedir "github.com/mitchellh/go-homedir" "github.com/runatlantis/atlantis/cmd" "github.com/runatlantis/atlantis/server" . "github.com/runatlantis/atlantis/testing" diff --git a/e2e/main.go b/e2e/main.go index bbbeeccd3..70575e60f 100644 --- a/e2e/main.go +++ b/e2e/main.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/google/go-github/github" - "github.com/hashicorp/go-multierror" + multierror "github.com/hashicorp/go-multierror" ) var defaultAtlantisURL = "http://localhost:4141" diff --git a/server/events/command_runner.go b/server/events/command_runner.go index 7b9cb1119..626f1760d 100644 --- a/server/events/command_runner.go +++ b/server/events/command_runner.go @@ -17,7 +17,7 @@ import ( "fmt" "github.com/google/go-github/github" - "github.com/lkysow/go-gitlab" + gitlab "github.com/lkysow/go-gitlab" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/db" "github.com/runatlantis/atlantis/server/events/models" diff --git a/server/events/comment_parser.go b/server/events/comment_parser.go index 59d5ab1a3..f7b1223d2 100644 --- a/server/events/comment_parser.go +++ b/server/events/comment_parser.go @@ -21,7 +21,7 @@ import ( "regexp" "strings" - "github.com/flynn-archive/go-shlex" + shlex "github.com/flynn-archive/go-shlex" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/yaml" "github.com/spf13/pflag" diff --git a/server/events/event_parser.go b/server/events/event_parser.go index 786fbac22..cc3492924 100644 --- a/server/events/event_parser.go +++ b/server/events/event_parser.go @@ -20,12 +20,12 @@ import ( "strings" "github.com/google/go-github/github" - "github.com/lkysow/go-gitlab" + gitlab "github.com/lkysow/go-gitlab" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/vcs/bitbucketcloud" "github.com/runatlantis/atlantis/server/events/vcs/bitbucketserver" - "gopkg.in/go-playground/validator.v9" + validator "gopkg.in/go-playground/validator.v9" ) const gitlabPullOpened = "opened" diff --git a/server/events/event_parser_test.go b/server/events/event_parser_test.go index ff64a6962..9d8ae71e0 100644 --- a/server/events/event_parser_test.go +++ b/server/events/event_parser_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/google/go-github/github" - "github.com/lkysow/go-gitlab" + gitlab "github.com/lkysow/go-gitlab" "github.com/mohae/deepcopy" "github.com/runatlantis/atlantis/server/events" "github.com/runatlantis/atlantis/server/events/models" diff --git a/server/events/models/models.go b/server/events/models/models.go index 4756b1386..388907aa9 100644 --- a/server/events/models/models.go +++ b/server/events/models/models.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/logging" "github.com/pkg/errors" diff --git a/server/events/project_command_builder_internal_test.go b/server/events/project_command_builder_internal_test.go index 64f470759..47f6a625e 100644 --- a/server/events/project_command_builder_internal_test.go +++ b/server/events/project_command_builder_internal_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" "github.com/runatlantis/atlantis/server/events/matchers" "github.com/runatlantis/atlantis/server/events/models" diff --git a/server/events/runtime/apply_step_runner.go b/server/events/runtime/apply_step_runner.go index 6482a684a..1fbf61bbb 100644 --- a/server/events/runtime/apply_step_runner.go +++ b/server/events/runtime/apply_step_runner.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/events/models" ) diff --git a/server/events/runtime/apply_step_runner_test.go b/server/events/runtime/apply_step_runner_test.go index 428cc8bd0..8c279aa5a 100644 --- a/server/events/runtime/apply_step_runner_test.go +++ b/server/events/runtime/apply_step_runner_test.go @@ -10,7 +10,7 @@ import ( "sync" "testing" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" mocks2 "github.com/runatlantis/atlantis/server/events/mocks" "github.com/runatlantis/atlantis/server/events/mocks/matchers" diff --git a/server/events/runtime/init_step_runner.go b/server/events/runtime/init_step_runner.go index 435997acc..923f3ea1f 100644 --- a/server/events/runtime/init_step_runner.go +++ b/server/events/runtime/init_step_runner.go @@ -1,7 +1,7 @@ package runtime import ( - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/events/models" ) diff --git a/server/events/runtime/plan_step_runner.go b/server/events/runtime/plan_step_runner.go index 605d019b4..43e6b4420 100644 --- a/server/events/runtime/plan_step_runner.go +++ b/server/events/runtime/plan_step_runner.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/models" ) diff --git a/server/events/runtime/plan_step_runner_test.go b/server/events/runtime/plan_step_runner_test.go index c304b026e..ebbd2f1d2 100644 --- a/server/events/runtime/plan_step_runner_test.go +++ b/server/events/runtime/plan_step_runner_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" + version "github.com/hashicorp/go-version" mocks2 "github.com/runatlantis/atlantis/server/events/mocks" "github.com/runatlantis/atlantis/server/events/terraform" - "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/mocks/matchers" diff --git a/server/events/runtime/run_step_runner.go b/server/events/runtime/run_step_runner.go index 438e4d898..d227ed10b 100644 --- a/server/events/runtime/run_step_runner.go +++ b/server/events/runtime/run_step_runner.go @@ -2,11 +2,12 @@ package runtime import ( "fmt" - "github.com/hashicorp/go-version" - "github.com/runatlantis/atlantis/server/events/models" "os" "os/exec" "path/filepath" + + version "github.com/hashicorp/go-version" + "github.com/runatlantis/atlantis/server/events/models" ) // RunStepRunner runs custom commands. diff --git a/server/events/runtime/run_step_runner_test.go b/server/events/runtime/run_step_runner_test.go index e961ccdde..c4c3b671a 100644 --- a/server/events/runtime/run_step_runner_test.go +++ b/server/events/runtime/run_step_runner_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/runtime" "github.com/runatlantis/atlantis/server/logging" diff --git a/server/events/runtime/runtime.go b/server/events/runtime/runtime.go index 1d7df1ef1..830ea9bf2 100644 --- a/server/events/runtime/runtime.go +++ b/server/events/runtime/runtime.go @@ -6,7 +6,7 @@ import ( "fmt" "regexp" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/terraform" "github.com/runatlantis/atlantis/server/logging" diff --git a/server/events/terraform/terraform_client.go b/server/events/terraform/terraform_client.go index bbbad5279..a42d7bd82 100644 --- a/server/events/terraform/terraform_client.go +++ b/server/events/terraform/terraform_client.go @@ -27,9 +27,9 @@ import ( "strings" "sync" - "github.com/hashicorp/go-getter" - "github.com/hashicorp/go-version" - "github.com/mitchellh/go-homedir" + getter "github.com/hashicorp/go-getter" + version "github.com/hashicorp/go-version" + homedir "github.com/mitchellh/go-homedir" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/events/terraform/terraform_client_internal_test.go b/server/events/terraform/terraform_client_internal_test.go index 48ba1d4fb..2881a2e23 100644 --- a/server/events/terraform/terraform_client_internal_test.go +++ b/server/events/terraform/terraform_client_internal_test.go @@ -8,9 +8,8 @@ import ( "strings" "testing" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/logging" - . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/terraform/terraform_client_test.go b/server/events/terraform/terraform_client_test.go index e67149e7c..a4ccc45dc 100644 --- a/server/events/terraform/terraform_client_test.go +++ b/server/events/terraform/terraform_client_test.go @@ -22,13 +22,12 @@ import ( "testing" "time" + version "github.com/hashicorp/go-version" "github.com/petergtz/pegomock" - "github.com/runatlantis/atlantis/cmd" - "github.com/runatlantis/atlantis/server/events/terraform/mocks" - - "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/cmd" "github.com/runatlantis/atlantis/server/events/terraform" + "github.com/runatlantis/atlantis/server/events/terraform/mocks" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/vcs/bitbucketcloud/client.go b/server/events/vcs/bitbucketcloud/client.go index dca0de293..75ca45d14 100644 --- a/server/events/vcs/bitbucketcloud/client.go +++ b/server/events/vcs/bitbucketcloud/client.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/models" - "gopkg.in/go-playground/validator.v9" + validator "gopkg.in/go-playground/validator.v9" ) type Client struct { diff --git a/server/events/vcs/bitbucketserver/client.go b/server/events/vcs/bitbucketserver/client.go index 7abfd2da7..27796198e 100644 --- a/server/events/vcs/bitbucketserver/client.go +++ b/server/events/vcs/bitbucketserver/client.go @@ -15,7 +15,7 @@ import ( "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/models" - "gopkg.in/go-playground/validator.v9" + validator "gopkg.in/go-playground/validator.v9" ) // maxCommentLength is the maximum number of chars allowed by Bitbucket in a diff --git a/server/events/vcs/gitlab_client.go b/server/events/vcs/gitlab_client.go index 98ebe8be5..91beffc3a 100644 --- a/server/events/vcs/gitlab_client.go +++ b/server/events/vcs/gitlab_client.go @@ -21,11 +21,11 @@ import ( "github.com/runatlantis/atlantis/server/events/vcs/common" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/logging" - "github.com/lkysow/go-gitlab" + gitlab "github.com/lkysow/go-gitlab" "github.com/runatlantis/atlantis/server/events/models" ) diff --git a/server/events/vcs/gitlab_client_test.go b/server/events/vcs/gitlab_client_test.go index 9c7d2a7b0..3dffe5048 100644 --- a/server/events/vcs/gitlab_client_test.go +++ b/server/events/vcs/gitlab_client_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/lkysow/go-gitlab" + version "github.com/hashicorp/go-version" + gitlab "github.com/lkysow/go-gitlab" "github.com/runatlantis/atlantis/server/events/models" - "github.com/hashicorp/go-version" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/yaml/parser_validator.go b/server/events/yaml/parser_validator.go index 48d27f86a..f5aeb0c52 100644 --- a/server/events/yaml/parser_validator.go +++ b/server/events/yaml/parser_validator.go @@ -3,17 +3,17 @@ package yaml import ( "encoding/json" "fmt" - "github.com/flynn-archive/go-shlex" "io/ioutil" "os" "path/filepath" "strings" - "github.com/go-ozzo/ozzo-validation" + shlex "github.com/flynn-archive/go-shlex" + validation "github.com/go-ozzo/ozzo-validation" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/yaml/raw" "github.com/runatlantis/atlantis/server/events/yaml/valid" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" ) // AtlantisYAMLFilename is the name of the config file for each repo. diff --git a/server/events/yaml/parser_validator_test.go b/server/events/yaml/parser_validator_test.go index f46c59680..c2ceca7bb 100644 --- a/server/events/yaml/parser_validator_test.go +++ b/server/events/yaml/parser_validator_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/events/yaml" "github.com/runatlantis/atlantis/server/events/yaml/valid" . "github.com/runatlantis/atlantis/testing" diff --git a/server/events/yaml/raw/autoplan_test.go b/server/events/yaml/raw/autoplan_test.go index 224ca959b..4e29007c9 100644 --- a/server/events/yaml/raw/autoplan_test.go +++ b/server/events/yaml/raw/autoplan_test.go @@ -6,7 +6,7 @@ import ( "github.com/runatlantis/atlantis/server/events/yaml/raw" "github.com/runatlantis/atlantis/server/events/yaml/valid" . "github.com/runatlantis/atlantis/testing" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" ) func TestAutoPlan_UnmarshalYAML(t *testing.T) { diff --git a/server/events/yaml/raw/global_cfg.go b/server/events/yaml/raw/global_cfg.go index 61fb6eaa9..1e5b03b4a 100644 --- a/server/events/yaml/raw/global_cfg.go +++ b/server/events/yaml/raw/global_cfg.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/go-ozzo/ozzo-validation" + validation "github.com/go-ozzo/ozzo-validation" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/yaml/valid" ) diff --git a/server/events/yaml/raw/project.go b/server/events/yaml/raw/project.go index f562e27e3..d30ee0147 100644 --- a/server/events/yaml/raw/project.go +++ b/server/events/yaml/raw/project.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/go-ozzo/ozzo-validation" - "github.com/hashicorp/go-version" + validation "github.com/go-ozzo/ozzo-validation" + version "github.com/hashicorp/go-version" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/yaml/valid" ) diff --git a/server/events/yaml/raw/project_test.go b/server/events/yaml/raw/project_test.go index 36ac12721..8da75c01f 100644 --- a/server/events/yaml/raw/project_test.go +++ b/server/events/yaml/raw/project_test.go @@ -3,12 +3,12 @@ package raw_test import ( "testing" - "github.com/go-ozzo/ozzo-validation" - "github.com/hashicorp/go-version" + validation "github.com/go-ozzo/ozzo-validation" + version "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/events/yaml/raw" "github.com/runatlantis/atlantis/server/events/yaml/valid" . "github.com/runatlantis/atlantis/testing" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" ) func TestProject_UnmarshalYAML(t *testing.T) { diff --git a/server/events/yaml/raw/repo_cfg.go b/server/events/yaml/raw/repo_cfg.go index 57b861044..c33c03cba 100644 --- a/server/events/yaml/raw/repo_cfg.go +++ b/server/events/yaml/raw/repo_cfg.go @@ -3,7 +3,7 @@ package raw import ( "errors" - "github.com/go-ozzo/ozzo-validation" + validation "github.com/go-ozzo/ozzo-validation" "github.com/runatlantis/atlantis/server/events/yaml/valid" ) diff --git a/server/events/yaml/raw/repo_cfg_test.go b/server/events/yaml/raw/repo_cfg_test.go index 059c3e9ce..47101c41b 100644 --- a/server/events/yaml/raw/repo_cfg_test.go +++ b/server/events/yaml/raw/repo_cfg_test.go @@ -3,11 +3,11 @@ package raw_test import ( "testing" - "github.com/go-ozzo/ozzo-validation" + validation "github.com/go-ozzo/ozzo-validation" "github.com/runatlantis/atlantis/server/events/yaml/raw" "github.com/runatlantis/atlantis/server/events/yaml/valid" . "github.com/runatlantis/atlantis/testing" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" ) func TestConfig_UnmarshalYAML(t *testing.T) { diff --git a/server/events/yaml/raw/stage.go b/server/events/yaml/raw/stage.go index 45bd05691..38772bfab 100644 --- a/server/events/yaml/raw/stage.go +++ b/server/events/yaml/raw/stage.go @@ -1,7 +1,7 @@ package raw import ( - "github.com/go-ozzo/ozzo-validation" + validation "github.com/go-ozzo/ozzo-validation" "github.com/runatlantis/atlantis/server/events/yaml/valid" ) diff --git a/server/events/yaml/raw/stage_test.go b/server/events/yaml/raw/stage_test.go index 240133baa..18c49c0bc 100644 --- a/server/events/yaml/raw/stage_test.go +++ b/server/events/yaml/raw/stage_test.go @@ -3,11 +3,11 @@ package raw_test import ( "testing" - "github.com/go-ozzo/ozzo-validation" + validation "github.com/go-ozzo/ozzo-validation" "github.com/runatlantis/atlantis/server/events/yaml/raw" "github.com/runatlantis/atlantis/server/events/yaml/valid" . "github.com/runatlantis/atlantis/testing" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" ) func TestStage_UnmarshalYAML(t *testing.T) { diff --git a/server/events/yaml/raw/step.go b/server/events/yaml/raw/step.go index b553aead6..12e22a5d6 100644 --- a/server/events/yaml/raw/step.go +++ b/server/events/yaml/raw/step.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/go-ozzo/ozzo-validation" + validation "github.com/go-ozzo/ozzo-validation" "github.com/runatlantis/atlantis/server/events/yaml/valid" ) diff --git a/server/events/yaml/raw/step_test.go b/server/events/yaml/raw/step_test.go index d4f9723bf..fd0cbe3c9 100644 --- a/server/events/yaml/raw/step_test.go +++ b/server/events/yaml/raw/step_test.go @@ -6,7 +6,7 @@ import ( "github.com/runatlantis/atlantis/server/events/yaml/raw" "github.com/runatlantis/atlantis/server/events/yaml/valid" . "github.com/runatlantis/atlantis/testing" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" ) func TestStepConfig_UnmarshalYAML(t *testing.T) { diff --git a/server/events/yaml/raw/workflow.go b/server/events/yaml/raw/workflow.go index 07a284cab..399ece21a 100644 --- a/server/events/yaml/raw/workflow.go +++ b/server/events/yaml/raw/workflow.go @@ -1,7 +1,7 @@ package raw import ( - "github.com/go-ozzo/ozzo-validation" + validation "github.com/go-ozzo/ozzo-validation" "github.com/runatlantis/atlantis/server/events/yaml/valid" ) diff --git a/server/events/yaml/raw/workflow_test.go b/server/events/yaml/raw/workflow_test.go index d9f4ae2ec..b0b3369dc 100644 --- a/server/events/yaml/raw/workflow_test.go +++ b/server/events/yaml/raw/workflow_test.go @@ -3,11 +3,11 @@ package raw_test import ( "testing" - "github.com/go-ozzo/ozzo-validation" + validation "github.com/go-ozzo/ozzo-validation" "github.com/runatlantis/atlantis/server/events/yaml/raw" "github.com/runatlantis/atlantis/server/events/yaml/valid" . "github.com/runatlantis/atlantis/testing" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" ) func TestWorkflow_UnmarshalYAML(t *testing.T) { diff --git a/server/events/yaml/valid/global_cfg.go b/server/events/yaml/valid/global_cfg.go index e5bb9251f..f843f131f 100644 --- a/server/events/yaml/valid/global_cfg.go +++ b/server/events/yaml/valid/global_cfg.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/hashicorp/go-version" + version "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/events/yaml/valid/repo_cfg.go b/server/events/yaml/valid/repo_cfg.go index cd953b6ba..376761807 100644 --- a/server/events/yaml/valid/repo_cfg.go +++ b/server/events/yaml/valid/repo_cfg.go @@ -2,7 +2,7 @@ // after it's been parsed and validated. package valid -import "github.com/hashicorp/go-version" +import version "github.com/hashicorp/go-version" // RepoCfg is the atlantis.yaml config after it's been parsed and validated. type RepoCfg struct { diff --git a/server/events_controller.go b/server/events_controller.go index f21ebf176..46160063a 100644 --- a/server/events_controller.go +++ b/server/events_controller.go @@ -19,7 +19,7 @@ import ( "net/http" "github.com/google/go-github/github" - "github.com/lkysow/go-gitlab" + gitlab "github.com/lkysow/go-gitlab" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events" "github.com/runatlantis/atlantis/server/events/models" diff --git a/server/events_controller_e2e_test.go b/server/events_controller_e2e_test.go index 8b240044a..f7e38d521 100644 --- a/server/events_controller_e2e_test.go +++ b/server/events_controller_e2e_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - "github.com/hashicorp/go-getter" + getter "github.com/hashicorp/go-getter" "github.com/runatlantis/atlantis/server/events/db" "github.com/runatlantis/atlantis/server/events/yaml/valid" diff --git a/server/events_controller_test.go b/server/events_controller_test.go index 07950db45..b71be8177 100644 --- a/server/events_controller_test.go +++ b/server/events_controller_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/lkysow/go-gitlab" + gitlab "github.com/lkysow/go-gitlab" . "github.com/petergtz/pegomock" "github.com/runatlantis/atlantis/server" "github.com/runatlantis/atlantis/server/events" diff --git a/server/gitlab_request_parser_validator.go b/server/gitlab_request_parser_validator.go index 23fa84e29..28dca7dfc 100644 --- a/server/gitlab_request_parser_validator.go +++ b/server/gitlab_request_parser_validator.go @@ -19,7 +19,7 @@ import ( "io/ioutil" "net/http" - "github.com/lkysow/go-gitlab" + gitlab "github.com/lkysow/go-gitlab" ) const secretHeader = "X-Gitlab-Token" // #nosec diff --git a/server/gitlab_request_parser_validator_test.go b/server/gitlab_request_parser_validator_test.go index 6759cf452..d6bb1e0f3 100644 --- a/server/gitlab_request_parser_validator_test.go +++ b/server/gitlab_request_parser_validator_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/lkysow/go-gitlab" + gitlab "github.com/lkysow/go-gitlab" . "github.com/petergtz/pegomock" "github.com/runatlantis/atlantis/server" . "github.com/runatlantis/atlantis/testing" diff --git a/server/server.go b/server/server.go index c53a84851..cbb353b63 100644 --- a/server/server.go +++ b/server/server.go @@ -32,7 +32,7 @@ import ( "github.com/runatlantis/atlantis/server/events/db" "github.com/runatlantis/atlantis/server/events/yaml/valid" - "github.com/elazarl/go-bindata-assetfs" + assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/gorilla/mux" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events"