-
Notifications
You must be signed in to change notification settings - Fork 2
feat(discovery): report available content pack versions in metadata #129
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package discovery | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
| ) | ||
|
|
||
| // pack_versions must list every linux-inventory-v<N>.yaml in pack_dir, | ||
| // ascending, ignoring unrelated files — the server picks a version from this | ||
| // list to pin in discovery_inventory requests, since content_pack_version is | ||
| // a required request param with no "latest" default. | ||
| func TestCollectMetadata_ReportsPackVersions(t *testing.T) { | ||
| dir := t.TempDir() | ||
| for _, name := range []string{ | ||
| "linux-inventory-v2.yaml", | ||
| "linux-inventory-v10.yaml", | ||
| "linux-inventory-vX.yaml", // non-numeric — ignored | ||
| "windows-inventory-v1.yaml", | ||
| "README.md", | ||
| } { | ||
| if err := os.WriteFile(filepath.Join(dir, name), []byte("x"), 0o600); err != nil { | ||
| t.Fatalf("writing %s: %v", name, err) | ||
| } | ||
| } | ||
|
|
||
| p, _ := newTestProxy(t, map[string]any{"pack_dir": dir}, nil) | ||
|
|
||
| meta, err := p.CollectMetadata(context.Background()) | ||
| if err != nil { | ||
| t.Fatalf("CollectMetadata: %v", err) | ||
| } | ||
| versions, ok := meta["pack_versions"].([]int) | ||
| if !ok { | ||
| t.Fatalf("pack_versions missing or wrong type: %#v", meta["pack_versions"]) | ||
| } | ||
| if len(versions) != 2 || versions[0] != 2 || versions[1] != 10 { | ||
| t.Fatalf("pack_versions = %v, want [2 10]", versions) | ||
| } | ||
| } | ||
|
|
||
| // Without a pack_dir there is nothing to report — the key must be absent, | ||
| // not an empty list, so the server treats it the same as an older agent | ||
| // that predates the field. | ||
| func TestCollectMetadata_NoPackDirOmitsPackVersions(t *testing.T) { | ||
| p, _ := newTestProxy(t, map[string]any{}, nil) | ||
|
|
||
| meta, err := p.CollectMetadata(context.Background()) | ||
| if err != nil { | ||
| t.Fatalf("CollectMetadata: %v", err) | ||
| } | ||
| if _, present := meta["pack_versions"]; present { | ||
| t.Fatalf("pack_versions should be absent without pack_dir, got %#v", meta["pack_versions"]) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.