From d914eafd2a3343fb22211018661bed1881b813e6 Mon Sep 17 00:00:00 2001 From: Nish Krishnan Date: Thu, 1 Jul 2021 12:54:44 -0700 Subject: [PATCH] Move core workflow packages under core. (#1684) * Move core workflow packages under core. * lint. --- .../events/events_controller_e2e_test.go | 14 +++++++------- server/controllers/locks_controller.go | 4 ++-- server/controllers/locks_controller_test.go | 6 +++--- server/{events => core}/db/boltdb.go | 0 server/{events => core}/db/boltdb_test.go | 2 +- server/{events => core}/locking/apply_locking.go | 0 server/{events => core}/locking/locking.go | 0 server/{events => core}/locking/locking_test.go | 6 +++--- .../mocks/matchers/locking_applycommandlock.go | 2 +- .../matchers/locking_applycommandlockresponse.go | 4 ++-- .../mocks/matchers/locking_trylockresponse.go | 2 +- .../map_of_string_to_models_projectlock.go | 0 .../locking/mocks/matchers/models_commandlock.go | 0 .../locking/mocks/matchers/models_commandname.go | 0 .../locking/mocks/matchers/models_project.go | 0 .../locking/mocks/matchers/models_projectlock.go | 0 .../locking/mocks/matchers/models_pullrequest.go | 0 .../locking/mocks/matchers/models_user.go | 0 .../mocks/matchers/ptr_to_models_commandlock.go | 0 .../mocks/matchers/ptr_to_models_projectlock.go | 0 .../mocks/matchers/slice_of_models_projectlock.go | 0 .../locking/mocks/matchers/time_time.go | 0 .../locking/mocks/mock_apply_lock_checker.go | 4 ++-- .../locking/mocks/mock_apply_locker.go | 4 ++-- .../{events => core}/locking/mocks/mock_backend.go | 2 +- .../{events => core}/locking/mocks/mock_locker.go | 4 ++-- .../{events => core}/runtime/apply_step_runner.go | 0 .../runtime/apply_step_runner_internal_test.go | 0 .../runtime/apply_step_runner_test.go | 8 ++++---- .../mocks/matchers/ptr_to_go_version_version.go | 0 .../runtime/cache/mocks/mock_key_serializer.go | 2 +- .../runtime/cache/mocks/mock_version_path.go | 2 +- .../{events => core}/runtime/cache/version_path.go | 2 +- .../runtime/cache/version_path_test.go | 6 +++--- server/{events => core}/runtime/env_step_runner.go | 0 .../runtime/env_step_runner_test.go | 4 ++-- server/{events => core}/runtime/executor.go | 0 .../{events => core}/runtime/init_step_runner.go | 0 .../runtime/init_step_runner_test.go | 6 +++--- .../minimum_version_step_runner_delegate.go | 0 .../minimum_version_step_runner_delegate_test.go | 2 +- .../mocks/matchers/logging_simplelogging.go | 0 .../mocks/matchers/map_of_string_to_string.go | 0 .../models_preworkflowhookcommandcontext.go | 0 .../mocks/matchers/models_projectcommandcontext.go | 0 .../runtime/mocks/matchers/models_pullrequest.go | 0 .../runtime/mocks/matchers/models_repo.go | 0 .../mocks/matchers/ptr_to_go_version_version.go | 0 .../mocks/matchers/ptr_to_logging_simplelogger.go | 0 .../runtime/mocks/matchers/slice_of_string.go | 0 .../mocks/mock_pre_workflows_hook_runner.go | 2 +- .../runtime/mocks/mock_pull_approved_checker.go | 2 +- .../{events => core}/runtime/mocks/mock_runner.go | 2 +- .../mocks/mock_versionedexecutorworkflow.go | 2 +- server/{events => core}/runtime/models/exec.go | 0 server/{events => core}/runtime/models/filepath.go | 0 .../mocks/matchers/map_of_string_to_string.go | 0 .../models/mocks/matchers/models_filepath.go | 2 +- .../models/mocks/matchers/slice_of_string.go | 0 .../runtime/models/mocks/mock_exec.go | 2 +- .../runtime/models/mocks/mock_filepath.go | 4 ++-- .../{events => core}/runtime/plan_step_runner.go | 0 .../runtime/plan_step_runner_test.go | 8 ++++---- .../runtime/plan_type_step_runner_delegate.go | 0 .../runtime/plan_type_step_runner_delegate_test.go | 2 +- .../runtime/policy/conftest_client.go | 6 +++--- .../runtime/policy/conftest_client_test.go | 8 ++++---- .../policy/mocks/matchers/valid_policyset.go | 0 .../runtime/policy/mocks/mock_conftest_client.go | 2 +- .../runtime/policy_check_step_runner.go | 0 .../runtime/policy_check_step_runner_test.go | 2 +- .../runtime/pre_workflow_hook_runner.go | 0 .../runtime/pre_workflow_hook_runner_test.go | 6 +++--- .../runtime/pull_approved_checker.go | 0 server/{events => core}/runtime/run_step_runner.go | 0 .../runtime/run_step_runner_test.go | 6 +++--- server/{events => core}/runtime/runtime.go | 2 +- server/{events => core}/runtime/runtime_test.go | 2 +- .../{events => core}/runtime/show_step_runner.go | 0 .../runtime/show_step_runner_test.go | 2 +- .../mocks/matchers/go_getter_clientoption.go | 0 .../mocks/matchers/logging_simplelogging.go | 0 .../mocks/matchers/map_of_string_to_string.go | 0 .../mocks/matchers/ptr_to_go_version_version.go | 0 .../mocks/matchers/ptr_to_logging_simplelogger.go | 0 .../terraform/mocks/matchers/slice_of_string.go | 0 .../terraform/mocks/mock_downloader.go | 2 +- .../terraform/mocks/mock_terraform_client.go | 2 +- .../{events => core}/terraform/terraform_client.go | 0 .../terraform/terraform_client_internal_test.go | 0 .../terraform/terraform_client_test.go | 4 ++-- server/events/apply_command_runner.go | 4 ++-- server/events/apply_command_runner_test.go | 2 +- server/events/command_runner_test.go | 4 ++-- server/events/db_updater.go | 2 +- server/events/delete_lock_command.go | 4 ++-- server/events/delete_lock_command_test.go | 4 ++-- server/events/pending_plan_finder.go | 2 +- server/events/pre_workflow_hooks_command_runner.go | 2 +- .../pre_workflow_hooks_command_runner_test.go | 2 +- server/events/project_command_runner.go | 2 +- server/events/project_command_runner_test.go | 6 +++--- server/events/project_locker.go | 2 +- server/events/project_locker_test.go | 4 ++-- server/events/pull_closed_executor.go | 4 ++-- server/events/pull_closed_executor_test.go | 4 ++-- server/server.go | 10 +++++----- server/server_test.go | 2 +- 108 files changed, 108 insertions(+), 108 deletions(-) rename server/{events => core}/db/boltdb.go (100%) rename server/{events => core}/db/boltdb_test.go (99%) rename server/{events => core}/locking/apply_locking.go (100%) rename server/{events => core}/locking/locking.go (100%) rename server/{events => core}/locking/locking_test.go (97%) rename server/{events => core}/locking/mocks/matchers/locking_applycommandlock.go (93%) rename server/{events => core}/locking/mocks/matchers/locking_applycommandlockresponse.go (89%) rename server/{events => core}/locking/mocks/matchers/locking_trylockresponse.go (93%) rename server/{events => core}/locking/mocks/matchers/map_of_string_to_models_projectlock.go (100%) rename server/{events => core}/locking/mocks/matchers/models_commandlock.go (100%) rename server/{events => core}/locking/mocks/matchers/models_commandname.go (100%) rename server/{events => core}/locking/mocks/matchers/models_project.go (100%) rename server/{events => core}/locking/mocks/matchers/models_projectlock.go (100%) rename server/{events => core}/locking/mocks/matchers/models_pullrequest.go (100%) rename server/{events => core}/locking/mocks/matchers/models_user.go (100%) rename server/{events => core}/locking/mocks/matchers/ptr_to_models_commandlock.go (100%) rename server/{events => core}/locking/mocks/matchers/ptr_to_models_projectlock.go (100%) rename server/{events => core}/locking/mocks/matchers/slice_of_models_projectlock.go (100%) rename server/{events => core}/locking/mocks/matchers/time_time.go (100%) rename server/{events => core}/locking/mocks/mock_apply_lock_checker.go (95%) rename server/{events => core}/locking/mocks/mock_apply_locker.go (97%) rename server/{events => core}/locking/mocks/mock_backend.go (99%) rename server/{events => core}/locking/mocks/mock_locker.go (98%) rename server/{events => core}/runtime/apply_step_runner.go (100%) rename server/{events => core}/runtime/apply_step_runner_internal_test.go (100%) rename server/{events => core}/runtime/apply_step_runner_test.go (98%) rename server/{events => core}/runtime/cache/mocks/matchers/ptr_to_go_version_version.go (100%) rename server/{events => core}/runtime/cache/mocks/mock_key_serializer.go (97%) rename server/{events => core}/runtime/cache/mocks/mock_version_path.go (97%) rename server/{events => core}/runtime/cache/version_path.go (98%) rename server/{events => core}/runtime/cache/version_path_test.go (96%) rename server/{events => core}/runtime/env_step_runner.go (100%) rename server/{events => core}/runtime/env_step_runner_test.go (93%) rename server/{events => core}/runtime/executor.go (100%) rename server/{events => core}/runtime/init_step_runner.go (100%) rename server/{events => core}/runtime/init_step_runner_test.go (97%) rename server/{events => core}/runtime/minimum_version_step_runner_delegate.go (100%) rename server/{events => core}/runtime/minimum_version_step_runner_delegate_test.go (97%) rename server/{events => core}/runtime/mocks/matchers/logging_simplelogging.go (100%) rename server/{events => core}/runtime/mocks/matchers/map_of_string_to_string.go (100%) rename server/{events => core}/runtime/mocks/matchers/models_preworkflowhookcommandcontext.go (100%) rename server/{events => core}/runtime/mocks/matchers/models_projectcommandcontext.go (100%) rename server/{events => core}/runtime/mocks/matchers/models_pullrequest.go (100%) rename server/{events => core}/runtime/mocks/matchers/models_repo.go (100%) rename server/{events => core}/runtime/mocks/matchers/ptr_to_go_version_version.go (100%) rename server/{events => core}/runtime/mocks/matchers/ptr_to_logging_simplelogger.go (100%) rename server/{events => core}/runtime/mocks/matchers/slice_of_string.go (100%) rename server/{events => core}/runtime/mocks/mock_pre_workflows_hook_runner.go (97%) rename server/{events => core}/runtime/mocks/mock_pull_approved_checker.go (97%) rename server/{events => core}/runtime/mocks/mock_runner.go (98%) rename server/{events => core}/runtime/mocks/mock_versionedexecutorworkflow.go (98%) rename server/{events => core}/runtime/models/exec.go (100%) rename server/{events => core}/runtime/models/filepath.go (100%) rename server/{events => core}/runtime/models/mocks/matchers/map_of_string_to_string.go (100%) rename server/{events => core}/runtime/models/mocks/matchers/models_filepath.go (92%) rename server/{events => core}/runtime/models/mocks/matchers/slice_of_string.go (100%) rename server/{events => core}/runtime/models/mocks/mock_exec.go (98%) rename server/{events => core}/runtime/models/mocks/mock_filepath.go (97%) rename server/{events => core}/runtime/plan_step_runner.go (100%) rename server/{events => core}/runtime/plan_step_runner_test.go (99%) rename server/{events => core}/runtime/plan_type_step_runner_delegate.go (100%) rename server/{events => core}/runtime/plan_type_step_runner_delegate_test.go (98%) rename server/{events => core}/runtime/policy/conftest_client.go (97%) rename server/{events => core}/runtime/policy/conftest_client_test.go (96%) rename server/{events => core}/runtime/policy/mocks/matchers/valid_policyset.go (100%) rename server/{events => core}/runtime/policy/mocks/mock_conftest_client.go (97%) rename server/{events => core}/runtime/policy_check_step_runner.go (100%) rename server/{events => core}/runtime/policy_check_step_runner_test.go (97%) rename server/{events => core}/runtime/pre_workflow_hook_runner.go (100%) rename server/{events => core}/runtime/pre_workflow_hook_runner_test.go (93%) rename server/{events => core}/runtime/pull_approved_checker.go (100%) rename server/{events => core}/runtime/run_step_runner.go (100%) rename server/{events => core}/runtime/run_step_runner_test.go (95%) rename server/{events => core}/runtime/runtime.go (98%) rename server/{events => core}/runtime/runtime_test.go (96%) rename server/{events => core}/runtime/show_step_runner.go (100%) rename server/{events => core}/runtime/show_step_runner_test.go (97%) rename server/{events => core}/terraform/mocks/matchers/go_getter_clientoption.go (100%) rename server/{events => core}/terraform/mocks/matchers/logging_simplelogging.go (100%) rename server/{events => core}/terraform/mocks/matchers/map_of_string_to_string.go (100%) rename server/{events => core}/terraform/mocks/matchers/ptr_to_go_version_version.go (100%) rename server/{events => core}/terraform/mocks/matchers/ptr_to_logging_simplelogger.go (100%) rename server/{events => core}/terraform/mocks/matchers/slice_of_string.go (100%) rename server/{events => core}/terraform/mocks/mock_downloader.go (98%) rename server/{events => core}/terraform/mocks/mock_terraform_client.go (98%) rename server/{events => core}/terraform/terraform_client.go (100%) rename server/{events => core}/terraform/terraform_client_internal_test.go (100%) rename server/{events => core}/terraform/terraform_client_test.go (98%) diff --git a/server/controllers/events/events_controller_e2e_test.go b/server/controllers/events/events_controller_e2e_test.go index eabfda2c3..29d4d45d9 100644 --- a/server/controllers/events/events_controller_e2e_test.go +++ b/server/controllers/events/events_controller_e2e_test.go @@ -19,17 +19,17 @@ import ( . "github.com/petergtz/pegomock" "github.com/runatlantis/atlantis/server" events_controllers "github.com/runatlantis/atlantis/server/controllers/events" + "github.com/runatlantis/atlantis/server/core/db" + "github.com/runatlantis/atlantis/server/core/locking" + "github.com/runatlantis/atlantis/server/core/runtime" + runtimemocks "github.com/runatlantis/atlantis/server/core/runtime/mocks" + runtimematchers "github.com/runatlantis/atlantis/server/core/runtime/mocks/matchers" + "github.com/runatlantis/atlantis/server/core/runtime/policy" + "github.com/runatlantis/atlantis/server/core/terraform" "github.com/runatlantis/atlantis/server/events" - "github.com/runatlantis/atlantis/server/events/db" - "github.com/runatlantis/atlantis/server/events/locking" "github.com/runatlantis/atlantis/server/events/mocks" "github.com/runatlantis/atlantis/server/events/mocks/matchers" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" - runtimemocks "github.com/runatlantis/atlantis/server/events/runtime/mocks" - runtimematchers "github.com/runatlantis/atlantis/server/events/runtime/mocks/matchers" - "github.com/runatlantis/atlantis/server/events/runtime/policy" - "github.com/runatlantis/atlantis/server/events/terraform" vcsmocks "github.com/runatlantis/atlantis/server/events/vcs/mocks" "github.com/runatlantis/atlantis/server/events/webhooks" "github.com/runatlantis/atlantis/server/events/yaml" diff --git a/server/controllers/locks_controller.go b/server/controllers/locks_controller.go index efe5d7c4e..02ea56181 100644 --- a/server/controllers/locks_controller.go +++ b/server/controllers/locks_controller.go @@ -6,11 +6,11 @@ import ( "net/url" "github.com/runatlantis/atlantis/server/controllers/templates" - "github.com/runatlantis/atlantis/server/events/db" + "github.com/runatlantis/atlantis/server/core/db" "github.com/gorilla/mux" + "github.com/runatlantis/atlantis/server/core/locking" "github.com/runatlantis/atlantis/server/events" - "github.com/runatlantis/atlantis/server/events/locking" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/vcs" "github.com/runatlantis/atlantis/server/logging" diff --git a/server/controllers/locks_controller_test.go b/server/controllers/locks_controller_test.go index d440ee2e5..f6ebd5500 100644 --- a/server/controllers/locks_controller_test.go +++ b/server/controllers/locks_controller_test.go @@ -14,14 +14,14 @@ import ( "github.com/runatlantis/atlantis/server/controllers" "github.com/runatlantis/atlantis/server/controllers/templates" tMocks "github.com/runatlantis/atlantis/server/controllers/templates/mocks" - "github.com/runatlantis/atlantis/server/events/db" - "github.com/runatlantis/atlantis/server/events/locking" + "github.com/runatlantis/atlantis/server/core/db" + "github.com/runatlantis/atlantis/server/core/locking" "github.com/gorilla/mux" . "github.com/petergtz/pegomock" "github.com/runatlantis/atlantis/server/events" - "github.com/runatlantis/atlantis/server/events/locking/mocks" + "github.com/runatlantis/atlantis/server/core/locking/mocks" mocks2 "github.com/runatlantis/atlantis/server/events/mocks" "github.com/runatlantis/atlantis/server/events/models" vcsmocks "github.com/runatlantis/atlantis/server/events/vcs/mocks" diff --git a/server/events/db/boltdb.go b/server/core/db/boltdb.go similarity index 100% rename from server/events/db/boltdb.go rename to server/core/db/boltdb.go diff --git a/server/events/db/boltdb_test.go b/server/core/db/boltdb_test.go similarity index 99% rename from server/events/db/boltdb_test.go rename to server/core/db/boltdb_test.go index 15e4b82d8..ca41c6c00 100644 --- a/server/events/db/boltdb_test.go +++ b/server/core/db/boltdb_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/runatlantis/atlantis/server/events/db" + "github.com/runatlantis/atlantis/server/core/db" "github.com/pkg/errors" "github.com/runatlantis/atlantis/server/events/models" diff --git a/server/events/locking/apply_locking.go b/server/core/locking/apply_locking.go similarity index 100% rename from server/events/locking/apply_locking.go rename to server/core/locking/apply_locking.go diff --git a/server/events/locking/locking.go b/server/core/locking/locking.go similarity index 100% rename from server/events/locking/locking.go rename to server/core/locking/locking.go diff --git a/server/events/locking/locking_test.go b/server/core/locking/locking_test.go similarity index 97% rename from server/events/locking/locking_test.go rename to server/core/locking/locking_test.go index 37b7f4ec9..fd8ce1e32 100644 --- a/server/events/locking/locking_test.go +++ b/server/core/locking/locking_test.go @@ -21,9 +21,9 @@ import ( "strings" . "github.com/petergtz/pegomock" - "github.com/runatlantis/atlantis/server/events/locking" - "github.com/runatlantis/atlantis/server/events/locking/mocks" - "github.com/runatlantis/atlantis/server/events/locking/mocks/matchers" + "github.com/runatlantis/atlantis/server/core/locking" + "github.com/runatlantis/atlantis/server/core/locking/mocks" + "github.com/runatlantis/atlantis/server/core/locking/mocks/matchers" "github.com/runatlantis/atlantis/server/events/models" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/locking/mocks/matchers/locking_applycommandlock.go b/server/core/locking/mocks/matchers/locking_applycommandlock.go similarity index 93% rename from server/events/locking/mocks/matchers/locking_applycommandlock.go rename to server/core/locking/mocks/matchers/locking_applycommandlock.go index bc9103cda..4e5627062 100644 --- a/server/events/locking/mocks/matchers/locking_applycommandlock.go +++ b/server/core/locking/mocks/matchers/locking_applycommandlock.go @@ -5,7 +5,7 @@ import ( "github.com/petergtz/pegomock" "reflect" - locking "github.com/runatlantis/atlantis/server/events/locking" + locking "github.com/runatlantis/atlantis/server/core/locking" ) func AnyLockingApplyCommandLock() locking.ApplyCommandLock { diff --git a/server/events/locking/mocks/matchers/locking_applycommandlockresponse.go b/server/core/locking/mocks/matchers/locking_applycommandlockresponse.go similarity index 89% rename from server/events/locking/mocks/matchers/locking_applycommandlockresponse.go rename to server/core/locking/mocks/matchers/locking_applycommandlockresponse.go index 735879321..f54209e43 100644 --- a/server/events/locking/mocks/matchers/locking_applycommandlockresponse.go +++ b/server/core/locking/mocks/matchers/locking_applycommandlockresponse.go @@ -2,9 +2,9 @@ package matchers import ( - "reflect" "github.com/petergtz/pegomock" - locking "github.com/runatlantis/atlantis/server/events/locking" + locking "github.com/runatlantis/atlantis/server/core/locking" + "reflect" ) func AnyLockingApplyCommandLockResponse() locking.ApplyCommandLock { diff --git a/server/events/locking/mocks/matchers/locking_trylockresponse.go b/server/core/locking/mocks/matchers/locking_trylockresponse.go similarity index 93% rename from server/events/locking/mocks/matchers/locking_trylockresponse.go rename to server/core/locking/mocks/matchers/locking_trylockresponse.go index 1fd8636ae..53e9bb19d 100644 --- a/server/events/locking/mocks/matchers/locking_trylockresponse.go +++ b/server/core/locking/mocks/matchers/locking_trylockresponse.go @@ -5,7 +5,7 @@ import ( "github.com/petergtz/pegomock" "reflect" - locking "github.com/runatlantis/atlantis/server/events/locking" + locking "github.com/runatlantis/atlantis/server/core/locking" ) func AnyLockingTryLockResponse() locking.TryLockResponse { diff --git a/server/events/locking/mocks/matchers/map_of_string_to_models_projectlock.go b/server/core/locking/mocks/matchers/map_of_string_to_models_projectlock.go similarity index 100% rename from server/events/locking/mocks/matchers/map_of_string_to_models_projectlock.go rename to server/core/locking/mocks/matchers/map_of_string_to_models_projectlock.go diff --git a/server/events/locking/mocks/matchers/models_commandlock.go b/server/core/locking/mocks/matchers/models_commandlock.go similarity index 100% rename from server/events/locking/mocks/matchers/models_commandlock.go rename to server/core/locking/mocks/matchers/models_commandlock.go diff --git a/server/events/locking/mocks/matchers/models_commandname.go b/server/core/locking/mocks/matchers/models_commandname.go similarity index 100% rename from server/events/locking/mocks/matchers/models_commandname.go rename to server/core/locking/mocks/matchers/models_commandname.go diff --git a/server/events/locking/mocks/matchers/models_project.go b/server/core/locking/mocks/matchers/models_project.go similarity index 100% rename from server/events/locking/mocks/matchers/models_project.go rename to server/core/locking/mocks/matchers/models_project.go diff --git a/server/events/locking/mocks/matchers/models_projectlock.go b/server/core/locking/mocks/matchers/models_projectlock.go similarity index 100% rename from server/events/locking/mocks/matchers/models_projectlock.go rename to server/core/locking/mocks/matchers/models_projectlock.go diff --git a/server/events/locking/mocks/matchers/models_pullrequest.go b/server/core/locking/mocks/matchers/models_pullrequest.go similarity index 100% rename from server/events/locking/mocks/matchers/models_pullrequest.go rename to server/core/locking/mocks/matchers/models_pullrequest.go diff --git a/server/events/locking/mocks/matchers/models_user.go b/server/core/locking/mocks/matchers/models_user.go similarity index 100% rename from server/events/locking/mocks/matchers/models_user.go rename to server/core/locking/mocks/matchers/models_user.go diff --git a/server/events/locking/mocks/matchers/ptr_to_models_commandlock.go b/server/core/locking/mocks/matchers/ptr_to_models_commandlock.go similarity index 100% rename from server/events/locking/mocks/matchers/ptr_to_models_commandlock.go rename to server/core/locking/mocks/matchers/ptr_to_models_commandlock.go diff --git a/server/events/locking/mocks/matchers/ptr_to_models_projectlock.go b/server/core/locking/mocks/matchers/ptr_to_models_projectlock.go similarity index 100% rename from server/events/locking/mocks/matchers/ptr_to_models_projectlock.go rename to server/core/locking/mocks/matchers/ptr_to_models_projectlock.go diff --git a/server/events/locking/mocks/matchers/slice_of_models_projectlock.go b/server/core/locking/mocks/matchers/slice_of_models_projectlock.go similarity index 100% rename from server/events/locking/mocks/matchers/slice_of_models_projectlock.go rename to server/core/locking/mocks/matchers/slice_of_models_projectlock.go diff --git a/server/events/locking/mocks/matchers/time_time.go b/server/core/locking/mocks/matchers/time_time.go similarity index 100% rename from server/events/locking/mocks/matchers/time_time.go rename to server/core/locking/mocks/matchers/time_time.go diff --git a/server/events/locking/mocks/mock_apply_lock_checker.go b/server/core/locking/mocks/mock_apply_lock_checker.go similarity index 95% rename from server/events/locking/mocks/mock_apply_lock_checker.go rename to server/core/locking/mocks/mock_apply_lock_checker.go index 7504ad65a..e133e9994 100644 --- a/server/events/locking/mocks/mock_apply_lock_checker.go +++ b/server/core/locking/mocks/mock_apply_lock_checker.go @@ -1,11 +1,11 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/locking (interfaces: ApplyLockChecker) +// Source: github.com/runatlantis/atlantis/server/core/locking (interfaces: ApplyLockChecker) package mocks import ( pegomock "github.com/petergtz/pegomock" - locking "github.com/runatlantis/atlantis/server/events/locking" + locking "github.com/runatlantis/atlantis/server/core/locking" "reflect" "time" ) diff --git a/server/events/locking/mocks/mock_apply_locker.go b/server/core/locking/mocks/mock_apply_locker.go similarity index 97% rename from server/events/locking/mocks/mock_apply_locker.go rename to server/core/locking/mocks/mock_apply_locker.go index 86ebb0e2d..d8608ec1f 100644 --- a/server/events/locking/mocks/mock_apply_locker.go +++ b/server/core/locking/mocks/mock_apply_locker.go @@ -1,11 +1,11 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/locking (interfaces: ApplyLocker) +// Source: github.com/runatlantis/atlantis/server/core/locking (interfaces: ApplyLocker) package mocks import ( pegomock "github.com/petergtz/pegomock" - locking "github.com/runatlantis/atlantis/server/events/locking" + locking "github.com/runatlantis/atlantis/server/core/locking" "reflect" "time" ) diff --git a/server/events/locking/mocks/mock_backend.go b/server/core/locking/mocks/mock_backend.go similarity index 99% rename from server/events/locking/mocks/mock_backend.go rename to server/core/locking/mocks/mock_backend.go index 6869e7783..c2876a9cb 100644 --- a/server/events/locking/mocks/mock_backend.go +++ b/server/core/locking/mocks/mock_backend.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/locking (interfaces: Backend) +// Source: github.com/runatlantis/atlantis/server/core/locking (interfaces: Backend) package mocks diff --git a/server/events/locking/mocks/mock_locker.go b/server/core/locking/mocks/mock_locker.go similarity index 98% rename from server/events/locking/mocks/mock_locker.go rename to server/core/locking/mocks/mock_locker.go index bc5c2486a..645ca4552 100644 --- a/server/events/locking/mocks/mock_locker.go +++ b/server/core/locking/mocks/mock_locker.go @@ -1,11 +1,11 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/locking (interfaces: Locker) +// Source: github.com/runatlantis/atlantis/server/core/locking (interfaces: Locker) package mocks import ( pegomock "github.com/petergtz/pegomock" - locking "github.com/runatlantis/atlantis/server/events/locking" + locking "github.com/runatlantis/atlantis/server/core/locking" models "github.com/runatlantis/atlantis/server/events/models" "reflect" "time" diff --git a/server/events/runtime/apply_step_runner.go b/server/core/runtime/apply_step_runner.go similarity index 100% rename from server/events/runtime/apply_step_runner.go rename to server/core/runtime/apply_step_runner.go diff --git a/server/events/runtime/apply_step_runner_internal_test.go b/server/core/runtime/apply_step_runner_internal_test.go similarity index 100% rename from server/events/runtime/apply_step_runner_internal_test.go rename to server/core/runtime/apply_step_runner_internal_test.go diff --git a/server/events/runtime/apply_step_runner_test.go b/server/core/runtime/apply_step_runner_test.go similarity index 98% rename from server/events/runtime/apply_step_runner_test.go rename to server/core/runtime/apply_step_runner_test.go index f5fa0b725..2130f4a81 100644 --- a/server/events/runtime/apply_step_runner_test.go +++ b/server/core/runtime/apply_step_runner_test.go @@ -12,13 +12,13 @@ import ( version "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/runtime" + "github.com/runatlantis/atlantis/server/core/terraform" + "github.com/runatlantis/atlantis/server/core/terraform/mocks" + matchers2 "github.com/runatlantis/atlantis/server/core/terraform/mocks/matchers" mocks2 "github.com/runatlantis/atlantis/server/events/mocks" "github.com/runatlantis/atlantis/server/events/mocks/matchers" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" - "github.com/runatlantis/atlantis/server/events/terraform" - "github.com/runatlantis/atlantis/server/events/terraform/mocks" - matchers2 "github.com/runatlantis/atlantis/server/events/terraform/mocks/matchers" "github.com/runatlantis/atlantis/server/logging" logging_matchers "github.com/runatlantis/atlantis/server/logging/mocks/matchers" . "github.com/runatlantis/atlantis/testing" diff --git a/server/events/runtime/cache/mocks/matchers/ptr_to_go_version_version.go b/server/core/runtime/cache/mocks/matchers/ptr_to_go_version_version.go similarity index 100% rename from server/events/runtime/cache/mocks/matchers/ptr_to_go_version_version.go rename to server/core/runtime/cache/mocks/matchers/ptr_to_go_version_version.go diff --git a/server/events/runtime/cache/mocks/mock_key_serializer.go b/server/core/runtime/cache/mocks/mock_key_serializer.go similarity index 97% rename from server/events/runtime/cache/mocks/mock_key_serializer.go rename to server/core/runtime/cache/mocks/mock_key_serializer.go index b82210099..e82f10140 100644 --- a/server/events/runtime/cache/mocks/mock_key_serializer.go +++ b/server/core/runtime/cache/mocks/mock_key_serializer.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/runtime/cache (interfaces: KeySerializer) +// Source: github.com/runatlantis/atlantis/server/core/runtime/cache (interfaces: KeySerializer) package mocks diff --git a/server/events/runtime/cache/mocks/mock_version_path.go b/server/core/runtime/cache/mocks/mock_version_path.go similarity index 97% rename from server/events/runtime/cache/mocks/mock_version_path.go rename to server/core/runtime/cache/mocks/mock_version_path.go index b1c5b4658..8db080d2e 100644 --- a/server/events/runtime/cache/mocks/mock_version_path.go +++ b/server/core/runtime/cache/mocks/mock_version_path.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/runtime/cache (interfaces: ExecutionVersionCache) +// Source: github.com/runatlantis/atlantis/server/core/runtime/cache (interfaces: ExecutionVersionCache) package mocks diff --git a/server/events/runtime/cache/version_path.go b/server/core/runtime/cache/version_path.go similarity index 98% rename from server/events/runtime/cache/version_path.go rename to server/core/runtime/cache/version_path.go index 56c3f21a4..c375e503d 100644 --- a/server/events/runtime/cache/version_path.go +++ b/server/core/runtime/cache/version_path.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/go-version" "github.com/pkg/errors" - "github.com/runatlantis/atlantis/server/events/runtime/models" + "github.com/runatlantis/atlantis/server/core/runtime/models" ) //go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_version_path.go ExecutionVersionCache diff --git a/server/events/runtime/cache/version_path_test.go b/server/core/runtime/cache/version_path_test.go similarity index 96% rename from server/events/runtime/cache/version_path_test.go rename to server/core/runtime/cache/version_path_test.go index a5f5e08b8..8dc681f15 100644 --- a/server/events/runtime/cache/version_path_test.go +++ b/server/core/runtime/cache/version_path_test.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" - cache_mocks "github.com/runatlantis/atlantis/server/events/runtime/cache/mocks" - "github.com/runatlantis/atlantis/server/events/runtime/models" - models_mocks "github.com/runatlantis/atlantis/server/events/runtime/models/mocks" + cache_mocks "github.com/runatlantis/atlantis/server/core/runtime/cache/mocks" + "github.com/runatlantis/atlantis/server/core/runtime/models" + models_mocks "github.com/runatlantis/atlantis/server/core/runtime/models/mocks" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/runtime/env_step_runner.go b/server/core/runtime/env_step_runner.go similarity index 100% rename from server/events/runtime/env_step_runner.go rename to server/core/runtime/env_step_runner.go diff --git a/server/events/runtime/env_step_runner_test.go b/server/core/runtime/env_step_runner_test.go similarity index 93% rename from server/events/runtime/env_step_runner_test.go rename to server/core/runtime/env_step_runner_test.go index 112016653..746840c4c 100644 --- a/server/events/runtime/env_step_runner_test.go +++ b/server/core/runtime/env_step_runner_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/hashicorp/go-version" + "github.com/runatlantis/atlantis/server/core/runtime" + "github.com/runatlantis/atlantis/server/core/terraform/mocks" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" - "github.com/runatlantis/atlantis/server/events/terraform/mocks" "github.com/runatlantis/atlantis/server/logging" . "github.com/petergtz/pegomock" diff --git a/server/events/runtime/executor.go b/server/core/runtime/executor.go similarity index 100% rename from server/events/runtime/executor.go rename to server/core/runtime/executor.go diff --git a/server/events/runtime/init_step_runner.go b/server/core/runtime/init_step_runner.go similarity index 100% rename from server/events/runtime/init_step_runner.go rename to server/core/runtime/init_step_runner.go diff --git a/server/events/runtime/init_step_runner_test.go b/server/core/runtime/init_step_runner_test.go similarity index 97% rename from server/events/runtime/init_step_runner_test.go rename to server/core/runtime/init_step_runner_test.go index 95ba137e9..fff48728c 100644 --- a/server/events/runtime/init_step_runner_test.go +++ b/server/core/runtime/init_step_runner_test.go @@ -9,10 +9,10 @@ import ( . "github.com/petergtz/pegomock" "github.com/pkg/errors" + "github.com/runatlantis/atlantis/server/core/runtime" + "github.com/runatlantis/atlantis/server/core/terraform/mocks" + matchers2 "github.com/runatlantis/atlantis/server/core/terraform/mocks/matchers" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" - "github.com/runatlantis/atlantis/server/events/terraform/mocks" - matchers2 "github.com/runatlantis/atlantis/server/events/terraform/mocks/matchers" "github.com/runatlantis/atlantis/server/logging" logging_matchers "github.com/runatlantis/atlantis/server/logging/mocks/matchers" . "github.com/runatlantis/atlantis/testing" diff --git a/server/events/runtime/minimum_version_step_runner_delegate.go b/server/core/runtime/minimum_version_step_runner_delegate.go similarity index 100% rename from server/events/runtime/minimum_version_step_runner_delegate.go rename to server/core/runtime/minimum_version_step_runner_delegate.go diff --git a/server/events/runtime/minimum_version_step_runner_delegate_test.go b/server/core/runtime/minimum_version_step_runner_delegate_test.go similarity index 97% rename from server/events/runtime/minimum_version_step_runner_delegate_test.go rename to server/core/runtime/minimum_version_step_runner_delegate_test.go index f7d5a4d14..5bcf7cedf 100644 --- a/server/events/runtime/minimum_version_step_runner_delegate_test.go +++ b/server/core/runtime/minimum_version_step_runner_delegate_test.go @@ -5,8 +5,8 @@ import ( "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/runtime/mocks" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime/mocks" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/runtime/mocks/matchers/logging_simplelogging.go b/server/core/runtime/mocks/matchers/logging_simplelogging.go similarity index 100% rename from server/events/runtime/mocks/matchers/logging_simplelogging.go rename to server/core/runtime/mocks/matchers/logging_simplelogging.go diff --git a/server/events/runtime/mocks/matchers/map_of_string_to_string.go b/server/core/runtime/mocks/matchers/map_of_string_to_string.go similarity index 100% rename from server/events/runtime/mocks/matchers/map_of_string_to_string.go rename to server/core/runtime/mocks/matchers/map_of_string_to_string.go diff --git a/server/events/runtime/mocks/matchers/models_preworkflowhookcommandcontext.go b/server/core/runtime/mocks/matchers/models_preworkflowhookcommandcontext.go similarity index 100% rename from server/events/runtime/mocks/matchers/models_preworkflowhookcommandcontext.go rename to server/core/runtime/mocks/matchers/models_preworkflowhookcommandcontext.go diff --git a/server/events/runtime/mocks/matchers/models_projectcommandcontext.go b/server/core/runtime/mocks/matchers/models_projectcommandcontext.go similarity index 100% rename from server/events/runtime/mocks/matchers/models_projectcommandcontext.go rename to server/core/runtime/mocks/matchers/models_projectcommandcontext.go diff --git a/server/events/runtime/mocks/matchers/models_pullrequest.go b/server/core/runtime/mocks/matchers/models_pullrequest.go similarity index 100% rename from server/events/runtime/mocks/matchers/models_pullrequest.go rename to server/core/runtime/mocks/matchers/models_pullrequest.go diff --git a/server/events/runtime/mocks/matchers/models_repo.go b/server/core/runtime/mocks/matchers/models_repo.go similarity index 100% rename from server/events/runtime/mocks/matchers/models_repo.go rename to server/core/runtime/mocks/matchers/models_repo.go diff --git a/server/events/runtime/mocks/matchers/ptr_to_go_version_version.go b/server/core/runtime/mocks/matchers/ptr_to_go_version_version.go similarity index 100% rename from server/events/runtime/mocks/matchers/ptr_to_go_version_version.go rename to server/core/runtime/mocks/matchers/ptr_to_go_version_version.go diff --git a/server/events/runtime/mocks/matchers/ptr_to_logging_simplelogger.go b/server/core/runtime/mocks/matchers/ptr_to_logging_simplelogger.go similarity index 100% rename from server/events/runtime/mocks/matchers/ptr_to_logging_simplelogger.go rename to server/core/runtime/mocks/matchers/ptr_to_logging_simplelogger.go diff --git a/server/events/runtime/mocks/matchers/slice_of_string.go b/server/core/runtime/mocks/matchers/slice_of_string.go similarity index 100% rename from server/events/runtime/mocks/matchers/slice_of_string.go rename to server/core/runtime/mocks/matchers/slice_of_string.go diff --git a/server/events/runtime/mocks/mock_pre_workflows_hook_runner.go b/server/core/runtime/mocks/mock_pre_workflows_hook_runner.go similarity index 97% rename from server/events/runtime/mocks/mock_pre_workflows_hook_runner.go rename to server/core/runtime/mocks/mock_pre_workflows_hook_runner.go index dcb5c3293..ddc883491 100644 --- a/server/events/runtime/mocks/mock_pre_workflows_hook_runner.go +++ b/server/core/runtime/mocks/mock_pre_workflows_hook_runner.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/runtime (interfaces: PreWorkflowHookRunner) +// Source: github.com/runatlantis/atlantis/server/core/runtime (interfaces: PreWorkflowHookRunner) package mocks diff --git a/server/events/runtime/mocks/mock_pull_approved_checker.go b/server/core/runtime/mocks/mock_pull_approved_checker.go similarity index 97% rename from server/events/runtime/mocks/mock_pull_approved_checker.go rename to server/core/runtime/mocks/mock_pull_approved_checker.go index 7acee92c7..9c0790100 100644 --- a/server/events/runtime/mocks/mock_pull_approved_checker.go +++ b/server/core/runtime/mocks/mock_pull_approved_checker.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/runtime (interfaces: PullApprovedChecker) +// Source: github.com/runatlantis/atlantis/server/core/runtime (interfaces: PullApprovedChecker) package mocks diff --git a/server/events/runtime/mocks/mock_runner.go b/server/core/runtime/mocks/mock_runner.go similarity index 98% rename from server/events/runtime/mocks/mock_runner.go rename to server/core/runtime/mocks/mock_runner.go index 5a3965b5d..f3d6534a4 100644 --- a/server/events/runtime/mocks/mock_runner.go +++ b/server/core/runtime/mocks/mock_runner.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/runtime (interfaces: Runner) +// Source: github.com/runatlantis/atlantis/server/core/runtime (interfaces: Runner) package mocks diff --git a/server/events/runtime/mocks/mock_versionedexecutorworkflow.go b/server/core/runtime/mocks/mock_versionedexecutorworkflow.go similarity index 98% rename from server/events/runtime/mocks/mock_versionedexecutorworkflow.go rename to server/core/runtime/mocks/mock_versionedexecutorworkflow.go index f43d1efcb..a2c7939da 100644 --- a/server/events/runtime/mocks/mock_versionedexecutorworkflow.go +++ b/server/core/runtime/mocks/mock_versionedexecutorworkflow.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/runtime (interfaces: VersionedExecutorWorkflow) +// Source: github.com/runatlantis/atlantis/server/core/runtime (interfaces: VersionedExecutorWorkflow) package mocks diff --git a/server/events/runtime/models/exec.go b/server/core/runtime/models/exec.go similarity index 100% rename from server/events/runtime/models/exec.go rename to server/core/runtime/models/exec.go diff --git a/server/events/runtime/models/filepath.go b/server/core/runtime/models/filepath.go similarity index 100% rename from server/events/runtime/models/filepath.go rename to server/core/runtime/models/filepath.go diff --git a/server/events/runtime/models/mocks/matchers/map_of_string_to_string.go b/server/core/runtime/models/mocks/matchers/map_of_string_to_string.go similarity index 100% rename from server/events/runtime/models/mocks/matchers/map_of_string_to_string.go rename to server/core/runtime/models/mocks/matchers/map_of_string_to_string.go diff --git a/server/events/runtime/models/mocks/matchers/models_filepath.go b/server/core/runtime/models/mocks/matchers/models_filepath.go similarity index 92% rename from server/events/runtime/models/mocks/matchers/models_filepath.go rename to server/core/runtime/models/mocks/matchers/models_filepath.go index e30e6b2a7..3d484539a 100644 --- a/server/events/runtime/models/mocks/matchers/models_filepath.go +++ b/server/core/runtime/models/mocks/matchers/models_filepath.go @@ -5,7 +5,7 @@ import ( "github.com/petergtz/pegomock" "reflect" - models "github.com/runatlantis/atlantis/server/events/runtime/models" + models "github.com/runatlantis/atlantis/server/core/runtime/models" ) func AnyModelsFilePath() models.FilePath { diff --git a/server/events/runtime/models/mocks/matchers/slice_of_string.go b/server/core/runtime/models/mocks/matchers/slice_of_string.go similarity index 100% rename from server/events/runtime/models/mocks/matchers/slice_of_string.go rename to server/core/runtime/models/mocks/matchers/slice_of_string.go diff --git a/server/events/runtime/models/mocks/mock_exec.go b/server/core/runtime/models/mocks/mock_exec.go similarity index 98% rename from server/events/runtime/models/mocks/mock_exec.go rename to server/core/runtime/models/mocks/mock_exec.go index 1755e66ac..83da167ae 100644 --- a/server/events/runtime/models/mocks/mock_exec.go +++ b/server/core/runtime/models/mocks/mock_exec.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/runtime/models (interfaces: Exec) +// Source: github.com/runatlantis/atlantis/server/core/runtime/models (interfaces: Exec) package mocks diff --git a/server/events/runtime/models/mocks/mock_filepath.go b/server/core/runtime/models/mocks/mock_filepath.go similarity index 97% rename from server/events/runtime/models/mocks/mock_filepath.go rename to server/core/runtime/models/mocks/mock_filepath.go index 9304c29e4..8bbc61632 100644 --- a/server/events/runtime/models/mocks/mock_filepath.go +++ b/server/core/runtime/models/mocks/mock_filepath.go @@ -1,11 +1,11 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/runtime/models (interfaces: FilePath) +// Source: github.com/runatlantis/atlantis/server/core/runtime/models (interfaces: FilePath) package mocks import ( pegomock "github.com/petergtz/pegomock" - models "github.com/runatlantis/atlantis/server/events/runtime/models" + models "github.com/runatlantis/atlantis/server/core/runtime/models" "reflect" "time" ) diff --git a/server/events/runtime/plan_step_runner.go b/server/core/runtime/plan_step_runner.go similarity index 100% rename from server/events/runtime/plan_step_runner.go rename to server/core/runtime/plan_step_runner.go diff --git a/server/events/runtime/plan_step_runner_test.go b/server/core/runtime/plan_step_runner_test.go similarity index 99% rename from server/events/runtime/plan_step_runner_test.go rename to server/core/runtime/plan_step_runner_test.go index 352d88126..d16d531a3 100644 --- a/server/events/runtime/plan_step_runner_test.go +++ b/server/core/runtime/plan_step_runner_test.go @@ -9,16 +9,16 @@ import ( "testing" "github.com/hashicorp/go-version" + "github.com/runatlantis/atlantis/server/core/terraform" mocks2 "github.com/runatlantis/atlantis/server/events/mocks" - "github.com/runatlantis/atlantis/server/events/terraform" . "github.com/petergtz/pegomock" "github.com/pkg/errors" + "github.com/runatlantis/atlantis/server/core/runtime" + "github.com/runatlantis/atlantis/server/core/terraform/mocks" + matchers2 "github.com/runatlantis/atlantis/server/core/terraform/mocks/matchers" "github.com/runatlantis/atlantis/server/events/mocks/matchers" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" - "github.com/runatlantis/atlantis/server/events/terraform/mocks" - matchers2 "github.com/runatlantis/atlantis/server/events/terraform/mocks/matchers" "github.com/runatlantis/atlantis/server/logging" logging_matchers "github.com/runatlantis/atlantis/server/logging/mocks/matchers" . "github.com/runatlantis/atlantis/testing" diff --git a/server/events/runtime/plan_type_step_runner_delegate.go b/server/core/runtime/plan_type_step_runner_delegate.go similarity index 100% rename from server/events/runtime/plan_type_step_runner_delegate.go rename to server/core/runtime/plan_type_step_runner_delegate.go diff --git a/server/events/runtime/plan_type_step_runner_delegate_test.go b/server/core/runtime/plan_type_step_runner_delegate_test.go similarity index 98% rename from server/events/runtime/plan_type_step_runner_delegate_test.go rename to server/core/runtime/plan_type_step_runner_delegate_test.go index 38a10c63d..060e163a6 100644 --- a/server/events/runtime/plan_type_step_runner_delegate_test.go +++ b/server/core/runtime/plan_type_step_runner_delegate_test.go @@ -10,8 +10,8 @@ import ( . "github.com/petergtz/pegomock" . "github.com/runatlantis/atlantis/testing" + "github.com/runatlantis/atlantis/server/core/runtime/mocks" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime/mocks" ) var planFileContents = ` diff --git a/server/events/runtime/policy/conftest_client.go b/server/core/runtime/policy/conftest_client.go similarity index 97% rename from server/events/runtime/policy/conftest_client.go rename to server/core/runtime/policy/conftest_client.go index 18591e881..8adfdc99c 100644 --- a/server/events/runtime/policy/conftest_client.go +++ b/server/core/runtime/policy/conftest_client.go @@ -9,10 +9,10 @@ import ( version "github.com/hashicorp/go-version" "github.com/pkg/errors" + "github.com/runatlantis/atlantis/server/core/runtime/cache" + runtime_models "github.com/runatlantis/atlantis/server/core/runtime/models" + "github.com/runatlantis/atlantis/server/core/terraform" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime/cache" - runtime_models "github.com/runatlantis/atlantis/server/events/runtime/models" - "github.com/runatlantis/atlantis/server/events/terraform" "github.com/runatlantis/atlantis/server/events/yaml/valid" "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/events/runtime/policy/conftest_client_test.go b/server/core/runtime/policy/conftest_client_test.go similarity index 96% rename from server/events/runtime/policy/conftest_client_test.go rename to server/core/runtime/policy/conftest_client_test.go index f6eea3ad2..85ad66755 100644 --- a/server/events/runtime/policy/conftest_client_test.go +++ b/server/core/runtime/policy/conftest_client_test.go @@ -10,11 +10,11 @@ import ( "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/runtime/cache/mocks" + models_mocks "github.com/runatlantis/atlantis/server/core/runtime/models/mocks" + conftest_mocks "github.com/runatlantis/atlantis/server/core/runtime/policy/mocks" + terraform_mocks "github.com/runatlantis/atlantis/server/core/terraform/mocks" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime/cache/mocks" - models_mocks "github.com/runatlantis/atlantis/server/events/runtime/models/mocks" - conftest_mocks "github.com/runatlantis/atlantis/server/events/runtime/policy/mocks" - terraform_mocks "github.com/runatlantis/atlantis/server/events/terraform/mocks" "github.com/runatlantis/atlantis/server/events/yaml/valid" "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing" diff --git a/server/events/runtime/policy/mocks/matchers/valid_policyset.go b/server/core/runtime/policy/mocks/matchers/valid_policyset.go similarity index 100% rename from server/events/runtime/policy/mocks/matchers/valid_policyset.go rename to server/core/runtime/policy/mocks/matchers/valid_policyset.go diff --git a/server/events/runtime/policy/mocks/mock_conftest_client.go b/server/core/runtime/policy/mocks/mock_conftest_client.go similarity index 97% rename from server/events/runtime/policy/mocks/mock_conftest_client.go rename to server/core/runtime/policy/mocks/mock_conftest_client.go index b9a4a411b..19cc3a991 100644 --- a/server/events/runtime/policy/mocks/mock_conftest_client.go +++ b/server/core/runtime/policy/mocks/mock_conftest_client.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/runtime/policy (interfaces: SourceResolver) +// Source: github.com/runatlantis/atlantis/server/core/runtime/policy (interfaces: SourceResolver) package mocks diff --git a/server/events/runtime/policy_check_step_runner.go b/server/core/runtime/policy_check_step_runner.go similarity index 100% rename from server/events/runtime/policy_check_step_runner.go rename to server/core/runtime/policy_check_step_runner.go diff --git a/server/events/runtime/policy_check_step_runner_test.go b/server/core/runtime/policy_check_step_runner_test.go similarity index 97% rename from server/events/runtime/policy_check_step_runner_test.go rename to server/core/runtime/policy_check_step_runner_test.go index 20c960603..0e255ac35 100644 --- a/server/events/runtime/policy_check_step_runner_test.go +++ b/server/core/runtime/policy_check_step_runner_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/runtime/mocks" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime/mocks" "github.com/runatlantis/atlantis/server/events/yaml/valid" "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing" diff --git a/server/events/runtime/pre_workflow_hook_runner.go b/server/core/runtime/pre_workflow_hook_runner.go similarity index 100% rename from server/events/runtime/pre_workflow_hook_runner.go rename to server/core/runtime/pre_workflow_hook_runner.go diff --git a/server/events/runtime/pre_workflow_hook_runner_test.go b/server/core/runtime/pre_workflow_hook_runner_test.go similarity index 93% rename from server/events/runtime/pre_workflow_hook_runner_test.go rename to server/core/runtime/pre_workflow_hook_runner_test.go index 75eb4a2b1..49da87a67 100644 --- a/server/events/runtime/pre_workflow_hook_runner_test.go +++ b/server/core/runtime/pre_workflow_hook_runner_test.go @@ -5,11 +5,11 @@ import ( "testing" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/runtime" + "github.com/runatlantis/atlantis/server/core/terraform/mocks" + matchers2 "github.com/runatlantis/atlantis/server/core/terraform/mocks/matchers" "github.com/runatlantis/atlantis/server/events/mocks/matchers" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" - "github.com/runatlantis/atlantis/server/events/terraform/mocks" - matchers2 "github.com/runatlantis/atlantis/server/events/terraform/mocks/matchers" "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/runtime/pull_approved_checker.go b/server/core/runtime/pull_approved_checker.go similarity index 100% rename from server/events/runtime/pull_approved_checker.go rename to server/core/runtime/pull_approved_checker.go diff --git a/server/events/runtime/run_step_runner.go b/server/core/runtime/run_step_runner.go similarity index 100% rename from server/events/runtime/run_step_runner.go rename to server/core/runtime/run_step_runner.go diff --git a/server/events/runtime/run_step_runner_test.go b/server/core/runtime/run_step_runner_test.go similarity index 95% rename from server/events/runtime/run_step_runner_test.go rename to server/core/runtime/run_step_runner_test.go index f5b264d1c..be6d4642a 100644 --- a/server/events/runtime/run_step_runner_test.go +++ b/server/core/runtime/run_step_runner_test.go @@ -8,11 +8,11 @@ import ( version "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/runtime" + "github.com/runatlantis/atlantis/server/core/terraform/mocks" + matchers2 "github.com/runatlantis/atlantis/server/core/terraform/mocks/matchers" "github.com/runatlantis/atlantis/server/events/mocks/matchers" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" - "github.com/runatlantis/atlantis/server/events/terraform/mocks" - matchers2 "github.com/runatlantis/atlantis/server/events/terraform/mocks/matchers" "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/runtime/runtime.go b/server/core/runtime/runtime.go similarity index 98% rename from server/events/runtime/runtime.go rename to server/core/runtime/runtime.go index a2beb78da..f3b130c68 100644 --- a/server/events/runtime/runtime.go +++ b/server/core/runtime/runtime.go @@ -10,8 +10,8 @@ import ( version "github.com/hashicorp/go-version" "github.com/pkg/errors" + "github.com/runatlantis/atlantis/server/core/terraform" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/terraform" "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/events/runtime/runtime_test.go b/server/core/runtime/runtime_test.go similarity index 96% rename from server/events/runtime/runtime_test.go rename to server/core/runtime/runtime_test.go index 6c840fa6a..e77ccd4d7 100644 --- a/server/events/runtime/runtime_test.go +++ b/server/core/runtime/runtime_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/runatlantis/atlantis/server/events/runtime" + "github.com/runatlantis/atlantis/server/core/runtime" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/runtime/show_step_runner.go b/server/core/runtime/show_step_runner.go similarity index 100% rename from server/events/runtime/show_step_runner.go rename to server/core/runtime/show_step_runner.go diff --git a/server/events/runtime/show_step_runner_test.go b/server/core/runtime/show_step_runner_test.go similarity index 97% rename from server/events/runtime/show_step_runner_test.go rename to server/core/runtime/show_step_runner_test.go index 72250d3a0..a01d8fb50 100644 --- a/server/events/runtime/show_step_runner_test.go +++ b/server/core/runtime/show_step_runner_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/terraform/mocks" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/terraform/mocks" "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/terraform/mocks/matchers/go_getter_clientoption.go b/server/core/terraform/mocks/matchers/go_getter_clientoption.go similarity index 100% rename from server/events/terraform/mocks/matchers/go_getter_clientoption.go rename to server/core/terraform/mocks/matchers/go_getter_clientoption.go diff --git a/server/events/terraform/mocks/matchers/logging_simplelogging.go b/server/core/terraform/mocks/matchers/logging_simplelogging.go similarity index 100% rename from server/events/terraform/mocks/matchers/logging_simplelogging.go rename to server/core/terraform/mocks/matchers/logging_simplelogging.go diff --git a/server/events/terraform/mocks/matchers/map_of_string_to_string.go b/server/core/terraform/mocks/matchers/map_of_string_to_string.go similarity index 100% rename from server/events/terraform/mocks/matchers/map_of_string_to_string.go rename to server/core/terraform/mocks/matchers/map_of_string_to_string.go diff --git a/server/events/terraform/mocks/matchers/ptr_to_go_version_version.go b/server/core/terraform/mocks/matchers/ptr_to_go_version_version.go similarity index 100% rename from server/events/terraform/mocks/matchers/ptr_to_go_version_version.go rename to server/core/terraform/mocks/matchers/ptr_to_go_version_version.go diff --git a/server/events/terraform/mocks/matchers/ptr_to_logging_simplelogger.go b/server/core/terraform/mocks/matchers/ptr_to_logging_simplelogger.go similarity index 100% rename from server/events/terraform/mocks/matchers/ptr_to_logging_simplelogger.go rename to server/core/terraform/mocks/matchers/ptr_to_logging_simplelogger.go diff --git a/server/events/terraform/mocks/matchers/slice_of_string.go b/server/core/terraform/mocks/matchers/slice_of_string.go similarity index 100% rename from server/events/terraform/mocks/matchers/slice_of_string.go rename to server/core/terraform/mocks/matchers/slice_of_string.go diff --git a/server/events/terraform/mocks/mock_downloader.go b/server/core/terraform/mocks/mock_downloader.go similarity index 98% rename from server/events/terraform/mocks/mock_downloader.go rename to server/core/terraform/mocks/mock_downloader.go index 1a520af16..7d5719ccd 100644 --- a/server/events/terraform/mocks/mock_downloader.go +++ b/server/core/terraform/mocks/mock_downloader.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/terraform (interfaces: Downloader) +// Source: github.com/runatlantis/atlantis/server/core/terraform (interfaces: Downloader) package mocks diff --git a/server/events/terraform/mocks/mock_terraform_client.go b/server/core/terraform/mocks/mock_terraform_client.go similarity index 98% rename from server/events/terraform/mocks/mock_terraform_client.go rename to server/core/terraform/mocks/mock_terraform_client.go index 89820350a..05565e208 100644 --- a/server/events/terraform/mocks/mock_terraform_client.go +++ b/server/core/terraform/mocks/mock_terraform_client.go @@ -1,5 +1,5 @@ // Code generated by pegomock. DO NOT EDIT. -// Source: github.com/runatlantis/atlantis/server/events/terraform (interfaces: Client) +// Source: github.com/runatlantis/atlantis/server/core/terraform (interfaces: Client) package mocks diff --git a/server/events/terraform/terraform_client.go b/server/core/terraform/terraform_client.go similarity index 100% rename from server/events/terraform/terraform_client.go rename to server/core/terraform/terraform_client.go diff --git a/server/events/terraform/terraform_client_internal_test.go b/server/core/terraform/terraform_client_internal_test.go similarity index 100% rename from server/events/terraform/terraform_client_internal_test.go rename to server/core/terraform/terraform_client_internal_test.go diff --git a/server/events/terraform/terraform_client_test.go b/server/core/terraform/terraform_client_test.go similarity index 98% rename from server/events/terraform/terraform_client_test.go rename to server/core/terraform/terraform_client_test.go index fcd89407e..5ccb2e573 100644 --- a/server/events/terraform/terraform_client_test.go +++ b/server/core/terraform/terraform_client_test.go @@ -26,8 +26,8 @@ import ( "github.com/petergtz/pegomock" . "github.com/petergtz/pegomock" "github.com/runatlantis/atlantis/cmd" - "github.com/runatlantis/atlantis/server/events/terraform" - "github.com/runatlantis/atlantis/server/events/terraform/mocks" + "github.com/runatlantis/atlantis/server/core/terraform" + "github.com/runatlantis/atlantis/server/core/terraform/mocks" "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing" ) diff --git a/server/events/apply_command_runner.go b/server/events/apply_command_runner.go index cd54b2a9c..6cd23c213 100644 --- a/server/events/apply_command_runner.go +++ b/server/events/apply_command_runner.go @@ -1,8 +1,8 @@ package events import ( - "github.com/runatlantis/atlantis/server/events/db" - "github.com/runatlantis/atlantis/server/events/locking" + "github.com/runatlantis/atlantis/server/core/db" + "github.com/runatlantis/atlantis/server/core/locking" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/vcs" ) diff --git a/server/events/apply_command_runner_test.go b/server/events/apply_command_runner_test.go index 49b171c2e..20f946fb9 100644 --- a/server/events/apply_command_runner_test.go +++ b/server/events/apply_command_runner_test.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-github/v31/github" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/locking" "github.com/runatlantis/atlantis/server/events" - "github.com/runatlantis/atlantis/server/events/locking" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/models/fixtures" "github.com/runatlantis/atlantis/server/logging" diff --git a/server/events/command_runner_test.go b/server/events/command_runner_test.go index e4066e531..a0b4c17a6 100644 --- a/server/events/command_runner_test.go +++ b/server/events/command_runner_test.go @@ -19,14 +19,14 @@ import ( "strings" "testing" - "github.com/runatlantis/atlantis/server/events/db" + "github.com/runatlantis/atlantis/server/core/db" "github.com/runatlantis/atlantis/server/events/yaml/valid" "github.com/runatlantis/atlantis/server/logging" "github.com/google/go-github/v31/github" . "github.com/petergtz/pegomock" + lockingmocks "github.com/runatlantis/atlantis/server/core/locking/mocks" "github.com/runatlantis/atlantis/server/events" - lockingmocks "github.com/runatlantis/atlantis/server/events/locking/mocks" "github.com/runatlantis/atlantis/server/events/mocks" eventmocks "github.com/runatlantis/atlantis/server/events/mocks" "github.com/runatlantis/atlantis/server/events/mocks/matchers" diff --git a/server/events/db_updater.go b/server/events/db_updater.go index 202ca5423..230b646b3 100644 --- a/server/events/db_updater.go +++ b/server/events/db_updater.go @@ -1,7 +1,7 @@ package events import ( - "github.com/runatlantis/atlantis/server/events/db" + "github.com/runatlantis/atlantis/server/core/db" "github.com/runatlantis/atlantis/server/events/models" ) diff --git a/server/events/delete_lock_command.go b/server/events/delete_lock_command.go index 2f34a737e..9139aec7a 100644 --- a/server/events/delete_lock_command.go +++ b/server/events/delete_lock_command.go @@ -1,8 +1,8 @@ package events import ( - "github.com/runatlantis/atlantis/server/events/db" - "github.com/runatlantis/atlantis/server/events/locking" + "github.com/runatlantis/atlantis/server/core/db" + "github.com/runatlantis/atlantis/server/core/locking" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/logging" ) diff --git a/server/events/delete_lock_command_test.go b/server/events/delete_lock_command_test.go index d16268915..1b467b1eb 100644 --- a/server/events/delete_lock_command_test.go +++ b/server/events/delete_lock_command_test.go @@ -5,9 +5,9 @@ import ( "testing" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/db" + lockmocks "github.com/runatlantis/atlantis/server/core/locking/mocks" "github.com/runatlantis/atlantis/server/events" - "github.com/runatlantis/atlantis/server/events/db" - lockmocks "github.com/runatlantis/atlantis/server/events/locking/mocks" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing" diff --git a/server/events/pending_plan_finder.go b/server/events/pending_plan_finder.go index e57789cec..bff75b623 100644 --- a/server/events/pending_plan_finder.go +++ b/server/events/pending_plan_finder.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/pkg/errors" - "github.com/runatlantis/atlantis/server/events/runtime" + "github.com/runatlantis/atlantis/server/core/runtime" ) //go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_pending_plan_finder.go PendingPlanFinder diff --git a/server/events/pre_workflow_hooks_command_runner.go b/server/events/pre_workflow_hooks_command_runner.go index cd5ae6eed..1f110db1d 100644 --- a/server/events/pre_workflow_hooks_command_runner.go +++ b/server/events/pre_workflow_hooks_command_runner.go @@ -1,8 +1,8 @@ package events import ( + "github.com/runatlantis/atlantis/server/core/runtime" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" "github.com/runatlantis/atlantis/server/events/vcs" "github.com/runatlantis/atlantis/server/events/yaml/valid" ) diff --git a/server/events/pre_workflow_hooks_command_runner_test.go b/server/events/pre_workflow_hooks_command_runner_test.go index 0b9fd48cf..e384a5235 100644 --- a/server/events/pre_workflow_hooks_command_runner_test.go +++ b/server/events/pre_workflow_hooks_command_runner_test.go @@ -5,11 +5,11 @@ import ( "testing" . "github.com/petergtz/pegomock" + runtime_mocks "github.com/runatlantis/atlantis/server/core/runtime/mocks" "github.com/runatlantis/atlantis/server/events" "github.com/runatlantis/atlantis/server/events/mocks" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/models/fixtures" - runtime_mocks "github.com/runatlantis/atlantis/server/events/runtime/mocks" vcsmocks "github.com/runatlantis/atlantis/server/events/vcs/mocks" "github.com/runatlantis/atlantis/server/events/yaml/valid" "github.com/runatlantis/atlantis/server/logging" diff --git a/server/events/project_command_runner.go b/server/events/project_command_runner.go index 1701fa0e0..d5d495fa9 100644 --- a/server/events/project_command_runner.go +++ b/server/events/project_command_runner.go @@ -20,8 +20,8 @@ import ( "strings" "github.com/pkg/errors" + "github.com/runatlantis/atlantis/server/core/runtime" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" "github.com/runatlantis/atlantis/server/events/webhooks" "github.com/runatlantis/atlantis/server/events/yaml/raw" "github.com/runatlantis/atlantis/server/events/yaml/valid" diff --git a/server/events/project_command_runner_test.go b/server/events/project_command_runner_test.go index 4d566c8ac..ed9cfcc62 100644 --- a/server/events/project_command_runner_test.go +++ b/server/events/project_command_runner_test.go @@ -19,13 +19,13 @@ import ( "github.com/hashicorp/go-version" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/runtime" + mocks2 "github.com/runatlantis/atlantis/server/core/runtime/mocks" + tmocks "github.com/runatlantis/atlantis/server/core/terraform/mocks" "github.com/runatlantis/atlantis/server/events" "github.com/runatlantis/atlantis/server/events/mocks" "github.com/runatlantis/atlantis/server/events/mocks/matchers" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" - mocks2 "github.com/runatlantis/atlantis/server/events/runtime/mocks" - tmocks "github.com/runatlantis/atlantis/server/events/terraform/mocks" "github.com/runatlantis/atlantis/server/events/yaml/valid" "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing" diff --git a/server/events/project_locker.go b/server/events/project_locker.go index bfffd0feb..4109724bd 100644 --- a/server/events/project_locker.go +++ b/server/events/project_locker.go @@ -16,7 +16,7 @@ package events import ( "fmt" - "github.com/runatlantis/atlantis/server/events/locking" + "github.com/runatlantis/atlantis/server/core/locking" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/vcs" "github.com/runatlantis/atlantis/server/logging" diff --git a/server/events/project_locker_test.go b/server/events/project_locker_test.go index ce5af7c97..0da01b4e4 100644 --- a/server/events/project_locker_test.go +++ b/server/events/project_locker_test.go @@ -18,9 +18,9 @@ import ( "testing" . "github.com/petergtz/pegomock" + "github.com/runatlantis/atlantis/server/core/locking" + "github.com/runatlantis/atlantis/server/core/locking/mocks" "github.com/runatlantis/atlantis/server/events" - "github.com/runatlantis/atlantis/server/events/locking" - "github.com/runatlantis/atlantis/server/events/locking/mocks" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/vcs" "github.com/runatlantis/atlantis/server/logging" diff --git a/server/events/pull_closed_executor.go b/server/events/pull_closed_executor.go index 94dc4743f..2ecaebe04 100644 --- a/server/events/pull_closed_executor.go +++ b/server/events/pull_closed_executor.go @@ -20,12 +20,12 @@ import ( "strings" "text/template" - "github.com/runatlantis/atlantis/server/events/db" + "github.com/runatlantis/atlantis/server/core/db" "github.com/runatlantis/atlantis/server/logging" "github.com/pkg/errors" - "github.com/runatlantis/atlantis/server/events/locking" + "github.com/runatlantis/atlantis/server/core/locking" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/events/vcs" ) diff --git a/server/events/pull_closed_executor_test.go b/server/events/pull_closed_executor_test.go index b84a1f825..e5d5953bb 100644 --- a/server/events/pull_closed_executor_test.go +++ b/server/events/pull_closed_executor_test.go @@ -17,11 +17,11 @@ import ( "errors" "testing" - "github.com/runatlantis/atlantis/server/events/db" + "github.com/runatlantis/atlantis/server/core/db" . "github.com/petergtz/pegomock" + lockmocks "github.com/runatlantis/atlantis/server/core/locking/mocks" "github.com/runatlantis/atlantis/server/events" - lockmocks "github.com/runatlantis/atlantis/server/events/locking/mocks" "github.com/runatlantis/atlantis/server/events/mocks" "github.com/runatlantis/atlantis/server/events/mocks/matchers" "github.com/runatlantis/atlantis/server/events/models" diff --git a/server/server.go b/server/server.go index f77b6dd8c..9353d9230 100644 --- a/server/server.go +++ b/server/server.go @@ -32,7 +32,7 @@ import ( "time" "github.com/mitchellh/go-homedir" - "github.com/runatlantis/atlantis/server/events/db" + "github.com/runatlantis/atlantis/server/core/db" "github.com/runatlantis/atlantis/server/events/yaml/valid" assetfs "github.com/elazarl/go-bindata-assetfs" @@ -41,12 +41,12 @@ import ( "github.com/runatlantis/atlantis/server/controllers" events_controllers "github.com/runatlantis/atlantis/server/controllers/events" "github.com/runatlantis/atlantis/server/controllers/templates" + "github.com/runatlantis/atlantis/server/core/locking" + "github.com/runatlantis/atlantis/server/core/runtime" + "github.com/runatlantis/atlantis/server/core/runtime/policy" + "github.com/runatlantis/atlantis/server/core/terraform" "github.com/runatlantis/atlantis/server/events" - "github.com/runatlantis/atlantis/server/events/locking" "github.com/runatlantis/atlantis/server/events/models" - "github.com/runatlantis/atlantis/server/events/runtime" - "github.com/runatlantis/atlantis/server/events/runtime/policy" - "github.com/runatlantis/atlantis/server/events/terraform" "github.com/runatlantis/atlantis/server/events/vcs" "github.com/runatlantis/atlantis/server/events/vcs/bitbucketcloud" "github.com/runatlantis/atlantis/server/events/vcs/bitbucketserver" diff --git a/server/server_test.go b/server/server_test.go index 5ee623cf7..3b62d35b3 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -28,7 +28,7 @@ import ( "github.com/runatlantis/atlantis/server" "github.com/runatlantis/atlantis/server/controllers/templates" tMocks "github.com/runatlantis/atlantis/server/controllers/templates/mocks" - "github.com/runatlantis/atlantis/server/events/locking/mocks" + "github.com/runatlantis/atlantis/server/core/locking/mocks" "github.com/runatlantis/atlantis/server/events/models" "github.com/runatlantis/atlantis/server/logging" . "github.com/runatlantis/atlantis/testing"