Skip to content

pkg: add reusable opencost + prom modules for FinOps v2 #492

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

Open
nadaverell wants to merge 10 commits into
base: main
Choose a base branch
from
Open

pkg: add reusable opencost + prom modules for FinOps v2 #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
226ff2b
pkg: extract reusable opencost + prom modules for cost math
nadaverell Apr 19, 2026
8c9e179
fix(prometheus): drop ?url= override on /api/prometheus/connect (SSRF)
nadaverell May 22, 2026
836e672
chore: scrub temporal/internal references from PR scope
nadaverell May 23, 2026
2e78f6c
chore: cut dead code and over-engineering from PR scope
nadaverell May 23, 2026
98c6a3e
chore: remove zero-caller backwards-compat aliases
nadaverell May 23, 2026
8b8ffe0
fix(cost): widen Understanding Cost Data modal
nadaverell May 23, 2026
37e0886
fix: restore error visibility lost by the pkg/* extraction
nadaverell May 23, 2026
d5e71df
chore: scrub remaining product-specific phrasing from pkg/*
nadaverell May 23, 2026
54a1bd6
test: cover ownerLookup contract, top-N+other aggregation, windowHours
nadaverell May 23, 2026
5ff0256
fix(log-injection): quote user-controlled values in log messages
nadaverell May 23, 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
637 changes: 48 additions & 589 deletions internal/opencost/handlers.go
View file
Open in desktop

Large diffs are not rendered by default.

401 changes: 111 additions & 290 deletions internal/prometheus/client.go
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 6 additions & 18 deletions internal/prometheus/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func TestProbe(t *testing.T) {
}
}

func TestHeadersOnQuery(t *testing.T) {
func TestHeadersOnProbe(t *testing.T) {
var gotAuth, gotOrg atomic.Value
gotAuth.Store("")
gotOrg.Store("")
Expand All @@ -96,8 +96,6 @@ func TestHeadersOnQuery(t *testing.T) {
gotAuth.Store(r.Header.Get("Authorization"))
gotOrg.Store(r.Header.Get("X-Scope-OrgID"))
w.WriteHeader(http.StatusOK)
// One result so probe()'s "empty instance" check passes; doQuery
// doesn't care about the body shape for this test.
_, _ = w.Write([]byte(`{"status":"success","data":{"resultType":"vector","result":[{"metric":{"job":"prometheus"},"value":[1700000000,"1"]}]}}`))
}))
defer srv.Close()
Expand All @@ -110,25 +108,15 @@ func TestHeadersOnQuery(t *testing.T) {
},
}

if _, err := c.doQuery(context.Background(), srv.URL+"/api/v1/query?query=up"); err != nil {
t.Fatalf("doQuery failed: %v", err)
if !c.probe(context.Background(), srv.URL) {
t.Fatal("probe() returned false for healthy server")
}
if got := gotAuth.Load().(string); got != "Bearer test-token" {
t.Errorf("Authorization header = %q, want %q", got, "Bearer test-token")
}
if got := gotOrg.Load().(string); got != "tenant-7" {
t.Errorf("X-Scope-OrgID header = %q, want %q", got, "tenant-7")
}

// probe() must carry the same headers — otherwise discovery would 401
// against an auth-protected endpoint before any real query runs.
gotAuth.Store("")
if !c.probe(context.Background(), srv.URL) {
t.Fatal("probe() returned false for healthy server")
}
if got := gotAuth.Load().(string); got != "Bearer test-token" {
t.Errorf("probe Authorization header = %q, want %q", got, "Bearer test-token")
}
}

func TestHeadersNoneWhenUnset(t *testing.T) {
Expand All @@ -139,13 +127,13 @@ func TestHeadersNoneWhenUnset(t *testing.T) {
sawAuth.Store(true)
}
w.WriteHeader(http.StatusOK)
_, _ = w.Write([]byte(`{"status":"success","data":{"resultType":"vector","result":[]}}`))
_, _ = w.Write([]byte(`{"status":"success","data":{"resultType":"vector","result":[{"metric":{"job":"prometheus"},"value":[1700000000,"1"]}]}}`))
}))
defer srv.Close()

c := &Client{httpClient: &http.Client{Timeout: 5 * time.Second}}
if _, err := c.doQuery(context.Background(), srv.URL+"/api/v1/query?query=up"); err != nil {
t.Fatalf("doQuery failed: %v", err)
if !c.probe(context.Background(), srv.URL) {
t.Fatal("probe() returned false for healthy server")
}
if sawAuth.Load() {
t.Error("Authorization header sent when none configured")
Expand Down
Loading
Loading