Comparing changes

## Description The Runner test `TestRunner_GetBaseActionCfg/extraEnv_adds_and_overrides_defaults` in [`src/pkg/runner/actions_test.go`](https://github.com/defenseunicorns/maru-runner/blob/535258256cd1714f55e643075ae15919316e4aec/src/pkg/runner/actions_test.go#L502) is flaky because we don't sort the string slices before comparing them, and occasionally they get created in slightly different orders: ```zsh === RUN TestRunner_GetBaseActionCfg/extraEnv_adds_and_overrides_defaults actions_test.go:502: Error Trace: /Users/clint/go/github.com/defenseunicorns/maru-runner/src/pkg/runner/actions_test.go:502 Error: Not equal: expected: []string{"ENV1=fromDefault", "ENV2=xyz1", "ENV4=fromSet", "ENV2=alsoFromEnv", "ENV3=fromExtra"} actual : []string{"ENV1=fromDefault", "ENV2=xyz1", "ENV4=fromSet", "ENV3=fromExtra", "ENV2=alsoFromEnv"} ``` note the expected `"ENV2=alsoFromEnv", "ENV3=fromExtra"` vs. the actual `"ENV3=fromExtra", "ENV2=alsoFromEnv"`. Assuming a successful test run produces this output: ```zsh === RUN TestRunner_GetBaseActionCfg === RUN TestRunner_GetBaseActionCfg/extraEnv_adds_and_overrides_defaults --- PASS: TestRunner_GetBaseActionCfg (0.00s) --- PASS: TestRunner_GetBaseActionCfg/extraEnv_adds_and_overrides_defaults (0.00s) ``` If we run the test enough times it will fail, as shown below where we would expect 200 lines of `-- PASS` here when running the test 100 times (2x per run), and 0 for `--- FAIL`: ```zsh github.com/defenseunicorns/maru-runner on  main [$] ➜ go test ./src/pkg/runner/... -v -run=TestRunner_GetBaseActionCfg/extraEnv_adds_and_overrides_defaults -count=100 | grep '\-\-\- PASS' | wc -l 142 github.com/defenseunicorns/maru-runner on  main ➜ go test ./src/pkg/runner/... -v -run=TestRunner_GetBaseActionCfg/extraEnv_adds_and_overrides_defaults -count=100 | grep '\-\-\- FAIL' | wc -l 46 ``` It's flaky, so your numbers will vary each time you run it. In this PR we sort both slices before comparing. Here's the updated output: ```zsh github.com/defenseunicorns/maru-runner on  fix-runner-test-sort ➜ go test ./src/pkg/runner/... -v -run=TestRunner_GetBaseActionCfg/extraEnv_adds_and_overrides_defaults -count=100 | grep '\-\-\- PASS' | wc -l 200 github.com/defenseunicorns/maru-runner on  fix-runner-test-sort ➜ go test ./src/pkg/runner/... -v -run=TestRunner_GetBaseActionCfg/extraEnv_adds_and_overrides_defaults -count=100 | grep '\-\-\- FAIL' | wc -l 0 ``` ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Other (security config, docs update, etc) ## Checklist before merging - [x] Test, docs, adr added or updated as needed - [x] [Contributor Guide Steps](https://github.com/defenseunicorns/maru-runner/blob/main/CONTRIBUTING.md) followed Signed-off-by: catsby <clint@ctshryock.com>

## Description NOTE: the below is now out of date... see UPDATE 2 Currently the makefile separates unit and e2e tests "physically", where unit tests *only* live in `src/pkg/...` and e2e tests *only* live in `src/test/e2e...`. The result is if you want to add tests to something like `src/message` or `src/types` you can't run them alongside the others unless you add a step to the makefile. In this PR we change ~both make steps~ _the test-unit make step_ to run tests across the entire codebase, ~but~ _and_ we restrict e2e tests behind the setting of an environment variable that's checked in the test themselves. The `test-unit` step does not set the variable, where as `test-e2e` does. Note that this does change the output of `test-unit` as it will now show the e2e tests as skipped. Alternatives to this would be to move the e2e tests outside of `src` but this seemed simple enough. The end goal is primarily because we can now add tests outside of `src/pkg` and not worry about making extra make steps to make sure they're ran in CI. UPDATE: I restored the part in the e2e step that did `cd src/test/e2e` because it assumed a maru binary there. **UPDATE 2:** after feedback I scrapped the env part and just used `go list ./... | grep` to filter out the e2e tests when running `test-unit`. Much simpler. ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [x] Other (security config, docs update, etc) ## Checklist before merging - [x] Test, docs, adr added or updated as needed - [x] [Contributor Guide Steps](https://github.com/defenseunicorns/maru-runner/blob/main/CONTRIBUTING.md) followed --------- Signed-off-by: catsby <clint@ctshryock.com> Co-authored-by: Wayne Starr <Racer159@users.noreply.github.com>

## Description Adds an `if` keyword to `task:` and `cmd:` that evaluates based on a go template to true or false to facilitate conditional task execution. ## Related Issue ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [ ] Other (security config, docs update, etc) ## Checklist before merging - [x] Test, docs, adr added or updated as needed - [x] [Contributor Guide Steps](https://github.com/defenseunicorns/maru-runner/blob/main/CONTRIBUTING.md) followed --------- Co-authored-by: Eric Wyles <23637493+ericwyles@users.noreply.github.com> Co-authored-by: Wayne Starr <me@racer159.com>

## Short Description This PR updates Maru's logging to match the standard library's `log/slog` package, and appropriately filters log messages according to levels. Tests included and feedback very welcome. ## Long Description The current implementation of log level handling is misleading because our [custom handler](https://github.com/defenseunicorns/maru-runner/blob/535258256cd1714f55e643075ae15919316e4aec/src/message/slog.go#L20-L23) doesn't filter by level. The code comment mentions logging functions already being aware if they are allowed to be called, but in practice I have not found that to be true. This is further complicated by Maru's log levels not matching what `log/slog` uses both in values and in ordering. Example: slog uses these levels/ordering ```go const ( LevelDebug Level = -4 LevelInfo Level = 0 LevelWarn Level = 4 LevelError Level = 8 ) ``` (See here for source and long explaination to the numbers used: https://pkg.go.dev/log/slog#Level) Where as Maru uses these levels/ordering: ```go const ( // WarnLevel level. Non-critical entries that deserve eyes. WarnLevel LogLevel = iota // InfoLevel level. General operational entries about what's going on inside the // application. InfoLevel // DebugLevel level. Usually only enabled when debugging. Very verbose logging. DebugLevel // TraceLevel level. Designates finer-grained informational events than the Debug. TraceLevel ) ``` (source: [src/message/logging.go#L16-L29](https://github.com/defenseunicorns/maru-runner/blob/535258256cd1714f55e643075ae15919316e4aec/src/message/logging.go#L16-L29)) In theory, implementing the [`Handler` interface](https://cs.opensource.google/go/go/+/refs/tags/go1.23.1:src/log/slog/handler.go;l=29-33) would have us ignore messages with a lower level than the one set. Maru sets it's default log level to `InfoLevel` (from Maru's constants, not slog's) which results in a value of `1`. However because our `InfoLevel` is `1` and slog's `LevelInfo` is `0`, then in theory Maru's logger should actually ignore it because it's a lower level. A call to `message.SLog.Info()` ([ex. in utils.go](https://github.com/defenseunicorns/maru-runner/blob/535258256cd1714f55e643075ae15919316e4aec/src/pkg/utils/utils.go#L35)) invokes slog's `Info()` method, which calls an internal [method `log()`](https://cs.opensource.google/go/go/+/refs/tags/go1.23.1:src/log/slog/logger.go;l=208-211) with slog's `LevelInfo` level which is a value of `0`. The [`log()` method](https://cs.opensource.google/go/go/+/refs/tags/go1.23.1:src/log/slog/logger.go;l=238-258) calls the handlers `Enabled()` method to see if it should log the message, which for maru always returns `true`, and then passes it on to the handlers `Handle()` method (Maru's `Handle()` method [here](https://github.com/defenseunicorns/maru-runner/blob/535258256cd1714f55e643075ae15919316e4aec/src/message/slog.go#L37)) and we print the message, even though we shouldn't because it's a lower value than our default. The net effect is setting the log level with `--log-level` has no effect, except for when setting to `trace`, in which case we output pterm debugging information with lines for errors/traces and debug calls. Otherwise Maru will always output all of the logs from `Debug()`, `Info()`, `Warn()` or `Error()` regardless of the level set. This PR updates Maru's log level constants both in values and ordering to match the standard library `log/slog` package, and implements the `Enabled()` method in the handler to filter correctly based on level. The net effect of this PR should be benign in that we aren't changing any usage details, but going forward we'll correctly output logs according to the set level. **NOTE:** This PR is based off of [my other PR (#140) for changing the `Makefile`](#140) with regards to `test-unit` and `test-e2e` tests. ## Test output: ```zsh ➜ go test ./src/message/... -v -count=1 === RUN Test_LogLevel_Diff === RUN Test_LogLevel_Diff/DebugLevel === RUN Test_LogLevel_Diff/InfoLevel === RUN Test_LogLevel_Diff/InfoWarnLevel === RUN Test_LogLevel_Diff/WarnInfoLevel === RUN Test_LogLevel_Diff/InfoTraceLevel === RUN Test_LogLevel_Diff/TraceInfoLevel === RUN Test_LogLevel_Diff/TraceLevel --- PASS: Test_LogLevel_Diff (0.00s) --- PASS: Test_LogLevel_Diff/DebugLevel (0.00s) --- PASS: Test_LogLevel_Diff/InfoLevel (0.00s) --- PASS: Test_LogLevel_Diff/InfoWarnLevel (0.00s) --- PASS: Test_LogLevel_Diff/WarnInfoLevel (0.00s) --- PASS: Test_LogLevel_Diff/InfoTraceLevel (0.00s) --- PASS: Test_LogLevel_Diff/TraceInfoLevel (0.00s) --- PASS: Test_LogLevel_Diff/TraceLevel (0.00s) PASS ok github.com/defenseunicorns/maru-runner/src/message 0.235s ``` ## Related - defenseunicorns/uds-cli#916 ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [x] Other (security config, docs update, etc) ## Checklist before merging - [x] Test, docs, adr added or updated as needed - [x] [Contributor Guide Steps](https://github.com/defenseunicorns/maru-runner/blob/main/CONTRIBUTING.md) followed --------- Signed-off-by: catsby <clint@ctshryock.com> Co-authored-by: Wayne Starr <Racer159@users.noreply.github.com> Co-authored-by: Eric Wyles <23637493+ericwyles@users.noreply.github.com>

This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/goccy/go-yaml](https://togithub.com/goccy/go-yaml) | `v1.11.3` -> `v1.12.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgoccy%2fgo-yaml/v1.12.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fgoccy%2fgo-yaml/v1.12.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fgoccy%2fgo-yaml/v1.11.3/v1.12.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgoccy%2fgo-yaml/v1.11.3/v1.12.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>goccy/go-yaml (github.com/goccy/go-yaml)</summary> ### [`v1.12.0`](https://togithub.com/goccy/go-yaml/releases/tag/v1.12.0): 1.12.0 [Compare Source](https://togithub.com/goccy/go-yaml/compare/v1.11.3...v1.12.0) #### What's Changed - Replace deprecated `io/ioutil` by [@harryzcy](https://togithub.com/harryzcy) in [https://github.com/goccy/go-yaml/pull/429](https://togithub.com/goccy/go-yaml/pull/429) - support custom unmarshalling for map keys by [@KSpaceer](https://togithub.com/KSpaceer) in [https://github.com/goccy/go-yaml/pull/453](https://togithub.com/goccy/go-yaml/pull/453) - trim right spaces before adding carriage return or linefeed by [@mfleader](https://togithub.com/mfleader) in [https://github.com/goccy/go-yaml/pull/462](https://togithub.com/goccy/go-yaml/pull/462) - fix: Correct token.Tokenize double quoted strings with escape sequences handling by [@nieomylnieja](https://togithub.com/nieomylnieja) in [https://github.com/goccy/go-yaml/pull/457](https://togithub.com/goccy/go-yaml/pull/457) - Fix decoding of scientific notation by [@morris-kelly](https://togithub.com/morris-kelly) in [https://github.com/goccy/go-yaml/pull/463](https://togithub.com/goccy/go-yaml/pull/463) - Quote is required even if it begins with backquote. by [@k1LoW](https://togithub.com/k1LoW) in [https://github.com/goccy/go-yaml/pull/440](https://togithub.com/goccy/go-yaml/pull/440) #### New Contributors - [@harryzcy](https://togithub.com/harryzcy) made their first contribution in [https://github.com/goccy/go-yaml/pull/429](https://togithub.com/goccy/go-yaml/pull/429) - [@KSpaceer](https://togithub.com/KSpaceer) made their first contribution in [https://github.com/goccy/go-yaml/pull/453](https://togithub.com/goccy/go-yaml/pull/453) - [@mfleader](https://togithub.com/mfleader) made their first contribution in [https://github.com/goccy/go-yaml/pull/462](https://togithub.com/goccy/go-yaml/pull/462) - [@nieomylnieja](https://togithub.com/nieomylnieja) made their first contribution in [https://github.com/goccy/go-yaml/pull/457](https://togithub.com/goccy/go-yaml/pull/457) - [@morris-kelly](https://togithub.com/morris-kelly) made their first contribution in [https://github.com/goccy/go-yaml/pull/463](https://togithub.com/goccy/go-yaml/pull/463) **Full Changelog**: goccy/go-yaml@v1.11.3...v1.11.4 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 12pm every weekday,before 11am every weekday" in timezone America/New_York, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/defenseunicorns/maru-runner).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Wayne Starr <Racer159@users.noreply.github.com>

## Description This fixes a bug where pattern is not checked when a variable is set to a value ## Related Issue Fixes #N/A ## Type of change - [X] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Other (security config, docs update, etc) ## Checklist before merging - [X] Test, docs, adr added or updated as needed - [X] [Contributor Guide Steps](https://github.com/defenseunicorns/maru-runner/blob/main/CONTRIBUTING.md) followed

…have default values (#146) ## Description allow direct calling of tasks with inputs when required inputs have default values ## Related Issue ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [ ] Other (security config, docs update, etc) ## Checklist before merging - [x] Test, docs, adr added or updated as needed - [x] [Contributor Guide Steps](https://github.com/defenseunicorns/maru-runner/blob/main/CONTRIBUTING.md) followed

Navigation Menu

Repository navigation

Comparing changes

Open a pull request

Commits on Sep 18, 2024

Commits on Sep 19, 2024

Commits on Sep 20, 2024

This comparison is taking too long to generate.

Uh oh!