From a1d54d93832f1993225b020ad01b4705d73e8a7d Mon Sep 17 00:00:00 2001 From: Pavel Lineitsev Date: Mon, 1 Jun 2026 11:29:07 -0700 Subject: [PATCH 1/2] fix: frontend paths --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3ba6de4..adaff17 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,7 @@ web/frontend/build/ web/frontend/.svelte-kit/ # Embedded frontend assets (populated at build time) -simrun/internal/web/frontend/* -!simrun/internal/web/frontend/.gitkeep +internal/web/frontend/* +!internal/web/frontend/.gitkeep _old_configs/ From c359b44123692527115e7ca4cb7038fd37a26d3c Mon Sep 17 00:00:00 2001 From: Pavel Lineitsev Date: Mon, 1 Jun 2026 11:46:04 -0700 Subject: [PATCH 2/2] fix: reorg --- .golangci.yml | 2 +- .mockery.yml | 10 +++++----- Dockerfile | 14 +++++++------- {simrun/cmd => cmd}/simrun/main.go | 12 ++++++------ .../internal => internal}/cloud/aws/assume.go | 0 .../cloud/aws/assume_test.go | 0 .../internal => internal}/cloud/azure/wif.go | 0 .../cloud/azure/wif_test.go | 0 {simrun/internal => internal}/cloud/gcp/wif.go | 0 .../cloud/gcp/wif_test.go | 0 .../cloud/k8s/generator.go | 2 +- .../cloud/k8s/generator_test.go | 0 .../collectors/collector.go | 0 .../collectors/elastic_collector.go | 2 +- .../collectors/elastic_collector_test.go | 0 .../internal => internal}/config/appconfig.go | 0 .../config/appconfig_test.go | 0 .../internal => internal}/config/bootstrap.go | 0 .../config/bootstrap_test.go | 0 {simrun/internal => internal}/config/config.go | 0 .../connectors/elastic/client.go | 0 .../credentials/kubernetes.go | 4 ++-- .../credentials/resolver.go | 10 +++++----- .../credentials/resolver_test.go | 6 +++--- {simrun/internal => internal}/crypto/crypto.go | 0 .../crypto/crypto_test.go | 0 {simrun/internal => internal}/db/config.go | 2 +- .../internal => internal}/db/config_test.go | 2 +- {simrun/internal => internal}/db/connectors.go | 0 {simrun/internal => internal}/db/db.go | 0 {simrun/internal => internal}/db/migrations.go | 0 .../db/migrations/001_initial.down.sql | 0 .../db/migrations/001_initial.up.sql | 0 .../migrations/002_add_user_tracking.down.sql | 0 .../db/migrations/002_add_user_tracking.up.sql | 0 .../003_add_scenario_id_to_runs.down.sql | 0 .../003_add_scenario_id_to_runs.up.sql | 0 .../004_kubernetes_connector.down.sql | 0 .../migrations/004_kubernetes_connector.up.sql | 0 .../005_add_schedule_parallelism.down.sql | 0 .../005_add_schedule_parallelism.up.sql | 0 .../006_add_discovered_alerts.down.sql | 0 .../006_add_discovered_alerts.up.sql | 0 .../migrations/007_add_scenario_type.down.sql | 0 .../db/migrations/007_add_scenario_type.up.sql | 0 ...pconfig_defaults_and_ssh_connector.down.sql | 0 ...appconfig_defaults_and_ssh_connector.up.sql | 0 .../009_runs_created_at_index.down.sql | 0 .../009_runs_created_at_index.up.sql | 0 ...0_saved_scenarios_updated_at_index.down.sql | 0 ...010_saved_scenarios_updated_at_index.up.sql | 0 {simrun/internal => internal}/db/packs.go | 0 {simrun/internal => internal}/db/runs.go | 0 {simrun/internal => internal}/db/scenarios.go | 0 {simrun/internal => internal}/db/schedules.go | 0 {simrun/internal => internal}/db/secrets.go | 0 {simrun/internal => internal}/db/sessions.go | 0 .../detonators/aws_cli_detonator.go | 2 +- .../detonators/detonator.go | 0 .../internal => internal}/detonators/logger.go | 0 .../detonators/mocks/Detonator.go | 0 .../detonators/simrun_detonator.go | 10 +++++----- .../detonators/simrun_detonator_test.go | 2 +- .../internal => internal}/envutil/envutil.go | 0 .../envutil/envutil_test.go | 0 .../injectors/elastic_injector.go | 2 +- .../injectors/elastic_injector_test.go | 0 .../injectors/injector.go | 0 .../injectors/mocks/Injector.go | 0 .../matchers/alert_matcher.go | 0 .../matchers/datadog/datadog.go | 0 .../matchers/datadog/datadog_test.go | 2 +- .../datadog/mocks/DatadogSecuritySignalsAPI.go | 0 .../matchers/datadog/types.go | 2 +- .../matchers/elastic/elastic.go | 2 +- .../matchers/elastic/elastic_test.go | 0 .../mocks/ElasticSecurityDetectionAlertsAPI.go | 2 +- .../matchers/elastic/types.go | 0 .../matchers/mocks/AlertGeneratedMatcher.go | 0 .../packs/executor/executor.go | 4 ++-- .../packs/locks/keyedmutex.go | 0 .../packs/locks/keyedmutex_test.go | 0 .../packs/resolver/resolver.go | 4 ++-- .../resolver/resolver_concurrency_test.go | 0 .../packs/runner/binary_runner.go | 2 +- .../packs/runner/factory.go | 6 +++--- .../packs/runner/runner.go | 4 ++-- .../packs/terraform/manager.go | 0 .../packs/terraform/manager_test.go | 0 {simrun/internal => internal}/parser/main.go | 18 +++++++++--------- {simrun/internal => internal}/parser/parser.go | 0 .../parser/parser_test.go | 6 +++--- .../testdata/scenarios/all-disabled.yaml | 0 .../testdata/scenarios/aws-cli-detonator.yaml | 0 .../testdata/scenarios/elastic-collector.yaml | 0 .../testdata/scenarios/elastic-injector.yaml | 0 .../testdata/scenarios/empty-scenarios.yaml | 0 .../scenarios/missing-detonate-and-inject.yaml | 0 .../parser/testdata/scenarios/targets-all.yaml | 0 .../testdata/scenarios/targets-aws-only.yaml | 0 .../internal => internal}/results/executor.go | 2 +- {simrun/internal => internal}/results/types.go | 4 ++-- {simrun/internal => internal}/runner/runner.go | 4 ++-- .../runner/runner_test.go | 10 +++++----- .../internal => internal}/runner/scenario.go | 8 ++++---- .../testutil/fakes/fakes.go | 4 ++-- .../testutil/testserver/testserver.go | 10 +++++----- .../testutil/testserver/testserver_test.go | 2 +- .../internal => internal}/version/version.go | 0 .../web/api_connectors_test.go | 6 +++--- .../web/api_health_test.go | 2 +- .../web/api_helpers_test.go | 0 .../web/api_packs_test.go | 6 +++--- .../internal => internal}/web/api_runs_test.go | 6 +++--- .../web/api_scenarios_test.go | 6 +++--- .../web/api_schedules_test.go | 6 +++--- .../web/api_secrets_test.go | 4 ++-- .../internal => internal}/web/auth/context.go | 0 .../internal => internal}/web/auth/handlers.go | 2 +- .../web/auth/middleware.go | 2 +- .../internal => internal}/web/auth/types.go | 0 .../web/connector_handlers.go | 12 ++++++------ {simrun/internal => internal}/web/coverage.go | 4 ++-- .../internal => internal}/web/coverage_test.go | 4 ++-- .../web/elastic_rules_handlers.go | 4 ++-- {simrun/internal => internal}/web/embed.go | 0 {simrun/internal => internal}/web/handlers.go | 4 ++-- .../web/pack_params_validation.go | 0 .../web/pack_params_validation_test.go | 0 .../internal => internal}/web/packs_handler.go | 8 ++++---- {simrun/internal => internal}/web/runlog.go | 0 .../web/scenario_export.go | 6 +++--- .../web/scenario_results.go | 6 +++--- .../web/scenario_results_test.go | 6 +++--- {simrun/internal => internal}/web/scenarios.go | 10 +++++----- .../web/schedule_handler.go | 2 +- {simrun/internal => internal}/web/scheduler.go | 2 +- .../web/secrets_handler.go | 4 ++-- {simrun/internal => internal}/web/server.go | 4 ++-- {simrun/internal => internal}/web/types.go | 0 .../internal => internal}/web/types_test.go | 0 .../internal => internal}/web/user_helper.go | 2 +- {simrun/internal => internal}/web/ws.go | 0 mise.toml | 14 +++++++------- {simrun/pack => pack}/aws/aws.go | 4 ++-- {simrun/pack => pack}/aws/aws_test.go | 2 +- {simrun/pack => pack}/azure/azure.go | 2 +- {simrun/pack => pack}/builtins.go | 0 {simrun/pack => pack}/builtins_test.go | 0 {simrun/pack => pack}/context.go | 2 +- {simrun/pack => pack}/gcp/gcp.go | 2 +- {simrun/pack => pack}/logger.go | 0 {simrun/pack => pack}/pack.go | 0 {simrun/pack => pack}/pack_test.go | 0 {simrun/pack => pack}/protocol.go | 0 {simrun/pack => pack}/protocol_test.go | 0 {simrun/pack => pack}/ssh.go | 0 {simrun/pack => pack}/tags.go | 0 {simrun/pack => pack}/tfparse.go | 0 {simrun/pack => pack}/tfparse_test.go | 0 {simrun/pack => pack}/types.go | 0 {simrun/pack => pack}/util.go | 0 .../awsCliDetonator.schema.json | 0 .../datadogSecuritySignal.schema.json | 0 .../elasticCollector.schema.json | 0 .../elasticInjector.schema.json | 0 .../elasticSecurityAlert.schema.json | 0 .../pack-protocol/cleanup-input.schema.json | 0 .../pack-protocol/cleanup-output.schema.json | 0 .../pack-protocol/detonate-input.schema.json | 0 .../pack-protocol/detonate-output.schema.json | 0 .../pack-protocol/error.schema.json | 0 .../pack-protocol/log-line.schema.json | 0 .../manifest-response.schema.json | 0 {simrun/schemas => schemas}/simrun.schema.json | 0 .../simrunDetonator.schema.json | 0 176 files changed, 161 insertions(+), 161 deletions(-) rename {simrun/cmd => cmd}/simrun/main.go (93%) rename {simrun/internal => internal}/cloud/aws/assume.go (100%) rename {simrun/internal => internal}/cloud/aws/assume_test.go (100%) rename {simrun/internal => internal}/cloud/azure/wif.go (100%) rename {simrun/internal => internal}/cloud/azure/wif_test.go (100%) rename {simrun/internal => internal}/cloud/gcp/wif.go (100%) rename {simrun/internal => internal}/cloud/gcp/wif_test.go (100%) rename {simrun/internal => internal}/cloud/k8s/generator.go (99%) rename {simrun/internal => internal}/cloud/k8s/generator_test.go (100%) rename {simrun/internal => internal}/collectors/collector.go (100%) rename {simrun/internal => internal}/collectors/elastic_collector.go (99%) rename {simrun/internal => internal}/collectors/elastic_collector_test.go (100%) rename {simrun/internal => internal}/config/appconfig.go (100%) rename {simrun/internal => internal}/config/appconfig_test.go (100%) rename {simrun/internal => internal}/config/bootstrap.go (100%) rename {simrun/internal => internal}/config/bootstrap_test.go (100%) rename {simrun/internal => internal}/config/config.go (100%) rename {simrun/internal => internal}/connectors/elastic/client.go (100%) rename {simrun/internal => internal}/credentials/kubernetes.go (96%) rename {simrun/internal => internal}/credentials/resolver.go (98%) rename {simrun/internal => internal}/credentials/resolver_test.go (98%) rename {simrun/internal => internal}/crypto/crypto.go (100%) rename {simrun/internal => internal}/crypto/crypto_test.go (100%) rename {simrun/internal => internal}/db/config.go (98%) rename {simrun/internal => internal}/db/config_test.go (98%) rename {simrun/internal => internal}/db/connectors.go (100%) rename {simrun/internal => internal}/db/db.go (100%) rename {simrun/internal => internal}/db/migrations.go (100%) rename {simrun/internal => internal}/db/migrations/001_initial.down.sql (100%) rename {simrun/internal => internal}/db/migrations/001_initial.up.sql (100%) rename {simrun/internal => internal}/db/migrations/002_add_user_tracking.down.sql (100%) rename {simrun/internal => internal}/db/migrations/002_add_user_tracking.up.sql (100%) rename {simrun/internal => internal}/db/migrations/003_add_scenario_id_to_runs.down.sql (100%) rename {simrun/internal => internal}/db/migrations/003_add_scenario_id_to_runs.up.sql (100%) rename {simrun/internal => internal}/db/migrations/004_kubernetes_connector.down.sql (100%) rename {simrun/internal => internal}/db/migrations/004_kubernetes_connector.up.sql (100%) rename {simrun/internal => internal}/db/migrations/005_add_schedule_parallelism.down.sql (100%) rename {simrun/internal => internal}/db/migrations/005_add_schedule_parallelism.up.sql (100%) rename {simrun/internal => internal}/db/migrations/006_add_discovered_alerts.down.sql (100%) rename {simrun/internal => internal}/db/migrations/006_add_discovered_alerts.up.sql (100%) rename {simrun/internal => internal}/db/migrations/007_add_scenario_type.down.sql (100%) rename {simrun/internal => internal}/db/migrations/007_add_scenario_type.up.sql (100%) rename {simrun/internal => internal}/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.down.sql (100%) rename {simrun/internal => internal}/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.up.sql (100%) rename {simrun/internal => internal}/db/migrations/009_runs_created_at_index.down.sql (100%) rename {simrun/internal => internal}/db/migrations/009_runs_created_at_index.up.sql (100%) rename {simrun/internal => internal}/db/migrations/010_saved_scenarios_updated_at_index.down.sql (100%) rename {simrun/internal => internal}/db/migrations/010_saved_scenarios_updated_at_index.up.sql (100%) rename {simrun/internal => internal}/db/packs.go (100%) rename {simrun/internal => internal}/db/runs.go (100%) rename {simrun/internal => internal}/db/scenarios.go (100%) rename {simrun/internal => internal}/db/schedules.go (100%) rename {simrun/internal => internal}/db/secrets.go (100%) rename {simrun/internal => internal}/db/sessions.go (100%) rename {simrun/internal => internal}/detonators/aws_cli_detonator.go (98%) rename {simrun/internal => internal}/detonators/detonator.go (100%) rename {simrun/internal => internal}/detonators/logger.go (100%) rename {simrun/internal => internal}/detonators/mocks/Detonator.go (100%) rename {simrun/internal => internal}/detonators/simrun_detonator.go (98%) rename {simrun/internal => internal}/detonators/simrun_detonator_test.go (97%) rename {simrun/internal => internal}/envutil/envutil.go (100%) rename {simrun/internal => internal}/envutil/envutil_test.go (100%) rename {simrun/internal => internal}/injectors/elastic_injector.go (99%) rename {simrun/internal => internal}/injectors/elastic_injector_test.go (100%) rename {simrun/internal => internal}/injectors/injector.go (100%) rename {simrun/internal => internal}/injectors/mocks/Injector.go (100%) rename {simrun/internal => internal}/matchers/alert_matcher.go (100%) rename {simrun/internal => internal}/matchers/datadog/datadog.go (100%) rename {simrun/internal => internal}/matchers/datadog/datadog_test.go (99%) rename {simrun/internal => internal}/matchers/datadog/mocks/DatadogSecuritySignalsAPI.go (100%) rename {simrun/internal => internal}/matchers/datadog/types.go (98%) rename {simrun/internal => internal}/matchers/elastic/elastic.go (99%) rename {simrun/internal => internal}/matchers/elastic/elastic_test.go (100%) rename {simrun/internal => internal}/matchers/elastic/mocks/ElasticSecurityDetectionAlertsAPI.go (98%) rename {simrun/internal => internal}/matchers/elastic/types.go (100%) rename {simrun/internal => internal}/matchers/mocks/AlertGeneratedMatcher.go (100%) rename {simrun/internal => internal}/packs/executor/executor.go (97%) rename {simrun/internal => internal}/packs/locks/keyedmutex.go (100%) rename {simrun/internal => internal}/packs/locks/keyedmutex_test.go (100%) rename {simrun/internal => internal}/packs/resolver/resolver.go (99%) rename {simrun/internal => internal}/packs/resolver/resolver_concurrency_test.go (100%) rename {simrun/internal => internal}/packs/runner/binary_runner.go (97%) rename {simrun/internal => internal}/packs/runner/factory.go (95%) rename {simrun/internal => internal}/packs/runner/runner.go (95%) rename {simrun/internal => internal}/packs/terraform/manager.go (100%) rename {simrun/internal => internal}/packs/terraform/manager_test.go (100%) rename {simrun/internal => internal}/parser/main.go (95%) rename {simrun/internal => internal}/parser/parser.go (100%) rename {simrun/internal => internal}/parser/parser_test.go (95%) rename {simrun/internal => internal}/parser/testdata/scenarios/all-disabled.yaml (100%) rename {simrun/internal => internal}/parser/testdata/scenarios/aws-cli-detonator.yaml (100%) rename {simrun/internal => internal}/parser/testdata/scenarios/elastic-collector.yaml (100%) rename {simrun/internal => internal}/parser/testdata/scenarios/elastic-injector.yaml (100%) rename {simrun/internal => internal}/parser/testdata/scenarios/empty-scenarios.yaml (100%) rename {simrun/internal => internal}/parser/testdata/scenarios/missing-detonate-and-inject.yaml (100%) rename {simrun/internal => internal}/parser/testdata/scenarios/targets-all.yaml (100%) rename {simrun/internal => internal}/parser/testdata/scenarios/targets-aws-only.yaml (100%) rename {simrun/internal => internal}/results/executor.go (98%) rename {simrun/internal => internal}/results/types.go (95%) rename {simrun/internal => internal}/runner/runner.go (99%) rename {simrun/internal => internal}/runner/runner_test.go (97%) rename {simrun/internal => internal}/runner/scenario.go (88%) rename {simrun/internal => internal}/testutil/fakes/fakes.go (99%) rename {simrun/internal => internal}/testutil/testserver/testserver.go (94%) rename {simrun/internal => internal}/testutil/testserver/testserver_test.go (81%) rename {simrun/internal => internal}/version/version.go (100%) rename {simrun/internal => internal}/web/api_connectors_test.go (97%) rename {simrun/internal => internal}/web/api_health_test.go (92%) rename {simrun/internal => internal}/web/api_helpers_test.go (100%) rename {simrun/internal => internal}/web/api_packs_test.go (96%) rename {simrun/internal => internal}/web/api_runs_test.go (98%) rename {simrun/internal => internal}/web/api_scenarios_test.go (98%) rename {simrun/internal => internal}/web/api_schedules_test.go (95%) rename {simrun/internal => internal}/web/api_secrets_test.go (97%) rename {simrun/internal => internal}/web/auth/context.go (100%) rename {simrun/internal => internal}/web/auth/handlers.go (99%) rename {simrun/internal => internal}/web/auth/middleware.go (97%) rename {simrun/internal => internal}/web/auth/types.go (100%) rename {simrun/internal => internal}/web/connector_handlers.go (97%) rename {simrun/internal => internal}/web/coverage.go (98%) rename {simrun/internal => internal}/web/coverage_test.go (96%) rename {simrun/internal => internal}/web/elastic_rules_handlers.go (98%) rename {simrun/internal => internal}/web/embed.go (100%) rename {simrun/internal => internal}/web/handlers.go (99%) rename {simrun/internal => internal}/web/pack_params_validation.go (100%) rename {simrun/internal => internal}/web/pack_params_validation_test.go (100%) rename {simrun/internal => internal}/web/packs_handler.go (97%) rename {simrun/internal => internal}/web/runlog.go (100%) rename {simrun/internal => internal}/web/scenario_export.go (97%) rename {simrun/internal => internal}/web/scenario_results.go (95%) rename {simrun/internal => internal}/web/scenario_results_test.go (96%) rename {simrun/internal => internal}/web/scenarios.go (97%) rename {simrun/internal => internal}/web/schedule_handler.go (99%) rename {simrun/internal => internal}/web/scheduler.go (98%) rename {simrun/internal => internal}/web/secrets_handler.go (98%) rename {simrun/internal => internal}/web/server.go (98%) rename {simrun/internal => internal}/web/types.go (100%) rename {simrun/internal => internal}/web/types_test.go (100%) rename {simrun/internal => internal}/web/user_helper.go (86%) rename {simrun/internal => internal}/web/ws.go (100%) rename {simrun/pack => pack}/aws/aws.go (98%) rename {simrun/pack => pack}/aws/aws_test.go (98%) rename {simrun/pack => pack}/azure/azure.go (97%) rename {simrun/pack => pack}/builtins.go (100%) rename {simrun/pack => pack}/builtins_test.go (100%) rename {simrun/pack => pack}/context.go (94%) rename {simrun/pack => pack}/gcp/gcp.go (99%) rename {simrun/pack => pack}/logger.go (100%) rename {simrun/pack => pack}/pack.go (100%) rename {simrun/pack => pack}/pack_test.go (100%) rename {simrun/pack => pack}/protocol.go (100%) rename {simrun/pack => pack}/protocol_test.go (100%) rename {simrun/pack => pack}/ssh.go (100%) rename {simrun/pack => pack}/tags.go (100%) rename {simrun/pack => pack}/tfparse.go (100%) rename {simrun/pack => pack}/tfparse_test.go (100%) rename {simrun/pack => pack}/types.go (100%) rename {simrun/pack => pack}/util.go (100%) rename {simrun/schemas => schemas}/awsCliDetonator.schema.json (100%) rename {simrun/schemas => schemas}/datadogSecuritySignal.schema.json (100%) rename {simrun/schemas => schemas}/elasticCollector.schema.json (100%) rename {simrun/schemas => schemas}/elasticInjector.schema.json (100%) rename {simrun/schemas => schemas}/elasticSecurityAlert.schema.json (100%) rename {simrun/schemas => schemas}/pack-protocol/cleanup-input.schema.json (100%) rename {simrun/schemas => schemas}/pack-protocol/cleanup-output.schema.json (100%) rename {simrun/schemas => schemas}/pack-protocol/detonate-input.schema.json (100%) rename {simrun/schemas => schemas}/pack-protocol/detonate-output.schema.json (100%) rename {simrun/schemas => schemas}/pack-protocol/error.schema.json (100%) rename {simrun/schemas => schemas}/pack-protocol/log-line.schema.json (100%) rename {simrun/schemas => schemas}/pack-protocol/manifest-response.schema.json (100%) rename {simrun/schemas => schemas}/simrun.schema.json (100%) rename {simrun/schemas => schemas}/simrunDetonator.schema.json (100%) diff --git a/.golangci.yml b/.golangci.yml index 8c5820b..a5683e1 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -17,7 +17,7 @@ linters: - errcheck text: 'Error return value of `[^`]+\.Close` is not checked' # Generated code: schema-derived parser and mockery mocks. - - path: simrun/internal/parser/parser\.go + - path: internal/parser/parser\.go linters: - errcheck - staticcheck diff --git a/.mockery.yml b/.mockery.yml index 6fa8679..467efd8 100644 --- a/.mockery.yml +++ b/.mockery.yml @@ -8,28 +8,28 @@ require-template-schema-exists: true template: testify template-schema: '{{.Template}}.schema.json' packages: - github.com/IBM/simrun/simrun/internal/matchers: + github.com/IBM/simrun/internal/matchers: config: all: true dir: '{{.InterfaceDir}}/mocks' filename: '{{.InterfaceName}}.go' pkgname: 'mocks' structname: 'Mock{{.InterfaceName}}' - github.com/IBM/simrun/simrun/internal/detonators: + github.com/IBM/simrun/internal/detonators: config: all: true dir: '{{.InterfaceDir}}/mocks' filename: '{{.InterfaceName}}.go' pkgname: 'mocks' structname: 'Mock{{.InterfaceName}}' - github.com/IBM/simrun/simrun/internal/matchers/datadog: + github.com/IBM/simrun/internal/matchers/datadog: config: all: true dir: '{{.InterfaceDir}}/mocks' filename: '{{.InterfaceName}}.go' pkgname: 'mocks' structname: 'Mock{{.InterfaceName}}' - github.com/IBM/simrun/simrun/internal/matchers/elastic: + github.com/IBM/simrun/internal/matchers/elastic: config: all: true dir: '{{.InterfaceDir}}/mocks' @@ -37,7 +37,7 @@ packages: pkgname: 'mocks' structname: 'Mock{{.InterfaceName}}' - github.com/IBM/simrun/simrun/internal/injectors: + github.com/IBM/simrun/internal/injectors: config: all: true dir: '{{.InterfaceDir}}/mocks' diff --git a/Dockerfile b/Dockerfile index d2fdd7d..1e0a5d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,18 +16,18 @@ RUN --mount=type=cache,target=/root/.npm \ cd web/frontend && npm ci && npm run build # Copy built frontend into the Go embed directory -RUN rm -rf simrun/internal/web/frontend && \ - mkdir -p simrun/internal/web/frontend && \ - cp -r web/frontend/build/* simrun/internal/web/frontend/ +RUN rm -rf internal/web/frontend && \ + mkdir -p internal/web/frontend && \ + cp -r web/frontend/build/* internal/web/frontend/ # Build the server binary with the embedded frontend ARG version=unknown RUN CGO_ENABLED=0 go build \ -ldflags="-w -s \ - -X github.com/IBM/simrun/simrun/internal/version.Version=${version} \ - -X github.com/IBM/simrun/simrun/internal/version.Commit=$(git rev-parse --short HEAD 2>/dev/null || echo unknown) \ - -X github.com/IBM/simrun/simrun/internal/version.BuildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \ - -o /simrun-server simrun/cmd/simrun/main.go + -X github.com/IBM/simrun/internal/version.Version=${version} \ + -X github.com/IBM/simrun/internal/version.Commit=$(git rev-parse --short HEAD 2>/dev/null || echo unknown) \ + -X github.com/IBM/simrun/internal/version.BuildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \ + -o /simrun-server cmd/simrun/main.go # --- Runtime stage --- FROM alpine:3.21 diff --git a/simrun/cmd/simrun/main.go b/cmd/simrun/main.go similarity index 93% rename from simrun/cmd/simrun/main.go rename to cmd/simrun/main.go index 7a4f8cc..c444bfd 100644 --- a/simrun/cmd/simrun/main.go +++ b/cmd/simrun/main.go @@ -8,12 +8,12 @@ import ( "syscall" "time" - "github.com/IBM/simrun/simrun/internal/config" - "github.com/IBM/simrun/simrun/internal/credentials" - "github.com/IBM/simrun/simrun/internal/crypto" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/web" - "github.com/IBM/simrun/simrun/internal/web/auth" + "github.com/IBM/simrun/internal/config" + "github.com/IBM/simrun/internal/credentials" + "github.com/IBM/simrun/internal/crypto" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/web" + "github.com/IBM/simrun/internal/web/auth" log "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/cloud/aws/assume.go b/internal/cloud/aws/assume.go similarity index 100% rename from simrun/internal/cloud/aws/assume.go rename to internal/cloud/aws/assume.go diff --git a/simrun/internal/cloud/aws/assume_test.go b/internal/cloud/aws/assume_test.go similarity index 100% rename from simrun/internal/cloud/aws/assume_test.go rename to internal/cloud/aws/assume_test.go diff --git a/simrun/internal/cloud/azure/wif.go b/internal/cloud/azure/wif.go similarity index 100% rename from simrun/internal/cloud/azure/wif.go rename to internal/cloud/azure/wif.go diff --git a/simrun/internal/cloud/azure/wif_test.go b/internal/cloud/azure/wif_test.go similarity index 100% rename from simrun/internal/cloud/azure/wif_test.go rename to internal/cloud/azure/wif_test.go diff --git a/simrun/internal/cloud/gcp/wif.go b/internal/cloud/gcp/wif.go similarity index 100% rename from simrun/internal/cloud/gcp/wif.go rename to internal/cloud/gcp/wif.go diff --git a/simrun/internal/cloud/gcp/wif_test.go b/internal/cloud/gcp/wif_test.go similarity index 100% rename from simrun/internal/cloud/gcp/wif_test.go rename to internal/cloud/gcp/wif_test.go diff --git a/simrun/internal/cloud/k8s/generator.go b/internal/cloud/k8s/generator.go similarity index 99% rename from simrun/internal/cloud/k8s/generator.go rename to internal/cloud/k8s/generator.go index e5bfa67..330a7c7 100644 --- a/simrun/internal/cloud/k8s/generator.go +++ b/internal/cloud/k8s/generator.go @@ -10,7 +10,7 @@ import ( "os/exec" "path/filepath" - "github.com/IBM/simrun/simrun/internal/envutil" + "github.com/IBM/simrun/internal/envutil" log "github.com/sirupsen/logrus" "sigs.k8s.io/yaml" ) diff --git a/simrun/internal/cloud/k8s/generator_test.go b/internal/cloud/k8s/generator_test.go similarity index 100% rename from simrun/internal/cloud/k8s/generator_test.go rename to internal/cloud/k8s/generator_test.go diff --git a/simrun/internal/collectors/collector.go b/internal/collectors/collector.go similarity index 100% rename from simrun/internal/collectors/collector.go rename to internal/collectors/collector.go diff --git a/simrun/internal/collectors/elastic_collector.go b/internal/collectors/elastic_collector.go similarity index 99% rename from simrun/internal/collectors/elastic_collector.go rename to internal/collectors/elastic_collector.go index d93654d..6d1c696 100644 --- a/simrun/internal/collectors/elastic_collector.go +++ b/internal/collectors/elastic_collector.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/IBM/simrun/simrun/internal/envutil" + "github.com/IBM/simrun/internal/envutil" "github.com/elastic/go-elasticsearch/v9" "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/collectors/elastic_collector_test.go b/internal/collectors/elastic_collector_test.go similarity index 100% rename from simrun/internal/collectors/elastic_collector_test.go rename to internal/collectors/elastic_collector_test.go diff --git a/simrun/internal/config/appconfig.go b/internal/config/appconfig.go similarity index 100% rename from simrun/internal/config/appconfig.go rename to internal/config/appconfig.go diff --git a/simrun/internal/config/appconfig_test.go b/internal/config/appconfig_test.go similarity index 100% rename from simrun/internal/config/appconfig_test.go rename to internal/config/appconfig_test.go diff --git a/simrun/internal/config/bootstrap.go b/internal/config/bootstrap.go similarity index 100% rename from simrun/internal/config/bootstrap.go rename to internal/config/bootstrap.go diff --git a/simrun/internal/config/bootstrap_test.go b/internal/config/bootstrap_test.go similarity index 100% rename from simrun/internal/config/bootstrap_test.go rename to internal/config/bootstrap_test.go diff --git a/simrun/internal/config/config.go b/internal/config/config.go similarity index 100% rename from simrun/internal/config/config.go rename to internal/config/config.go diff --git a/simrun/internal/connectors/elastic/client.go b/internal/connectors/elastic/client.go similarity index 100% rename from simrun/internal/connectors/elastic/client.go rename to internal/connectors/elastic/client.go diff --git a/simrun/internal/credentials/kubernetes.go b/internal/credentials/kubernetes.go similarity index 96% rename from simrun/internal/credentials/kubernetes.go rename to internal/credentials/kubernetes.go index 3585ce2..b98c9ec 100644 --- a/simrun/internal/credentials/kubernetes.go +++ b/internal/credentials/kubernetes.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "github.com/IBM/simrun/simrun/internal/cloud/k8s" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/cloud/k8s" + "github.com/IBM/simrun/internal/db" log "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/credentials/resolver.go b/internal/credentials/resolver.go similarity index 98% rename from simrun/internal/credentials/resolver.go rename to internal/credentials/resolver.go index 6f0fa8b..bd36603 100644 --- a/simrun/internal/credentials/resolver.go +++ b/internal/credentials/resolver.go @@ -13,11 +13,11 @@ import ( "os" "strconv" - "github.com/IBM/simrun/simrun/internal/cloud/aws" - "github.com/IBM/simrun/simrun/internal/cloud/azure" - "github.com/IBM/simrun/simrun/internal/cloud/gcp" - "github.com/IBM/simrun/simrun/internal/crypto" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/cloud/aws" + "github.com/IBM/simrun/internal/cloud/azure" + "github.com/IBM/simrun/internal/cloud/gcp" + "github.com/IBM/simrun/internal/crypto" + "github.com/IBM/simrun/internal/db" "github.com/google/uuid" log "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/credentials/resolver_test.go b/internal/credentials/resolver_test.go similarity index 98% rename from simrun/internal/credentials/resolver_test.go rename to internal/credentials/resolver_test.go index 9b7b835..25911f3 100644 --- a/simrun/internal/credentials/resolver_test.go +++ b/internal/credentials/resolver_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "github.com/IBM/simrun/simrun/internal/crypto" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/testutil/fakes" + "github.com/IBM/simrun/internal/crypto" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/testutil/fakes" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/simrun/internal/crypto/crypto.go b/internal/crypto/crypto.go similarity index 100% rename from simrun/internal/crypto/crypto.go rename to internal/crypto/crypto.go diff --git a/simrun/internal/crypto/crypto_test.go b/internal/crypto/crypto_test.go similarity index 100% rename from simrun/internal/crypto/crypto_test.go rename to internal/crypto/crypto_test.go diff --git a/simrun/internal/db/config.go b/internal/db/config.go similarity index 98% rename from simrun/internal/db/config.go rename to internal/db/config.go index 1739986..f1dd78f 100644 --- a/simrun/internal/db/config.go +++ b/internal/db/config.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/IBM/simrun/simrun/internal/config" + "github.com/IBM/simrun/internal/config" "github.com/jackc/pgx/v5/pgxpool" ) diff --git a/simrun/internal/db/config_test.go b/internal/db/config_test.go similarity index 98% rename from simrun/internal/db/config_test.go rename to internal/db/config_test.go index 5c7601e..6fe974b 100644 --- a/simrun/internal/db/config_test.go +++ b/internal/db/config_test.go @@ -6,7 +6,7 @@ import ( "maps" "testing" - "github.com/IBM/simrun/simrun/internal/config" + "github.com/IBM/simrun/internal/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/simrun/internal/db/connectors.go b/internal/db/connectors.go similarity index 100% rename from simrun/internal/db/connectors.go rename to internal/db/connectors.go diff --git a/simrun/internal/db/db.go b/internal/db/db.go similarity index 100% rename from simrun/internal/db/db.go rename to internal/db/db.go diff --git a/simrun/internal/db/migrations.go b/internal/db/migrations.go similarity index 100% rename from simrun/internal/db/migrations.go rename to internal/db/migrations.go diff --git a/simrun/internal/db/migrations/001_initial.down.sql b/internal/db/migrations/001_initial.down.sql similarity index 100% rename from simrun/internal/db/migrations/001_initial.down.sql rename to internal/db/migrations/001_initial.down.sql diff --git a/simrun/internal/db/migrations/001_initial.up.sql b/internal/db/migrations/001_initial.up.sql similarity index 100% rename from simrun/internal/db/migrations/001_initial.up.sql rename to internal/db/migrations/001_initial.up.sql diff --git a/simrun/internal/db/migrations/002_add_user_tracking.down.sql b/internal/db/migrations/002_add_user_tracking.down.sql similarity index 100% rename from simrun/internal/db/migrations/002_add_user_tracking.down.sql rename to internal/db/migrations/002_add_user_tracking.down.sql diff --git a/simrun/internal/db/migrations/002_add_user_tracking.up.sql b/internal/db/migrations/002_add_user_tracking.up.sql similarity index 100% rename from simrun/internal/db/migrations/002_add_user_tracking.up.sql rename to internal/db/migrations/002_add_user_tracking.up.sql diff --git a/simrun/internal/db/migrations/003_add_scenario_id_to_runs.down.sql b/internal/db/migrations/003_add_scenario_id_to_runs.down.sql similarity index 100% rename from simrun/internal/db/migrations/003_add_scenario_id_to_runs.down.sql rename to internal/db/migrations/003_add_scenario_id_to_runs.down.sql diff --git a/simrun/internal/db/migrations/003_add_scenario_id_to_runs.up.sql b/internal/db/migrations/003_add_scenario_id_to_runs.up.sql similarity index 100% rename from simrun/internal/db/migrations/003_add_scenario_id_to_runs.up.sql rename to internal/db/migrations/003_add_scenario_id_to_runs.up.sql diff --git a/simrun/internal/db/migrations/004_kubernetes_connector.down.sql b/internal/db/migrations/004_kubernetes_connector.down.sql similarity index 100% rename from simrun/internal/db/migrations/004_kubernetes_connector.down.sql rename to internal/db/migrations/004_kubernetes_connector.down.sql diff --git a/simrun/internal/db/migrations/004_kubernetes_connector.up.sql b/internal/db/migrations/004_kubernetes_connector.up.sql similarity index 100% rename from simrun/internal/db/migrations/004_kubernetes_connector.up.sql rename to internal/db/migrations/004_kubernetes_connector.up.sql diff --git a/simrun/internal/db/migrations/005_add_schedule_parallelism.down.sql b/internal/db/migrations/005_add_schedule_parallelism.down.sql similarity index 100% rename from simrun/internal/db/migrations/005_add_schedule_parallelism.down.sql rename to internal/db/migrations/005_add_schedule_parallelism.down.sql diff --git a/simrun/internal/db/migrations/005_add_schedule_parallelism.up.sql b/internal/db/migrations/005_add_schedule_parallelism.up.sql similarity index 100% rename from simrun/internal/db/migrations/005_add_schedule_parallelism.up.sql rename to internal/db/migrations/005_add_schedule_parallelism.up.sql diff --git a/simrun/internal/db/migrations/006_add_discovered_alerts.down.sql b/internal/db/migrations/006_add_discovered_alerts.down.sql similarity index 100% rename from simrun/internal/db/migrations/006_add_discovered_alerts.down.sql rename to internal/db/migrations/006_add_discovered_alerts.down.sql diff --git a/simrun/internal/db/migrations/006_add_discovered_alerts.up.sql b/internal/db/migrations/006_add_discovered_alerts.up.sql similarity index 100% rename from simrun/internal/db/migrations/006_add_discovered_alerts.up.sql rename to internal/db/migrations/006_add_discovered_alerts.up.sql diff --git a/simrun/internal/db/migrations/007_add_scenario_type.down.sql b/internal/db/migrations/007_add_scenario_type.down.sql similarity index 100% rename from simrun/internal/db/migrations/007_add_scenario_type.down.sql rename to internal/db/migrations/007_add_scenario_type.down.sql diff --git a/simrun/internal/db/migrations/007_add_scenario_type.up.sql b/internal/db/migrations/007_add_scenario_type.up.sql similarity index 100% rename from simrun/internal/db/migrations/007_add_scenario_type.up.sql rename to internal/db/migrations/007_add_scenario_type.up.sql diff --git a/simrun/internal/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.down.sql b/internal/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.down.sql similarity index 100% rename from simrun/internal/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.down.sql rename to internal/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.down.sql diff --git a/simrun/internal/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.up.sql b/internal/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.up.sql similarity index 100% rename from simrun/internal/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.up.sql rename to internal/db/migrations/008_v4_appconfig_defaults_and_ssh_connector.up.sql diff --git a/simrun/internal/db/migrations/009_runs_created_at_index.down.sql b/internal/db/migrations/009_runs_created_at_index.down.sql similarity index 100% rename from simrun/internal/db/migrations/009_runs_created_at_index.down.sql rename to internal/db/migrations/009_runs_created_at_index.down.sql diff --git a/simrun/internal/db/migrations/009_runs_created_at_index.up.sql b/internal/db/migrations/009_runs_created_at_index.up.sql similarity index 100% rename from simrun/internal/db/migrations/009_runs_created_at_index.up.sql rename to internal/db/migrations/009_runs_created_at_index.up.sql diff --git a/simrun/internal/db/migrations/010_saved_scenarios_updated_at_index.down.sql b/internal/db/migrations/010_saved_scenarios_updated_at_index.down.sql similarity index 100% rename from simrun/internal/db/migrations/010_saved_scenarios_updated_at_index.down.sql rename to internal/db/migrations/010_saved_scenarios_updated_at_index.down.sql diff --git a/simrun/internal/db/migrations/010_saved_scenarios_updated_at_index.up.sql b/internal/db/migrations/010_saved_scenarios_updated_at_index.up.sql similarity index 100% rename from simrun/internal/db/migrations/010_saved_scenarios_updated_at_index.up.sql rename to internal/db/migrations/010_saved_scenarios_updated_at_index.up.sql diff --git a/simrun/internal/db/packs.go b/internal/db/packs.go similarity index 100% rename from simrun/internal/db/packs.go rename to internal/db/packs.go diff --git a/simrun/internal/db/runs.go b/internal/db/runs.go similarity index 100% rename from simrun/internal/db/runs.go rename to internal/db/runs.go diff --git a/simrun/internal/db/scenarios.go b/internal/db/scenarios.go similarity index 100% rename from simrun/internal/db/scenarios.go rename to internal/db/scenarios.go diff --git a/simrun/internal/db/schedules.go b/internal/db/schedules.go similarity index 100% rename from simrun/internal/db/schedules.go rename to internal/db/schedules.go diff --git a/simrun/internal/db/secrets.go b/internal/db/secrets.go similarity index 100% rename from simrun/internal/db/secrets.go rename to internal/db/secrets.go diff --git a/simrun/internal/db/sessions.go b/internal/db/sessions.go similarity index 100% rename from simrun/internal/db/sessions.go rename to internal/db/sessions.go diff --git a/simrun/internal/detonators/aws_cli_detonator.go b/internal/detonators/aws_cli_detonator.go similarity index 98% rename from simrun/internal/detonators/aws_cli_detonator.go rename to internal/detonators/aws_cli_detonator.go index 9b2ffc9..1e7b95e 100644 --- a/simrun/internal/detonators/aws_cli_detonator.go +++ b/internal/detonators/aws_cli_detonator.go @@ -5,7 +5,7 @@ import ( "fmt" "os/exec" - "github.com/IBM/simrun/simrun/internal/envutil" + "github.com/IBM/simrun/internal/envutil" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/credentials" diff --git a/simrun/internal/detonators/detonator.go b/internal/detonators/detonator.go similarity index 100% rename from simrun/internal/detonators/detonator.go rename to internal/detonators/detonator.go diff --git a/simrun/internal/detonators/logger.go b/internal/detonators/logger.go similarity index 100% rename from simrun/internal/detonators/logger.go rename to internal/detonators/logger.go diff --git a/simrun/internal/detonators/mocks/Detonator.go b/internal/detonators/mocks/Detonator.go similarity index 100% rename from simrun/internal/detonators/mocks/Detonator.go rename to internal/detonators/mocks/Detonator.go diff --git a/simrun/internal/detonators/simrun_detonator.go b/internal/detonators/simrun_detonator.go similarity index 98% rename from simrun/internal/detonators/simrun_detonator.go rename to internal/detonators/simrun_detonator.go index 9f19a05..7a1bdc8 100644 --- a/simrun/internal/detonators/simrun_detonator.go +++ b/internal/detonators/simrun_detonator.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "github.com/IBM/simrun/simrun/internal/config" - "github.com/IBM/simrun/simrun/internal/packs/executor" - "github.com/IBM/simrun/simrun/internal/packs/runner" - "github.com/IBM/simrun/simrun/internal/packs/terraform" - "github.com/IBM/simrun/simrun/pack" + "github.com/IBM/simrun/internal/config" + "github.com/IBM/simrun/internal/packs/executor" + "github.com/IBM/simrun/internal/packs/runner" + "github.com/IBM/simrun/internal/packs/terraform" + "github.com/IBM/simrun/pack" gonanoid "github.com/matoous/go-nanoid/v2" "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/detonators/simrun_detonator_test.go b/internal/detonators/simrun_detonator_test.go similarity index 97% rename from simrun/internal/detonators/simrun_detonator_test.go rename to internal/detonators/simrun_detonator_test.go index 28258d0..619029f 100644 --- a/simrun/internal/detonators/simrun_detonator_test.go +++ b/internal/detonators/simrun_detonator_test.go @@ -3,7 +3,7 @@ package detonators import ( "testing" - "github.com/IBM/simrun/simrun/internal/config" + "github.com/IBM/simrun/internal/config" ) func TestTerraformEnvVars_PerSimOverridesPackLevel(t *testing.T) { diff --git a/simrun/internal/envutil/envutil.go b/internal/envutil/envutil.go similarity index 100% rename from simrun/internal/envutil/envutil.go rename to internal/envutil/envutil.go diff --git a/simrun/internal/envutil/envutil_test.go b/internal/envutil/envutil_test.go similarity index 100% rename from simrun/internal/envutil/envutil_test.go rename to internal/envutil/envutil_test.go diff --git a/simrun/internal/injectors/elastic_injector.go b/internal/injectors/elastic_injector.go similarity index 99% rename from simrun/internal/injectors/elastic_injector.go rename to internal/injectors/elastic_injector.go index 8cd5f51..54ad196 100644 --- a/simrun/internal/injectors/elastic_injector.go +++ b/internal/injectors/elastic_injector.go @@ -13,7 +13,7 @@ import ( "text/template" "time" - "github.com/IBM/simrun/simrun/internal/envutil" + "github.com/IBM/simrun/internal/envutil" "github.com/elastic/go-elasticsearch/v9" "github.com/google/uuid" "github.com/sirupsen/logrus" diff --git a/simrun/internal/injectors/elastic_injector_test.go b/internal/injectors/elastic_injector_test.go similarity index 100% rename from simrun/internal/injectors/elastic_injector_test.go rename to internal/injectors/elastic_injector_test.go diff --git a/simrun/internal/injectors/injector.go b/internal/injectors/injector.go similarity index 100% rename from simrun/internal/injectors/injector.go rename to internal/injectors/injector.go diff --git a/simrun/internal/injectors/mocks/Injector.go b/internal/injectors/mocks/Injector.go similarity index 100% rename from simrun/internal/injectors/mocks/Injector.go rename to internal/injectors/mocks/Injector.go diff --git a/simrun/internal/matchers/alert_matcher.go b/internal/matchers/alert_matcher.go similarity index 100% rename from simrun/internal/matchers/alert_matcher.go rename to internal/matchers/alert_matcher.go diff --git a/simrun/internal/matchers/datadog/datadog.go b/internal/matchers/datadog/datadog.go similarity index 100% rename from simrun/internal/matchers/datadog/datadog.go rename to internal/matchers/datadog/datadog.go diff --git a/simrun/internal/matchers/datadog/datadog_test.go b/internal/matchers/datadog/datadog_test.go similarity index 99% rename from simrun/internal/matchers/datadog/datadog_test.go rename to internal/matchers/datadog/datadog_test.go index 9c5dfaa..a914dda 100644 --- a/simrun/internal/matchers/datadog/datadog_test.go +++ b/internal/matchers/datadog/datadog_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" - "github.com/IBM/simrun/simrun/internal/matchers/datadog/mocks" + "github.com/IBM/simrun/internal/matchers/datadog/mocks" "github.com/aws/smithy-go/ptr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/simrun/internal/matchers/datadog/mocks/DatadogSecuritySignalsAPI.go b/internal/matchers/datadog/mocks/DatadogSecuritySignalsAPI.go similarity index 100% rename from simrun/internal/matchers/datadog/mocks/DatadogSecuritySignalsAPI.go rename to internal/matchers/datadog/mocks/DatadogSecuritySignalsAPI.go diff --git a/simrun/internal/matchers/datadog/types.go b/internal/matchers/datadog/types.go similarity index 98% rename from simrun/internal/matchers/datadog/types.go rename to internal/matchers/datadog/types.go index 2858592..6b00668 100644 --- a/simrun/internal/matchers/datadog/types.go +++ b/internal/matchers/datadog/types.go @@ -5,7 +5,7 @@ import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" - "github.com/IBM/simrun/simrun/internal/envutil" + "github.com/IBM/simrun/internal/envutil" log "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/matchers/elastic/elastic.go b/internal/matchers/elastic/elastic.go similarity index 99% rename from simrun/internal/matchers/elastic/elastic.go rename to internal/matchers/elastic/elastic.go index 08b577f..b127f10 100644 --- a/simrun/internal/matchers/elastic/elastic.go +++ b/internal/matchers/elastic/elastic.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/IBM/simrun/simrun/internal/envutil" + "github.com/IBM/simrun/internal/envutil" "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/matchers/elastic/elastic_test.go b/internal/matchers/elastic/elastic_test.go similarity index 100% rename from simrun/internal/matchers/elastic/elastic_test.go rename to internal/matchers/elastic/elastic_test.go diff --git a/simrun/internal/matchers/elastic/mocks/ElasticSecurityDetectionAlertsAPI.go b/internal/matchers/elastic/mocks/ElasticSecurityDetectionAlertsAPI.go similarity index 98% rename from simrun/internal/matchers/elastic/mocks/ElasticSecurityDetectionAlertsAPI.go rename to internal/matchers/elastic/mocks/ElasticSecurityDetectionAlertsAPI.go index 9c561f3..bb378a7 100644 --- a/simrun/internal/matchers/elastic/mocks/ElasticSecurityDetectionAlertsAPI.go +++ b/internal/matchers/elastic/mocks/ElasticSecurityDetectionAlertsAPI.go @@ -5,7 +5,7 @@ package mocks import ( - "github.com/IBM/simrun/simrun/internal/matchers/elastic" + "github.com/IBM/simrun/internal/matchers/elastic" mock "github.com/stretchr/testify/mock" ) diff --git a/simrun/internal/matchers/elastic/types.go b/internal/matchers/elastic/types.go similarity index 100% rename from simrun/internal/matchers/elastic/types.go rename to internal/matchers/elastic/types.go diff --git a/simrun/internal/matchers/mocks/AlertGeneratedMatcher.go b/internal/matchers/mocks/AlertGeneratedMatcher.go similarity index 100% rename from simrun/internal/matchers/mocks/AlertGeneratedMatcher.go rename to internal/matchers/mocks/AlertGeneratedMatcher.go diff --git a/simrun/internal/packs/executor/executor.go b/internal/packs/executor/executor.go similarity index 97% rename from simrun/internal/packs/executor/executor.go rename to internal/packs/executor/executor.go index 8c3cfa3..b172581 100644 --- a/simrun/internal/packs/executor/executor.go +++ b/internal/packs/executor/executor.go @@ -8,8 +8,8 @@ import ( "fmt" "io" - "github.com/IBM/simrun/simrun/internal/packs/runner" - "github.com/IBM/simrun/simrun/pack" + "github.com/IBM/simrun/internal/packs/runner" + "github.com/IBM/simrun/pack" "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/packs/locks/keyedmutex.go b/internal/packs/locks/keyedmutex.go similarity index 100% rename from simrun/internal/packs/locks/keyedmutex.go rename to internal/packs/locks/keyedmutex.go diff --git a/simrun/internal/packs/locks/keyedmutex_test.go b/internal/packs/locks/keyedmutex_test.go similarity index 100% rename from simrun/internal/packs/locks/keyedmutex_test.go rename to internal/packs/locks/keyedmutex_test.go diff --git a/simrun/internal/packs/resolver/resolver.go b/internal/packs/resolver/resolver.go similarity index 99% rename from simrun/internal/packs/resolver/resolver.go rename to internal/packs/resolver/resolver.go index b714f7e..6d6c660 100644 --- a/simrun/internal/packs/resolver/resolver.go +++ b/internal/packs/resolver/resolver.go @@ -18,8 +18,8 @@ import ( "runtime" "strings" - "github.com/IBM/simrun/simrun/internal/packs/locks" - "github.com/IBM/simrun/simrun/pack" + "github.com/IBM/simrun/internal/packs/locks" + "github.com/IBM/simrun/pack" "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/packs/resolver/resolver_concurrency_test.go b/internal/packs/resolver/resolver_concurrency_test.go similarity index 100% rename from simrun/internal/packs/resolver/resolver_concurrency_test.go rename to internal/packs/resolver/resolver_concurrency_test.go diff --git a/simrun/internal/packs/runner/binary_runner.go b/internal/packs/runner/binary_runner.go similarity index 97% rename from simrun/internal/packs/runner/binary_runner.go rename to internal/packs/runner/binary_runner.go index 7f35b38..ef2f860 100644 --- a/simrun/internal/packs/runner/binary_runner.go +++ b/internal/packs/runner/binary_runner.go @@ -7,7 +7,7 @@ import ( "io" "os/exec" - "github.com/IBM/simrun/simrun/internal/envutil" + "github.com/IBM/simrun/internal/envutil" ) // BinaryRunner executes pack commands using a local binary. diff --git a/simrun/internal/packs/runner/factory.go b/internal/packs/runner/factory.go similarity index 95% rename from simrun/internal/packs/runner/factory.go rename to internal/packs/runner/factory.go index facf034..48e6432 100644 --- a/simrun/internal/packs/runner/factory.go +++ b/internal/packs/runner/factory.go @@ -8,9 +8,9 @@ import ( "fmt" "os" - "github.com/IBM/simrun/simrun/internal/config" - "github.com/IBM/simrun/simrun/internal/packs/resolver" - "github.com/IBM/simrun/simrun/pack" + "github.com/IBM/simrun/internal/config" + "github.com/IBM/simrun/internal/packs/resolver" + "github.com/IBM/simrun/pack" "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/packs/runner/runner.go b/internal/packs/runner/runner.go similarity index 95% rename from simrun/internal/packs/runner/runner.go rename to internal/packs/runner/runner.go index 785a57a..697a585 100644 --- a/simrun/internal/packs/runner/runner.go +++ b/internal/packs/runner/runner.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/IBM/simrun/simrun/internal/config" - "github.com/IBM/simrun/simrun/pack" + "github.com/IBM/simrun/internal/config" + "github.com/IBM/simrun/pack" ) // PackRunner abstracts the execution of pack commands. diff --git a/simrun/internal/packs/terraform/manager.go b/internal/packs/terraform/manager.go similarity index 100% rename from simrun/internal/packs/terraform/manager.go rename to internal/packs/terraform/manager.go diff --git a/simrun/internal/packs/terraform/manager_test.go b/internal/packs/terraform/manager_test.go similarity index 100% rename from simrun/internal/packs/terraform/manager_test.go rename to internal/packs/terraform/manager_test.go diff --git a/simrun/internal/parser/main.go b/internal/parser/main.go similarity index 95% rename from simrun/internal/parser/main.go rename to internal/parser/main.go index 54347f6..30d9192 100644 --- a/simrun/internal/parser/main.go +++ b/internal/parser/main.go @@ -8,15 +8,15 @@ import ( "fmt" "time" - "github.com/IBM/simrun/simrun/internal/collectors" - "github.com/IBM/simrun/simrun/internal/config" - "github.com/IBM/simrun/simrun/internal/detonators" - "github.com/IBM/simrun/simrun/internal/injectors" - "github.com/IBM/simrun/simrun/internal/matchers" - "github.com/IBM/simrun/simrun/internal/matchers/datadog" - "github.com/IBM/simrun/simrun/internal/matchers/elastic" - packrunner "github.com/IBM/simrun/simrun/internal/packs/runner" - "github.com/IBM/simrun/simrun/internal/runner" + "github.com/IBM/simrun/internal/collectors" + "github.com/IBM/simrun/internal/config" + "github.com/IBM/simrun/internal/detonators" + "github.com/IBM/simrun/internal/injectors" + "github.com/IBM/simrun/internal/matchers" + "github.com/IBM/simrun/internal/matchers/datadog" + "github.com/IBM/simrun/internal/matchers/elastic" + packrunner "github.com/IBM/simrun/internal/packs/runner" + "github.com/IBM/simrun/internal/runner" "sigs.k8s.io/yaml" // we use this library as it provides a handy "YAMLToJSON" function ) diff --git a/simrun/internal/parser/parser.go b/internal/parser/parser.go similarity index 100% rename from simrun/internal/parser/parser.go rename to internal/parser/parser.go diff --git a/simrun/internal/parser/parser_test.go b/internal/parser/parser_test.go similarity index 95% rename from simrun/internal/parser/parser_test.go rename to internal/parser/parser_test.go index 9be373f..fd7d078 100644 --- a/simrun/internal/parser/parser_test.go +++ b/internal/parser/parser_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" - "github.com/IBM/simrun/simrun/internal/detonators" - "github.com/IBM/simrun/simrun/internal/injectors" - "github.com/IBM/simrun/simrun/internal/runner" + "github.com/IBM/simrun/internal/detonators" + "github.com/IBM/simrun/internal/injectors" + "github.com/IBM/simrun/internal/runner" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/simrun/internal/parser/testdata/scenarios/all-disabled.yaml b/internal/parser/testdata/scenarios/all-disabled.yaml similarity index 100% rename from simrun/internal/parser/testdata/scenarios/all-disabled.yaml rename to internal/parser/testdata/scenarios/all-disabled.yaml diff --git a/simrun/internal/parser/testdata/scenarios/aws-cli-detonator.yaml b/internal/parser/testdata/scenarios/aws-cli-detonator.yaml similarity index 100% rename from simrun/internal/parser/testdata/scenarios/aws-cli-detonator.yaml rename to internal/parser/testdata/scenarios/aws-cli-detonator.yaml diff --git a/simrun/internal/parser/testdata/scenarios/elastic-collector.yaml b/internal/parser/testdata/scenarios/elastic-collector.yaml similarity index 100% rename from simrun/internal/parser/testdata/scenarios/elastic-collector.yaml rename to internal/parser/testdata/scenarios/elastic-collector.yaml diff --git a/simrun/internal/parser/testdata/scenarios/elastic-injector.yaml b/internal/parser/testdata/scenarios/elastic-injector.yaml similarity index 100% rename from simrun/internal/parser/testdata/scenarios/elastic-injector.yaml rename to internal/parser/testdata/scenarios/elastic-injector.yaml diff --git a/simrun/internal/parser/testdata/scenarios/empty-scenarios.yaml b/internal/parser/testdata/scenarios/empty-scenarios.yaml similarity index 100% rename from simrun/internal/parser/testdata/scenarios/empty-scenarios.yaml rename to internal/parser/testdata/scenarios/empty-scenarios.yaml diff --git a/simrun/internal/parser/testdata/scenarios/missing-detonate-and-inject.yaml b/internal/parser/testdata/scenarios/missing-detonate-and-inject.yaml similarity index 100% rename from simrun/internal/parser/testdata/scenarios/missing-detonate-and-inject.yaml rename to internal/parser/testdata/scenarios/missing-detonate-and-inject.yaml diff --git a/simrun/internal/parser/testdata/scenarios/targets-all.yaml b/internal/parser/testdata/scenarios/targets-all.yaml similarity index 100% rename from simrun/internal/parser/testdata/scenarios/targets-all.yaml rename to internal/parser/testdata/scenarios/targets-all.yaml diff --git a/simrun/internal/parser/testdata/scenarios/targets-aws-only.yaml b/internal/parser/testdata/scenarios/targets-aws-only.yaml similarity index 100% rename from simrun/internal/parser/testdata/scenarios/targets-aws-only.yaml rename to internal/parser/testdata/scenarios/targets-aws-only.yaml diff --git a/simrun/internal/results/executor.go b/internal/results/executor.go similarity index 98% rename from simrun/internal/results/executor.go rename to internal/results/executor.go index 9b8e772..9660751 100644 --- a/simrun/internal/results/executor.go +++ b/internal/results/executor.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/IBM/simrun/simrun/internal/runner" + "github.com/IBM/simrun/internal/runner" ) // RunScenariosParallel runs scenarios in parallel with the given parallelism. diff --git a/simrun/internal/results/types.go b/internal/results/types.go similarity index 95% rename from simrun/internal/results/types.go rename to internal/results/types.go index 93971bd..288346b 100644 --- a/simrun/internal/results/types.go +++ b/internal/results/types.go @@ -5,8 +5,8 @@ package results import ( "time" - "github.com/IBM/simrun/simrun/internal/matchers" - "github.com/IBM/simrun/simrun/internal/runner" + "github.com/IBM/simrun/internal/matchers" + "github.com/IBM/simrun/internal/runner" ) type ScenarioRunResult struct { diff --git a/simrun/internal/runner/runner.go b/internal/runner/runner.go similarity index 99% rename from simrun/internal/runner/runner.go rename to internal/runner/runner.go index 24e5957..91e232a 100644 --- a/simrun/internal/runner/runner.go +++ b/internal/runner/runner.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/IBM/simrun/simrun/internal/matchers" - "github.com/IBM/simrun/simrun/internal/matchers/elastic" + "github.com/IBM/simrun/internal/matchers" + "github.com/IBM/simrun/internal/matchers/elastic" "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/runner/runner_test.go b/internal/runner/runner_test.go similarity index 97% rename from simrun/internal/runner/runner_test.go rename to internal/runner/runner_test.go index ac4ad4f..20323e3 100644 --- a/simrun/internal/runner/runner_test.go +++ b/internal/runner/runner_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - detonatorMocks "github.com/IBM/simrun/simrun/internal/detonators/mocks" - injectorMocks "github.com/IBM/simrun/simrun/internal/injectors/mocks" - "github.com/IBM/simrun/simrun/internal/matchers" - "github.com/IBM/simrun/simrun/internal/matchers/elastic" - matcherMocks "github.com/IBM/simrun/simrun/internal/matchers/mocks" + detonatorMocks "github.com/IBM/simrun/internal/detonators/mocks" + injectorMocks "github.com/IBM/simrun/internal/injectors/mocks" + "github.com/IBM/simrun/internal/matchers" + "github.com/IBM/simrun/internal/matchers/elastic" + matcherMocks "github.com/IBM/simrun/internal/matchers/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/simrun/internal/runner/scenario.go b/internal/runner/scenario.go similarity index 88% rename from simrun/internal/runner/scenario.go rename to internal/runner/scenario.go index 2ec4c4e..adc4d58 100644 --- a/simrun/internal/runner/scenario.go +++ b/internal/runner/scenario.go @@ -3,10 +3,10 @@ package runner import ( "time" - "github.com/IBM/simrun/simrun/internal/collectors" - "github.com/IBM/simrun/simrun/internal/detonators" - "github.com/IBM/simrun/simrun/internal/injectors" - "github.com/IBM/simrun/simrun/internal/matchers" + "github.com/IBM/simrun/internal/collectors" + "github.com/IBM/simrun/internal/detonators" + "github.com/IBM/simrun/internal/injectors" + "github.com/IBM/simrun/internal/matchers" ) type Scenario struct { diff --git a/simrun/internal/testutil/fakes/fakes.go b/internal/testutil/fakes/fakes.go similarity index 99% rename from simrun/internal/testutil/fakes/fakes.go rename to internal/testutil/fakes/fakes.go index ed47e49..2267cf0 100644 --- a/simrun/internal/testutil/fakes/fakes.go +++ b/internal/testutil/fakes/fakes.go @@ -16,8 +16,8 @@ import ( "sync" "time" - "github.com/IBM/simrun/simrun/internal/config" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/config" + "github.com/IBM/simrun/internal/db" "github.com/google/uuid" "github.com/jackc/pgx/v5" ) diff --git a/simrun/internal/testutil/testserver/testserver.go b/internal/testutil/testserver/testserver.go similarity index 94% rename from simrun/internal/testutil/testserver/testserver.go rename to internal/testutil/testserver/testserver.go index a80bdeb..7af555b 100644 --- a/simrun/internal/testutil/testserver/testserver.go +++ b/internal/testutil/testserver/testserver.go @@ -12,11 +12,11 @@ import ( "path/filepath" "testing" - "github.com/IBM/simrun/simrun/internal/credentials" - "github.com/IBM/simrun/simrun/internal/crypto" - "github.com/IBM/simrun/simrun/internal/testutil/fakes" - "github.com/IBM/simrun/simrun/internal/web" - "github.com/IBM/simrun/simrun/internal/web/auth" + "github.com/IBM/simrun/internal/credentials" + "github.com/IBM/simrun/internal/crypto" + "github.com/IBM/simrun/internal/testutil/fakes" + "github.com/IBM/simrun/internal/web" + "github.com/IBM/simrun/internal/web/auth" "github.com/stretchr/testify/require" ) diff --git a/simrun/internal/testutil/testserver/testserver_test.go b/internal/testutil/testserver/testserver_test.go similarity index 81% rename from simrun/internal/testutil/testserver/testserver_test.go rename to internal/testutil/testserver/testserver_test.go index c96838d..229d923 100644 --- a/simrun/internal/testutil/testserver/testserver_test.go +++ b/internal/testutil/testserver/testserver_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/IBM/simrun/simrun/internal/testutil/testserver" + "github.com/IBM/simrun/internal/testutil/testserver" "github.com/stretchr/testify/assert" ) diff --git a/simrun/internal/version/version.go b/internal/version/version.go similarity index 100% rename from simrun/internal/version/version.go rename to internal/version/version.go diff --git a/simrun/internal/web/api_connectors_test.go b/internal/web/api_connectors_test.go similarity index 97% rename from simrun/internal/web/api_connectors_test.go rename to internal/web/api_connectors_test.go index f8e71f9..1f49569 100644 --- a/simrun/internal/web/api_connectors_test.go +++ b/internal/web/api_connectors_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/testutil/testserver" - "github.com/IBM/simrun/simrun/internal/web" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/testutil/testserver" + "github.com/IBM/simrun/internal/web" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/simrun/internal/web/api_health_test.go b/internal/web/api_health_test.go similarity index 92% rename from simrun/internal/web/api_health_test.go rename to internal/web/api_health_test.go index 466b33b..5ab5bbd 100644 --- a/simrun/internal/web/api_health_test.go +++ b/internal/web/api_health_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/IBM/simrun/simrun/internal/testutil/testserver" + "github.com/IBM/simrun/internal/testutil/testserver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/simrun/internal/web/api_helpers_test.go b/internal/web/api_helpers_test.go similarity index 100% rename from simrun/internal/web/api_helpers_test.go rename to internal/web/api_helpers_test.go diff --git a/simrun/internal/web/api_packs_test.go b/internal/web/api_packs_test.go similarity index 96% rename from simrun/internal/web/api_packs_test.go rename to internal/web/api_packs_test.go index 2ec2a11..36a93e4 100644 --- a/simrun/internal/web/api_packs_test.go +++ b/internal/web/api_packs_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/testutil/testserver" - "github.com/IBM/simrun/simrun/internal/web" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/testutil/testserver" + "github.com/IBM/simrun/internal/web" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/simrun/internal/web/api_runs_test.go b/internal/web/api_runs_test.go similarity index 98% rename from simrun/internal/web/api_runs_test.go rename to internal/web/api_runs_test.go index a4c0aca..5a9cdf9 100644 --- a/simrun/internal/web/api_runs_test.go +++ b/internal/web/api_runs_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/testutil/testserver" - "github.com/IBM/simrun/simrun/internal/web" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/testutil/testserver" + "github.com/IBM/simrun/internal/web" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/simrun/internal/web/api_scenarios_test.go b/internal/web/api_scenarios_test.go similarity index 98% rename from simrun/internal/web/api_scenarios_test.go rename to internal/web/api_scenarios_test.go index d4f3f3b..382b731 100644 --- a/simrun/internal/web/api_scenarios_test.go +++ b/internal/web/api_scenarios_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/testutil/testserver" - "github.com/IBM/simrun/simrun/internal/web" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/testutil/testserver" + "github.com/IBM/simrun/internal/web" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/simrun/internal/web/api_schedules_test.go b/internal/web/api_schedules_test.go similarity index 95% rename from simrun/internal/web/api_schedules_test.go rename to internal/web/api_schedules_test.go index d4381a1..d5f9d82 100644 --- a/simrun/internal/web/api_schedules_test.go +++ b/internal/web/api_schedules_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/testutil/testserver" - "github.com/IBM/simrun/simrun/internal/web" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/testutil/testserver" + "github.com/IBM/simrun/internal/web" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/simrun/internal/web/api_secrets_test.go b/internal/web/api_secrets_test.go similarity index 97% rename from simrun/internal/web/api_secrets_test.go rename to internal/web/api_secrets_test.go index 62259e2..70baa08 100644 --- a/simrun/internal/web/api_secrets_test.go +++ b/internal/web/api_secrets_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/IBM/simrun/simrun/internal/testutil/testserver" - "github.com/IBM/simrun/simrun/internal/web" + "github.com/IBM/simrun/internal/testutil/testserver" + "github.com/IBM/simrun/internal/web" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/simrun/internal/web/auth/context.go b/internal/web/auth/context.go similarity index 100% rename from simrun/internal/web/auth/context.go rename to internal/web/auth/context.go diff --git a/simrun/internal/web/auth/handlers.go b/internal/web/auth/handlers.go similarity index 99% rename from simrun/internal/web/auth/handlers.go rename to internal/web/auth/handlers.go index 1d3697c..f23688d 100644 --- a/simrun/internal/web/auth/handlers.go +++ b/internal/web/auth/handlers.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/db" log "github.com/sirupsen/logrus" "golang.org/x/oauth2" "golang.org/x/oauth2/google" diff --git a/simrun/internal/web/auth/middleware.go b/internal/web/auth/middleware.go similarity index 97% rename from simrun/internal/web/auth/middleware.go rename to internal/web/auth/middleware.go index 16d0f31..ece65c4 100644 --- a/simrun/internal/web/auth/middleware.go +++ b/internal/web/auth/middleware.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/db" ) const sessionCookieName = "simrun_session" diff --git a/simrun/internal/web/auth/types.go b/internal/web/auth/types.go similarity index 100% rename from simrun/internal/web/auth/types.go rename to internal/web/auth/types.go diff --git a/simrun/internal/web/connector_handlers.go b/internal/web/connector_handlers.go similarity index 97% rename from simrun/internal/web/connector_handlers.go rename to internal/web/connector_handlers.go index f98f7d8..9cfa258 100644 --- a/simrun/internal/web/connector_handlers.go +++ b/internal/web/connector_handlers.go @@ -8,12 +8,12 @@ import ( "os/exec" "strings" - "github.com/IBM/simrun/simrun/internal/cloud/azure" - "github.com/IBM/simrun/simrun/internal/cloud/k8s" - "github.com/IBM/simrun/simrun/internal/connectors/elastic" - "github.com/IBM/simrun/simrun/internal/credentials" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/envutil" + "github.com/IBM/simrun/internal/cloud/azure" + "github.com/IBM/simrun/internal/cloud/k8s" + "github.com/IBM/simrun/internal/connectors/elastic" + "github.com/IBM/simrun/internal/credentials" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/envutil" "github.com/go-chi/chi/v5" "github.com/google/uuid" ) diff --git a/simrun/internal/web/coverage.go b/internal/web/coverage.go similarity index 98% rename from simrun/internal/web/coverage.go rename to internal/web/coverage.go index 7a9a3c6..57de48a 100644 --- a/simrun/internal/web/coverage.go +++ b/internal/web/coverage.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/IBM/simrun/simrun/internal/connectors/elastic" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/connectors/elastic" + "github.com/IBM/simrun/internal/db" "sigs.k8s.io/yaml" ) diff --git a/simrun/internal/web/coverage_test.go b/internal/web/coverage_test.go similarity index 96% rename from simrun/internal/web/coverage_test.go rename to internal/web/coverage_test.go index 8517f44..12f6744 100644 --- a/simrun/internal/web/coverage_test.go +++ b/internal/web/coverage_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/IBM/simrun/simrun/internal/connectors/elastic" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/connectors/elastic" + "github.com/IBM/simrun/internal/db" "github.com/google/uuid" "github.com/stretchr/testify/assert" ) diff --git a/simrun/internal/web/elastic_rules_handlers.go b/internal/web/elastic_rules_handlers.go similarity index 98% rename from simrun/internal/web/elastic_rules_handlers.go rename to internal/web/elastic_rules_handlers.go index a1c9c26..ba516bc 100644 --- a/simrun/internal/web/elastic_rules_handlers.go +++ b/internal/web/elastic_rules_handlers.go @@ -5,8 +5,8 @@ import ( "net/http" "strconv" - "github.com/IBM/simrun/simrun/internal/connectors/elastic" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/connectors/elastic" + "github.com/IBM/simrun/internal/db" "github.com/go-chi/chi/v5" "github.com/google/uuid" ) diff --git a/simrun/internal/web/embed.go b/internal/web/embed.go similarity index 100% rename from simrun/internal/web/embed.go rename to internal/web/embed.go diff --git a/simrun/internal/web/handlers.go b/internal/web/handlers.go similarity index 99% rename from simrun/internal/web/handlers.go rename to internal/web/handlers.go index a1fb447..03d44ac 100644 --- a/simrun/internal/web/handlers.go +++ b/internal/web/handlers.go @@ -11,8 +11,8 @@ import ( "strconv" "time" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/version" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/version" "github.com/go-chi/chi/v5" "github.com/google/uuid" ) diff --git a/simrun/internal/web/pack_params_validation.go b/internal/web/pack_params_validation.go similarity index 100% rename from simrun/internal/web/pack_params_validation.go rename to internal/web/pack_params_validation.go diff --git a/simrun/internal/web/pack_params_validation_test.go b/internal/web/pack_params_validation_test.go similarity index 100% rename from simrun/internal/web/pack_params_validation_test.go rename to internal/web/pack_params_validation_test.go diff --git a/simrun/internal/web/packs_handler.go b/internal/web/packs_handler.go similarity index 97% rename from simrun/internal/web/packs_handler.go rename to internal/web/packs_handler.go index 5bf0bb4..5cbf2f5 100644 --- a/simrun/internal/web/packs_handler.go +++ b/internal/web/packs_handler.go @@ -9,10 +9,10 @@ import ( "path/filepath" "strings" - "github.com/IBM/simrun/simrun/internal/config" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/packs/locks" - packrunner "github.com/IBM/simrun/simrun/internal/packs/runner" + "github.com/IBM/simrun/internal/config" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/packs/locks" + packrunner "github.com/IBM/simrun/internal/packs/runner" "github.com/go-chi/chi/v5" ) diff --git a/simrun/internal/web/runlog.go b/internal/web/runlog.go similarity index 100% rename from simrun/internal/web/runlog.go rename to internal/web/runlog.go diff --git a/simrun/internal/web/scenario_export.go b/internal/web/scenario_export.go similarity index 97% rename from simrun/internal/web/scenario_export.go rename to internal/web/scenario_export.go index fcfc7f0..33ebd13 100644 --- a/simrun/internal/web/scenario_export.go +++ b/internal/web/scenario_export.go @@ -6,9 +6,9 @@ import ( "encoding/json" "fmt" - "github.com/IBM/simrun/simrun/internal/credentials" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/results" + "github.com/IBM/simrun/internal/credentials" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/results" "github.com/elastic/go-elasticsearch/v9" "github.com/google/uuid" log "github.com/sirupsen/logrus" diff --git a/simrun/internal/web/scenario_results.go b/internal/web/scenario_results.go similarity index 95% rename from simrun/internal/web/scenario_results.go rename to internal/web/scenario_results.go index 2c7e2f1..098a5e3 100644 --- a/simrun/internal/web/scenario_results.go +++ b/internal/web/scenario_results.go @@ -3,9 +3,9 @@ package web import ( "encoding/json" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/matchers" - "github.com/IBM/simrun/simrun/internal/results" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/matchers" + "github.com/IBM/simrun/internal/results" "github.com/google/uuid" log "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/web/scenario_results_test.go b/internal/web/scenario_results_test.go similarity index 96% rename from simrun/internal/web/scenario_results_test.go rename to internal/web/scenario_results_test.go index 432cdbf..27ad74d 100644 --- a/simrun/internal/web/scenario_results_test.go +++ b/internal/web/scenario_results_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/IBM/simrun/simrun/internal/matchers" - "github.com/IBM/simrun/simrun/internal/results" - "github.com/IBM/simrun/simrun/internal/runner" + "github.com/IBM/simrun/internal/matchers" + "github.com/IBM/simrun/internal/results" + "github.com/IBM/simrun/internal/runner" "github.com/google/uuid" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/simrun/internal/web/scenarios.go b/internal/web/scenarios.go similarity index 97% rename from simrun/internal/web/scenarios.go rename to internal/web/scenarios.go index 00e7a74..54f20dc 100644 --- a/simrun/internal/web/scenarios.go +++ b/internal/web/scenarios.go @@ -6,11 +6,11 @@ import ( "path/filepath" "time" - "github.com/IBM/simrun/simrun/internal/config" - "github.com/IBM/simrun/simrun/internal/credentials" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/parser" - "github.com/IBM/simrun/simrun/internal/results" + "github.com/IBM/simrun/internal/config" + "github.com/IBM/simrun/internal/credentials" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/parser" + "github.com/IBM/simrun/internal/results" "github.com/google/uuid" log "github.com/sirupsen/logrus" ) diff --git a/simrun/internal/web/schedule_handler.go b/internal/web/schedule_handler.go similarity index 99% rename from simrun/internal/web/schedule_handler.go rename to internal/web/schedule_handler.go index 01b8426..2d546de 100644 --- a/simrun/internal/web/schedule_handler.go +++ b/internal/web/schedule_handler.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/db" "github.com/go-chi/chi/v5" "github.com/google/uuid" "github.com/robfig/cron/v3" diff --git a/simrun/internal/web/scheduler.go b/internal/web/scheduler.go similarity index 98% rename from simrun/internal/web/scheduler.go rename to internal/web/scheduler.go index 7438e09..0e1169b 100644 --- a/simrun/internal/web/scheduler.go +++ b/internal/web/scheduler.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/db" "github.com/google/uuid" "github.com/robfig/cron/v3" log "github.com/sirupsen/logrus" diff --git a/simrun/internal/web/secrets_handler.go b/internal/web/secrets_handler.go similarity index 98% rename from simrun/internal/web/secrets_handler.go rename to internal/web/secrets_handler.go index 4688593..0d4302f 100644 --- a/simrun/internal/web/secrets_handler.go +++ b/internal/web/secrets_handler.go @@ -5,8 +5,8 @@ import ( "net/http" "sort" - "github.com/IBM/simrun/simrun/internal/crypto" - "github.com/IBM/simrun/simrun/internal/db" + "github.com/IBM/simrun/internal/crypto" + "github.com/IBM/simrun/internal/db" "github.com/go-chi/chi/v5" "github.com/google/uuid" ) diff --git a/simrun/internal/web/server.go b/internal/web/server.go similarity index 98% rename from simrun/internal/web/server.go rename to internal/web/server.go index b7353ff..0506100 100644 --- a/simrun/internal/web/server.go +++ b/internal/web/server.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - "github.com/IBM/simrun/simrun/internal/db" - "github.com/IBM/simrun/simrun/internal/web/auth" + "github.com/IBM/simrun/internal/db" + "github.com/IBM/simrun/internal/web/auth" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" ) diff --git a/simrun/internal/web/types.go b/internal/web/types.go similarity index 100% rename from simrun/internal/web/types.go rename to internal/web/types.go diff --git a/simrun/internal/web/types_test.go b/internal/web/types_test.go similarity index 100% rename from simrun/internal/web/types_test.go rename to internal/web/types_test.go diff --git a/simrun/internal/web/user_helper.go b/internal/web/user_helper.go similarity index 86% rename from simrun/internal/web/user_helper.go rename to internal/web/user_helper.go index 12532e5..2502d6d 100644 --- a/simrun/internal/web/user_helper.go +++ b/internal/web/user_helper.go @@ -3,7 +3,7 @@ package web import ( "net/http" - "github.com/IBM/simrun/simrun/internal/web/auth" + "github.com/IBM/simrun/internal/web/auth" ) // getUserEmail extracts the authenticated user's email from the request context. diff --git a/simrun/internal/web/ws.go b/internal/web/ws.go similarity index 100% rename from simrun/internal/web/ws.go rename to internal/web/ws.go diff --git a/mise.toml b/mise.toml index d5e73ba..f45757a 100644 --- a/mise.toml +++ b/mise.toml @@ -27,15 +27,15 @@ run = "echo 'Built simrun binary'" description = "Build all binaries" [tasks.lint] -run = "golangci-lint run ./simrun/..." +run = "golangci-lint run ./..." description = "Run golangci-lint" [tasks.fmt] -run = "golangci-lint fmt ./simrun/..." +run = "golangci-lint fmt ./..." description = "Format Go code (gofmt + goimports)" [tasks.test] -run = "go test ./simrun/..." +run = "go test ./..." description = "Run Go tests" [tasks.parser] @@ -43,7 +43,7 @@ run = """ #!/usr/bin/env bash go get github.com/atombender/go-jsonschema/... go install github.com/atombender/go-jsonschema@latest -go-jsonschema -p parser simrun/schemas/simrun.schema.json > simrun/internal/parser/parser.go +go-jsonschema -p parser schemas/simrun.schema.json > internal/parser/parser.go """ description = "Generate Go types from JSON schema" @@ -53,15 +53,15 @@ description = "Build SvelteKit frontend" [tasks.copy-frontend] depends = ["build-frontend"] -run = "rm -rf simrun/internal/web/frontend && mkdir -p simrun/internal/web/frontend && cp -r web/frontend/build/* simrun/internal/web/frontend/" +run = "rm -rf internal/web/frontend && mkdir -p internal/web/frontend && cp -r web/frontend/build/* internal/web/frontend/" description = "Copy built frontend assets to Go embed directory" [tasks.build-server] depends = ["copy-frontend"] run = ''' CGO_ENABLED=0 go build \ - -ldflags="-w -s -X github.com/IBM/simrun/simrun/internal/version.Version=dev -X github.com/IBM/simrun/simrun/internal/version.Commit=$(git rev-parse --short HEAD) -X github.com/IBM/simrun/simrun/internal/version.BuildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \ - -o dist/simrun simrun/cmd/simrun/main.go + -ldflags="-w -s -X github.com/IBM/simrun/internal/version.Version=dev -X github.com/IBM/simrun/internal/version.Commit=$(git rev-parse --short HEAD) -X github.com/IBM/simrun/internal/version.BuildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \ + -o dist/simrun cmd/simrun/main.go ''' description = "Build simrun Go binary (includes frontend)" alias = ["bs"] diff --git a/simrun/pack/aws/aws.go b/pack/aws/aws.go similarity index 98% rename from simrun/pack/aws/aws.go rename to pack/aws/aws.go index e3f41bf..bc40d3d 100644 --- a/simrun/pack/aws/aws.go +++ b/pack/aws/aws.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/IBM/simrun/simrun/internal/version" - "github.com/IBM/simrun/simrun/pack" + "github.com/IBM/simrun/internal/version" + "github.com/IBM/simrun/pack" "github.com/aws/aws-sdk-go-v2/aws" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/config" diff --git a/simrun/pack/aws/aws_test.go b/pack/aws/aws_test.go similarity index 98% rename from simrun/pack/aws/aws_test.go rename to pack/aws/aws_test.go index 6982ff7..bc5c3ed 100644 --- a/simrun/pack/aws/aws_test.go +++ b/pack/aws/aws_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/IBM/simrun/simrun/pack" + "github.com/IBM/simrun/pack" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ssm" ) diff --git a/simrun/pack/azure/azure.go b/pack/azure/azure.go similarity index 97% rename from simrun/pack/azure/azure.go rename to pack/azure/azure.go index 89141d8..72daefe 100644 --- a/simrun/pack/azure/azure.go +++ b/pack/azure/azure.go @@ -8,7 +8,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" - "github.com/IBM/simrun/simrun/pack" + "github.com/IBM/simrun/pack" ) // AzureCredential creates an Azure token credential using the default credential chain. diff --git a/simrun/pack/builtins.go b/pack/builtins.go similarity index 100% rename from simrun/pack/builtins.go rename to pack/builtins.go diff --git a/simrun/pack/builtins_test.go b/pack/builtins_test.go similarity index 100% rename from simrun/pack/builtins_test.go rename to pack/builtins_test.go diff --git a/simrun/pack/context.go b/pack/context.go similarity index 94% rename from simrun/pack/context.go rename to pack/context.go index 0eb9f83..c4ad4ca 100644 --- a/simrun/pack/context.go +++ b/pack/context.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/IBM/simrun/simrun/internal/version" + "github.com/IBM/simrun/internal/version" ) type contextKey int diff --git a/simrun/pack/gcp/gcp.go b/pack/gcp/gcp.go similarity index 99% rename from simrun/pack/gcp/gcp.go rename to pack/gcp/gcp.go index 2955721..fde9744 100644 --- a/simrun/pack/gcp/gcp.go +++ b/pack/gcp/gcp.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/IBM/simrun/simrun/pack" + "github.com/IBM/simrun/pack" "golang.org/x/oauth2/google" "google.golang.org/api/impersonate" "google.golang.org/api/option" diff --git a/simrun/pack/logger.go b/pack/logger.go similarity index 100% rename from simrun/pack/logger.go rename to pack/logger.go diff --git a/simrun/pack/pack.go b/pack/pack.go similarity index 100% rename from simrun/pack/pack.go rename to pack/pack.go diff --git a/simrun/pack/pack_test.go b/pack/pack_test.go similarity index 100% rename from simrun/pack/pack_test.go rename to pack/pack_test.go diff --git a/simrun/pack/protocol.go b/pack/protocol.go similarity index 100% rename from simrun/pack/protocol.go rename to pack/protocol.go diff --git a/simrun/pack/protocol_test.go b/pack/protocol_test.go similarity index 100% rename from simrun/pack/protocol_test.go rename to pack/protocol_test.go diff --git a/simrun/pack/ssh.go b/pack/ssh.go similarity index 100% rename from simrun/pack/ssh.go rename to pack/ssh.go diff --git a/simrun/pack/tags.go b/pack/tags.go similarity index 100% rename from simrun/pack/tags.go rename to pack/tags.go diff --git a/simrun/pack/tfparse.go b/pack/tfparse.go similarity index 100% rename from simrun/pack/tfparse.go rename to pack/tfparse.go diff --git a/simrun/pack/tfparse_test.go b/pack/tfparse_test.go similarity index 100% rename from simrun/pack/tfparse_test.go rename to pack/tfparse_test.go diff --git a/simrun/pack/types.go b/pack/types.go similarity index 100% rename from simrun/pack/types.go rename to pack/types.go diff --git a/simrun/pack/util.go b/pack/util.go similarity index 100% rename from simrun/pack/util.go rename to pack/util.go diff --git a/simrun/schemas/awsCliDetonator.schema.json b/schemas/awsCliDetonator.schema.json similarity index 100% rename from simrun/schemas/awsCliDetonator.schema.json rename to schemas/awsCliDetonator.schema.json diff --git a/simrun/schemas/datadogSecuritySignal.schema.json b/schemas/datadogSecuritySignal.schema.json similarity index 100% rename from simrun/schemas/datadogSecuritySignal.schema.json rename to schemas/datadogSecuritySignal.schema.json diff --git a/simrun/schemas/elasticCollector.schema.json b/schemas/elasticCollector.schema.json similarity index 100% rename from simrun/schemas/elasticCollector.schema.json rename to schemas/elasticCollector.schema.json diff --git a/simrun/schemas/elasticInjector.schema.json b/schemas/elasticInjector.schema.json similarity index 100% rename from simrun/schemas/elasticInjector.schema.json rename to schemas/elasticInjector.schema.json diff --git a/simrun/schemas/elasticSecurityAlert.schema.json b/schemas/elasticSecurityAlert.schema.json similarity index 100% rename from simrun/schemas/elasticSecurityAlert.schema.json rename to schemas/elasticSecurityAlert.schema.json diff --git a/simrun/schemas/pack-protocol/cleanup-input.schema.json b/schemas/pack-protocol/cleanup-input.schema.json similarity index 100% rename from simrun/schemas/pack-protocol/cleanup-input.schema.json rename to schemas/pack-protocol/cleanup-input.schema.json diff --git a/simrun/schemas/pack-protocol/cleanup-output.schema.json b/schemas/pack-protocol/cleanup-output.schema.json similarity index 100% rename from simrun/schemas/pack-protocol/cleanup-output.schema.json rename to schemas/pack-protocol/cleanup-output.schema.json diff --git a/simrun/schemas/pack-protocol/detonate-input.schema.json b/schemas/pack-protocol/detonate-input.schema.json similarity index 100% rename from simrun/schemas/pack-protocol/detonate-input.schema.json rename to schemas/pack-protocol/detonate-input.schema.json diff --git a/simrun/schemas/pack-protocol/detonate-output.schema.json b/schemas/pack-protocol/detonate-output.schema.json similarity index 100% rename from simrun/schemas/pack-protocol/detonate-output.schema.json rename to schemas/pack-protocol/detonate-output.schema.json diff --git a/simrun/schemas/pack-protocol/error.schema.json b/schemas/pack-protocol/error.schema.json similarity index 100% rename from simrun/schemas/pack-protocol/error.schema.json rename to schemas/pack-protocol/error.schema.json diff --git a/simrun/schemas/pack-protocol/log-line.schema.json b/schemas/pack-protocol/log-line.schema.json similarity index 100% rename from simrun/schemas/pack-protocol/log-line.schema.json rename to schemas/pack-protocol/log-line.schema.json diff --git a/simrun/schemas/pack-protocol/manifest-response.schema.json b/schemas/pack-protocol/manifest-response.schema.json similarity index 100% rename from simrun/schemas/pack-protocol/manifest-response.schema.json rename to schemas/pack-protocol/manifest-response.schema.json diff --git a/simrun/schemas/simrun.schema.json b/schemas/simrun.schema.json similarity index 100% rename from simrun/schemas/simrun.schema.json rename to schemas/simrun.schema.json diff --git a/simrun/schemas/simrunDetonator.schema.json b/schemas/simrunDetonator.schema.json similarity index 100% rename from simrun/schemas/simrunDetonator.schema.json rename to schemas/simrunDetonator.schema.json