Skip to content

fix: reorg #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
faloker merged 2 commits into from
Jun 1, 2026
Merged

fix: reorg #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1d54d9
fix: frontend paths
faloker Jun 1, 2026
c359b44
fix: reorg
faloker Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .mockery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,36 @@ 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'
filename: '{{.InterfaceName}}.go'
pkgname: 'mocks'
structname: 'Mock{{.InterfaceName}}'

github.com/IBM/simrun/simrun/internal/injectors:
github.com/IBM/simrun/internal/injectors:
config:
all: true
dir: '{{.InterfaceDir}}/mocks'
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions simrun/cmd/simrun/main.go → cmd/simrun/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 simrun/internal/cloud/aws/assume.go → internal/cloud/aws/assume.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/cloud/aws/assume_test.go → internal/cloud/aws/assume_test.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/cloud/azure/wif.go → internal/cloud/azure/wif.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/cloud/azure/wif_test.go → internal/cloud/azure/wif_test.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/cloud/gcp/wif.go → internal/cloud/gcp/wif.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/cloud/gcp/wif_test.go → internal/cloud/gcp/wif_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion simrun/internal/cloud/k8s/generator.go → internal/cloud/k8s/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 simrun/internal/cloud/k8s/generator_test.go → internal/cloud/k8s/generator_test.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/collectors/collector.go → internal/collectors/collector.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../internal/collectors/elastic_collector.go → internal/collectors/elastic_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 ...rnal/collectors/elastic_collector_test.go → ...rnal/collectors/elastic_collector_test.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/config/appconfig.go → internal/config/appconfig.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/config/appconfig_test.go → internal/config/appconfig_test.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/config/bootstrap.go → internal/config/bootstrap.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/config/bootstrap_test.go → internal/config/bootstrap_test.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/config/config.go → internal/config/config.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/connectors/elastic/client.go → internal/connectors/elastic/client.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions simrun/internal/credentials/kubernetes.go → internal/credentials/kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
10 changes: 5 additions & 5 deletions simrun/internal/credentials/resolver.go → internal/credentials/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions simrun/internal/credentials/resolver_test.go → internal/credentials/resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 simrun/internal/crypto/crypto.go → internal/crypto/crypto.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/crypto/crypto_test.go → internal/crypto/crypto_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion simrun/internal/db/config.go → internal/db/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion simrun/internal/db/config_test.go → internal/db/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 simrun/internal/db/connectors.go → internal/db/connectors.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/db/db.go → internal/db/db.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/db/migrations.go → internal/db/migrations.go
View file
Open in desktop
File renamed without changes.
0 ...ternal/db/migrations/001_initial.down.sql → internal/db/migrations/001_initial.down.sql
View file
Open in desktop
File renamed without changes.
0 ...internal/db/migrations/001_initial.up.sql → internal/db/migrations/001_initial.up.sql
View file
Open in desktop
File renamed without changes.
0 ...migrations/002_add_user_tracking.down.sql → ...migrations/002_add_user_tracking.down.sql
View file
Open in desktop
File renamed without changes.
0 ...b/migrations/002_add_user_tracking.up.sql → ...b/migrations/002_add_user_tracking.up.sql
View file
Open in desktop
File renamed without changes.
0 ...ions/003_add_scenario_id_to_runs.down.sql → ...ions/003_add_scenario_id_to_runs.down.sql
View file
Open in desktop
File renamed without changes.
0 ...ations/003_add_scenario_id_to_runs.up.sql → ...ations/003_add_scenario_id_to_runs.up.sql
View file
Open in desktop
File renamed without changes.
0 ...rations/004_kubernetes_connector.down.sql → ...rations/004_kubernetes_connector.down.sql
View file
Open in desktop
File renamed without changes.
0 ...igrations/004_kubernetes_connector.up.sql → ...igrations/004_kubernetes_connector.up.sql
View file
Open in desktop
File renamed without changes.
0 ...ons/005_add_schedule_parallelism.down.sql → ...ons/005_add_schedule_parallelism.down.sql
View file
Open in desktop
File renamed without changes.
0 ...tions/005_add_schedule_parallelism.up.sql → ...tions/005_add_schedule_parallelism.up.sql
View file
Open in desktop
File renamed without changes.
0 ...ations/006_add_discovered_alerts.down.sql → ...ations/006_add_discovered_alerts.down.sql
View file
Open in desktop
File renamed without changes.
0 ...grations/006_add_discovered_alerts.up.sql → ...grations/006_add_discovered_alerts.up.sql
View file
Open in desktop
File renamed without changes.
0 ...migrations/007_add_scenario_type.down.sql → ...migrations/007_add_scenario_type.down.sql
View file
Open in desktop
File renamed without changes.
0 ...b/migrations/007_add_scenario_type.up.sql → ...b/migrations/007_add_scenario_type.up.sql
View file
Open in desktop
File renamed without changes.
0 ...onfig_defaults_and_ssh_connector.down.sql → ...onfig_defaults_and_ssh_connector.down.sql
View file
Open in desktop
File renamed without changes.
0 ...pconfig_defaults_and_ssh_connector.up.sql → ...pconfig_defaults_and_ssh_connector.up.sql
View file
Open in desktop
File renamed without changes.
0 ...ations/009_runs_created_at_index.down.sql → ...ations/009_runs_created_at_index.down.sql
View file
Open in desktop
File renamed without changes.
0 ...grations/009_runs_created_at_index.up.sql → ...grations/009_runs_created_at_index.up.sql
View file
Open in desktop
File renamed without changes.
0 ...saved_scenarios_updated_at_index.down.sql → ...saved_scenarios_updated_at_index.down.sql
View file
Open in desktop
File renamed without changes.
0 ...0_saved_scenarios_updated_at_index.up.sql → ...0_saved_scenarios_updated_at_index.up.sql
View file
Open in desktop
File renamed without changes.
0 simrun/internal/db/packs.go → internal/db/packs.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/db/runs.go → internal/db/runs.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/db/scenarios.go → internal/db/scenarios.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/db/schedules.go → internal/db/schedules.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/db/secrets.go → internal/db/secrets.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/db/sessions.go → internal/db/sessions.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../internal/detonators/aws_cli_detonator.go → internal/detonators/aws_cli_detonator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 simrun/internal/detonators/detonator.go → internal/detonators/detonator.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/detonators/logger.go → internal/detonators/logger.go
View file
Open in desktop
File renamed without changes.
0 ...un/internal/detonators/mocks/Detonator.go → internal/detonators/mocks/Detonator.go
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...n/internal/detonators/simrun_detonator.go → internal/detonators/simrun_detonator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion ...ernal/detonators/simrun_detonator_test.go → internal/detonators/simrun_detonator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
0 simrun/internal/envutil/envutil.go → internal/envutil/envutil.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/envutil/envutil_test.go → internal/envutil/envutil_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...un/internal/injectors/elastic_injector.go → internal/injectors/elastic_injector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...ternal/injectors/elastic_injector_test.go → internal/injectors/elastic_injector_test.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/injectors/injector.go → internal/injectors/injector.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/injectors/mocks/Injector.go → internal/injectors/mocks/Injector.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/matchers/alert_matcher.go → internal/matchers/alert_matcher.go
View file
Open in desktop
File renamed without changes.
0 simrun/internal/matchers/datadog/datadog.go → internal/matchers/datadog/datadog.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...internal/matchers/datadog/datadog_test.go → internal/matchers/datadog/datadog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...atadog/mocks/DatadogSecuritySignalsAPI.go → ...atadog/mocks/DatadogSecuritySignalsAPI.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion simrun/internal/matchers/datadog/types.go → internal/matchers/datadog/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion simrun/internal/matchers/elastic/elastic.go → internal/matchers/elastic/elastic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"time"

"github.com/IBM/simrun/simrun/internal/envutil"
"github.com/IBM/simrun/internal/envutil"
"github.com/sirupsen/logrus"
)

Expand Down
0 ...internal/matchers/elastic/elastic_test.go → internal/matchers/elastic/elastic_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ocks/ElasticSecurityDetectionAlertsAPI.go → ...ocks/ElasticSecurityDetectionAlertsAPI.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 simrun/internal/matchers/elastic/types.go → internal/matchers/elastic/types.go
View file
Open in desktop
File renamed without changes.
0 ...l/matchers/mocks/AlertGeneratedMatcher.go → ...l/matchers/mocks/AlertGeneratedMatcher.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions simrun/internal/packs/executor/executor.go → internal/packs/executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 simrun/internal/packs/locks/keyedmutex.go → internal/packs/locks/keyedmutex.go
View file
Open in desktop
File renamed without changes.
0 ...n/internal/packs/locks/keyedmutex_test.go → internal/packs/locks/keyedmutex_test.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions simrun/internal/packs/resolver/resolver.go → internal/packs/resolver/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 ...cks/resolver/resolver_concurrency_test.go → ...cks/resolver/resolver_concurrency_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...un/internal/packs/runner/binary_runner.go → internal/packs/runner/binary_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions simrun/internal/packs/runner/factory.go → internal/packs/runner/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions simrun/internal/packs/runner/runner.go → internal/packs/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 simrun/internal/packs/terraform/manager.go → internal/packs/terraform/manager.go
View file
Open in desktop
File renamed without changes.
0 .../internal/packs/terraform/manager_test.go → internal/packs/terraform/manager_test.go
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions simrun/internal/parser/main.go → internal/parser/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
0 simrun/internal/parser/parser.go → internal/parser/parser.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions simrun/internal/parser/parser_test.go → internal/parser/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 ...rser/testdata/scenarios/all-disabled.yaml → ...rser/testdata/scenarios/all-disabled.yaml
View file
Open in desktop
File renamed without changes.
0 ...testdata/scenarios/aws-cli-detonator.yaml → ...testdata/scenarios/aws-cli-detonator.yaml
View file
Open in desktop
File renamed without changes.
0 ...testdata/scenarios/elastic-collector.yaml → ...testdata/scenarios/elastic-collector.yaml
View file
Open in desktop
File renamed without changes.
0 .../testdata/scenarios/elastic-injector.yaml → .../testdata/scenarios/elastic-injector.yaml
View file
Open in desktop
File renamed without changes.
0 ...r/testdata/scenarios/empty-scenarios.yaml → ...r/testdata/scenarios/empty-scenarios.yaml
View file
Open in desktop
File renamed without changes.
0 ...cenarios/missing-detonate-and-inject.yaml → ...cenarios/missing-detonate-and-inject.yaml
View file
Open in desktop
File renamed without changes.
0 ...arser/testdata/scenarios/targets-all.yaml → ...arser/testdata/scenarios/targets-all.yaml
View file
Open in desktop
File renamed without changes.
0 .../testdata/scenarios/targets-aws-only.yaml → .../testdata/scenarios/targets-aws-only.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion simrun/internal/results/executor.go → internal/results/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions simrun/internal/results/types.go → internal/results/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions simrun/internal/runner/runner.go → internal/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading
Loading