From e7010d268d0738610f4290ed0fb9b806e0905c2c Mon Sep 17 00:00:00 2001 From: "Project Vitals (Connor McCarthy)" Date: Thu, 11 Jul 2024 13:58:47 -0400 Subject: [PATCH] =?UTF-8?q?[PV]=20Automated=20Suggestion=20=F0=9F=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Project Vitals has indentified the following code as unused and generated this corresponding PR to facilitate deletion. Please verify correctness and oversee the merge of this PR. Simplifying our collective codebase helps to minimize surface area for teams across Lyft! Join us in [#project-vitals-dev](https://lyft.enterprise.slack.com/archives/C06TB1M2V5W) with any questions, concerns, or curiosities! --- .../controllers/events/mocks/matchers/models_repo.go | 3 ++- .../legacy/controllers/websocket/instrumented_mux.go | 3 ++- .../locking/mocks/matchers/locking_trylockresponse.go | 3 ++- .../matchers/map_of_string_to_models_projectlock.go | 3 ++- .../core/locking/mocks/matchers/models_project.go | 3 ++- .../core/locking/mocks/matchers/models_pullrequest.go | 3 ++- .../legacy/core/locking/mocks/matchers/models_user.go | 3 ++- .../mocks/matchers/ptr_to_models_projectlock.go | 3 ++- .../mocks/matchers/slice_of_models_projectlock.go | 3 ++- server/legacy/core/locking/mocks/mock_locker.go | 5 +++-- .../cache/mocks/matchers/ptr_to_go_version_version.go | 3 ++- .../core/runtime/cache/mocks/mock_key_serializer.go | 5 +++-- .../core/runtime/cache/mocks/mock_version_path.go | 5 +++-- .../runtime/mocks/matchers/command_projectcontext.go | 3 ++- .../core/runtime/mocks/matchers/context_context.go | 3 ++- .../core/runtime/mocks/matchers/logging_logger.go | 3 ++- .../runtime/mocks/matchers/logging_simplelogging.go | 3 ++- .../runtime/mocks/matchers/map_of_string_to_string.go | 3 ++- .../matchers/models_preworkflowhookcommandcontext.go | 3 ++- .../core/runtime/mocks/matchers/models_pullrequest.go | 3 ++- .../legacy/core/runtime/mocks/matchers/models_repo.go | 3 ++- .../mocks/matchers/ptr_to_go_version_version.go | 3 ++- .../core/runtime/mocks/matchers/slice_of_string.go | 3 ++- .../runtime/mocks/matchers/slice_of_valid_step.go | 3 ++- .../legacy/core/runtime/mocks/mock_custom_runner.go | 5 +++-- server/legacy/core/runtime/mocks/mock_env_runner.go | 5 +++-- .../runtime/mocks/mock_pre_workflows_hook_runner.go | 5 +++-- .../core/runtime/mocks/mock_pull_approved_checker.go | 5 +++-- server/legacy/core/runtime/mocks/mock_runner.go | 5 +++-- server/legacy/core/runtime/mocks/mock_steps_runner.go | 5 +++-- .../runtime/mocks/mock_versionedexecutorworkflow.go | 5 +++-- .../models/mocks/matchers/map_of_string_to_string.go | 3 ++- .../runtime/models/mocks/matchers/models_filepath.go | 3 ++- .../runtime/models/mocks/matchers/slice_of_string.go | 3 ++- server/legacy/core/runtime/models/mocks/mock_exec.go | 3 ++- .../legacy/core/runtime/models/mocks/mock_filepath.go | 5 +++-- .../runtime/policy/mocks/matchers/valid_policyset.go | 3 ++- .../core/runtime/policy/mocks/mock_conftest_client.go | 5 +++-- .../mocks/matchers/command_projectcontext.go | 3 ++- .../core/terraform/mocks/matchers/context_context.go | 3 ++- .../mocks/matchers/go_getter_clientoption.go | 3 ++- .../core/terraform/mocks/matchers/logging_logger.go | 3 ++- .../terraform/mocks/matchers/logging_simplelogging.go | 3 ++- .../mocks/matchers/map_of_string_to_string.go | 3 ++- .../core/terraform/mocks/matchers/ptr_to_exec_cmd.go | 3 ++- .../mocks/matchers/ptr_to_go_version_version.go | 3 ++- .../mocks/matchers/recv_chan_of_helpers_line.go | 3 ++- .../terraform/mocks/matchers/recv_chan_of_string.go | 3 ++- .../mocks/matchers/recv_chan_of_terraform_line.go | 3 ++- .../core/terraform/mocks/matchers/slice_of_string.go | 3 ++- .../core/terraform/mocks/mock_command_builder.go | 5 +++-- server/legacy/core/terraform/mocks/mock_downloader.go | 5 +++-- .../core/terraform/mocks/mock_terraform_client.go | 5 +++-- .../terraform/mocks/mock_terraform_client_async.go | 5 +++-- .../events/command/mocks/matchers/context_context.go | 3 ++- .../events/command/mocks/matchers/models_repo.go | 3 ++- .../command/mocks/matchers/ptr_to_command_comment.go | 3 ++- .../command/mocks/matchers/ptr_to_command_context.go | 3 ++- server/legacy/events/command/mocks/mock_job_closer.go | 5 +++-- .../command/mocks/mock_project_job_url_generator.go | 3 ++- server/legacy/events/command/mocks/mock_runner.go | 5 +++-- server/legacy/events/matchers/logging_logger.go | 3 ++- server/legacy/events/matchers/models_pullrequest.go | 3 ++- server/legacy/events/matchers/models_repo.go | 3 ++- server/legacy/events/mock_workingdir_test.go | 5 +++-- server/legacy/events/mocks/matchers/command_name.go | 3 ++- .../events/mocks/matchers/command_projectcontext.go | 3 ++- .../legacy/events/mocks/matchers/context_context.go | 3 ++- server/legacy/events/mocks/matchers/fmt_stringer.go | 3 ++- server/legacy/events/mocks/matchers/logging_logger.go | 3 ++- .../events/mocks/matchers/logging_simplelogging.go | 3 ++- server/legacy/events/mocks/matchers/models_project.go | 3 ++- .../events/mocks/matchers/models_pullrequest.go | 3 ++- server/legacy/events/mocks/matchers/models_repo.go | 3 ++- server/legacy/events/mocks/matchers/models_user.go | 3 ++- .../legacy/events/mocks/matchers/models_vcsstatus.go | 3 ++- .../events/mocks/matchers/ptr_to_command_comment.go | 3 ++- .../events/mocks/matchers/ptr_to_command_context.go | 3 ++- .../mocks/matchers/ptr_to_events_commentcommand.go | 3 ++- .../mocks/matchers/ptr_to_events_trylockresponse.go | 3 ++- .../mocks/matchers/ptr_to_github_pullrequest.go | 3 ++- .../mocks/matchers/ptr_to_models_pullrequest.go | 3 ++- .../events/mocks/matchers/ptr_to_models_repo.go | 3 ++- server/legacy/events/mocks/matchers/time_time.go | 3 ++- .../events/mocks/matchers/webhooks_applyresult.go | 3 ++- server/legacy/events/mocks/mock_command_runner.go | 5 +++-- .../events/mocks/mock_comment_command_runner.go | 5 +++-- server/legacy/events/mocks/mock_github_pull_getter.go | 5 +++-- server/legacy/events/mocks/mock_job_closer.go | 5 +++-- .../mocks/mock_pre_workflows_hooks_command_runner.go | 5 +++-- server/legacy/events/mocks/mock_project_lock.go | 5 +++-- .../legacy/events/mocks/mock_stale_command_checker.go | 5 +++-- server/legacy/events/mocks/mock_vcs_status_updater.go | 5 +++-- server/legacy/events/mocks/mock_webhooks_sender.go | 5 +++-- server/legacy/events/mocks/mock_working_dir.go | 5 +++-- .../events/vcs/mocks/matchers/context_context.go | 3 ++- .../vcs/mocks/matchers/models_approvalstatus.go | 3 ++- .../events/vcs/mocks/matchers/models_pullrequest.go | 3 ++- .../legacy/events/vcs/mocks/matchers/models_repo.go | 3 ++- .../vcs/mocks/matchers/ptr_to_github_pullrequest.go | 3 ++- .../legacy/events/vcs/mocks/matchers/slice_of_byte.go | 3 ++- .../mocks/matchers/slice_of_ptr_to_github_checkrun.go | 3 ++- .../matchers/slice_of_ptr_to_github_repostatus.go | 3 ++- .../events/vcs/mocks/matchers/slice_of_string.go | 3 ++- .../vcs/mocks/matchers/types_updatestatusrequest.go | 3 ++- server/legacy/events/vcs/mocks/mock_IGithub_client.go | 5 +++-- server/legacy/events/vcs/mocks/mock_client.go | 5 +++-- .../events/webhooks/mocks/matchers/logging_logger.go | 3 ++- .../webhooks/mocks/matchers/webhooks_applyresult.go | 3 ++- server/legacy/events/webhooks/mocks/mock_sender.go | 5 +++-- server/legacy/jobs/mocks/matchers/chan_of_string.go | 3 ++- server/legacy/jobs/mocks/matchers/command_name.go | 3 ++- .../jobs/mocks/matchers/command_projectcontext.go | 3 ++- server/legacy/jobs/mocks/matchers/context_context.go | 3 ++- server/legacy/jobs/mocks/matchers/fmt_stringer.go | 3 ++- server/legacy/jobs/mocks/matchers/io_reader.go | 3 ++- server/legacy/jobs/mocks/matchers/jobs_jobstatus.go | 3 ++- server/legacy/jobs/mocks/matchers/jobs_pullinfo.go | 3 ++- server/legacy/jobs/mocks/matchers/models_repo.go | 3 ++- server/legacy/jobs/mocks/matchers/ptr_to_jobs_job.go | 3 ++- server/legacy/jobs/mocks/matchers/slice_of_string.go | 3 ++- server/legacy/jobs/mocks/mock_job_store.go | 5 +++-- .../jobs/mocks/mock_project_command_output_handler.go | 5 +++-- .../jobs/mocks/mock_project_job_url_generator.go | 3 ++- .../legacy/jobs/mocks/mock_project_status_updater.go | 5 +++-- server/legacy/jobs/mocks/mock_storage_backend.go | 3 ++- .../lyft/aws/sns/mocks/matchers/context_context.go | 3 ++- .../lyft/aws/sns/mocks/matchers/slice_of_byte.go | 3 ++- server/legacy/lyft/aws/sns/mocks/mock_writer.go | 3 ++- server/neptune/exec/exec_test.go | 3 ++- server/neptune/gateway/api/deploy.go | 1 + .../neptune/gateway/event/legacy_comment_handler.go | 1 + .../gateway/event/modified_pull_request_handler.go | 3 ++- .../gateway/event/pull_request_review_handler.go | 3 ++- .../gateway/event/pull_request_review_handler_test.go | 7 ++++--- .../feature/mocks/matchers/feature_featurecontext.go | 3 ++- .../lyft/feature/mocks/matchers/feature_name.go | 3 ++- .../neptune/lyft/feature/mocks/matchers/time_time.go | 3 ++- server/neptune/lyft/feature/mocks/mock_allocator.go | 5 +++-- server/neptune/lyft/feature/retriever.go | 1 + server/neptune/sync/crons/ratelimit_stats.go | 3 ++- server/neptune/temporal/propagator.go | 1 + server/neptune/workflows/activities/conftest.go | 3 ++- .../neptune/workflows/activities/conftest/summary.go | 3 ++- .../workflows/activities/conftest/summary_test.go | 3 ++- server/neptune/workflows/activities/conftest_test.go | 5 +++-- .../workflows/activities/github/markdown/renderer.go | 3 ++- .../neptune/workflows/activities/github/middleware.go | 5 +++-- .../workflows/activities/temporal/heartbeat.go | 3 ++- .../neptune/workflows/activities/terraform/summary.go | 2 +- .../internal/deploy/revision/queue/updater.go | 1 + .../internal/deploy/revision/queue/updater_test.go | 3 ++- .../internal/deploy/revision/revision_test.go | 3 ++- .../workflows/internal/deploy/terraform/state_test.go | 3 ++- server/neptune/workflows/internal/deploy/workflow.go | 3 ++- server/neptune/workflows/internal/notifier/github.go | 1 + .../workflows/internal/notifier/github_cache_test.go | 3 ++- .../workflows/internal/notifier/github_test.go | 3 ++- .../internal/pr/revision/policy/dismisser.go | 3 ++- .../internal/pr/revision/policy/dismisser_test.go | 5 +++-- .../internal/pr/revision/policy/filter_test.go | 3 ++- .../internal/pr/revision/policy/handler_test.go | 5 +++-- .../workflows/internal/pr/revision/processor_test.go | 5 +++-- .../neptune/workflows/internal/pr/revision/state.go | 1 + .../workflows/internal/pr/revision/state_test.go | 5 +++-- server/neptune/workflows/internal/pr/runner.go | 3 ++- server/neptune/workflows/internal/pr/runner_test.go | 5 +++-- server/neptune/workflows/internal/pr/shutdown.go | 1 + server/neptune/workflows/internal/pr/shutdown_test.go | 5 +++-- server/neptune/workflows/internal/pr/workflow.go | 5 +++-- .../neptune/workflows/internal/temporal/selector.go | 3 ++- .../workflows/internal/terraform/job/runner_test.go | 3 ++- .../workflows/internal/terraform/state/store.go | 3 ++- .../workflows/internal/terraform/state/workflow.go | 3 ++- server/static/bindata_assetfs.go | 11 ----------- server/vcs/provider/github/git_cred_writer_test.go | 3 ++- server/vcs/provider/github/list_iterator.go | 3 ++- server/vcs/provider/github/list_iterator_test.go | 5 +++-- server/vcs/provider/github/pr_fetcher.go | 3 ++- server/vcs/provider/github/team_fetcher.go | 1 + 180 files changed, 396 insertions(+), 229 deletions(-) diff --git a/server/legacy/controllers/events/mocks/matchers/models_repo.go b/server/legacy/controllers/events/mocks/matchers/models_repo.go index b36c3ee7c..bcf147850 100644 --- a/server/legacy/controllers/events/mocks/matchers/models_repo.go +++ b/server/legacy/controllers/events/mocks/matchers/models_repo.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/controllers/websocket/instrumented_mux.go b/server/legacy/controllers/websocket/instrumented_mux.go index 66d7c90d0..d1644417b 100644 --- a/server/legacy/controllers/websocket/instrumented_mux.go +++ b/server/legacy/controllers/websocket/instrumented_mux.go @@ -1,8 +1,9 @@ package websocket import ( - "github.com/uber-go/tally/v4" "net/http" + + "github.com/uber-go/tally/v4" ) type InstrumentedMultiplexor struct { diff --git a/server/legacy/core/locking/mocks/matchers/locking_trylockresponse.go b/server/legacy/core/locking/mocks/matchers/locking_trylockresponse.go index 2d301b537..16352966a 100644 --- a/server/legacy/core/locking/mocks/matchers/locking_trylockresponse.go +++ b/server/legacy/core/locking/mocks/matchers/locking_trylockresponse.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + locking "github.com/runatlantis/atlantis/server/legacy/core/locking" ) diff --git a/server/legacy/core/locking/mocks/matchers/map_of_string_to_models_projectlock.go b/server/legacy/core/locking/mocks/matchers/map_of_string_to_models_projectlock.go index eb8f8290a..c6bdde10a 100644 --- a/server/legacy/core/locking/mocks/matchers/map_of_string_to_models_projectlock.go +++ b/server/legacy/core/locking/mocks/matchers/map_of_string_to_models_projectlock.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/core/locking/mocks/matchers/models_project.go b/server/legacy/core/locking/mocks/matchers/models_project.go index 8a78aae18..d5935d621 100644 --- a/server/legacy/core/locking/mocks/matchers/models_project.go +++ b/server/legacy/core/locking/mocks/matchers/models_project.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/core/locking/mocks/matchers/models_pullrequest.go b/server/legacy/core/locking/mocks/matchers/models_pullrequest.go index 94e36a1ab..eff31445d 100644 --- a/server/legacy/core/locking/mocks/matchers/models_pullrequest.go +++ b/server/legacy/core/locking/mocks/matchers/models_pullrequest.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/core/locking/mocks/matchers/models_user.go b/server/legacy/core/locking/mocks/matchers/models_user.go index 8e552bb1c..929229090 100644 --- a/server/legacy/core/locking/mocks/matchers/models_user.go +++ b/server/legacy/core/locking/mocks/matchers/models_user.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/core/locking/mocks/matchers/ptr_to_models_projectlock.go b/server/legacy/core/locking/mocks/matchers/ptr_to_models_projectlock.go index 092842ecb..ec87b4970 100644 --- a/server/legacy/core/locking/mocks/matchers/ptr_to_models_projectlock.go +++ b/server/legacy/core/locking/mocks/matchers/ptr_to_models_projectlock.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/core/locking/mocks/matchers/slice_of_models_projectlock.go b/server/legacy/core/locking/mocks/matchers/slice_of_models_projectlock.go index 70ada801d..6abd140cb 100644 --- a/server/legacy/core/locking/mocks/matchers/slice_of_models_projectlock.go +++ b/server/legacy/core/locking/mocks/matchers/slice_of_models_projectlock.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/core/locking/mocks/mock_locker.go b/server/legacy/core/locking/mocks/mock_locker.go index e68d7b0c4..095e21767 100644 --- a/server/legacy/core/locking/mocks/mock_locker.go +++ b/server/legacy/core/locking/mocks/mock_locker.go @@ -4,11 +4,12 @@ package mocks import ( + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" locking "github.com/runatlantis/atlantis/server/legacy/core/locking" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockLocker struct { diff --git a/server/legacy/core/runtime/cache/mocks/matchers/ptr_to_go_version_version.go b/server/legacy/core/runtime/cache/mocks/matchers/ptr_to_go_version_version.go index 06fb461ce..78ba961ef 100644 --- a/server/legacy/core/runtime/cache/mocks/matchers/ptr_to_go_version_version.go +++ b/server/legacy/core/runtime/cache/mocks/matchers/ptr_to_go_version_version.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + go_version "github.com/hashicorp/go-version" "github.com/petergtz/pegomock" - "reflect" ) func AnyPtrToGoVersionVersion() *go_version.Version { diff --git a/server/legacy/core/runtime/cache/mocks/mock_key_serializer.go b/server/legacy/core/runtime/cache/mocks/mock_key_serializer.go index dbfb03b88..c6795ae8f 100644 --- a/server/legacy/core/runtime/cache/mocks/mock_key_serializer.go +++ b/server/legacy/core/runtime/cache/mocks/mock_key_serializer.go @@ -4,10 +4,11 @@ package mocks import ( - go_version "github.com/hashicorp/go-version" - pegomock "github.com/petergtz/pegomock" "reflect" "time" + + go_version "github.com/hashicorp/go-version" + pegomock "github.com/petergtz/pegomock" ) type MockKeySerializer struct { diff --git a/server/legacy/core/runtime/cache/mocks/mock_version_path.go b/server/legacy/core/runtime/cache/mocks/mock_version_path.go index ddaf381e1..16251d736 100644 --- a/server/legacy/core/runtime/cache/mocks/mock_version_path.go +++ b/server/legacy/core/runtime/cache/mocks/mock_version_path.go @@ -4,10 +4,11 @@ package mocks import ( - go_version "github.com/hashicorp/go-version" - pegomock "github.com/petergtz/pegomock" "reflect" "time" + + go_version "github.com/hashicorp/go-version" + pegomock "github.com/petergtz/pegomock" ) type MockExecutionVersionCache struct { diff --git a/server/legacy/core/runtime/mocks/matchers/command_projectcontext.go b/server/legacy/core/runtime/mocks/matchers/command_projectcontext.go index 8722b7ba3..90daded9f 100644 --- a/server/legacy/core/runtime/mocks/matchers/command_projectcontext.go +++ b/server/legacy/core/runtime/mocks/matchers/command_projectcontext.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) diff --git a/server/legacy/core/runtime/mocks/matchers/context_context.go b/server/legacy/core/runtime/mocks/matchers/context_context.go index 2e07bf9a5..18ea6cfde 100644 --- a/server/legacy/core/runtime/mocks/matchers/context_context.go +++ b/server/legacy/core/runtime/mocks/matchers/context_context.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + context "context" ) diff --git a/server/legacy/core/runtime/mocks/matchers/logging_logger.go b/server/legacy/core/runtime/mocks/matchers/logging_logger.go index d43fd90e9..19eae48f9 100644 --- a/server/legacy/core/runtime/mocks/matchers/logging_logger.go +++ b/server/legacy/core/runtime/mocks/matchers/logging_logger.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + logging "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/legacy/core/runtime/mocks/matchers/logging_simplelogging.go b/server/legacy/core/runtime/mocks/matchers/logging_simplelogging.go index af87b9432..b1ee4542e 100644 --- a/server/legacy/core/runtime/mocks/matchers/logging_simplelogging.go +++ b/server/legacy/core/runtime/mocks/matchers/logging_simplelogging.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" logging "github.com/runatlantis/atlantis/server/logging" - "reflect" ) func AnyLoggingSimpleLogging() logging.SimpleLogging { diff --git a/server/legacy/core/runtime/mocks/matchers/map_of_string_to_string.go b/server/legacy/core/runtime/mocks/matchers/map_of_string_to_string.go index 65175de1a..e1683b5df 100644 --- a/server/legacy/core/runtime/mocks/matchers/map_of_string_to_string.go +++ b/server/legacy/core/runtime/mocks/matchers/map_of_string_to_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnyMapOfStringToString() map[string]string { diff --git a/server/legacy/core/runtime/mocks/matchers/models_preworkflowhookcommandcontext.go b/server/legacy/core/runtime/mocks/matchers/models_preworkflowhookcommandcontext.go index 4ee9a18bd..d37f81541 100644 --- a/server/legacy/core/runtime/mocks/matchers/models_preworkflowhookcommandcontext.go +++ b/server/legacy/core/runtime/mocks/matchers/models_preworkflowhookcommandcontext.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" models "github.com/runatlantis/atlantis/server/models" - "reflect" ) func AnyModelsPreWorkflowHookCommandContext() models.PreWorkflowHookCommandContext { diff --git a/server/legacy/core/runtime/mocks/matchers/models_pullrequest.go b/server/legacy/core/runtime/mocks/matchers/models_pullrequest.go index d3b691438..656f04179 100644 --- a/server/legacy/core/runtime/mocks/matchers/models_pullrequest.go +++ b/server/legacy/core/runtime/mocks/matchers/models_pullrequest.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" models "github.com/runatlantis/atlantis/server/models" - "reflect" ) func AnyModelsPullRequest() models.PullRequest { diff --git a/server/legacy/core/runtime/mocks/matchers/models_repo.go b/server/legacy/core/runtime/mocks/matchers/models_repo.go index 0ff69cc6e..d79d71b11 100644 --- a/server/legacy/core/runtime/mocks/matchers/models_repo.go +++ b/server/legacy/core/runtime/mocks/matchers/models_repo.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" models "github.com/runatlantis/atlantis/server/models" - "reflect" ) func AnyModelsRepo() models.Repo { diff --git a/server/legacy/core/runtime/mocks/matchers/ptr_to_go_version_version.go b/server/legacy/core/runtime/mocks/matchers/ptr_to_go_version_version.go index bb596fe3d..038c5f8f1 100644 --- a/server/legacy/core/runtime/mocks/matchers/ptr_to_go_version_version.go +++ b/server/legacy/core/runtime/mocks/matchers/ptr_to_go_version_version.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + go_version "github.com/hashicorp/go-version" ) diff --git a/server/legacy/core/runtime/mocks/matchers/slice_of_string.go b/server/legacy/core/runtime/mocks/matchers/slice_of_string.go index f9281819d..8bfc2792f 100644 --- a/server/legacy/core/runtime/mocks/matchers/slice_of_string.go +++ b/server/legacy/core/runtime/mocks/matchers/slice_of_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnySliceOfString() []string { diff --git a/server/legacy/core/runtime/mocks/matchers/slice_of_valid_step.go b/server/legacy/core/runtime/mocks/matchers/slice_of_valid_step.go index b8d3c8bde..9c1c7d6ce 100644 --- a/server/legacy/core/runtime/mocks/matchers/slice_of_valid_step.go +++ b/server/legacy/core/runtime/mocks/matchers/slice_of_valid_step.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" valid "github.com/runatlantis/atlantis/server/config/valid" - "reflect" ) func AnySliceOfValidStep() []valid.Step { diff --git a/server/legacy/core/runtime/mocks/mock_custom_runner.go b/server/legacy/core/runtime/mocks/mock_custom_runner.go index e84288421..099e55bf8 100644 --- a/server/legacy/core/runtime/mocks/mock_custom_runner.go +++ b/server/legacy/core/runtime/mocks/mock_custom_runner.go @@ -5,10 +5,11 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" - command "github.com/runatlantis/atlantis/server/legacy/events/command" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) type MockCustomRunner struct { diff --git a/server/legacy/core/runtime/mocks/mock_env_runner.go b/server/legacy/core/runtime/mocks/mock_env_runner.go index 0b2d70579..8f07fb47d 100644 --- a/server/legacy/core/runtime/mocks/mock_env_runner.go +++ b/server/legacy/core/runtime/mocks/mock_env_runner.go @@ -5,10 +5,11 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" - command "github.com/runatlantis/atlantis/server/legacy/events/command" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) type MockEnvRunner struct { diff --git a/server/legacy/core/runtime/mocks/mock_pre_workflows_hook_runner.go b/server/legacy/core/runtime/mocks/mock_pre_workflows_hook_runner.go index 06552fe33..eaf21cba3 100644 --- a/server/legacy/core/runtime/mocks/mock_pre_workflows_hook_runner.go +++ b/server/legacy/core/runtime/mocks/mock_pre_workflows_hook_runner.go @@ -5,10 +5,11 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" - models "github.com/runatlantis/atlantis/server/models" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) type MockPreWorkflowHookRunner struct { diff --git a/server/legacy/core/runtime/mocks/mock_pull_approved_checker.go b/server/legacy/core/runtime/mocks/mock_pull_approved_checker.go index 2e94609d3..4f3bfd7f0 100644 --- a/server/legacy/core/runtime/mocks/mock_pull_approved_checker.go +++ b/server/legacy/core/runtime/mocks/mock_pull_approved_checker.go @@ -4,10 +4,11 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" - models "github.com/runatlantis/atlantis/server/models" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) type MockPullApprovedChecker struct { diff --git a/server/legacy/core/runtime/mocks/mock_runner.go b/server/legacy/core/runtime/mocks/mock_runner.go index 320f6a045..bef214f9b 100644 --- a/server/legacy/core/runtime/mocks/mock_runner.go +++ b/server/legacy/core/runtime/mocks/mock_runner.go @@ -5,10 +5,11 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" - command "github.com/runatlantis/atlantis/server/legacy/events/command" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) type MockRunner struct { diff --git a/server/legacy/core/runtime/mocks/mock_steps_runner.go b/server/legacy/core/runtime/mocks/mock_steps_runner.go index 942eb28a5..cb7e6b4f0 100644 --- a/server/legacy/core/runtime/mocks/mock_steps_runner.go +++ b/server/legacy/core/runtime/mocks/mock_steps_runner.go @@ -5,10 +5,11 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" - command "github.com/runatlantis/atlantis/server/legacy/events/command" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) type MockStepsRunner struct { diff --git a/server/legacy/core/runtime/mocks/mock_versionedexecutorworkflow.go b/server/legacy/core/runtime/mocks/mock_versionedexecutorworkflow.go index 4c436c1c9..3492e63f0 100644 --- a/server/legacy/core/runtime/mocks/mock_versionedexecutorworkflow.go +++ b/server/legacy/core/runtime/mocks/mock_versionedexecutorworkflow.go @@ -5,12 +5,13 @@ package mocks import ( context "context" + "reflect" + "time" + go_version "github.com/hashicorp/go-version" pegomock "github.com/petergtz/pegomock" command "github.com/runatlantis/atlantis/server/legacy/events/command" logging "github.com/runatlantis/atlantis/server/logging" - "reflect" - "time" ) type MockVersionedExecutorWorkflow struct { diff --git a/server/legacy/core/runtime/models/mocks/matchers/map_of_string_to_string.go b/server/legacy/core/runtime/models/mocks/matchers/map_of_string_to_string.go index cfcc47c96..94ef0b0da 100644 --- a/server/legacy/core/runtime/models/mocks/matchers/map_of_string_to_string.go +++ b/server/legacy/core/runtime/models/mocks/matchers/map_of_string_to_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnyMapOfStringToString() map[string]string { diff --git a/server/legacy/core/runtime/models/mocks/matchers/models_filepath.go b/server/legacy/core/runtime/models/mocks/matchers/models_filepath.go index 28b845c19..ed26e71f5 100644 --- a/server/legacy/core/runtime/models/mocks/matchers/models_filepath.go +++ b/server/legacy/core/runtime/models/mocks/matchers/models_filepath.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" models "github.com/runatlantis/atlantis/server/legacy/core/runtime/models" - "reflect" ) func AnyModelsFilePath() models.FilePath { diff --git a/server/legacy/core/runtime/models/mocks/matchers/slice_of_string.go b/server/legacy/core/runtime/models/mocks/matchers/slice_of_string.go index 207d54d74..5faf3dda5 100644 --- a/server/legacy/core/runtime/models/mocks/matchers/slice_of_string.go +++ b/server/legacy/core/runtime/models/mocks/matchers/slice_of_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnySliceOfString() []string { diff --git a/server/legacy/core/runtime/models/mocks/mock_exec.go b/server/legacy/core/runtime/models/mocks/mock_exec.go index 1df47bc9c..3ee7c5672 100644 --- a/server/legacy/core/runtime/models/mocks/mock_exec.go +++ b/server/legacy/core/runtime/models/mocks/mock_exec.go @@ -4,9 +4,10 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" ) type MockExec struct { diff --git a/server/legacy/core/runtime/models/mocks/mock_filepath.go b/server/legacy/core/runtime/models/mocks/mock_filepath.go index 27be34e72..0fa8a8acf 100644 --- a/server/legacy/core/runtime/models/mocks/mock_filepath.go +++ b/server/legacy/core/runtime/models/mocks/mock_filepath.go @@ -4,10 +4,11 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" - models "github.com/runatlantis/atlantis/server/legacy/core/runtime/models" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/legacy/core/runtime/models" ) type MockFilePath struct { diff --git a/server/legacy/core/runtime/policy/mocks/matchers/valid_policyset.go b/server/legacy/core/runtime/policy/mocks/matchers/valid_policyset.go index da1b709bc..6dcb2892c 100644 --- a/server/legacy/core/runtime/policy/mocks/matchers/valid_policyset.go +++ b/server/legacy/core/runtime/policy/mocks/matchers/valid_policyset.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" valid "github.com/runatlantis/atlantis/server/config/valid" - "reflect" ) func AnyValidPolicySet() valid.PolicySet { diff --git a/server/legacy/core/runtime/policy/mocks/mock_conftest_client.go b/server/legacy/core/runtime/policy/mocks/mock_conftest_client.go index 3d1c15a3e..24cecfa4f 100644 --- a/server/legacy/core/runtime/policy/mocks/mock_conftest_client.go +++ b/server/legacy/core/runtime/policy/mocks/mock_conftest_client.go @@ -4,10 +4,11 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" - valid "github.com/runatlantis/atlantis/server/config/valid" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + valid "github.com/runatlantis/atlantis/server/config/valid" ) type MockSourceResolver struct { diff --git a/server/legacy/core/terraform/mocks/matchers/command_projectcontext.go b/server/legacy/core/terraform/mocks/matchers/command_projectcontext.go index 8722b7ba3..90daded9f 100644 --- a/server/legacy/core/terraform/mocks/matchers/command_projectcontext.go +++ b/server/legacy/core/terraform/mocks/matchers/command_projectcontext.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) diff --git a/server/legacy/core/terraform/mocks/matchers/context_context.go b/server/legacy/core/terraform/mocks/matchers/context_context.go index 2e07bf9a5..18ea6cfde 100644 --- a/server/legacy/core/terraform/mocks/matchers/context_context.go +++ b/server/legacy/core/terraform/mocks/matchers/context_context.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + context "context" ) diff --git a/server/legacy/core/terraform/mocks/matchers/go_getter_clientoption.go b/server/legacy/core/terraform/mocks/matchers/go_getter_clientoption.go index 610330926..b0d363d98 100644 --- a/server/legacy/core/terraform/mocks/matchers/go_getter_clientoption.go +++ b/server/legacy/core/terraform/mocks/matchers/go_getter_clientoption.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + go_getter "github.com/hashicorp/go-getter" "github.com/petergtz/pegomock" - "reflect" ) func AnyGoGetterClientOption() go_getter.ClientOption { diff --git a/server/legacy/core/terraform/mocks/matchers/logging_logger.go b/server/legacy/core/terraform/mocks/matchers/logging_logger.go index d43fd90e9..19eae48f9 100644 --- a/server/legacy/core/terraform/mocks/matchers/logging_logger.go +++ b/server/legacy/core/terraform/mocks/matchers/logging_logger.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + logging "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/legacy/core/terraform/mocks/matchers/logging_simplelogging.go b/server/legacy/core/terraform/mocks/matchers/logging_simplelogging.go index af87b9432..b1ee4542e 100644 --- a/server/legacy/core/terraform/mocks/matchers/logging_simplelogging.go +++ b/server/legacy/core/terraform/mocks/matchers/logging_simplelogging.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" logging "github.com/runatlantis/atlantis/server/logging" - "reflect" ) func AnyLoggingSimpleLogging() logging.SimpleLogging { diff --git a/server/legacy/core/terraform/mocks/matchers/map_of_string_to_string.go b/server/legacy/core/terraform/mocks/matchers/map_of_string_to_string.go index 65175de1a..e1683b5df 100644 --- a/server/legacy/core/terraform/mocks/matchers/map_of_string_to_string.go +++ b/server/legacy/core/terraform/mocks/matchers/map_of_string_to_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnyMapOfStringToString() map[string]string { diff --git a/server/legacy/core/terraform/mocks/matchers/ptr_to_exec_cmd.go b/server/legacy/core/terraform/mocks/matchers/ptr_to_exec_cmd.go index d493ea556..ca7ca5292 100644 --- a/server/legacy/core/terraform/mocks/matchers/ptr_to_exec_cmd.go +++ b/server/legacy/core/terraform/mocks/matchers/ptr_to_exec_cmd.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" exec "os/exec" "reflect" + + "github.com/petergtz/pegomock" ) func AnyPtrToExecCmd() *exec.Cmd { diff --git a/server/legacy/core/terraform/mocks/matchers/ptr_to_go_version_version.go b/server/legacy/core/terraform/mocks/matchers/ptr_to_go_version_version.go index bb596fe3d..038c5f8f1 100644 --- a/server/legacy/core/terraform/mocks/matchers/ptr_to_go_version_version.go +++ b/server/legacy/core/terraform/mocks/matchers/ptr_to_go_version_version.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + go_version "github.com/hashicorp/go-version" ) diff --git a/server/legacy/core/terraform/mocks/matchers/recv_chan_of_helpers_line.go b/server/legacy/core/terraform/mocks/matchers/recv_chan_of_helpers_line.go index 8cae5ef92..0d5070dde 100644 --- a/server/legacy/core/terraform/mocks/matchers/recv_chan_of_helpers_line.go +++ b/server/legacy/core/terraform/mocks/matchers/recv_chan_of_helpers_line.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" helpers "github.com/runatlantis/atlantis/server/legacy/core/terraform/helpers" - "reflect" ) func AnyRecvChanOfHelpersLine() <-chan helpers.Line { diff --git a/server/legacy/core/terraform/mocks/matchers/recv_chan_of_string.go b/server/legacy/core/terraform/mocks/matchers/recv_chan_of_string.go index e2c14d38a..77a5dfa6f 100644 --- a/server/legacy/core/terraform/mocks/matchers/recv_chan_of_string.go +++ b/server/legacy/core/terraform/mocks/matchers/recv_chan_of_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnyRecvChanOfString() <-chan string { diff --git a/server/legacy/core/terraform/mocks/matchers/recv_chan_of_terraform_line.go b/server/legacy/core/terraform/mocks/matchers/recv_chan_of_terraform_line.go index 61e1dd76d..1cb917a11 100644 --- a/server/legacy/core/terraform/mocks/matchers/recv_chan_of_terraform_line.go +++ b/server/legacy/core/terraform/mocks/matchers/recv_chan_of_terraform_line.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" helpers "github.com/runatlantis/atlantis/server/legacy/core/terraform/helpers" - "reflect" ) func AnyRecvChanOfTerraformLine() <-chan helpers.Line { diff --git a/server/legacy/core/terraform/mocks/matchers/slice_of_string.go b/server/legacy/core/terraform/mocks/matchers/slice_of_string.go index f9281819d..8bfc2792f 100644 --- a/server/legacy/core/terraform/mocks/matchers/slice_of_string.go +++ b/server/legacy/core/terraform/mocks/matchers/slice_of_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnySliceOfString() []string { diff --git a/server/legacy/core/terraform/mocks/mock_command_builder.go b/server/legacy/core/terraform/mocks/mock_command_builder.go index f4dae8552..1eddfae79 100644 --- a/server/legacy/core/terraform/mocks/mock_command_builder.go +++ b/server/legacy/core/terraform/mocks/mock_command_builder.go @@ -4,11 +4,12 @@ package mocks import ( - go_version "github.com/hashicorp/go-version" - pegomock "github.com/petergtz/pegomock" exec "os/exec" "reflect" "time" + + go_version "github.com/hashicorp/go-version" + pegomock "github.com/petergtz/pegomock" ) type MockcommandBuilder struct { diff --git a/server/legacy/core/terraform/mocks/mock_downloader.go b/server/legacy/core/terraform/mocks/mock_downloader.go index aaeed9a08..175a91900 100644 --- a/server/legacy/core/terraform/mocks/mock_downloader.go +++ b/server/legacy/core/terraform/mocks/mock_downloader.go @@ -4,10 +4,11 @@ package mocks import ( - go_getter "github.com/hashicorp/go-getter" - pegomock "github.com/petergtz/pegomock" "reflect" "time" + + go_getter "github.com/hashicorp/go-getter" + pegomock "github.com/petergtz/pegomock" ) type MockDownloader struct { diff --git a/server/legacy/core/terraform/mocks/mock_terraform_client.go b/server/legacy/core/terraform/mocks/mock_terraform_client.go index a8161e9b7..42d4d47cf 100644 --- a/server/legacy/core/terraform/mocks/mock_terraform_client.go +++ b/server/legacy/core/terraform/mocks/mock_terraform_client.go @@ -5,12 +5,13 @@ package mocks import ( context "context" + "reflect" + "time" + go_version "github.com/hashicorp/go-version" pegomock "github.com/petergtz/pegomock" command "github.com/runatlantis/atlantis/server/legacy/events/command" logging "github.com/runatlantis/atlantis/server/logging" - "reflect" - "time" ) type MockClient struct { diff --git a/server/legacy/core/terraform/mocks/mock_terraform_client_async.go b/server/legacy/core/terraform/mocks/mock_terraform_client_async.go index fcc68afd3..74462780e 100644 --- a/server/legacy/core/terraform/mocks/mock_terraform_client_async.go +++ b/server/legacy/core/terraform/mocks/mock_terraform_client_async.go @@ -5,12 +5,13 @@ package mocks import ( context "context" + "reflect" + "time" + go_version "github.com/hashicorp/go-version" pegomock "github.com/petergtz/pegomock" helpers "github.com/runatlantis/atlantis/server/legacy/core/terraform/helpers" command "github.com/runatlantis/atlantis/server/legacy/events/command" - "reflect" - "time" ) type MockClientAsync struct { diff --git a/server/legacy/events/command/mocks/matchers/context_context.go b/server/legacy/events/command/mocks/matchers/context_context.go index 2e07bf9a5..18ea6cfde 100644 --- a/server/legacy/events/command/mocks/matchers/context_context.go +++ b/server/legacy/events/command/mocks/matchers/context_context.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + context "context" ) diff --git a/server/legacy/events/command/mocks/matchers/models_repo.go b/server/legacy/events/command/mocks/matchers/models_repo.go index b36c3ee7c..bcf147850 100644 --- a/server/legacy/events/command/mocks/matchers/models_repo.go +++ b/server/legacy/events/command/mocks/matchers/models_repo.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/command/mocks/matchers/ptr_to_command_comment.go b/server/legacy/events/command/mocks/matchers/ptr_to_command_comment.go index 682e74d7a..46b5b7d5e 100644 --- a/server/legacy/events/command/mocks/matchers/ptr_to_command_comment.go +++ b/server/legacy/events/command/mocks/matchers/ptr_to_command_comment.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" command "github.com/runatlantis/atlantis/server/legacy/events/command" - "reflect" ) func AnyPtrToCommandComment() *command.Comment { diff --git a/server/legacy/events/command/mocks/matchers/ptr_to_command_context.go b/server/legacy/events/command/mocks/matchers/ptr_to_command_context.go index 342d40d55..d20b65d9a 100644 --- a/server/legacy/events/command/mocks/matchers/ptr_to_command_context.go +++ b/server/legacy/events/command/mocks/matchers/ptr_to_command_context.go @@ -2,9 +2,10 @@ package matchers import ( + "reflect" + "github.com/petergtz/pegomock" command "github.com/runatlantis/atlantis/server/legacy/events/command" - "reflect" ) func AnyPtrToCommandContext() *command.Context { diff --git a/server/legacy/events/command/mocks/mock_job_closer.go b/server/legacy/events/command/mocks/mock_job_closer.go index 47d3e8cdb..6c1b2dee3 100644 --- a/server/legacy/events/command/mocks/mock_job_closer.go +++ b/server/legacy/events/command/mocks/mock_job_closer.go @@ -5,10 +5,11 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" - models "github.com/runatlantis/atlantis/server/models" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) type MockJobCloser struct { diff --git a/server/legacy/events/command/mocks/mock_project_job_url_generator.go b/server/legacy/events/command/mocks/mock_project_job_url_generator.go index be61cc201..38333ef87 100644 --- a/server/legacy/events/command/mocks/mock_project_job_url_generator.go +++ b/server/legacy/events/command/mocks/mock_project_job_url_generator.go @@ -4,9 +4,10 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" ) type MockJobURLGenerator struct { diff --git a/server/legacy/events/command/mocks/mock_runner.go b/server/legacy/events/command/mocks/mock_runner.go index 6fecf6179..bf62f680a 100644 --- a/server/legacy/events/command/mocks/mock_runner.go +++ b/server/legacy/events/command/mocks/mock_runner.go @@ -4,10 +4,11 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" - command "github.com/runatlantis/atlantis/server/legacy/events/command" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) type MockRunner struct { diff --git a/server/legacy/events/matchers/logging_logger.go b/server/legacy/events/matchers/logging_logger.go index d43fd90e9..19eae48f9 100644 --- a/server/legacy/events/matchers/logging_logger.go +++ b/server/legacy/events/matchers/logging_logger.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + logging "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/legacy/events/matchers/models_pullrequest.go b/server/legacy/events/matchers/models_pullrequest.go index 94e36a1ab..eff31445d 100644 --- a/server/legacy/events/matchers/models_pullrequest.go +++ b/server/legacy/events/matchers/models_pullrequest.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/matchers/models_repo.go b/server/legacy/events/matchers/models_repo.go index b36c3ee7c..bcf147850 100644 --- a/server/legacy/events/matchers/models_repo.go +++ b/server/legacy/events/matchers/models_repo.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/mock_workingdir_test.go b/server/legacy/events/mock_workingdir_test.go index c0a932289..77ded22d2 100644 --- a/server/legacy/events/mock_workingdir_test.go +++ b/server/legacy/events/mock_workingdir_test.go @@ -4,11 +4,12 @@ package events import ( + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" logging "github.com/runatlantis/atlantis/server/logging" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockWorkingDir struct { diff --git a/server/legacy/events/mocks/matchers/command_name.go b/server/legacy/events/mocks/matchers/command_name.go index 35fdfcc41..469fcfba7 100644 --- a/server/legacy/events/mocks/matchers/command_name.go +++ b/server/legacy/events/mocks/matchers/command_name.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) diff --git a/server/legacy/events/mocks/matchers/command_projectcontext.go b/server/legacy/events/mocks/matchers/command_projectcontext.go index 8722b7ba3..90daded9f 100644 --- a/server/legacy/events/mocks/matchers/command_projectcontext.go +++ b/server/legacy/events/mocks/matchers/command_projectcontext.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) diff --git a/server/legacy/events/mocks/matchers/context_context.go b/server/legacy/events/mocks/matchers/context_context.go index 2e07bf9a5..18ea6cfde 100644 --- a/server/legacy/events/mocks/matchers/context_context.go +++ b/server/legacy/events/mocks/matchers/context_context.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + context "context" ) diff --git a/server/legacy/events/mocks/matchers/fmt_stringer.go b/server/legacy/events/mocks/matchers/fmt_stringer.go index f68c94720..3646cda46 100644 --- a/server/legacy/events/mocks/matchers/fmt_stringer.go +++ b/server/legacy/events/mocks/matchers/fmt_stringer.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + fmt "fmt" ) diff --git a/server/legacy/events/mocks/matchers/logging_logger.go b/server/legacy/events/mocks/matchers/logging_logger.go index d43fd90e9..19eae48f9 100644 --- a/server/legacy/events/mocks/matchers/logging_logger.go +++ b/server/legacy/events/mocks/matchers/logging_logger.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + logging "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/legacy/events/mocks/matchers/logging_simplelogging.go b/server/legacy/events/mocks/matchers/logging_simplelogging.go index 502456e7c..c3b96f61f 100644 --- a/server/legacy/events/mocks/matchers/logging_simplelogging.go +++ b/server/legacy/events/mocks/matchers/logging_simplelogging.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + logging "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/legacy/events/mocks/matchers/models_project.go b/server/legacy/events/mocks/matchers/models_project.go index 8a78aae18..d5935d621 100644 --- a/server/legacy/events/mocks/matchers/models_project.go +++ b/server/legacy/events/mocks/matchers/models_project.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/mocks/matchers/models_pullrequest.go b/server/legacy/events/mocks/matchers/models_pullrequest.go index 94e36a1ab..eff31445d 100644 --- a/server/legacy/events/mocks/matchers/models_pullrequest.go +++ b/server/legacy/events/mocks/matchers/models_pullrequest.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/mocks/matchers/models_repo.go b/server/legacy/events/mocks/matchers/models_repo.go index b36c3ee7c..bcf147850 100644 --- a/server/legacy/events/mocks/matchers/models_repo.go +++ b/server/legacy/events/mocks/matchers/models_repo.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/mocks/matchers/models_user.go b/server/legacy/events/mocks/matchers/models_user.go index 8e552bb1c..929229090 100644 --- a/server/legacy/events/mocks/matchers/models_user.go +++ b/server/legacy/events/mocks/matchers/models_user.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/mocks/matchers/models_vcsstatus.go b/server/legacy/events/mocks/matchers/models_vcsstatus.go index f3d0a55fa..eb3aadb24 100644 --- a/server/legacy/events/mocks/matchers/models_vcsstatus.go +++ b/server/legacy/events/mocks/matchers/models_vcsstatus.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/mocks/matchers/ptr_to_command_comment.go b/server/legacy/events/mocks/matchers/ptr_to_command_comment.go index 85321450c..404c41ab5 100644 --- a/server/legacy/events/mocks/matchers/ptr_to_command_comment.go +++ b/server/legacy/events/mocks/matchers/ptr_to_command_comment.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) diff --git a/server/legacy/events/mocks/matchers/ptr_to_command_context.go b/server/legacy/events/mocks/matchers/ptr_to_command_context.go index 5ea47f0a1..82793b73c 100644 --- a/server/legacy/events/mocks/matchers/ptr_to_command_context.go +++ b/server/legacy/events/mocks/matchers/ptr_to_command_context.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) diff --git a/server/legacy/events/mocks/matchers/ptr_to_events_commentcommand.go b/server/legacy/events/mocks/matchers/ptr_to_events_commentcommand.go index f3d640dea..e8758fbb1 100644 --- a/server/legacy/events/mocks/matchers/ptr_to_events_commentcommand.go +++ b/server/legacy/events/mocks/matchers/ptr_to_events_commentcommand.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/legacy/events/command" ) diff --git a/server/legacy/events/mocks/matchers/ptr_to_events_trylockresponse.go b/server/legacy/events/mocks/matchers/ptr_to_events_trylockresponse.go index 1d9993d51..65ce44faf 100644 --- a/server/legacy/events/mocks/matchers/ptr_to_events_trylockresponse.go +++ b/server/legacy/events/mocks/matchers/ptr_to_events_trylockresponse.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + events "github.com/runatlantis/atlantis/server/legacy/events" ) diff --git a/server/legacy/events/mocks/matchers/ptr_to_github_pullrequest.go b/server/legacy/events/mocks/matchers/ptr_to_github_pullrequest.go index 4f93e0cee..4a1b9b371 100644 --- a/server/legacy/events/mocks/matchers/ptr_to_github_pullrequest.go +++ b/server/legacy/events/mocks/matchers/ptr_to_github_pullrequest.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + github "github.com/google/go-github/v45/github" ) diff --git a/server/legacy/events/mocks/matchers/ptr_to_models_pullrequest.go b/server/legacy/events/mocks/matchers/ptr_to_models_pullrequest.go index 732cc76ad..bca5fb156 100644 --- a/server/legacy/events/mocks/matchers/ptr_to_models_pullrequest.go +++ b/server/legacy/events/mocks/matchers/ptr_to_models_pullrequest.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/mocks/matchers/ptr_to_models_repo.go b/server/legacy/events/mocks/matchers/ptr_to_models_repo.go index 35e10bff0..dabe3e5e9 100644 --- a/server/legacy/events/mocks/matchers/ptr_to_models_repo.go +++ b/server/legacy/events/mocks/matchers/ptr_to_models_repo.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/mocks/matchers/time_time.go b/server/legacy/events/mocks/matchers/time_time.go index 461e1dd6d..755cf1bf8 100644 --- a/server/legacy/events/mocks/matchers/time_time.go +++ b/server/legacy/events/mocks/matchers/time_time.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + time "time" ) diff --git a/server/legacy/events/mocks/matchers/webhooks_applyresult.go b/server/legacy/events/mocks/matchers/webhooks_applyresult.go index ad2b8776d..ed77321f4 100644 --- a/server/legacy/events/mocks/matchers/webhooks_applyresult.go +++ b/server/legacy/events/mocks/matchers/webhooks_applyresult.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + webhooks "github.com/runatlantis/atlantis/server/legacy/events/webhooks" ) diff --git a/server/legacy/events/mocks/mock_command_runner.go b/server/legacy/events/mocks/mock_command_runner.go index aa464ce8f..66db0b69b 100644 --- a/server/legacy/events/mocks/mock_command_runner.go +++ b/server/legacy/events/mocks/mock_command_runner.go @@ -5,11 +5,12 @@ package mocks import ( context "context" + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" command "github.com/runatlantis/atlantis/server/legacy/events/command" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockCommandRunner struct { diff --git a/server/legacy/events/mocks/mock_comment_command_runner.go b/server/legacy/events/mocks/mock_comment_command_runner.go index 1e790a19c..bf279ce62 100644 --- a/server/legacy/events/mocks/mock_comment_command_runner.go +++ b/server/legacy/events/mocks/mock_comment_command_runner.go @@ -4,10 +4,11 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" - command "github.com/runatlantis/atlantis/server/legacy/events/command" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) type MockCommentCommandRunner struct { diff --git a/server/legacy/events/mocks/mock_github_pull_getter.go b/server/legacy/events/mocks/mock_github_pull_getter.go index 965d7d2fe..946627731 100644 --- a/server/legacy/events/mocks/mock_github_pull_getter.go +++ b/server/legacy/events/mocks/mock_github_pull_getter.go @@ -4,11 +4,12 @@ package mocks import ( + "reflect" + "time" + github "github.com/google/go-github/v45/github" pegomock "github.com/petergtz/pegomock" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockGithubPullGetter struct { diff --git a/server/legacy/events/mocks/mock_job_closer.go b/server/legacy/events/mocks/mock_job_closer.go index c0fe097bf..9e22dce58 100644 --- a/server/legacy/events/mocks/mock_job_closer.go +++ b/server/legacy/events/mocks/mock_job_closer.go @@ -4,10 +4,11 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" - models "github.com/runatlantis/atlantis/server/models" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) type MockJobCloser struct { diff --git a/server/legacy/events/mocks/mock_pre_workflows_hooks_command_runner.go b/server/legacy/events/mocks/mock_pre_workflows_hooks_command_runner.go index 5faefa0c3..bc6b1a925 100644 --- a/server/legacy/events/mocks/mock_pre_workflows_hooks_command_runner.go +++ b/server/legacy/events/mocks/mock_pre_workflows_hooks_command_runner.go @@ -5,10 +5,11 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" - command "github.com/runatlantis/atlantis/server/legacy/events/command" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) type MockPreWorkflowHooksCommandRunner struct { diff --git a/server/legacy/events/mocks/mock_project_lock.go b/server/legacy/events/mocks/mock_project_lock.go index 81b2a620d..76a10da8b 100644 --- a/server/legacy/events/mocks/mock_project_lock.go +++ b/server/legacy/events/mocks/mock_project_lock.go @@ -5,12 +5,13 @@ package mocks import ( context "context" + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" events "github.com/runatlantis/atlantis/server/legacy/events" logging "github.com/runatlantis/atlantis/server/logging" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockProjectLocker struct { diff --git a/server/legacy/events/mocks/mock_stale_command_checker.go b/server/legacy/events/mocks/mock_stale_command_checker.go index 5f3107686..7066e99a5 100644 --- a/server/legacy/events/mocks/mock_stale_command_checker.go +++ b/server/legacy/events/mocks/mock_stale_command_checker.go @@ -4,10 +4,11 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" - command "github.com/runatlantis/atlantis/server/legacy/events/command" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) type MockStaleCommandChecker struct { diff --git a/server/legacy/events/mocks/mock_vcs_status_updater.go b/server/legacy/events/mocks/mock_vcs_status_updater.go index 0e9e0cd32..d7413330f 100644 --- a/server/legacy/events/mocks/mock_vcs_status_updater.go +++ b/server/legacy/events/mocks/mock_vcs_status_updater.go @@ -6,11 +6,12 @@ package mocks import ( context "context" fmt "fmt" + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" command "github.com/runatlantis/atlantis/server/legacy/events/command" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockVCSStatusUpdater struct { diff --git a/server/legacy/events/mocks/mock_webhooks_sender.go b/server/legacy/events/mocks/mock_webhooks_sender.go index 77e3caff6..540f42543 100644 --- a/server/legacy/events/mocks/mock_webhooks_sender.go +++ b/server/legacy/events/mocks/mock_webhooks_sender.go @@ -4,11 +4,12 @@ package mocks import ( + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" webhooks "github.com/runatlantis/atlantis/server/legacy/events/webhooks" logging "github.com/runatlantis/atlantis/server/logging" - "reflect" - "time" ) type MockWebhooksSender struct { diff --git a/server/legacy/events/mocks/mock_working_dir.go b/server/legacy/events/mocks/mock_working_dir.go index dde0f66f0..19b8f3172 100644 --- a/server/legacy/events/mocks/mock_working_dir.go +++ b/server/legacy/events/mocks/mock_working_dir.go @@ -4,11 +4,12 @@ package mocks import ( + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" logging "github.com/runatlantis/atlantis/server/logging" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockWorkingDir struct { diff --git a/server/legacy/events/vcs/mocks/matchers/context_context.go b/server/legacy/events/vcs/mocks/matchers/context_context.go index 2e07bf9a5..18ea6cfde 100644 --- a/server/legacy/events/vcs/mocks/matchers/context_context.go +++ b/server/legacy/events/vcs/mocks/matchers/context_context.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + context "context" ) diff --git a/server/legacy/events/vcs/mocks/matchers/models_approvalstatus.go b/server/legacy/events/vcs/mocks/matchers/models_approvalstatus.go index 10f4f2264..7be3789b3 100644 --- a/server/legacy/events/vcs/mocks/matchers/models_approvalstatus.go +++ b/server/legacy/events/vcs/mocks/matchers/models_approvalstatus.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/vcs/mocks/matchers/models_pullrequest.go b/server/legacy/events/vcs/mocks/matchers/models_pullrequest.go index 94e36a1ab..eff31445d 100644 --- a/server/legacy/events/vcs/mocks/matchers/models_pullrequest.go +++ b/server/legacy/events/vcs/mocks/matchers/models_pullrequest.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/vcs/mocks/matchers/models_repo.go b/server/legacy/events/vcs/mocks/matchers/models_repo.go index b36c3ee7c..bcf147850 100644 --- a/server/legacy/events/vcs/mocks/matchers/models_repo.go +++ b/server/legacy/events/vcs/mocks/matchers/models_repo.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/events/vcs/mocks/matchers/ptr_to_github_pullrequest.go b/server/legacy/events/vcs/mocks/matchers/ptr_to_github_pullrequest.go index 4f93e0cee..4a1b9b371 100644 --- a/server/legacy/events/vcs/mocks/matchers/ptr_to_github_pullrequest.go +++ b/server/legacy/events/vcs/mocks/matchers/ptr_to_github_pullrequest.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + github "github.com/google/go-github/v45/github" ) diff --git a/server/legacy/events/vcs/mocks/matchers/slice_of_byte.go b/server/legacy/events/vcs/mocks/matchers/slice_of_byte.go index 951531345..7ff2e45ca 100644 --- a/server/legacy/events/vcs/mocks/matchers/slice_of_byte.go +++ b/server/legacy/events/vcs/mocks/matchers/slice_of_byte.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnySliceOfByte() []byte { diff --git a/server/legacy/events/vcs/mocks/matchers/slice_of_ptr_to_github_checkrun.go b/server/legacy/events/vcs/mocks/matchers/slice_of_ptr_to_github_checkrun.go index 43dc1fc51..7cef11ec1 100644 --- a/server/legacy/events/vcs/mocks/matchers/slice_of_ptr_to_github_checkrun.go +++ b/server/legacy/events/vcs/mocks/matchers/slice_of_ptr_to_github_checkrun.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + github "github.com/google/go-github/v45/github" ) diff --git a/server/legacy/events/vcs/mocks/matchers/slice_of_ptr_to_github_repostatus.go b/server/legacy/events/vcs/mocks/matchers/slice_of_ptr_to_github_repostatus.go index bfda831ae..0aa930211 100644 --- a/server/legacy/events/vcs/mocks/matchers/slice_of_ptr_to_github_repostatus.go +++ b/server/legacy/events/vcs/mocks/matchers/slice_of_ptr_to_github_repostatus.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + github "github.com/google/go-github/v45/github" ) diff --git a/server/legacy/events/vcs/mocks/matchers/slice_of_string.go b/server/legacy/events/vcs/mocks/matchers/slice_of_string.go index f9281819d..8bfc2792f 100644 --- a/server/legacy/events/vcs/mocks/matchers/slice_of_string.go +++ b/server/legacy/events/vcs/mocks/matchers/slice_of_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnySliceOfString() []string { diff --git a/server/legacy/events/vcs/mocks/matchers/types_updatestatusrequest.go b/server/legacy/events/vcs/mocks/matchers/types_updatestatusrequest.go index e230c7363..0bfcb9b18 100644 --- a/server/legacy/events/vcs/mocks/matchers/types_updatestatusrequest.go +++ b/server/legacy/events/vcs/mocks/matchers/types_updatestatusrequest.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + types "github.com/runatlantis/atlantis/server/legacy/events/vcs/types" ) diff --git a/server/legacy/events/vcs/mocks/mock_IGithub_client.go b/server/legacy/events/vcs/mocks/mock_IGithub_client.go index 19a9c3212..952c3d210 100644 --- a/server/legacy/events/vcs/mocks/mock_IGithub_client.go +++ b/server/legacy/events/vcs/mocks/mock_IGithub_client.go @@ -5,12 +5,13 @@ package mocks import ( context "context" + "reflect" + "time" + github "github.com/google/go-github/v45/github" pegomock "github.com/petergtz/pegomock" types "github.com/runatlantis/atlantis/server/legacy/events/vcs/types" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockIGithubClient struct { diff --git a/server/legacy/events/vcs/mocks/mock_client.go b/server/legacy/events/vcs/mocks/mock_client.go index 1578e8ba8..10f0da0ba 100644 --- a/server/legacy/events/vcs/mocks/mock_client.go +++ b/server/legacy/events/vcs/mocks/mock_client.go @@ -5,11 +5,12 @@ package mocks import ( context "context" + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" types "github.com/runatlantis/atlantis/server/legacy/events/vcs/types" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockClient struct { diff --git a/server/legacy/events/webhooks/mocks/matchers/logging_logger.go b/server/legacy/events/webhooks/mocks/matchers/logging_logger.go index d43fd90e9..19eae48f9 100644 --- a/server/legacy/events/webhooks/mocks/matchers/logging_logger.go +++ b/server/legacy/events/webhooks/mocks/matchers/logging_logger.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + logging "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/legacy/events/webhooks/mocks/matchers/webhooks_applyresult.go b/server/legacy/events/webhooks/mocks/matchers/webhooks_applyresult.go index ad2b8776d..ed77321f4 100644 --- a/server/legacy/events/webhooks/mocks/matchers/webhooks_applyresult.go +++ b/server/legacy/events/webhooks/mocks/matchers/webhooks_applyresult.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + webhooks "github.com/runatlantis/atlantis/server/legacy/events/webhooks" ) diff --git a/server/legacy/events/webhooks/mocks/mock_sender.go b/server/legacy/events/webhooks/mocks/mock_sender.go index aada73406..bb025f75c 100644 --- a/server/legacy/events/webhooks/mocks/mock_sender.go +++ b/server/legacy/events/webhooks/mocks/mock_sender.go @@ -4,11 +4,12 @@ package mocks import ( + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" webhooks "github.com/runatlantis/atlantis/server/legacy/events/webhooks" logging "github.com/runatlantis/atlantis/server/logging" - "reflect" - "time" ) type MockSender struct { diff --git a/server/legacy/jobs/mocks/matchers/chan_of_string.go b/server/legacy/jobs/mocks/matchers/chan_of_string.go index e1bfee572..44526eb9b 100644 --- a/server/legacy/jobs/mocks/matchers/chan_of_string.go +++ b/server/legacy/jobs/mocks/matchers/chan_of_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnyChanOfString() chan string { diff --git a/server/legacy/jobs/mocks/matchers/command_name.go b/server/legacy/jobs/mocks/matchers/command_name.go index 35fdfcc41..469fcfba7 100644 --- a/server/legacy/jobs/mocks/matchers/command_name.go +++ b/server/legacy/jobs/mocks/matchers/command_name.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) diff --git a/server/legacy/jobs/mocks/matchers/command_projectcontext.go b/server/legacy/jobs/mocks/matchers/command_projectcontext.go index 8722b7ba3..90daded9f 100644 --- a/server/legacy/jobs/mocks/matchers/command_projectcontext.go +++ b/server/legacy/jobs/mocks/matchers/command_projectcontext.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + command "github.com/runatlantis/atlantis/server/legacy/events/command" ) diff --git a/server/legacy/jobs/mocks/matchers/context_context.go b/server/legacy/jobs/mocks/matchers/context_context.go index 2e07bf9a5..18ea6cfde 100644 --- a/server/legacy/jobs/mocks/matchers/context_context.go +++ b/server/legacy/jobs/mocks/matchers/context_context.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + context "context" ) diff --git a/server/legacy/jobs/mocks/matchers/fmt_stringer.go b/server/legacy/jobs/mocks/matchers/fmt_stringer.go index f68c94720..3646cda46 100644 --- a/server/legacy/jobs/mocks/matchers/fmt_stringer.go +++ b/server/legacy/jobs/mocks/matchers/fmt_stringer.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + fmt "fmt" ) diff --git a/server/legacy/jobs/mocks/matchers/io_reader.go b/server/legacy/jobs/mocks/matchers/io_reader.go index 4686f91f7..ea3f63e85 100644 --- a/server/legacy/jobs/mocks/matchers/io_reader.go +++ b/server/legacy/jobs/mocks/matchers/io_reader.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + io "io" ) diff --git a/server/legacy/jobs/mocks/matchers/jobs_jobstatus.go b/server/legacy/jobs/mocks/matchers/jobs_jobstatus.go index 6f9381fcb..9800e0a5d 100644 --- a/server/legacy/jobs/mocks/matchers/jobs_jobstatus.go +++ b/server/legacy/jobs/mocks/matchers/jobs_jobstatus.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + jobs "github.com/runatlantis/atlantis/server/legacy/jobs" ) diff --git a/server/legacy/jobs/mocks/matchers/jobs_pullinfo.go b/server/legacy/jobs/mocks/matchers/jobs_pullinfo.go index 25610e7bc..63c2fbd08 100644 --- a/server/legacy/jobs/mocks/matchers/jobs_pullinfo.go +++ b/server/legacy/jobs/mocks/matchers/jobs_pullinfo.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + jobs "github.com/runatlantis/atlantis/server/legacy/jobs" ) diff --git a/server/legacy/jobs/mocks/matchers/models_repo.go b/server/legacy/jobs/mocks/matchers/models_repo.go index b36c3ee7c..bcf147850 100644 --- a/server/legacy/jobs/mocks/matchers/models_repo.go +++ b/server/legacy/jobs/mocks/matchers/models_repo.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + models "github.com/runatlantis/atlantis/server/models" ) diff --git a/server/legacy/jobs/mocks/matchers/ptr_to_jobs_job.go b/server/legacy/jobs/mocks/matchers/ptr_to_jobs_job.go index 719bcdc94..043484c9f 100644 --- a/server/legacy/jobs/mocks/matchers/ptr_to_jobs_job.go +++ b/server/legacy/jobs/mocks/matchers/ptr_to_jobs_job.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + jobs "github.com/runatlantis/atlantis/server/legacy/jobs" ) diff --git a/server/legacy/jobs/mocks/matchers/slice_of_string.go b/server/legacy/jobs/mocks/matchers/slice_of_string.go index f9281819d..8bfc2792f 100644 --- a/server/legacy/jobs/mocks/matchers/slice_of_string.go +++ b/server/legacy/jobs/mocks/matchers/slice_of_string.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnySliceOfString() []string { diff --git a/server/legacy/jobs/mocks/mock_job_store.go b/server/legacy/jobs/mocks/mock_job_store.go index d1e4e8a39..6acf2efbc 100644 --- a/server/legacy/jobs/mocks/mock_job_store.go +++ b/server/legacy/jobs/mocks/mock_job_store.go @@ -5,10 +5,11 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" - jobs "github.com/runatlantis/atlantis/server/legacy/jobs" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + jobs "github.com/runatlantis/atlantis/server/legacy/jobs" ) type MockJobStore struct { diff --git a/server/legacy/jobs/mocks/mock_project_command_output_handler.go b/server/legacy/jobs/mocks/mock_project_command_output_handler.go index 130b3047d..ac6d3ce57 100644 --- a/server/legacy/jobs/mocks/mock_project_command_output_handler.go +++ b/server/legacy/jobs/mocks/mock_project_command_output_handler.go @@ -5,12 +5,13 @@ package mocks import ( context "context" + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" command "github.com/runatlantis/atlantis/server/legacy/events/command" jobs "github.com/runatlantis/atlantis/server/legacy/jobs" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockProjectCommandOutputHandler struct { diff --git a/server/legacy/jobs/mocks/mock_project_job_url_generator.go b/server/legacy/jobs/mocks/mock_project_job_url_generator.go index 39ec28e6e..e201c4ff1 100644 --- a/server/legacy/jobs/mocks/mock_project_job_url_generator.go +++ b/server/legacy/jobs/mocks/mock_project_job_url_generator.go @@ -4,9 +4,10 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" ) type MockProjectJobURLGenerator struct { diff --git a/server/legacy/jobs/mocks/mock_project_status_updater.go b/server/legacy/jobs/mocks/mock_project_status_updater.go index 7f924677f..f097bf901 100644 --- a/server/legacy/jobs/mocks/mock_project_status_updater.go +++ b/server/legacy/jobs/mocks/mock_project_status_updater.go @@ -6,11 +6,12 @@ package mocks import ( context "context" fmt "fmt" + "reflect" + "time" + pegomock "github.com/petergtz/pegomock" command "github.com/runatlantis/atlantis/server/legacy/events/command" models "github.com/runatlantis/atlantis/server/models" - "reflect" - "time" ) type MockProjectStatusUpdater struct { diff --git a/server/legacy/jobs/mocks/mock_storage_backend.go b/server/legacy/jobs/mocks/mock_storage_backend.go index de03af7bd..b931acfd4 100644 --- a/server/legacy/jobs/mocks/mock_storage_backend.go +++ b/server/legacy/jobs/mocks/mock_storage_backend.go @@ -5,9 +5,10 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" ) type MockStorageBackend struct { diff --git a/server/legacy/lyft/aws/sns/mocks/matchers/context_context.go b/server/legacy/lyft/aws/sns/mocks/matchers/context_context.go index 2e07bf9a5..18ea6cfde 100644 --- a/server/legacy/lyft/aws/sns/mocks/matchers/context_context.go +++ b/server/legacy/lyft/aws/sns/mocks/matchers/context_context.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + context "context" ) diff --git a/server/legacy/lyft/aws/sns/mocks/matchers/slice_of_byte.go b/server/legacy/lyft/aws/sns/mocks/matchers/slice_of_byte.go index 951531345..7ff2e45ca 100644 --- a/server/legacy/lyft/aws/sns/mocks/matchers/slice_of_byte.go +++ b/server/legacy/lyft/aws/sns/mocks/matchers/slice_of_byte.go @@ -2,8 +2,9 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + + "github.com/petergtz/pegomock" ) func AnySliceOfByte() []byte { diff --git a/server/legacy/lyft/aws/sns/mocks/mock_writer.go b/server/legacy/lyft/aws/sns/mocks/mock_writer.go index 81599268f..639fe129d 100644 --- a/server/legacy/lyft/aws/sns/mocks/mock_writer.go +++ b/server/legacy/lyft/aws/sns/mocks/mock_writer.go @@ -5,9 +5,10 @@ package mocks import ( context "context" - pegomock "github.com/petergtz/pegomock" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" ) type MockWriter struct { diff --git a/server/neptune/exec/exec_test.go b/server/neptune/exec/exec_test.go index 2ce74be73..07c9ead78 100644 --- a/server/neptune/exec/exec_test.go +++ b/server/neptune/exec/exec_test.go @@ -2,10 +2,11 @@ package exec_test import ( "context" + "testing" + "github.com/runatlantis/atlantis/server/logging" subprocess_exec "github.com/runatlantis/atlantis/server/neptune/exec" "github.com/stretchr/testify/assert" - "testing" ) func TestCmd_RunWithNewProcessGroup(t *testing.T) { diff --git a/server/neptune/gateway/api/deploy.go b/server/neptune/gateway/api/deploy.go index 549262d19..d3f7bb5e7 100644 --- a/server/neptune/gateway/api/deploy.go +++ b/server/neptune/gateway/api/deploy.go @@ -2,6 +2,7 @@ package api import ( "context" + "github.com/runatlantis/atlantis/server/logging" "github.com/runatlantis/atlantis/server/neptune/gateway/api/request" "github.com/runatlantis/atlantis/server/neptune/gateway/deploy" diff --git a/server/neptune/gateway/event/legacy_comment_handler.go b/server/neptune/gateway/event/legacy_comment_handler.go index eef09dad7..d168dbc9c 100644 --- a/server/neptune/gateway/event/legacy_comment_handler.go +++ b/server/neptune/gateway/event/legacy_comment_handler.go @@ -3,6 +3,7 @@ package event import ( "bytes" "context" + "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/config/valid" "github.com/runatlantis/atlantis/server/legacy/events/command" diff --git a/server/neptune/gateway/event/modified_pull_request_handler.go b/server/neptune/gateway/event/modified_pull_request_handler.go index 5280b3b4d..36d630b1e 100644 --- a/server/neptune/gateway/event/modified_pull_request_handler.go +++ b/server/neptune/gateway/event/modified_pull_request_handler.go @@ -2,9 +2,10 @@ package event import ( "context" - "github.com/hashicorp/go-multierror" "time" + "github.com/hashicorp/go-multierror" + "github.com/runatlantis/atlantis/server/config/valid" "github.com/runatlantis/atlantis/server/neptune/gateway/config" "github.com/runatlantis/atlantis/server/neptune/gateway/pr" diff --git a/server/neptune/gateway/event/pull_request_review_handler.go b/server/neptune/gateway/event/pull_request_review_handler.go index 6b7b85a5d..34167fcad 100644 --- a/server/neptune/gateway/event/pull_request_review_handler.go +++ b/server/neptune/gateway/event/pull_request_review_handler.go @@ -3,10 +3,11 @@ package event import ( "bytes" "context" + "time" + "github.com/runatlantis/atlantis/server/config/valid" "github.com/runatlantis/atlantis/server/neptune/gateway/config" "github.com/runatlantis/atlantis/server/vcs/provider/github" - "time" "github.com/runatlantis/atlantis/server/neptune/gateway/pr" "github.com/uber-go/tally/v4" diff --git a/server/neptune/gateway/event/pull_request_review_handler_test.go b/server/neptune/gateway/event/pull_request_review_handler_test.go index 3d3fdcc18..bf9a1f677 100644 --- a/server/neptune/gateway/event/pull_request_review_handler_test.go +++ b/server/neptune/gateway/event/pull_request_review_handler_test.go @@ -3,13 +3,14 @@ package event_test import ( "bytes" "context" - "github.com/runatlantis/atlantis/server/config/valid" - "github.com/runatlantis/atlantis/server/neptune/gateway/config" - "github.com/runatlantis/atlantis/server/neptune/gateway/pr" "io" "net/http" "testing" + "github.com/runatlantis/atlantis/server/config/valid" + "github.com/runatlantis/atlantis/server/neptune/gateway/config" + "github.com/runatlantis/atlantis/server/neptune/gateway/pr" + buffered "github.com/runatlantis/atlantis/server/legacy/http" "github.com/runatlantis/atlantis/server/logging" "github.com/runatlantis/atlantis/server/models" diff --git a/server/neptune/lyft/feature/mocks/matchers/feature_featurecontext.go b/server/neptune/lyft/feature/mocks/matchers/feature_featurecontext.go index 63397bd3c..de0408919 100644 --- a/server/neptune/lyft/feature/mocks/matchers/feature_featurecontext.go +++ b/server/neptune/lyft/feature/mocks/matchers/feature_featurecontext.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + feature "github.com/runatlantis/atlantis/server/neptune/lyft/feature" ) diff --git a/server/neptune/lyft/feature/mocks/matchers/feature_name.go b/server/neptune/lyft/feature/mocks/matchers/feature_name.go index 02dc87965..c825649d1 100644 --- a/server/neptune/lyft/feature/mocks/matchers/feature_name.go +++ b/server/neptune/lyft/feature/mocks/matchers/feature_name.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + feature "github.com/runatlantis/atlantis/server/neptune/lyft/feature" ) diff --git a/server/neptune/lyft/feature/mocks/matchers/time_time.go b/server/neptune/lyft/feature/mocks/matchers/time_time.go index 461e1dd6d..755cf1bf8 100644 --- a/server/neptune/lyft/feature/mocks/matchers/time_time.go +++ b/server/neptune/lyft/feature/mocks/matchers/time_time.go @@ -2,9 +2,10 @@ package matchers import ( - "github.com/petergtz/pegomock" "reflect" + "github.com/petergtz/pegomock" + time "time" ) diff --git a/server/neptune/lyft/feature/mocks/mock_allocator.go b/server/neptune/lyft/feature/mocks/mock_allocator.go index 8933559ed..db99ce145 100644 --- a/server/neptune/lyft/feature/mocks/mock_allocator.go +++ b/server/neptune/lyft/feature/mocks/mock_allocator.go @@ -4,10 +4,11 @@ package mocks import ( - pegomock "github.com/petergtz/pegomock" - feature "github.com/runatlantis/atlantis/server/neptune/lyft/feature" "reflect" "time" + + pegomock "github.com/petergtz/pegomock" + feature "github.com/runatlantis/atlantis/server/neptune/lyft/feature" ) type MockAllocator struct { diff --git a/server/neptune/lyft/feature/retriever.go b/server/neptune/lyft/feature/retriever.go index 57f7e23b0..210716003 100644 --- a/server/neptune/lyft/feature/retriever.go +++ b/server/neptune/lyft/feature/retriever.go @@ -2,6 +2,7 @@ package feature import ( "context" + "github.com/pkg/errors" gh "github.com/runatlantis/atlantis/server/vcs/provider/github" ) diff --git a/server/neptune/sync/crons/ratelimit_stats.go b/server/neptune/sync/crons/ratelimit_stats.go index 9382ab014..5d3db177c 100644 --- a/server/neptune/sync/crons/ratelimit_stats.go +++ b/server/neptune/sync/crons/ratelimit_stats.go @@ -2,11 +2,12 @@ package crons import ( "context" + "net/http" + "github.com/palantir/go-githubapp/githubapp" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/metrics" "github.com/uber-go/tally/v4" - "net/http" ) const ( diff --git a/server/neptune/temporal/propagator.go b/server/neptune/temporal/propagator.go index 078f5330d..9082335fb 100644 --- a/server/neptune/temporal/propagator.go +++ b/server/neptune/temporal/propagator.go @@ -2,6 +2,7 @@ package temporal import ( "context" + internalContext "github.com/runatlantis/atlantis/server/neptune/context" "github.com/pkg/errors" diff --git a/server/neptune/workflows/activities/conftest.go b/server/neptune/workflows/activities/conftest.go index 4402b41d8..f508fd8ce 100644 --- a/server/neptune/workflows/activities/conftest.go +++ b/server/neptune/workflows/activities/conftest.go @@ -4,11 +4,12 @@ import ( "bytes" "context" "fmt" + "strings" + "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/command" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/temporal" "go.temporal.io/sdk/activity" - "strings" ) type asyncClient interface { diff --git a/server/neptune/workflows/activities/conftest/summary.go b/server/neptune/workflows/activities/conftest/summary.go index 7b1cc0231..d2eb935dd 100644 --- a/server/neptune/workflows/activities/conftest/summary.go +++ b/server/neptune/workflows/activities/conftest/summary.go @@ -2,8 +2,9 @@ package conftest import ( "fmt" - "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "strings" + + "github.com/runatlantis/atlantis/server/neptune/workflows/activities" ) type ValidateSummary struct { diff --git a/server/neptune/workflows/activities/conftest/summary_test.go b/server/neptune/workflows/activities/conftest/summary_test.go index 5d8d509ce..4892f0354 100644 --- a/server/neptune/workflows/activities/conftest/summary_test.go +++ b/server/neptune/workflows/activities/conftest/summary_test.go @@ -1,9 +1,10 @@ package conftest import ( + "testing" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "gopkg.in/go-playground/assert.v1" - "testing" ) func TestNewValidateSummaryFromResults(t *testing.T) { diff --git a/server/neptune/workflows/activities/conftest_test.go b/server/neptune/workflows/activities/conftest_test.go index 5d3d264d6..b45681133 100644 --- a/server/neptune/workflows/activities/conftest_test.go +++ b/server/neptune/workflows/activities/conftest_test.go @@ -1,12 +1,13 @@ package activities import ( + "strings" + "testing" + "github.com/hashicorp/go-version" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/command" "github.com/stretchr/testify/assert" "go.temporal.io/sdk/testsuite" - "strings" - "testing" ) func TestConftest_RequestValidation(t *testing.T) { diff --git a/server/neptune/workflows/activities/github/markdown/renderer.go b/server/neptune/workflows/activities/github/markdown/renderer.go index da4f822a0..0cddad60d 100644 --- a/server/neptune/workflows/activities/github/markdown/renderer.go +++ b/server/neptune/workflows/activities/github/markdown/renderer.go @@ -4,9 +4,10 @@ import ( "bytes" _ "embed" //embedding files "fmt" + "html/template" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform" - "html/template" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/terraform/state" ) diff --git a/server/neptune/workflows/activities/github/middleware.go b/server/neptune/workflows/activities/github/middleware.go index f27c794da..c0020c459 100644 --- a/server/neptune/workflows/activities/github/middleware.go +++ b/server/neptune/workflows/activities/github/middleware.go @@ -1,11 +1,12 @@ package github import ( + "net/http" + "strconv" + "github.com/gregjones/httpcache" "github.com/palantir/go-githubapp/githubapp" "github.com/uber-go/tally/v4" - "net/http" - "strconv" ) const ( diff --git a/server/neptune/workflows/activities/temporal/heartbeat.go b/server/neptune/workflows/activities/temporal/heartbeat.go index 7d37481bf..41077dd8f 100644 --- a/server/neptune/workflows/activities/temporal/heartbeat.go +++ b/server/neptune/workflows/activities/temporal/heartbeat.go @@ -2,8 +2,9 @@ package temporal import ( "context" - "go.temporal.io/sdk/activity" "time" + + "go.temporal.io/sdk/activity" ) const HeartbeatTimeout = 5 * time.Second diff --git a/server/neptune/workflows/activities/terraform/summary.go b/server/neptune/workflows/activities/terraform/summary.go index eab26df8d..45006dca7 100644 --- a/server/neptune/workflows/activities/terraform/summary.go +++ b/server/neptune/workflows/activities/terraform/summary.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/hashicorp/terraform-json" + tfjson "github.com/hashicorp/terraform-json" "github.com/pkg/errors" ) diff --git a/server/neptune/workflows/internal/deploy/revision/queue/updater.go b/server/neptune/workflows/internal/deploy/revision/queue/updater.go index 098c66d5c..c985a6bf5 100644 --- a/server/neptune/workflows/internal/deploy/revision/queue/updater.go +++ b/server/neptune/workflows/internal/deploy/revision/queue/updater.go @@ -2,6 +2,7 @@ package queue import ( "fmt" + key "github.com/runatlantis/atlantis/server/neptune/context" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" diff --git a/server/neptune/workflows/internal/deploy/revision/queue/updater_test.go b/server/neptune/workflows/internal/deploy/revision/queue/updater_test.go index dd8ade796..64a097562 100644 --- a/server/neptune/workflows/internal/deploy/revision/queue/updater_test.go +++ b/server/neptune/workflows/internal/deploy/revision/queue/updater_test.go @@ -1,10 +1,11 @@ package queue_test import ( - "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" "testing" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" + "github.com/google/uuid" "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" diff --git a/server/neptune/workflows/internal/deploy/revision/revision_test.go b/server/neptune/workflows/internal/deploy/revision/revision_test.go index d80d7073a..719bc7b0e 100644 --- a/server/neptune/workflows/internal/deploy/revision/revision_test.go +++ b/server/neptune/workflows/internal/deploy/revision/revision_test.go @@ -1,10 +1,11 @@ package revision_test import ( - "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" "testing" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" + "github.com/google/uuid" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform" diff --git a/server/neptune/workflows/internal/deploy/terraform/state_test.go b/server/neptune/workflows/internal/deploy/terraform/state_test.go index edd3cfd8f..b68caf28d 100644 --- a/server/neptune/workflows/internal/deploy/terraform/state_test.go +++ b/server/neptune/workflows/internal/deploy/terraform/state_test.go @@ -1,11 +1,12 @@ package terraform_test import ( - "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" "net/url" "testing" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" + "github.com/google/uuid" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform" diff --git a/server/neptune/workflows/internal/deploy/workflow.go b/server/neptune/workflows/internal/deploy/workflow.go index 986317743..384e1896d 100644 --- a/server/neptune/workflows/internal/deploy/workflow.go +++ b/server/neptune/workflows/internal/deploy/workflow.go @@ -1,9 +1,10 @@ package deploy import ( - "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" + "github.com/pkg/errors" key "github.com/runatlantis/atlantis/server/neptune/context" "github.com/runatlantis/atlantis/server/neptune/workflows/activities" diff --git a/server/neptune/workflows/internal/notifier/github.go b/server/neptune/workflows/internal/notifier/github.go index 45a7cd081..5f9a8d99f 100644 --- a/server/neptune/workflows/internal/notifier/github.go +++ b/server/neptune/workflows/internal/notifier/github.go @@ -3,6 +3,7 @@ package notifier import ( "context" "fmt" + "github.com/google/uuid" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/neptune/workflows/activities" diff --git a/server/neptune/workflows/internal/notifier/github_cache_test.go b/server/neptune/workflows/internal/notifier/github_cache_test.go index a38f8efa6..b09ea7ab2 100644 --- a/server/neptune/workflows/internal/notifier/github_cache_test.go +++ b/server/neptune/workflows/internal/notifier/github_cache_test.go @@ -2,10 +2,11 @@ package notifier_test import ( "context" - "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" "testing" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" "github.com/stretchr/testify/assert" diff --git a/server/neptune/workflows/internal/notifier/github_test.go b/server/neptune/workflows/internal/notifier/github_test.go index e638ad608..a50eb3ae8 100644 --- a/server/neptune/workflows/internal/notifier/github_test.go +++ b/server/neptune/workflows/internal/notifier/github_test.go @@ -1,11 +1,12 @@ package notifier_test import ( - "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" "net/url" "testing" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" + "github.com/google/uuid" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github/markdown" diff --git a/server/neptune/workflows/internal/pr/revision/policy/dismisser.go b/server/neptune/workflows/internal/pr/revision/policy/dismisser.go index efb7e8d4e..de2866fb9 100644 --- a/server/neptune/workflows/internal/pr/revision/policy/dismisser.go +++ b/server/neptune/workflows/internal/pr/revision/policy/dismisser.go @@ -2,11 +2,12 @@ package policy import ( "context" + "sort" + "github.com/google/go-github/v45/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/pr/revision" "go.temporal.io/sdk/workflow" - "sort" ) type dismisserGithubActivities interface { diff --git a/server/neptune/workflows/internal/pr/revision/policy/dismisser_test.go b/server/neptune/workflows/internal/pr/revision/policy/dismisser_test.go index 86385a82f..0ab76c9e7 100644 --- a/server/neptune/workflows/internal/pr/revision/policy/dismisser_test.go +++ b/server/neptune/workflows/internal/pr/revision/policy/dismisser_test.go @@ -2,6 +2,9 @@ package policy_test import ( "context" + "testing" + "time" + "github.com/google/go-github/v45/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities" gh "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" @@ -10,8 +13,6 @@ import ( "github.com/stretchr/testify/assert" "go.temporal.io/sdk/testsuite" "go.temporal.io/sdk/workflow" - "testing" - "time" ) type dismissRequest struct { diff --git a/server/neptune/workflows/internal/pr/revision/policy/filter_test.go b/server/neptune/workflows/internal/pr/revision/policy/filter_test.go index 67073c796..2a4b5ddde 100644 --- a/server/neptune/workflows/internal/pr/revision/policy/filter_test.go +++ b/server/neptune/workflows/internal/pr/revision/policy/filter_test.go @@ -1,11 +1,12 @@ package policy_test import ( + "testing" + "github.com/google/go-github/v45/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/pr/revision/policy" "github.com/stretchr/testify/assert" - "testing" ) func TestFilter_FilterOutTeamA(t *testing.T) { diff --git a/server/neptune/workflows/internal/pr/revision/policy/handler_test.go b/server/neptune/workflows/internal/pr/revision/policy/handler_test.go index fcdbf1615..d1e66f035 100644 --- a/server/neptune/workflows/internal/pr/revision/policy/handler_test.go +++ b/server/neptune/workflows/internal/pr/revision/policy/handler_test.go @@ -2,6 +2,9 @@ package policy_test import ( "context" + "testing" + "time" + "github.com/google/go-github/v45/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities" gh "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" @@ -13,8 +16,6 @@ import ( "github.com/stretchr/testify/assert" "go.temporal.io/sdk/testsuite" "go.temporal.io/sdk/workflow" - "testing" - "time" ) type request struct { diff --git a/server/neptune/workflows/internal/pr/revision/processor_test.go b/server/neptune/workflows/internal/pr/revision/processor_test.go index f7d248cd4..511e2ef50 100644 --- a/server/neptune/workflows/internal/pr/revision/processor_test.go +++ b/server/neptune/workflows/internal/pr/revision/processor_test.go @@ -1,6 +1,9 @@ package revision_test import ( + "testing" + "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" terraformActivities "github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform" @@ -11,8 +14,6 @@ import ( "github.com/stretchr/testify/assert" "go.temporal.io/sdk/testsuite" "go.temporal.io/sdk/workflow" - "testing" - "time" ) const ( diff --git a/server/neptune/workflows/internal/pr/revision/state.go b/server/neptune/workflows/internal/pr/revision/state.go index 633d7f15a..cdaa87d02 100644 --- a/server/neptune/workflows/internal/pr/revision/state.go +++ b/server/neptune/workflows/internal/pr/revision/state.go @@ -2,6 +2,7 @@ package revision import ( "fmt" + "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/metrics" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" diff --git a/server/neptune/workflows/internal/pr/revision/state_test.go b/server/neptune/workflows/internal/pr/revision/state_test.go index e4ffad9a1..1cf6cc037 100644 --- a/server/neptune/workflows/internal/pr/revision/state_test.go +++ b/server/neptune/workflows/internal/pr/revision/state_test.go @@ -1,12 +1,13 @@ package revision_test import ( - "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" - "github.com/runatlantis/atlantis/server/neptune/workflows/internal/pr/revision" "net/url" "testing" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" + "github.com/runatlantis/atlantis/server/neptune/workflows/internal/pr/revision" + "github.com/google/uuid" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform" diff --git a/server/neptune/workflows/internal/pr/runner.go b/server/neptune/workflows/internal/pr/runner.go index 8de8e9d4c..d6db0cd90 100644 --- a/server/neptune/workflows/internal/pr/runner.go +++ b/server/neptune/workflows/internal/pr/runner.go @@ -2,9 +2,10 @@ package pr import ( "context" + "time" + tfModel "github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/notifier" - "time" metricNames "github.com/runatlantis/atlantis/server/metrics" internalContext "github.com/runatlantis/atlantis/server/neptune/context" diff --git a/server/neptune/workflows/internal/pr/runner_test.go b/server/neptune/workflows/internal/pr/runner_test.go index 050ab318e..84035c52c 100644 --- a/server/neptune/workflows/internal/pr/runner_test.go +++ b/server/neptune/workflows/internal/pr/runner_test.go @@ -2,6 +2,9 @@ package pr import ( "context" + "testing" + "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/metrics" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/pr/revision" @@ -9,8 +12,6 @@ import ( "github.com/stretchr/testify/mock" "go.temporal.io/sdk/testsuite" "go.temporal.io/sdk/workflow" - "testing" - "time" ) type request struct { diff --git a/server/neptune/workflows/internal/pr/shutdown.go b/server/neptune/workflows/internal/pr/shutdown.go index d94121142..de22742ab 100644 --- a/server/neptune/workflows/internal/pr/shutdown.go +++ b/server/neptune/workflows/internal/pr/shutdown.go @@ -2,6 +2,7 @@ package pr import ( "context" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/pr/revision" "go.temporal.io/sdk/workflow" diff --git a/server/neptune/workflows/internal/pr/shutdown_test.go b/server/neptune/workflows/internal/pr/shutdown_test.go index be39fb7a8..d9f2e2126 100644 --- a/server/neptune/workflows/internal/pr/shutdown_test.go +++ b/server/neptune/workflows/internal/pr/shutdown_test.go @@ -2,6 +2,9 @@ package pr_test import ( "context" + "testing" + "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/pr" @@ -9,8 +12,6 @@ import ( "github.com/stretchr/testify/assert" "go.temporal.io/sdk/testsuite" "go.temporal.io/sdk/workflow" - "testing" - "time" ) type request struct { diff --git a/server/neptune/workflows/internal/pr/workflow.go b/server/neptune/workflows/internal/pr/workflow.go index 06e7c4712..8054874fd 100644 --- a/server/neptune/workflows/internal/pr/workflow.go +++ b/server/neptune/workflows/internal/pr/workflow.go @@ -1,12 +1,13 @@ package pr import ( + "strconv" + "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities" workflowMetrics "github.com/runatlantis/atlantis/server/neptune/workflows/internal/metrics" "github.com/runatlantis/atlantis/server/neptune/workflows/internal/pr/revision" "go.temporal.io/sdk/workflow" - "strconv" - "time" ) const TaskQueue = "pr" diff --git a/server/neptune/workflows/internal/temporal/selector.go b/server/neptune/workflows/internal/temporal/selector.go index fb7eda644..174cabdd4 100644 --- a/server/neptune/workflows/internal/temporal/selector.go +++ b/server/neptune/workflows/internal/temporal/selector.go @@ -1,8 +1,9 @@ package temporal import ( - "go.temporal.io/sdk/workflow" "time" + + "go.temporal.io/sdk/workflow" ) // SelectorWithTimeout makes it a bit easier to add Timeout futures diff --git a/server/neptune/workflows/internal/terraform/job/runner_test.go b/server/neptune/workflows/internal/terraform/job/runner_test.go index 7c4e4f378..36239d8fb 100644 --- a/server/neptune/workflows/internal/terraform/job/runner_test.go +++ b/server/neptune/workflows/internal/terraform/job/runner_test.go @@ -2,10 +2,11 @@ package job_test import ( "context" - "github.com/runatlantis/atlantis/server/neptune/workflows/activities/command" "testing" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities/command" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/execute" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" diff --git a/server/neptune/workflows/internal/terraform/state/store.go b/server/neptune/workflows/internal/terraform/state/store.go index 049d45fda..45488d5b5 100644 --- a/server/neptune/workflows/internal/terraform/state/store.go +++ b/server/neptune/workflows/internal/terraform/state/store.go @@ -2,10 +2,11 @@ package state import ( "fmt" - "github.com/runatlantis/atlantis/server/neptune/workflows/activities/conftest" "net/url" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities/conftest" + "github.com/gorilla/mux" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform" diff --git a/server/neptune/workflows/internal/terraform/state/workflow.go b/server/neptune/workflows/internal/terraform/state/workflow.go index 43056f898..96a1cc9ab 100644 --- a/server/neptune/workflows/internal/terraform/state/workflow.go +++ b/server/neptune/workflows/internal/terraform/state/workflow.go @@ -1,10 +1,11 @@ package state import ( - "github.com/runatlantis/atlantis/server/neptune/workflows/activities/conftest" "net/url" "time" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities/conftest" + "github.com/runatlantis/atlantis/server/neptune/workflows/activities/github" "github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform" "github.com/runatlantis/atlantis/server/neptune/workflows/plugins" diff --git a/server/static/bindata_assetfs.go b/server/static/bindata_assetfs.go index 4e478dc22..3bccca5c3 100644 --- a/server/static/bindata_assetfs.go +++ b/server/static/bindata_assetfs.go @@ -17,7 +17,6 @@ import ( "bytes" "compress/gzip" "fmt" - "github.com/elazarl/go-bindata-assetfs" "io" "io/ioutil" "os" @@ -485,13 +484,3 @@ func _filePath(dir, name string) string { cannonicalName := strings.Replace(name, "\\", "/", -1) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } - -func assetFS() *assetfs.AssetFS { - assetInfo := func(path string) (os.FileInfo, error) { - return os.Stat(path) - } - for k := range _bintree.Children { - return &assetfs.AssetFS{Asset: Asset, AssetDir: AssetDir, AssetInfo: assetInfo, Prefix: k} - } - panic("unreachable") -} diff --git a/server/vcs/provider/github/git_cred_writer_test.go b/server/vcs/provider/github/git_cred_writer_test.go index c7f6bdc52..edc1ef57e 100644 --- a/server/vcs/provider/github/git_cred_writer_test.go +++ b/server/vcs/provider/github/git_cred_writer_test.go @@ -2,12 +2,13 @@ package github_test import ( "fmt" - "github.com/runatlantis/atlantis/server/vcs/provider/github" "os" "os/exec" "path/filepath" "testing" + "github.com/runatlantis/atlantis/server/vcs/provider/github" + "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/vcs/provider/github/list_iterator.go b/server/vcs/provider/github/list_iterator.go index f5db50700..94c564c7d 100644 --- a/server/vcs/provider/github/list_iterator.go +++ b/server/vcs/provider/github/list_iterator.go @@ -3,9 +3,10 @@ package github import ( "context" "fmt" + "net/http" + gh "github.com/google/go-github/v45/github" "github.com/pkg/errors" - "net/http" ) func Iterate[T interface{}]( diff --git a/server/vcs/provider/github/list_iterator_test.go b/server/vcs/provider/github/list_iterator_test.go index 57afa2c65..003b59874 100644 --- a/server/vcs/provider/github/list_iterator_test.go +++ b/server/vcs/provider/github/list_iterator_test.go @@ -2,11 +2,12 @@ package github_test import ( "context" + "net/http" + "testing" + gh "github.com/google/go-github/v45/github" "github.com/runatlantis/atlantis/server/vcs/provider/github" "github.com/stretchr/testify/assert" - "net/http" - "testing" ) const ( diff --git a/server/vcs/provider/github/pr_fetcher.go b/server/vcs/provider/github/pr_fetcher.go index 8f5cf907a..3782411c0 100644 --- a/server/vcs/provider/github/pr_fetcher.go +++ b/server/vcs/provider/github/pr_fetcher.go @@ -3,10 +3,11 @@ package github import ( "context" "fmt" + "net/http" + gh "github.com/google/go-github/v45/github" "github.com/palantir/go-githubapp/githubapp" "github.com/pkg/errors" - "net/http" ) type PRFetcher struct { diff --git a/server/vcs/provider/github/team_fetcher.go b/server/vcs/provider/github/team_fetcher.go index 05a471523..0c5e5a339 100644 --- a/server/vcs/provider/github/team_fetcher.go +++ b/server/vcs/provider/github/team_fetcher.go @@ -2,6 +2,7 @@ package github import ( "context" + gh "github.com/google/go-github/v45/github" "github.com/palantir/go-githubapp/githubapp" "github.com/pkg/errors"