Skip to content

Add test target table #232

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
isakstenstrom merged 1 commit into from
May 4, 2026
Merged

Add test target table #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ent/authschema/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ go_library(
"//ent/gen/ent/privacy",
"//ent/gen/ent/target",
"//ent/gen/ent/testsummary",
"//ent/gen/ent/testtarget",
"//ent/schema",
"//internal/database/dbauthservice",
"@io_entgo_ent//entql",
Expand Down
16 changes: 16 additions & 0 deletions ent/authschema/privacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/buildbarn/bb-portal/ent/gen/ent/privacy"
"github.com/buildbarn/bb-portal/ent/gen/ent/target"
"github.com/buildbarn/bb-portal/ent/gen/ent/testsummary"
"github.com/buildbarn/bb-portal/ent/gen/ent/testtarget"
"github.com/buildbarn/bb-portal/internal/database/dbauthservice"
)

Expand Down Expand Up @@ -108,3 +109,18 @@ func (TestSummary) Policy() ent.Policy {
})
})
}

// Policy for TestTarget.
func (TestTarget) Policy() ent.Policy {
return privacy.FilterFunc(func(ctx context.Context, f privacy.Filter) error {
return privacyFilterFunc(ctx, f, func(f privacy.Filter, authorizedInstanceNames []any) entql.P {
return entql.HasEdgeWith(
testtarget.EdgeTarget,
entql.HasEdgeWith(
target.EdgeInstanceName,
entql.FieldIn(instancename.FieldName, authorizedInstanceNames...),
),
)
})
})
}
39 changes: 32 additions & 7 deletions ent/authschema/privacy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestPrivacy(t *testing.T) {
ctx = dbauthservice.NewContextWithDbAuthService(ctx, dbAuthService)

t.Run("EmptyDatabase", func(t *testing.T) {
clock.EXPECT().Now().Return(time.Unix(10000000, 0)).Times(5)
clock.EXPECT().Now().Return(time.Unix(10000000, 0)).Times(6)

invocations, err := db.BazelInvocation.Query().IDs(ctx)
require.NoError(t, err)
Expand All @@ -66,12 +66,16 @@ func TestPrivacy(t *testing.T) {
require.NoError(t, err)
require.Equal(t, 0, len(targets))

testTargets, err := db.TestTarget.Query().IDs(ctx)
require.NoError(t, err)
require.Equal(t, 0, len(testTargets))

testSummaries, err := db.TestSummary.Query().IDs(ctx)
require.NoError(t, err)
require.Equal(t, 0, len(testSummaries))
})

clock.EXPECT().Now().Return(time.Unix(20000000, 0)).Times(5)
clock.EXPECT().Now().Return(time.Unix(20000000, 0)).Times(6)

deniedInstance := testutils.CreateInstanceName(ctx, t, db, "denied")
deniedInvocation, err := testutils.StartCreateInvocation(db, deniedInstance).Save(ctx)
Expand All @@ -82,14 +86,16 @@ func TestPrivacy(t *testing.T) {
require.NoError(t, err)
deniedTarget, err := db.Target.Create().SetInstanceName(deniedInstance).SetLabel("denied").SetAspect("aspect").SetTargetKind("targetKind").Save(ctx)
require.NoError(t, err)
_, err = db.TestTarget.Create().SetTarget(deniedTarget).Save(ctx)
require.NoError(t, err)
deniedInvocationTarget, err := db.InvocationTarget.Create().SetBazelInvocation(deniedInvocation).SetTarget(deniedTarget).SetAbortReason(invocationtarget.AbortReasonNONE).Save(ctx)
require.NoError(t, err)

_, err = db.TestSummary.Create().SetInvocationTarget(deniedInvocationTarget).Save(ctx)
require.NoError(t, err)

t.Run("PopulatedDatabaseWithDeniedInstance", func(t *testing.T) {
clock.EXPECT().Now().Return(time.Unix(30000000, 0)).Times(5)
clock.EXPECT().Now().Return(time.Unix(30000000, 0)).Times(6)

invocations, err := db.BazelInvocation.Query().IDs(ctx)
require.NoError(t, err)
Expand All @@ -107,12 +113,16 @@ func TestPrivacy(t *testing.T) {
require.NoError(t, err)
require.Equal(t, 0, len(targets))

testTargets, err := db.TestTarget.Query().IDs(ctx)
require.NoError(t, err)
require.Equal(t, 0, len(testTargets))

testSummaries, err := db.TestSummary.Query().IDs(ctx)
require.NoError(t, err)
require.Equal(t, 0, len(testSummaries))
})

clock.EXPECT().Now().Return(time.Unix(40000000, 0)).Times(5)
clock.EXPECT().Now().Return(time.Unix(40000000, 0)).Times(6)

allowed1Instance := testutils.CreateInstanceName(ctx, t, db, "allowed1")
allowed1Invocation, err := testutils.StartCreateInvocation(db, allowed1Instance).Save(ctx)
Expand All @@ -123,13 +133,15 @@ func TestPrivacy(t *testing.T) {
require.NoError(t, err)
allowed1Target, err := db.Target.Create().SetInstanceName(allowed1Instance).SetLabel("allowed1").SetAspect("aspect").SetTargetKind("targetKind").Save(ctx)
require.NoError(t, err)
allowed1TestTarget, err := db.TestTarget.Create().SetTarget(allowed1Target).Save(ctx)
require.NoError(t, err)
allowed1InvocationTarget, err := db.InvocationTarget.Create().SetBazelInvocation(allowed1Invocation).SetTarget(allowed1Target).SetAbortReason(invocationtarget.AbortReasonNONE).Save(ctx)
require.NoError(t, err)
allowed1TestSummary, err := db.TestSummary.Create().SetInvocationTarget(allowed1InvocationTarget).Save(ctx)
require.NoError(t, err)

t.Run("PopulatedDatabase", func(t *testing.T) {
clock.EXPECT().Now().Return(time.Unix(50000000, 0)).Times(5)
clock.EXPECT().Now().Return(time.Unix(50000000, 0)).Times(6)

invocations, err := db.BazelInvocation.Query().IDs(ctx)
require.NoError(t, err)
Expand All @@ -151,13 +163,18 @@ func TestPrivacy(t *testing.T) {
require.Equal(t, 1, len(targets))
require.Contains(t, targets, allowed1Target.ID)

testTargets, err := db.TestTarget.Query().IDs(ctx)
require.NoError(t, err)
require.Equal(t, 1, len(testTargets))
require.Contains(t, testTargets, allowed1TestTarget.ID)

testSummaries, err := db.TestSummary.Query().IDs(ctx)
require.NoError(t, err)
require.Equal(t, 1, len(testSummaries))
require.Contains(t, testSummaries, allowed1TestSummary.ID)
})

clock.EXPECT().Now().Return(time.Unix(50000000, 0)).Times(5)
clock.EXPECT().Now().Return(time.Unix(50000000, 0)).Times(6)

allowed2Instance := testutils.CreateInstanceName(ctx, t, db, "allowed2")
allowed2Invocation, err := testutils.StartCreateInvocation(db, allowed2Instance).Save(ctx)
Expand All @@ -168,13 +185,15 @@ func TestPrivacy(t *testing.T) {
require.NoError(t, err)
allowed2Target, err := db.Target.Create().SetInstanceName(allowed2Instance).SetLabel("allowed2").SetAspect("aspect").SetTargetKind("targetKind").Save(ctx)
require.NoError(t, err)
allowed2TestTarget, err := db.TestTarget.Create().SetTarget(allowed2Target).Save(ctx)
require.NoError(t, err)
allowed2InvocationTarget, err := db.InvocationTarget.Create().SetBazelInvocation(allowed2Invocation).SetTarget(allowed2Target).SetAbortReason(invocationtarget.AbortReasonNONE).Save(ctx)
require.NoError(t, err)
allowed2TestSummary, err := db.TestSummary.Create().SetInvocationTarget(allowed2InvocationTarget).Save(ctx)
require.NoError(t, err)

t.Run("PopulatedDatabase2", func(t *testing.T) {
clock.EXPECT().Now().Return(time.Unix(60000000, 0)).Times(5)
clock.EXPECT().Now().Return(time.Unix(60000000, 0)).Times(6)

invocations, err := db.BazelInvocation.Query().IDs(ctx)
require.NoError(t, err)
Expand All @@ -200,6 +219,12 @@ func TestPrivacy(t *testing.T) {
require.Contains(t, targets, allowed1Target.ID)
require.Contains(t, targets, allowed2Target.ID)

testTargets, err := db.TestTarget.Query().IDs(ctx)
require.NoError(t, err)
require.Equal(t, 2, len(testTargets))
require.Contains(t, testTargets, allowed1TestTarget.ID)
require.Contains(t, testTargets, allowed2TestTarget.ID)

testSummaries, err := db.TestSummary.Query().IDs(ctx)
require.NoError(t, err)
require.Equal(t, 2, len(testSummaries))
Expand Down
2 changes: 2 additions & 0 deletions ent/authschema/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ type (
TargetKindMapping struct{ schema.TargetKindMapping }
// TargetMetrics reexport with auth policy added
TargetMetrics struct{ schema.TargetMetrics }
// TestTarget reexport with auth policy added
TestTarget struct{ schema.TestTarget }
// TestResult reexport with auth policy added
TestResult struct{ schema.TestResult }
// TestSummary reexport with auth policy added
Expand Down
6 changes: 6 additions & 0 deletions ent/gen/ent/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ go_library(
"testsummary_delete.go",
"testsummary_query.go",
"testsummary_update.go",
"testtarget.go",
"testtarget_create.go",
"testtarget_delete.go",
"testtarget_query.go",
"testtarget_update.go",
"timingmetrics.go",
"timingmetrics_create.go",
"timingmetrics_delete.go",
Expand Down Expand Up @@ -208,6 +213,7 @@ go_library(
"//ent/gen/ent/targetmetrics",
"//ent/gen/ent/testresult",
"//ent/gen/ent/testsummary",
"//ent/gen/ent/testtarget",
"//ent/gen/ent/timingmetrics",
"//pkg/invocation",
"@com_github_99designs_gqlgen//graphql",
Expand Down
Loading
Loading