diff --git a/integration_tests/activitylog_github_actor_claims.lua b/integration_tests/activitylog_github_actor_claims.lua new file mode 100644 index 000000000..e3a57bfb7 --- /dev/null +++ b/integration_tests/activitylog_github_actor_claims.lua @@ -0,0 +1,139 @@ +local user = User.new() +local team = Team.new("activity-claims", "Activity claims", "#activity-claims") +team:addMember(user) + +Test.sql("Store GitHub actor claims separately from activity log data", function(t) + Helper.SQLExec([[ + INSERT INTO activity_log_entries + (actor, action, resource_type, resource_name, team_slug, environment, created_at, data, github_actor_claims) + VALUES + ( + 'github-repo:nais/example', 'CREATED', 'APP', 'claims-created', $1, 'dev', + NOW() - INTERVAL '1 minute', + CONVERT_TO('{"apiVersion":"nais.io/v1alpha1","kind":"Application"}', 'UTF8'), + '{"actor":"octocat","repository":"nais/example","run_id":"123"}'::JSONB + ), + ( + 'github-repo:nais/example', 'UPDATED', 'APP', 'claims-updated', $1, 'dev', + NOW() - INTERVAL '2 minutes', + CONVERT_TO('{"changedFields":[{"field":"spec.image"}]}', 'UTF8'), + '{"actor":"octocat","repository":"nais/example","run_id":"124"}'::JSONB + ), + ( + 'github-repo:nais/example', 'UPDATED', 'JOB', 'claims-job-updated', $1, 'dev', + NOW() - INTERVAL '150 seconds', + CONVERT_TO('{"changedFields":[]}', 'UTF8'), + '{"actor":"octocat","repository":"nais/example","run_id":"126"}'::JSONB + ), + ( + 'github-repo:nais/example', 'CREATED', 'APP', 'claims-legacy', $1, 'dev', + NOW() - INTERVAL '3 minutes', + CONVERT_TO('{"apiVersion":"nais.io/v1alpha1","kind":"Application","gitHubActorClaims":{"actor":"octocat","repository":"nais/example","run_id":"125"}}', 'UTF8'), + NULL + ), + ( + 'human@example.com', 'CREATED', 'APP', 'claims-absent', $1, 'dev', + NOW() - INTERVAL '4 minutes', + CONVERT_TO('{"apiVersion":"nais.io/v1alpha1","kind":"Application"}', 'UTF8'), + NULL + ) + ]], team:slug()) + + t.queryRow([[ + SELECT + github_actor_claims ->> 'actor' AS actor, + CONVERT_FROM(data, 'UTF8')::JSONB ? 'gitHubActorClaims' AS claims_in_data + FROM activity_log_entries + WHERE resource_name = 'claims-created' + ]]) + t.check { + actor = "octocat", + claims_in_data = false, + } +end) + +Test.gql("Activity log exposes stored and legacy GitHub actor claims", function(t) + t.addHeader("x-user-email", user:email()) + t.query(string.format([[ + query { + team(slug: "%s") { + activityLog( + first: 10 + filter: { activityTypes: [GENERIC_KUBERNETES_RESOURCE_CREATED, APPLICATION_UPDATED, JOB_UPDATED] } + ) { + nodes { + resourceName + gitHubActorClaims { actor repository runID } + ... on ApplicationCreatedActivityLogEntry { + data { + kind + gitHubActorClaims { actor runID } + } + } + ... on ApplicationUpdatedActivityLogEntry { + data { + changedFields { field } + gitHubActorClaims { actor runID } + } + } + ... on JobUpdatedActivityLogEntry { + data { + gitHubActorClaims { actor runID } + } + } + } + } + } + } + ]], team:slug())) + + t.check { + data = { + team = { + activityLog = { + nodes = { + { + resourceName = "claims-created", + gitHubActorClaims = { actor = "octocat", repository = "nais/example", runID = "123" }, + data = { + kind = "Application", + gitHubActorClaims = { actor = "octocat", runID = "123" }, + }, + }, + { + resourceName = "claims-updated", + gitHubActorClaims = { actor = "octocat", repository = "nais/example", runID = "124" }, + data = { + changedFields = { { field = "spec.image" } }, + gitHubActorClaims = { actor = "octocat", runID = "124" }, + }, + }, + { + resourceName = "claims-job-updated", + gitHubActorClaims = { actor = "octocat", repository = "nais/example", runID = "126" }, + data = { + gitHubActorClaims = { actor = "octocat", runID = "126" }, + }, + }, + { + resourceName = "claims-legacy", + gitHubActorClaims = { actor = "octocat", repository = "nais/example", runID = "125" }, + data = { + kind = "Application", + gitHubActorClaims = { actor = "octocat", runID = "125" }, + }, + }, + { + resourceName = "claims-absent", + gitHubActorClaims = Null, + data = { + kind = "Application", + gitHubActorClaims = Null, + }, + }, + }, + }, + }, + }, + } +end) diff --git a/internal/activitylog/activitylogsql/activitylog.sql.go b/internal/activitylog/activitylogsql/activitylog.sql.go index bee9afaf5..4b99e5f99 100644 --- a/internal/activitylog/activitylogsql/activitylog.sql.go +++ b/internal/activitylog/activitylogsql/activitylog.sql.go @@ -20,7 +20,8 @@ INSERT INTO resource_name, team_slug, environment, - data + data, + github_actor_claims ) VALUES ( @@ -30,18 +31,20 @@ VALUES $4, $5, $6, - $7 + $7, + $8 ) ` type CreateParams struct { - Actor string - Action string - ResourceType string - ResourceName string - TeamSlug *slug.Slug - EnvironmentName *string - Data []byte + Actor string + Action string + ResourceType string + ResourceName string + TeamSlug *slug.Slug + EnvironmentName *string + Data []byte + GithubActorClaims []byte } func (q *Queries) Create(ctx context.Context, arg CreateParams) error { @@ -53,6 +56,7 @@ func (q *Queries) Create(ctx context.Context, arg CreateParams) error { arg.TeamSlug, arg.EnvironmentName, arg.Data, + arg.GithubActorClaims, ) return err } @@ -693,7 +697,7 @@ func (q *Queries) FacetsForTenantActivityTypes(ctx context.Context, arg FacetsFo const get = `-- name: Get :one SELECT - id, created_at, actor, action, resource_type, resource_name, team_slug, data, environment + id, created_at, actor, action, resource_type, resource_name, team_slug, data, environment, github_actor_claims FROM activity_log_combined_view WHERE @@ -713,13 +717,14 @@ func (q *Queries) Get(ctx context.Context, id uuid.UUID) (*ActivityLogCombinedVi &i.TeamSlug, &i.Data, &i.Environment, + &i.GithubActorClaims, ) return &i, err } const listByIDs = `-- name: ListByIDs :many SELECT - id, created_at, actor, action, resource_type, resource_name, team_slug, data, environment + id, created_at, actor, action, resource_type, resource_name, team_slug, data, environment, github_actor_claims FROM activity_log_combined_view WHERE @@ -747,6 +752,7 @@ func (q *Queries) ListByIDs(ctx context.Context, ids []uuid.UUID) ([]*ActivityLo &i.TeamSlug, &i.Data, &i.Environment, + &i.GithubActorClaims, ); err != nil { return nil, err } @@ -790,7 +796,7 @@ WITH ) ) SELECT - activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, + activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, activity_log_combined_view.github_actor_claims, matching_entries.total_count FROM activity_log_combined_view @@ -874,6 +880,7 @@ func (q *Queries) ListForResource(ctx context.Context, arg ListForResourceParams &i.ActivityLogCombinedView.TeamSlug, &i.ActivityLogCombinedView.Data, &i.ActivityLogCombinedView.Environment, + &i.ActivityLogCombinedView.GithubActorClaims, &i.TotalCount, ); err != nil { return nil, err @@ -888,7 +895,7 @@ func (q *Queries) ListForResource(ctx context.Context, arg ListForResourceParams const listForResourceAndTeam = `-- name: ListForResourceAndTeam :many SELECT - activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, + activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, activity_log_combined_view.github_actor_claims, COUNT(*) OVER () AS total_count FROM activity_log_combined_view @@ -972,6 +979,7 @@ func (q *Queries) ListForResourceAndTeam(ctx context.Context, arg ListForResourc &i.ActivityLogCombinedView.TeamSlug, &i.ActivityLogCombinedView.Data, &i.ActivityLogCombinedView.Environment, + &i.ActivityLogCombinedView.GithubActorClaims, &i.TotalCount, ); err != nil { return nil, err @@ -986,7 +994,7 @@ func (q *Queries) ListForResourceAndTeam(ctx context.Context, arg ListForResourc const listForResourceTeamAndEnvironment = `-- name: ListForResourceTeamAndEnvironment :many SELECT - activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, + activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, activity_log_combined_view.github_actor_claims, COUNT(*) OVER () AS total_count FROM activity_log_combined_view @@ -1073,6 +1081,7 @@ func (q *Queries) ListForResourceTeamAndEnvironment(ctx context.Context, arg Lis &i.ActivityLogCombinedView.TeamSlug, &i.ActivityLogCombinedView.Data, &i.ActivityLogCombinedView.Environment, + &i.ActivityLogCombinedView.GithubActorClaims, &i.TotalCount, ); err != nil { return nil, err @@ -1087,7 +1096,7 @@ func (q *Queries) ListForResourceTeamAndEnvironment(ctx context.Context, arg Lis const listForResourceWithoutTeam = `-- name: ListForResourceWithoutTeam :many SELECT - activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, + activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, activity_log_combined_view.github_actor_claims, COUNT(*) OVER () AS total_count FROM activity_log_combined_view @@ -1169,6 +1178,7 @@ func (q *Queries) ListForResourceWithoutTeam(ctx context.Context, arg ListForRes &i.ActivityLogCombinedView.TeamSlug, &i.ActivityLogCombinedView.Data, &i.ActivityLogCombinedView.Environment, + &i.ActivityLogCombinedView.GithubActorClaims, &i.TotalCount, ); err != nil { return nil, err @@ -1212,7 +1222,7 @@ WITH ) ) SELECT - activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, + activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, activity_log_combined_view.github_actor_claims, matching_entries.total_count FROM activity_log_combined_view @@ -1293,6 +1303,7 @@ func (q *Queries) ListForTeam(ctx context.Context, arg ListForTeamParams) ([]*Li &i.ActivityLogCombinedView.TeamSlug, &i.ActivityLogCombinedView.Data, &i.ActivityLogCombinedView.Environment, + &i.ActivityLogCombinedView.GithubActorClaims, &i.TotalCount, ); err != nil { return nil, err @@ -1335,7 +1346,7 @@ WITH ) ) SELECT - activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, + activity_log_combined_view.id, activity_log_combined_view.created_at, activity_log_combined_view.actor, activity_log_combined_view.action, activity_log_combined_view.resource_type, activity_log_combined_view.resource_name, activity_log_combined_view.team_slug, activity_log_combined_view.data, activity_log_combined_view.environment, activity_log_combined_view.github_actor_claims, matching_entries.total_count FROM activity_log_combined_view @@ -1411,6 +1422,7 @@ func (q *Queries) ListForTenant(ctx context.Context, arg ListForTenantParams) ([ &i.ActivityLogCombinedView.TeamSlug, &i.ActivityLogCombinedView.Data, &i.ActivityLogCombinedView.Environment, + &i.ActivityLogCombinedView.GithubActorClaims, &i.TotalCount, ); err != nil { return nil, err diff --git a/internal/activitylog/activitylogsql/models.go b/internal/activitylog/activitylogsql/models.go index 0124f3e81..e569ca13b 100644 --- a/internal/activitylog/activitylogsql/models.go +++ b/internal/activitylog/activitylogsql/models.go @@ -9,13 +9,14 @@ import ( ) type ActivityLogCombinedView struct { - ID uuid.UUID - CreatedAt pgtype.Timestamptz - Actor string - Action string - ResourceType string - ResourceName string - TeamSlug *slug.Slug - Data []byte - Environment *string + ID uuid.UUID + CreatedAt pgtype.Timestamptz + Actor string + Action string + ResourceType string + ResourceName string + TeamSlug *slug.Slug + Data []byte + Environment *string + GithubActorClaims []byte } diff --git a/internal/activitylog/model.go b/internal/activitylog/model.go index 516d905ec..854447df3 100644 --- a/internal/activitylog/model.go +++ b/internal/activitylog/model.go @@ -8,6 +8,7 @@ import ( "time" "github.com/google/uuid" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" @@ -76,16 +77,17 @@ type ActivityLogResourceTypeFacetItem struct { } type GenericActivityLogEntry struct { - Actor string `json:"actor"` - CreatedAt time.Time `json:"createdAt"` - EnvironmentName *string `json:"environmentName,omitempty"` - Message string `json:"message"` - ResourceType ActivityLogEntryResourceType `json:"resourceType"` - ResourceName string `json:"resourceName"` - TeamSlug *slug.Slug `json:"teamSlug,omitempty"` - Action ActivityLogEntryAction `json:"-"` - UUID uuid.UUID `json:"-"` - Data []byte `json:"-"` + Actor string `json:"actor"` + CreatedAt time.Time `json:"createdAt"` + EnvironmentName *string `json:"environmentName,omitempty"` + Message string `json:"message"` + ResourceType ActivityLogEntryResourceType `json:"resourceType"` + ResourceName string `json:"resourceName"` + TeamSlug *slug.Slug `json:"teamSlug,omitempty"` + GitHubActorClaims *github.GitHubActorClaims `json:"gitHubActorClaims,omitempty"` + Action ActivityLogEntryAction `json:"-"` + UUID uuid.UUID `json:"-"` + Data []byte `json:"-"` } func (GenericActivityLogEntry) IsNode() {} diff --git a/internal/activitylog/queries.go b/internal/activitylog/queries.go index f1b0312d1..ed06d10ea 100644 --- a/internal/activitylog/queries.go +++ b/internal/activitylog/queries.go @@ -1,13 +1,16 @@ package activitylog import ( + "bytes" "context" "encoding/json" "fmt" + "strings" "github.com/google/uuid" "github.com/nais/api/internal/activitylog/activitylogsql" "github.com/nais/api/internal/auth/authz" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/environmentmapper" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/pagination" @@ -41,26 +44,37 @@ func MarshalData(input CreateInput) ([]byte, error) { } func Create(ctx context.Context, input CreateInput) error { - q := db(ctx) - data, err := MarshalData(input) if err != nil { return err } + var claimsData []byte + if actor, ok := input.Actor.(interface { + GitHubActorClaims() *github.GitHubActorClaims + }); ok { + if claims := actor.GitHubActorClaims(); claims != nil { + claimsData, err = json.Marshal(claims) + if err != nil { + return fmt.Errorf("marshaling GitHub actor claims: %w", err) + } + } + } + q := db(ctx) var environmentName *string if input.EnvironmentName != nil { environmentName = new(environmentmapper.EnvironmentName(*input.EnvironmentName)) } return q.Create(ctx, activitylogsql.CreateParams{ - Action: string(input.Action), - Actor: input.Actor.Identity(), - Data: data, - EnvironmentName: environmentName, - ResourceName: input.ResourceName, - ResourceType: string(input.ResourceType), - TeamSlug: input.TeamSlug, + Action: string(input.Action), + Actor: input.Actor.Identity(), + Data: data, + EnvironmentName: environmentName, + ResourceName: input.ResourceName, + ResourceType: string(input.ResourceType), + TeamSlug: input.TeamSlug, + GithubActorClaims: claimsData, }) } @@ -309,17 +323,33 @@ func ListForResourceTeamAndEnvironment(ctx context.Context, resourceType Activit func toGraphActivityLogEntry(row *activitylogsql.ActivityLogCombinedView) (ActivityLogEntry, error) { titler := cases.Title(language.English) + var claims *github.GitHubActorClaims + if len(row.GithubActorClaims) > 0 { + if err := json.Unmarshal(row.GithubActorClaims, &claims); err != nil { + return nil, fmt.Errorf("unmarshaling activity log actor claims: %w", err) + } + } else if strings.HasPrefix(row.Actor, "github-repo:") && bytes.Contains(row.Data, []byte(`"gitHubActorClaims"`)) { + // Older API instances may still write claims into data during a rolling deployment. + var legacy struct { + GitHubActorClaims *github.GitHubActorClaims `json:"gitHubActorClaims"` + } + if err := json.Unmarshal(row.Data, &legacy); err != nil { + return nil, fmt.Errorf("unmarshaling legacy activity log actor claims: %w", err) + } + claims = legacy.GitHubActorClaims + } entry := GenericActivityLogEntry{ - Action: ActivityLogEntryAction(row.Action), - Actor: row.Actor, - CreatedAt: row.CreatedAt.Time, - EnvironmentName: row.Environment, - Message: titler.String(row.Action) + " " + titler.String(row.ResourceType), - ResourceType: ActivityLogEntryResourceType(row.ResourceType), - ResourceName: row.ResourceName, - TeamSlug: row.TeamSlug, - UUID: row.ID, - Data: row.Data, + Action: ActivityLogEntryAction(row.Action), + Actor: row.Actor, + CreatedAt: row.CreatedAt.Time, + EnvironmentName: row.Environment, + Message: titler.String(row.Action) + " " + titler.String(row.ResourceType), + ResourceType: ActivityLogEntryResourceType(row.ResourceType), + ResourceName: row.ResourceName, + TeamSlug: row.TeamSlug, + UUID: row.ID, + Data: row.Data, + GitHubActorClaims: claims, } transformer, ok := knownTransformers[ActivityLogEntryResourceType(row.ResourceType)] diff --git a/internal/activitylog/queries/activitylog.sql b/internal/activitylog/queries/activitylog.sql index cb1f34463..fc4cd21a7 100644 --- a/internal/activitylog/queries/activitylog.sql +++ b/internal/activitylog/queries/activitylog.sql @@ -324,7 +324,8 @@ INSERT INTO resource_name, team_slug, environment, - data + data, + github_actor_claims ) VALUES ( @@ -334,7 +335,8 @@ VALUES @resource_name, @team_slug, @environment_name, - @data + @data, + @github_actor_claims ) ; diff --git a/internal/activitylog/queries_test.go b/internal/activitylog/queries_test.go new file mode 100644 index 000000000..d95a5a1b3 --- /dev/null +++ b/internal/activitylog/queries_test.go @@ -0,0 +1,153 @@ +package activitylog + +import ( + "context" + "encoding/json" + "testing" + + "github.com/jackc/pgx/v5/pgconn" + "github.com/nais/api/internal/activitylog/activitylogsql" + "github.com/nais/api/internal/auth/authz" + "github.com/nais/api/internal/auth/middleware/github" +) + +type claimsActor struct { + authz.AuthenticatedUser + claims *github.GitHubActorClaims +} + +func (a claimsActor) Identity() string { return "github-repo:nais/example" } + +func (a claimsActor) GitHubActorClaims() *github.GitHubActorClaims { return a.claims } + +type captureActivityLogDB struct { + activitylogsql.DBTX + args []any +} + +func (db *captureActivityLogDB) Exec(_ context.Context, _ string, args ...any) (pgconn.CommandTag, error) { + db.args = args + return pgconn.CommandTag{}, nil +} + +func TestCreateGitHubActorClaimsColumn(t *testing.T) { + claims := &github.GitHubActorClaims{Actor: "octocat", Repository: "nais/example", RunID: "123"} + for _, test := range []struct { + name string + data any + }{ + {name: "without data"}, + {name: "with data", data: &GenericKubernetesResourceActivityLogEntryData{Kind: "Application", GitHubActorClaims: claims}}, + } { + t.Run(test.name, func(t *testing.T) { + db := &captureActivityLogDB{} + ctx := context.WithValue(context.Background(), loadersKey, &loaders{internalQuerier: activitylogsql.New(db)}) + if err := Create(ctx, CreateInput{Actor: claimsActor{claims: claims}, Data: test.data}); err != nil { + t.Fatal(err) + } + if len(db.args) != 8 { + t.Fatalf("expected 8 arguments, got %d", len(db.args)) + } + if data := db.args[6].([]byte); test.data == nil { + if data != nil { + t.Fatalf("expected no data, got %s", data) + } + } else { + var payload map[string]json.RawMessage + if err := json.Unmarshal(data, &payload); err != nil { + t.Fatal(err) + } + if _, ok := payload["gitHubActorClaims"]; ok { + t.Fatalf("claims were stored in data: %s", data) + } + } + var stored github.GitHubActorClaims + if err := json.Unmarshal(db.args[7].([]byte), &stored); err != nil { + t.Fatal(err) + } + if stored.Actor != claims.Actor || stored.RunID != claims.RunID { + t.Fatalf("unexpected stored claims: %+v", stored) + } + }) + } +} + +func TestGitHubActorClaimsNotInActivityLogData(t *testing.T) { + claims := &github.GitHubActorClaims{Actor: "octocat", Repository: "nais/example", RunID: "123"} + for _, test := range []struct { + name string + data any + }{ + {name: "entry without data"}, + {name: "entry with data", data: &GenericKubernetesResourceActivityLogEntryData{ + Kind: "Application", + GitHubActorClaims: claims, + }}, + } { + t.Run(test.name, func(t *testing.T) { + data, err := MarshalData(CreateInput{Data: test.data}) + if err != nil { + t.Fatal(err) + } + if test.data == nil { + if data != nil { + t.Fatalf("expected no data, got %s", data) + } + return + } + var payload map[string]json.RawMessage + if err := json.Unmarshal(data, &payload); err != nil { + t.Fatal(err) + } + if _, ok := payload["gitHubActorClaims"]; ok { + t.Fatalf("claims must not be stored in data: %s", data) + } + if _, ok := payload["kind"]; !ok { + t.Fatalf("existing payload was lost: %s", data) + } + }) + } +} + +func TestActivityLogEntryGitHubActorClaims(t *testing.T) { + data := []byte(`{"apiVersion":"v1","kind":"ConfigMap"}`) + claims := []byte(`{"actor":"octocat","repository":"nais/example","run_id":"123"}`) + for _, test := range []struct { + name string + claims []byte + data []byte + wantClaims bool + }{ + {name: "repository actor", claims: claims, data: data, wantClaims: true}, + {name: "column takes precedence over legacy data", claims: claims, data: []byte(`{"kind":"ConfigMap","gitHubActorClaims":{"actor":"old"}}`), wantClaims: true}, + {name: "legacy entry", data: []byte(`{"apiVersion":"v1","kind":"ConfigMap","gitHubActorClaims":{"actor":"octocat","run_id":"123"}}`), wantClaims: true}, + {name: "entry without claims", data: data}, + } { + t.Run(test.name, func(t *testing.T) { + entry, err := toGraphActivityLogEntry(&activitylogsql.ActivityLogCombinedView{ + Actor: "github-repo:nais/example", + Action: string(ActivityLogEntryActionCreated), + ResourceType: "ConfigMap", + ResourceName: "example", + Data: test.data, + GithubActorClaims: test.claims, + }) + if err != nil { + t.Fatal(err) + } + generic := entry.(GenericKubernetesResourceActivityLogEntry) + if (generic.GitHubActorClaims != nil) != test.wantClaims { + t.Fatalf("unexpected claims: %+v", generic.GitHubActorClaims) + } + if test.wantClaims && generic.GitHubActorClaims.RunID != "123" { + t.Fatalf("unexpected claims: %+v", generic.GitHubActorClaims) + } + if generic.Data.GitHubActorClaims != generic.GitHubActorClaims { + t.Fatalf("deprecated data field does not match entry claims") + } + if generic.Data.Kind != "ConfigMap" { + t.Fatalf("existing data was lost: %+v", generic.Data) + } + }) + } +} diff --git a/internal/activitylog/resource.go b/internal/activitylog/resource.go index 72b7e3131..e7b5651d3 100644 --- a/internal/activitylog/resource.go +++ b/internal/activitylog/resource.go @@ -69,9 +69,8 @@ type GenericKubernetesResourceActivityLogEntryData struct { // Only populated for updates. ChangedFields []ResourceChangedField `json:"changedFields"` - // GitHubActorClaims holds the GitHub Actions OIDC token claims at the time of the - // apply. Only populated when the request was authenticated via a GitHub token. - GitHubActorClaims *github.GitHubActorClaims `json:"gitHubActorClaims,omitempty"` + // GitHubActorClaims exposes the deprecated data field from the entry's claims column. + GitHubActorClaims *github.GitHubActorClaims `json:"-"` } // GenericKubernetesActivityLogEntry is used for resource types that do not have @@ -101,6 +100,7 @@ func init() { if err != nil { return nil, fmt.Errorf("transforming unsupported resource activity log entry data: %w", err) } + data.GitHubActorClaims = entry.GitHubActorClaims return GenericKubernetesResourceActivityLogEntry{ GenericActivityLogEntry: entry.WithMessage( fmt.Sprintf("%s %s %s", entry.ResourceName, entry.Action, entry.ResourceType), diff --git a/internal/apply/apply.go b/internal/apply/apply.go index 309f7e842..404c8a743 100644 --- a/internal/apply/apply.go +++ b/internal/apply/apply.go @@ -10,7 +10,6 @@ import ( "github.com/nais/api/internal/activitylog" "github.com/nais/api/internal/auth/authz" - "github.com/nais/api/internal/auth/middleware" "github.com/nais/api/internal/environmentmapper" "github.com/nais/api/internal/slug" "github.com/sirupsen/logrus" @@ -176,9 +175,6 @@ func (h *Handler) applyOne( } actor := authz.ActorFromContext(ctx) - if ghActor, ok := actor.User.(*middleware.GitHubRepoActor); ok { - logData.GitHubActorClaims = &ghActor.Claims - } if err := activitylog.Create(ctx, activitylog.CreateInput{ Action: action, diff --git a/internal/auth/middleware/github_token.go b/internal/auth/middleware/github_token.go index 90544de4a..75d7ed0f1 100644 --- a/internal/auth/middleware/github_token.go +++ b/internal/auth/middleware/github_token.go @@ -111,6 +111,10 @@ func (g *GitHubRepoActor) Identity() string { return fmt.Sprintf("github-repo:%s", g.RepositoryName) } +func (g *GitHubRepoActor) GitHubActorClaims() *github.GitHubActorClaims { + return &g.Claims +} + func (g *GitHubRepoActor) IsServiceAccount() bool { return true } func (g *GitHubRepoActor) IsGitHubActions() {} diff --git a/internal/database/migrations/0076_activity_log_github_actor_claims.sql b/internal/database/migrations/0076_activity_log_github_actor_claims.sql new file mode 100644 index 000000000..7a48fec6f --- /dev/null +++ b/internal/database/migrations/0076_activity_log_github_actor_claims.sql @@ -0,0 +1,34 @@ +-- +goose Up +ALTER TABLE activity_log_entries +ADD COLUMN IF NOT EXISTS github_actor_claims JSONB +; + +CREATE OR REPLACE VIEW activity_log_combined_view AS +SELECT + id, + created_at, + actor, + action, + resource_type, + resource_name, + team_slug::TEXT AS team_slug, + data, + environment, + github_actor_claims +FROM + activity_log_entries +UNION ALL +SELECT + id, + created_at, + actor, + action, + resource_type, + resource_name, + team_slug, + data, + environment, + NULL::JSONB AS github_actor_claims +FROM + activity_log_subset_mat_view +; diff --git a/internal/graph/gengql/applications.generated.go b/internal/graph/gengql/applications.generated.go index e609bc820..dcbe7a6e2 100644 --- a/internal/graph/gengql/applications.generated.go +++ b/internal/graph/gengql/applications.generated.go @@ -1871,6 +1871,38 @@ func (ec *executionContext) fieldContext_ApplicationCreatedActivityLogEntry_acto return graphql.NewScalarFieldContext("ApplicationCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ApplicationCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ApplicationCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ApplicationCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ApplicationCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ApplicationCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2087,6 +2119,38 @@ func (ec *executionContext) fieldContext_ApplicationDeletedActivityLogEntry_acto return graphql.NewScalarFieldContext("ApplicationDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ApplicationDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ApplicationDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ApplicationDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ApplicationDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ApplicationDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3076,6 +3140,38 @@ func (ec *executionContext) fieldContext_ApplicationRestartedActivityLogEntry_ac return graphql.NewScalarFieldContext("ApplicationRestartedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ApplicationRestartedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationRestartedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ApplicationRestartedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ApplicationRestartedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ApplicationRestartedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ApplicationRestartedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationRestartedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3260,6 +3356,38 @@ func (ec *executionContext) fieldContext_ApplicationScaledActivityLogEntry_actor return graphql.NewScalarFieldContext("ApplicationScaledActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ApplicationScaledActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationScaledActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ApplicationScaledActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ApplicationScaledActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ApplicationScaledActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ApplicationScaledActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationScaledActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3637,6 +3765,38 @@ func (ec *executionContext) fieldContext_ApplicationUpdatedActivityLogEntry_acto return graphql.NewScalarFieldContext("ApplicationUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ApplicationUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ApplicationUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ApplicationUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ApplicationUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ApplicationUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *application.ApplicationUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -5713,6 +5873,8 @@ func (ec *executionContext) _ApplicationCreatedActivityLogEntry(ctx context.Cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ApplicationCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ApplicationCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -5789,6 +5951,8 @@ func (ec *executionContext) _ApplicationDeletedActivityLogEntry(ctx context.Cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ApplicationDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ApplicationDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -6426,6 +6590,8 @@ func (ec *executionContext) _ApplicationRestartedActivityLogEntry(ctx context.Co if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ApplicationRestartedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ApplicationRestartedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -6497,6 +6663,8 @@ func (ec *executionContext) _ApplicationScaledActivityLogEntry(ctx context.Conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ApplicationScaledActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ApplicationScaledActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -6710,6 +6878,8 @@ func (ec *executionContext) _ApplicationUpdatedActivityLogEntry(ctx context.Cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ApplicationUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ApplicationUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/apply.generated.go b/internal/graph/gengql/apply.generated.go index 7eb08010c..b7ee88679 100644 --- a/internal/graph/gengql/apply.generated.go +++ b/internal/graph/gengql/apply.generated.go @@ -78,6 +78,38 @@ func (ec *executionContext) fieldContext_GenericKubernetesResourceActivityLogEnt return graphql.NewScalarFieldContext("GenericKubernetesResourceActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _GenericKubernetesResourceActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *activitylog.GenericKubernetesResourceActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_GenericKubernetesResourceActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_GenericKubernetesResourceActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "GenericKubernetesResourceActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _GenericKubernetesResourceActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *activitylog.GenericKubernetesResourceActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -989,6 +1021,8 @@ func (ec *executionContext) _GenericKubernetesResourceActivityLogEntry(ctx conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._GenericKubernetesResourceActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._GenericKubernetesResourceActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/cluster.generated.go b/internal/graph/gengql/cluster.generated.go index a57c32751..99ee4b30a 100644 --- a/internal/graph/gengql/cluster.generated.go +++ b/internal/graph/gengql/cluster.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/kubernetes/event/pubsublog" "github.com/nais/api/internal/slug" @@ -78,6 +79,38 @@ func (ec *executionContext) fieldContext_ClusterAuditActivityLogEntry_actor(_ co return graphql.NewScalarFieldContext("ClusterAuditActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ClusterAuditActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *pubsublog.ClusterAuditActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ClusterAuditActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ClusterAuditActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ClusterAuditActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ClusterAuditActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *pubsublog.ClusterAuditActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -327,6 +360,8 @@ func (ec *executionContext) _ClusterAuditActivityLogEntry(ctx context.Context, s if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ClusterAuditActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ClusterAuditActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/config.generated.go b/internal/graph/gengql/config.generated.go index 17eea1452..87a7b48e7 100644 --- a/internal/graph/gengql/config.generated.go +++ b/internal/graph/gengql/config.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" @@ -827,6 +828,38 @@ func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("ConfigCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ConfigCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ConfigCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ConfigCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ConfigCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ConfigCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *config.ConfigCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1011,6 +1044,38 @@ func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("ConfigDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ConfigDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ConfigDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ConfigDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ConfigDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ConfigDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *config.ConfigDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1346,6 +1411,38 @@ func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("ConfigUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ConfigUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ConfigUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ConfigUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ConfigUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ConfigUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *config.ConfigUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2796,6 +2893,8 @@ func (ec *executionContext) _ConfigCreatedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ConfigCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ConfigCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -2867,6 +2966,8 @@ func (ec *executionContext) _ConfigDeletedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ConfigDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ConfigDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -3124,6 +3225,8 @@ func (ec *executionContext) _ConfigUpdatedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ConfigUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ConfigUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/deployment.generated.go b/internal/graph/gengql/deployment.generated.go index 2999285fb..3e515e0c5 100644 --- a/internal/graph/gengql/deployment.generated.go +++ b/internal/graph/gengql/deployment.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/deployment" "github.com/nais/api/internal/deployment/deploymentactivity" "github.com/nais/api/internal/graph/ident" @@ -465,6 +466,38 @@ func (ec *executionContext) fieldContext_DeploymentActivityLogEntry_actor(_ cont return graphql.NewScalarFieldContext("DeploymentActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _DeploymentActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *deploymentactivity.DeploymentActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_DeploymentActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_DeploymentActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "DeploymentActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _DeploymentActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *deploymentactivity.DeploymentActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1410,6 +1443,38 @@ func (ec *executionContext) fieldContext_TeamDeployKeyUpdatedActivityLogEntry_ac return graphql.NewScalarFieldContext("TeamDeployKeyUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TeamDeployKeyUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *deploymentactivity.TeamDeployKeyUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TeamDeployKeyUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TeamDeployKeyUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TeamDeployKeyUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TeamDeployKeyUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *deploymentactivity.TeamDeployKeyUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1855,6 +1920,8 @@ func (ec *executionContext) _DeploymentActivityLogEntry(ctx context.Context, sel if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._DeploymentActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._DeploymentActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -2403,6 +2470,8 @@ func (ec *executionContext) _TeamDeployKeyUpdatedActivityLogEntry(ctx context.Co if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TeamDeployKeyUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TeamDeployKeyUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/jobs.generated.go b/internal/graph/gengql/jobs.generated.go index 48a33ce09..b78204420 100644 --- a/internal/graph/gengql/jobs.generated.go +++ b/internal/graph/gengql/jobs.generated.go @@ -1905,6 +1905,38 @@ func (ec *executionContext) fieldContext_JobCreatedActivityLogEntry_actor(_ cont return graphql.NewScalarFieldContext("JobCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _JobCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *job.JobCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_JobCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_JobCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "JobCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _JobCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *job.JobCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2121,6 +2153,38 @@ func (ec *executionContext) fieldContext_JobDeletedActivityLogEntry_actor(_ cont return graphql.NewScalarFieldContext("JobDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _JobDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *job.JobDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_JobDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_JobDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "JobDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _JobDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *job.JobDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2894,6 +2958,38 @@ func (ec *executionContext) fieldContext_JobRunDeletedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("JobRunDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _JobRunDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *job.JobRunDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_JobRunDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_JobRunDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "JobRunDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _JobRunDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *job.JobRunDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3592,6 +3688,38 @@ func (ec *executionContext) fieldContext_JobTriggeredActivityLogEntry_actor(_ co return graphql.NewScalarFieldContext("JobTriggeredActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _JobTriggeredActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *job.JobTriggeredActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_JobTriggeredActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_JobTriggeredActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "JobTriggeredActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _JobTriggeredActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *job.JobTriggeredActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3776,6 +3904,38 @@ func (ec *executionContext) fieldContext_JobUpdatedActivityLogEntry_actor(_ cont return graphql.NewScalarFieldContext("JobUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _JobUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *job.JobUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_JobUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_JobUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "JobUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _JobUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *job.JobUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -5703,6 +5863,8 @@ func (ec *executionContext) _JobCreatedActivityLogEntry(ctx context.Context, sel if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._JobCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._JobCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -5779,6 +5941,8 @@ func (ec *executionContext) _JobDeletedActivityLogEntry(ctx context.Context, sel if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._JobDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._JobDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -6303,6 +6467,8 @@ func (ec *executionContext) _JobRunDeletedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._JobRunDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._JobRunDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -6771,6 +6937,8 @@ func (ec *executionContext) _JobTriggeredActivityLogEntry(ctx context.Context, s if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._JobTriggeredActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._JobTriggeredActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -6842,6 +7010,8 @@ func (ec *executionContext) _JobUpdatedActivityLogEntry(ctx context.Context, sel if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._JobUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._JobUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/kafka.generated.go b/internal/graph/gengql/kafka.generated.go index 57beca6fc..fab660a81 100644 --- a/internal/graph/gengql/kafka.generated.go +++ b/internal/graph/gengql/kafka.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" @@ -320,6 +321,38 @@ func (ec *executionContext) fieldContext_KafkaCredentialsCreatedActivityLogEntry return graphql.NewScalarFieldContext("KafkaCredentialsCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _KafkaCredentialsCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *kafkatopic.KafkaCredentialsCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_KafkaCredentialsCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_KafkaCredentialsCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "KafkaCredentialsCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _KafkaCredentialsCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *kafkatopic.KafkaCredentialsCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1579,6 +1612,38 @@ func (ec *executionContext) fieldContext_KafkaTopicUpdatedActivityLogEntry_actor return graphql.NewScalarFieldContext("KafkaTopicUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _KafkaTopicUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *kafkatopic.KafkaTopicUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_KafkaTopicUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_KafkaTopicUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "KafkaTopicUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _KafkaTopicUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *kafkatopic.KafkaTopicUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2388,6 +2453,8 @@ func (ec *executionContext) _KafkaCredentialsCreatedActivityLogEntry(ctx context if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._KafkaCredentialsCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._KafkaCredentialsCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -3229,6 +3296,8 @@ func (ec *executionContext) _KafkaTopicUpdatedActivityLogEntry(ctx context.Conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._KafkaTopicUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._KafkaTopicUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/opensearch.generated.go b/internal/graph/gengql/opensearch.generated.go index 96af8dbda..8d6bffd29 100644 --- a/internal/graph/gengql/opensearch.generated.go +++ b/internal/graph/gengql/opensearch.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/cost" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" @@ -1283,6 +1284,38 @@ func (ec *executionContext) fieldContext_OpenSearchCreatedActivityLogEntry_actor return graphql.NewScalarFieldContext("OpenSearchCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _OpenSearchCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *opensearch.OpenSearchCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_OpenSearchCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_OpenSearchCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "OpenSearchCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _OpenSearchCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *opensearch.OpenSearchCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1582,6 +1615,38 @@ func (ec *executionContext) fieldContext_OpenSearchCredentialsCreatedActivityLog return graphql.NewScalarFieldContext("OpenSearchCredentialsCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _OpenSearchCredentialsCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *opensearch.OpenSearchCredentialsCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_OpenSearchCredentialsCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_OpenSearchCredentialsCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "OpenSearchCredentialsCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _OpenSearchCredentialsCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *opensearch.OpenSearchCredentialsCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1844,6 +1909,38 @@ func (ec *executionContext) fieldContext_OpenSearchDeletedActivityLogEntry_actor return graphql.NewScalarFieldContext("OpenSearchDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _OpenSearchDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *opensearch.OpenSearchDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_OpenSearchDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_OpenSearchDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "OpenSearchDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _OpenSearchDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *opensearch.OpenSearchDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2225,6 +2322,38 @@ func (ec *executionContext) fieldContext_OpenSearchUpdatedActivityLogEntry_actor return graphql.NewScalarFieldContext("OpenSearchUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _OpenSearchUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *opensearch.OpenSearchUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_OpenSearchUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_OpenSearchUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "OpenSearchUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _OpenSearchUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *opensearch.OpenSearchUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3868,6 +3997,8 @@ func (ec *executionContext) _OpenSearchCreatedActivityLogEntry(ctx context.Conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._OpenSearchCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._OpenSearchCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -3998,6 +4129,8 @@ func (ec *executionContext) _OpenSearchCredentialsCreatedActivityLogEntry(ctx co if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._OpenSearchCredentialsCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._OpenSearchCredentialsCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4115,6 +4248,8 @@ func (ec *executionContext) _OpenSearchDeletedActivityLogEntry(ctx context.Conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._OpenSearchDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._OpenSearchDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4416,6 +4551,8 @@ func (ec *executionContext) _OpenSearchUpdatedActivityLogEntry(ctx context.Conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._OpenSearchUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._OpenSearchUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/postgres.generated.go b/internal/graph/gengql/postgres.generated.go index fc1a3e91c..7d76a743f 100644 --- a/internal/graph/gengql/postgres.generated.go +++ b/internal/graph/gengql/postgres.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" @@ -178,6 +179,38 @@ func (ec *executionContext) fieldContext_PostgresDeletedActivityLogEntry_actor(_ return graphql.NewScalarFieldContext("PostgresDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _PostgresDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *postgres.PostgresDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_PostgresDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_PostgresDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "PostgresDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _PostgresDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *postgres.PostgresDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -362,6 +395,38 @@ func (ec *executionContext) fieldContext_PostgresGrantAccessActivityLogEntry_act return graphql.NewScalarFieldContext("PostgresGrantAccessActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _PostgresGrantAccessActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *postgres.PostgresGrantAccessActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_PostgresGrantAccessActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_PostgresGrantAccessActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "PostgresGrantAccessActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _PostgresGrantAccessActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *postgres.PostgresGrantAccessActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1834,6 +1899,8 @@ func (ec *executionContext) _PostgresDeletedActivityLogEntry(ctx context.Context if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._PostgresDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._PostgresDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -1905,6 +1972,8 @@ func (ec *executionContext) _PostgresGrantAccessActivityLogEntry(ctx context.Con if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._PostgresGrantAccessActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._PostgresGrantAccessActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/reconcilers.generated.go b/internal/graph/gengql/reconcilers.generated.go index 74a83a63b..a85bfbe18 100644 --- a/internal/graph/gengql/reconcilers.generated.go +++ b/internal/graph/gengql/reconcilers.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/pagination" "github.com/nais/api/internal/reconciler" @@ -570,6 +571,38 @@ func (ec *executionContext) fieldContext_ReconcilerConfiguredActivityLogEntry_ac return graphql.NewScalarFieldContext("ReconcilerConfiguredActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ReconcilerConfiguredActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *reconciler.ReconcilerConfiguredActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ReconcilerConfiguredActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ReconcilerConfiguredActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ReconcilerConfiguredActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ReconcilerConfiguredActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *reconciler.ReconcilerConfiguredActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -905,6 +938,38 @@ func (ec *executionContext) fieldContext_ReconcilerDisabledActivityLogEntry_acto return graphql.NewScalarFieldContext("ReconcilerDisabledActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ReconcilerDisabledActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *reconciler.ReconcilerDisabledActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ReconcilerDisabledActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ReconcilerDisabledActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ReconcilerDisabledActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ReconcilerDisabledActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *reconciler.ReconcilerDisabledActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1144,6 +1209,38 @@ func (ec *executionContext) fieldContext_ReconcilerEnabledActivityLogEntry_actor return graphql.NewScalarFieldContext("ReconcilerEnabledActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ReconcilerEnabledActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *reconciler.ReconcilerEnabledActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ReconcilerEnabledActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ReconcilerEnabledActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ReconcilerEnabledActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ReconcilerEnabledActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *reconciler.ReconcilerEnabledActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1988,6 +2085,8 @@ func (ec *executionContext) _ReconcilerConfiguredActivityLogEntry(ctx context.Co if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ReconcilerConfiguredActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ReconcilerConfiguredActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -2152,6 +2251,8 @@ func (ec *executionContext) _ReconcilerDisabledActivityLogEntry(ctx context.Cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ReconcilerDisabledActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ReconcilerDisabledActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -2267,6 +2368,8 @@ func (ec *executionContext) _ReconcilerEnabledActivityLogEntry(ctx context.Conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ReconcilerEnabledActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ReconcilerEnabledActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/repository.generated.go b/internal/graph/gengql/repository.generated.go index fc391c216..9ab2ac22d 100644 --- a/internal/graph/gengql/repository.generated.go +++ b/internal/graph/gengql/repository.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/github/repository" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/pagination" @@ -217,6 +218,38 @@ func (ec *executionContext) fieldContext_RepositoryAddedActivityLogEntry_actor(_ return graphql.NewScalarFieldContext("RepositoryAddedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _RepositoryAddedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *repository.RepositoryAddedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_RepositoryAddedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_RepositoryAddedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "RepositoryAddedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _RepositoryAddedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *repository.RepositoryAddedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -552,6 +585,38 @@ func (ec *executionContext) fieldContext_RepositoryRemovedActivityLogEntry_actor return graphql.NewScalarFieldContext("RepositoryRemovedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _RepositoryRemovedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *repository.RepositoryRemovedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_RepositoryRemovedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_RepositoryRemovedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "RepositoryRemovedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _RepositoryRemovedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *repository.RepositoryRemovedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1016,6 +1081,8 @@ func (ec *executionContext) _RepositoryAddedActivityLogEntry(ctx context.Context if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._RepositoryAddedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._RepositoryAddedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -1180,6 +1247,8 @@ func (ec *executionContext) _RepositoryRemovedActivityLogEntry(ctx context.Conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._RepositoryRemovedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._RepositoryRemovedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/root_.generated.go b/internal/graph/gengql/root_.generated.go index cbb57eb61..0164e70a8 100644 --- a/internal/graph/gengql/root_.generated.go +++ b/internal/graph/gengql/root_.generated.go @@ -282,26 +282,28 @@ type ComplexityRoot struct { } ApplicationCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ApplicationDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ApplicationEdge struct { @@ -376,26 +378,28 @@ type ComplexityRoot struct { } ApplicationRestartedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ApplicationScaledActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ApplicationScaledActivityLogEntryData struct { @@ -415,15 +419,16 @@ type ComplexityRoot struct { } ApplicationUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ApplicationUpdatedActivityLogEntryData struct { @@ -565,15 +570,16 @@ type ComplexityRoot struct { } ClusterAuditActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ClusterAuditActivityLogEntryData struct { @@ -604,25 +610,27 @@ type ComplexityRoot struct { } ConfigCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ConfigDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ConfigEdge struct { @@ -637,15 +645,16 @@ type ComplexityRoot struct { } ConfigUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ConfigUpdatedActivityLogEntryData struct { @@ -827,15 +836,16 @@ type ComplexityRoot struct { } DeploymentActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } DeploymentActivityLogEntryData struct { @@ -1002,15 +1012,16 @@ type ComplexityRoot struct { } GenericKubernetesResourceActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } GenericKubernetesResourceActivityLogEntryData struct { @@ -1251,26 +1262,28 @@ type ComplexityRoot struct { } JobCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } JobDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } JobEdge struct { @@ -1312,15 +1325,16 @@ type ComplexityRoot struct { } JobRunDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } JobRunDeletedActivityLogEntryData struct { @@ -1370,26 +1384,28 @@ type ComplexityRoot struct { } JobTriggeredActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } JobUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } JobUpdatedActivityLogEntryData struct { @@ -1407,15 +1423,16 @@ type ComplexityRoot struct { } KafkaCredentialsCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } KafkaCredentialsCreatedActivityLogEntryData struct { @@ -1489,15 +1506,16 @@ type ComplexityRoot struct { } KafkaTopicUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } KafkaTopicUpdatedActivityLogEntryData struct { @@ -1729,14 +1747,15 @@ type ComplexityRoot struct { } OpenSearchCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } OpenSearchCredentials struct { @@ -1748,15 +1767,16 @@ type ComplexityRoot struct { } OpenSearchCredentialsCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } OpenSearchCredentialsCreatedActivityLogEntryData struct { @@ -1765,14 +1785,15 @@ type ComplexityRoot struct { } OpenSearchDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } OpenSearchEdge struct { @@ -1824,15 +1845,16 @@ type ComplexityRoot struct { } OpenSearchUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } OpenSearchUpdatedActivityLogEntryData struct { @@ -1866,26 +1888,28 @@ type ComplexityRoot struct { } PostgresDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } PostgresGrantAccessActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } PostgresGrantAccessActivityLogEntryData struct { @@ -2026,15 +2050,16 @@ type ComplexityRoot struct { } ReconcilerConfiguredActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ReconcilerConfiguredActivityLogEntryData struct { @@ -2048,14 +2073,15 @@ type ComplexityRoot struct { } ReconcilerDisabledActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ReconcilerEdge struct { @@ -2064,14 +2090,15 @@ type ComplexityRoot struct { } ReconcilerEnabledActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ReconcilerError struct { @@ -2122,14 +2149,15 @@ type ComplexityRoot struct { } RepositoryAddedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } RepositoryConnection struct { @@ -2144,14 +2172,15 @@ type ComplexityRoot struct { } RepositoryRemovedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } RequestTeamDeletionPayload struct { @@ -2188,15 +2217,16 @@ type ComplexityRoot struct { } RoleAssignedToServiceAccountActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } RoleAssignedToServiceAccountActivityLogEntryData struct { @@ -2225,15 +2255,16 @@ type ComplexityRoot struct { } RoleRevokedFromServiceAccountActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } RoleRevokedFromServiceAccountActivityLogEntryData struct { @@ -2284,25 +2315,27 @@ type ComplexityRoot struct { } SecretCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } SecretDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } SecretEdge struct { @@ -2317,15 +2350,16 @@ type ComplexityRoot struct { } SecretUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } SecretUpdatedActivityLogEntryData struct { @@ -2345,15 +2379,16 @@ type ComplexityRoot struct { } SecretValueAddedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } SecretValueAddedActivityLogEntryData struct { @@ -2361,15 +2396,16 @@ type ComplexityRoot struct { } SecretValueRemovedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } SecretValueRemovedActivityLogEntryData struct { @@ -2377,15 +2413,16 @@ type ComplexityRoot struct { } SecretValueUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } SecretValueUpdatedActivityLogEntryData struct { @@ -2393,15 +2430,16 @@ type ComplexityRoot struct { } SecretValuesViewedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } SecretValuesViewedActivityLogEntryData struct { @@ -2429,25 +2467,27 @@ type ComplexityRoot struct { } ServiceAccountCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ServiceAccountDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ServiceAccountEdge struct { @@ -2472,15 +2512,16 @@ type ComplexityRoot struct { } ServiceAccountTokenCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ServiceAccountTokenCreatedActivityLogEntryData struct { @@ -2488,15 +2529,16 @@ type ComplexityRoot struct { } ServiceAccountTokenDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ServiceAccountTokenDeletedActivityLogEntryData struct { @@ -2509,15 +2551,16 @@ type ComplexityRoot struct { } ServiceAccountTokenUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ServiceAccountTokenUpdatedActivityLogEntryData struct { @@ -2532,15 +2575,16 @@ type ComplexityRoot struct { } ServiceAccountUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ServiceAccountUpdatedActivityLogEntryData struct { @@ -2566,15 +2610,16 @@ type ComplexityRoot struct { } ServiceAccountWorkloadBindingAddedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ServiceAccountWorkloadBindingAddedActivityLogEntryData struct { @@ -2595,15 +2640,16 @@ type ComplexityRoot struct { } ServiceAccountWorkloadBindingRemovedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ServiceAccountWorkloadBindingRemovedActivityLogEntryData struct { @@ -2624,14 +2670,15 @@ type ComplexityRoot struct { } ServiceMaintenanceActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } SetTeamMemberRolePayload struct { @@ -2851,14 +2898,15 @@ type ComplexityRoot struct { } TeamConfirmDeleteKeyActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TeamConnection struct { @@ -2888,25 +2936,27 @@ type ComplexityRoot struct { } TeamCreateDeleteKeyActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TeamCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TeamDeleteKey struct { @@ -2918,14 +2968,15 @@ type ComplexityRoot struct { } TeamDeployKeyUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TeamEdge struct { @@ -2971,15 +3022,16 @@ type ComplexityRoot struct { } TeamEnvironmentUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TeamEnvironmentUpdatedActivityLogEntryData struct { @@ -3084,15 +3136,16 @@ type ComplexityRoot struct { } TeamMemberAddedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TeamMemberAddedActivityLogEntryData struct { @@ -3113,15 +3166,16 @@ type ComplexityRoot struct { } TeamMemberRemovedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TeamMemberRemovedActivityLogEntryData struct { @@ -3130,15 +3184,16 @@ type ComplexityRoot struct { } TeamMemberSetRoleActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TeamMemberSetRoleActivityLogEntryData struct { @@ -3176,15 +3231,16 @@ type ComplexityRoot struct { } TeamUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TeamUpdatedActivityLogEntryData struct { @@ -3254,15 +3310,16 @@ type ComplexityRoot struct { } TunnelCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TunnelCreatedActivityLogEntryData struct { @@ -3271,15 +3328,16 @@ type ComplexityRoot struct { } TunnelDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } TunnelDeletedActivityLogEntryData struct { @@ -3305,25 +3363,27 @@ type ComplexityRoot struct { } UnleashInstanceCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } UnleashInstanceDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } UnleashInstanceMetrics struct { @@ -3336,15 +3396,16 @@ type ComplexityRoot struct { } UnleashInstanceUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } UnleashInstanceUpdatedActivityLogEntryData struct { @@ -3550,14 +3611,15 @@ type ComplexityRoot struct { } ValkeyCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ValkeyCredentials struct { @@ -3569,15 +3631,16 @@ type ComplexityRoot struct { } ValkeyCredentialsCreatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ValkeyCredentialsCreatedActivityLogEntryData struct { @@ -3586,14 +3649,15 @@ type ComplexityRoot struct { } ValkeyDeletedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ValkeyEdge struct { @@ -3645,15 +3709,16 @@ type ComplexityRoot struct { } ValkeyUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } ValkeyUpdatedActivityLogEntryData struct { @@ -3698,15 +3763,16 @@ type ComplexityRoot struct { } VulnerabilityUpdatedActivityLogEntry struct { - Actor func(childComplexity int) int - CreatedAt func(childComplexity int) int - Data func(childComplexity int) int - EnvironmentName func(childComplexity int) int - ID func(childComplexity int) int - Message func(childComplexity int) int - ResourceName func(childComplexity int) int - ResourceType func(childComplexity int) int - TeamSlug func(childComplexity int) int + Actor func(childComplexity int) int + CreatedAt func(childComplexity int) int + Data func(childComplexity int) int + EnvironmentName func(childComplexity int) int + GitHubActorClaims func(childComplexity int) int + ID func(childComplexity int) int + Message func(childComplexity int) int + ResourceName func(childComplexity int) int + ResourceType func(childComplexity int) int + TeamSlug func(childComplexity int) int } VulnerableImageIssue struct { @@ -4420,6 +4486,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ApplicationCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ApplicationCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ApplicationCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ApplicationCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ApplicationCreatedActivityLogEntry.id": if e.ComplexityRoot.ApplicationCreatedActivityLogEntry.ID == nil { break @@ -4476,6 +4549,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ApplicationDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "ApplicationDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ApplicationDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ApplicationDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ApplicationDeletedActivityLogEntry.id": if e.ComplexityRoot.ApplicationDeletedActivityLogEntry.ID == nil { break @@ -4803,6 +4883,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ApplicationRestartedActivityLogEntry.EnvironmentName(childComplexity), true + case "ApplicationRestartedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ApplicationRestartedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ApplicationRestartedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ApplicationRestartedActivityLogEntry.id": if e.ComplexityRoot.ApplicationRestartedActivityLogEntry.ID == nil { break @@ -4866,6 +4953,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ApplicationScaledActivityLogEntry.EnvironmentName(childComplexity), true + case "ApplicationScaledActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ApplicationScaledActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ApplicationScaledActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ApplicationScaledActivityLogEntry.id": if e.ComplexityRoot.ApplicationScaledActivityLogEntry.ID == nil { break @@ -4978,6 +5072,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ApplicationUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ApplicationUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ApplicationUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ApplicationUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ApplicationUpdatedActivityLogEntry.id": if e.ComplexityRoot.ApplicationUpdatedActivityLogEntry.ID == nil { break @@ -5555,6 +5656,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ClusterAuditActivityLogEntry.EnvironmentName(childComplexity), true + case "ClusterAuditActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ClusterAuditActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ClusterAuditActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ClusterAuditActivityLogEntry.id": if e.ComplexityRoot.ClusterAuditActivityLogEntry.ID == nil { break @@ -5757,6 +5865,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ConfigCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ConfigCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ConfigCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ConfigCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ConfigCreatedActivityLogEntry.id": if e.ComplexityRoot.ConfigCreatedActivityLogEntry.ID == nil { break @@ -5813,6 +5928,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ConfigDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "ConfigDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ConfigDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ConfigDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ConfigDeletedActivityLogEntry.id": if e.ComplexityRoot.ConfigDeletedActivityLogEntry.ID == nil { break @@ -5911,6 +6033,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ConfigUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ConfigUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ConfigUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ConfigUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ConfigUpdatedActivityLogEntry.id": if e.ComplexityRoot.ConfigUpdatedActivityLogEntry.ID == nil { break @@ -6489,6 +6618,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.DeploymentActivityLogEntry.EnvironmentName(childComplexity), true + case "DeploymentActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.DeploymentActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.DeploymentActivityLogEntry.GitHubActorClaims(childComplexity), true + case "DeploymentActivityLogEntry.id": if e.ComplexityRoot.DeploymentActivityLogEntry.ID == nil { break @@ -7157,6 +7293,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.GenericKubernetesResourceActivityLogEntry.EnvironmentName(childComplexity), true + case "GenericKubernetesResourceActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.GenericKubernetesResourceActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.GenericKubernetesResourceActivityLogEntry.GitHubActorClaims(childComplexity), true + case "GenericKubernetesResourceActivityLogEntry.id": if e.ComplexityRoot.GenericKubernetesResourceActivityLogEntry.ID == nil { break @@ -8361,6 +8504,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.JobCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "JobCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.JobCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.JobCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "JobCreatedActivityLogEntry.id": if e.ComplexityRoot.JobCreatedActivityLogEntry.ID == nil { break @@ -8417,6 +8567,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.JobDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "JobDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.JobDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.JobDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "JobDeletedActivityLogEntry.id": if e.ComplexityRoot.JobDeletedActivityLogEntry.ID == nil { break @@ -8625,6 +8782,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.JobRunDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "JobRunDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.JobRunDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.JobRunDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "JobRunDeletedActivityLogEntry.id": if e.ComplexityRoot.JobRunDeletedActivityLogEntry.ID == nil { break @@ -8814,6 +8978,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.JobTriggeredActivityLogEntry.EnvironmentName(childComplexity), true + case "JobTriggeredActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.JobTriggeredActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.JobTriggeredActivityLogEntry.GitHubActorClaims(childComplexity), true + case "JobTriggeredActivityLogEntry.id": if e.ComplexityRoot.JobTriggeredActivityLogEntry.ID == nil { break @@ -8877,6 +9048,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.JobUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "JobUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.JobUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.JobUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "JobUpdatedActivityLogEntry.id": if e.ComplexityRoot.JobUpdatedActivityLogEntry.ID == nil { break @@ -8996,6 +9174,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.KafkaCredentialsCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "KafkaCredentialsCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.KafkaCredentialsCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.KafkaCredentialsCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "KafkaCredentialsCreatedActivityLogEntry.id": if e.ComplexityRoot.KafkaCredentialsCreatedActivityLogEntry.ID == nil { break @@ -9344,6 +9529,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.KafkaTopicUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "KafkaTopicUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.KafkaTopicUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.KafkaTopicUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "KafkaTopicUpdatedActivityLogEntry.id": if e.ComplexityRoot.KafkaTopicUpdatedActivityLogEntry.ID == nil { break @@ -10795,6 +10987,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.OpenSearchCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "OpenSearchCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.OpenSearchCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.OpenSearchCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "OpenSearchCreatedActivityLogEntry.id": if e.ComplexityRoot.OpenSearchCreatedActivityLogEntry.ID == nil { break @@ -10893,6 +11092,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.OpenSearchCredentialsCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "OpenSearchCredentialsCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.OpenSearchCredentialsCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.OpenSearchCredentialsCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "OpenSearchCredentialsCreatedActivityLogEntry.id": if e.ComplexityRoot.OpenSearchCredentialsCreatedActivityLogEntry.ID == nil { break @@ -10963,6 +11169,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.OpenSearchDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "OpenSearchDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.OpenSearchDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.OpenSearchDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "OpenSearchDeletedActivityLogEntry.id": if e.ComplexityRoot.OpenSearchDeletedActivityLogEntry.ID == nil { break @@ -11199,6 +11412,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.OpenSearchUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "OpenSearchUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.OpenSearchUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.OpenSearchUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "OpenSearchUpdatedActivityLogEntry.id": if e.ComplexityRoot.OpenSearchUpdatedActivityLogEntry.ID == nil { break @@ -11360,6 +11580,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.PostgresDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "PostgresDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.PostgresDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.PostgresDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "PostgresDeletedActivityLogEntry.id": if e.ComplexityRoot.PostgresDeletedActivityLogEntry.ID == nil { break @@ -11423,6 +11650,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.PostgresGrantAccessActivityLogEntry.EnvironmentName(childComplexity), true + case "PostgresGrantAccessActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.PostgresGrantAccessActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.PostgresGrantAccessActivityLogEntry.GitHubActorClaims(childComplexity), true + case "PostgresGrantAccessActivityLogEntry.id": if e.ComplexityRoot.PostgresGrantAccessActivityLogEntry.ID == nil { break @@ -12250,6 +12484,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ReconcilerConfiguredActivityLogEntry.EnvironmentName(childComplexity), true + case "ReconcilerConfiguredActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ReconcilerConfiguredActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ReconcilerConfiguredActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ReconcilerConfiguredActivityLogEntry.id": if e.ComplexityRoot.ReconcilerConfiguredActivityLogEntry.ID == nil { break @@ -12334,6 +12575,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ReconcilerDisabledActivityLogEntry.EnvironmentName(childComplexity), true + case "ReconcilerDisabledActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ReconcilerDisabledActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ReconcilerDisabledActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ReconcilerDisabledActivityLogEntry.id": if e.ComplexityRoot.ReconcilerDisabledActivityLogEntry.ID == nil { break @@ -12404,6 +12652,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ReconcilerEnabledActivityLogEntry.EnvironmentName(childComplexity), true + case "ReconcilerEnabledActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ReconcilerEnabledActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ReconcilerEnabledActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ReconcilerEnabledActivityLogEntry.id": if e.ComplexityRoot.ReconcilerEnabledActivityLogEntry.ID == nil { break @@ -12600,6 +12855,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.RepositoryAddedActivityLogEntry.EnvironmentName(childComplexity), true + case "RepositoryAddedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.RepositoryAddedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.RepositoryAddedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "RepositoryAddedActivityLogEntry.id": if e.ComplexityRoot.RepositoryAddedActivityLogEntry.ID == nil { break @@ -12691,6 +12953,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.RepositoryRemovedActivityLogEntry.EnvironmentName(childComplexity), true + case "RepositoryRemovedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.RepositoryRemovedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.RepositoryRemovedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "RepositoryRemovedActivityLogEntry.id": if e.ComplexityRoot.RepositoryRemovedActivityLogEntry.ID == nil { break @@ -12838,6 +13107,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.RoleAssignedToServiceAccountActivityLogEntry.EnvironmentName(childComplexity), true + case "RoleAssignedToServiceAccountActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.RoleAssignedToServiceAccountActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.RoleAssignedToServiceAccountActivityLogEntry.GitHubActorClaims(childComplexity), true + case "RoleAssignedToServiceAccountActivityLogEntry.id": if e.ComplexityRoot.RoleAssignedToServiceAccountActivityLogEntry.ID == nil { break @@ -12992,6 +13268,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.RoleRevokedFromServiceAccountActivityLogEntry.EnvironmentName(childComplexity), true + case "RoleRevokedFromServiceAccountActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.RoleRevokedFromServiceAccountActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.RoleRevokedFromServiceAccountActivityLogEntry.GitHubActorClaims(childComplexity), true + case "RoleRevokedFromServiceAccountActivityLogEntry.id": if e.ComplexityRoot.RoleRevokedFromServiceAccountActivityLogEntry.ID == nil { break @@ -13271,6 +13554,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.SecretCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "SecretCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.SecretCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.SecretCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "SecretCreatedActivityLogEntry.id": if e.ComplexityRoot.SecretCreatedActivityLogEntry.ID == nil { break @@ -13327,6 +13617,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.SecretDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "SecretDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.SecretDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.SecretDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "SecretDeletedActivityLogEntry.id": if e.ComplexityRoot.SecretDeletedActivityLogEntry.ID == nil { break @@ -13425,6 +13722,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.SecretUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "SecretUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.SecretUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.SecretUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "SecretUpdatedActivityLogEntry.id": if e.ComplexityRoot.SecretUpdatedActivityLogEntry.ID == nil { break @@ -13537,6 +13841,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.SecretValueAddedActivityLogEntry.EnvironmentName(childComplexity), true + case "SecretValueAddedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.SecretValueAddedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.SecretValueAddedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "SecretValueAddedActivityLogEntry.id": if e.ComplexityRoot.SecretValueAddedActivityLogEntry.ID == nil { break @@ -13607,6 +13918,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.SecretValueRemovedActivityLogEntry.EnvironmentName(childComplexity), true + case "SecretValueRemovedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.SecretValueRemovedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.SecretValueRemovedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "SecretValueRemovedActivityLogEntry.id": if e.ComplexityRoot.SecretValueRemovedActivityLogEntry.ID == nil { break @@ -13677,6 +13995,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.SecretValueUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "SecretValueUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.SecretValueUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.SecretValueUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "SecretValueUpdatedActivityLogEntry.id": if e.ComplexityRoot.SecretValueUpdatedActivityLogEntry.ID == nil { break @@ -13747,6 +14072,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.SecretValuesViewedActivityLogEntry.EnvironmentName(childComplexity), true + case "SecretValuesViewedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.SecretValuesViewedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.SecretValuesViewedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "SecretValuesViewedActivityLogEntry.id": if e.ComplexityRoot.SecretValuesViewedActivityLogEntry.ID == nil { break @@ -13928,6 +14260,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ServiceAccountCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ServiceAccountCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ServiceAccountCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ServiceAccountCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ServiceAccountCreatedActivityLogEntry.id": if e.ComplexityRoot.ServiceAccountCreatedActivityLogEntry.ID == nil { break @@ -13984,6 +14323,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ServiceAccountDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "ServiceAccountDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ServiceAccountDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ServiceAccountDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ServiceAccountDeletedActivityLogEntry.id": if e.ComplexityRoot.ServiceAccountDeletedActivityLogEntry.ID == nil { break @@ -14131,6 +14477,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ServiceAccountTokenCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ServiceAccountTokenCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ServiceAccountTokenCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ServiceAccountTokenCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ServiceAccountTokenCreatedActivityLogEntry.id": if e.ComplexityRoot.ServiceAccountTokenCreatedActivityLogEntry.ID == nil { break @@ -14201,6 +14554,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ServiceAccountTokenDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "ServiceAccountTokenDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ServiceAccountTokenDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ServiceAccountTokenDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ServiceAccountTokenDeletedActivityLogEntry.id": if e.ComplexityRoot.ServiceAccountTokenDeletedActivityLogEntry.ID == nil { break @@ -14285,6 +14645,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ServiceAccountTokenUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ServiceAccountTokenUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ServiceAccountTokenUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ServiceAccountTokenUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ServiceAccountTokenUpdatedActivityLogEntry.id": if e.ComplexityRoot.ServiceAccountTokenUpdatedActivityLogEntry.ID == nil { break @@ -14383,6 +14750,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ServiceAccountUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ServiceAccountUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ServiceAccountUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ServiceAccountUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ServiceAccountUpdatedActivityLogEntry.id": if e.ComplexityRoot.ServiceAccountUpdatedActivityLogEntry.ID == nil { break @@ -14537,6 +14911,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ServiceAccountWorkloadBindingAddedActivityLogEntry.EnvironmentName(childComplexity), true + case "ServiceAccountWorkloadBindingAddedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ServiceAccountWorkloadBindingAddedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ServiceAccountWorkloadBindingAddedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ServiceAccountWorkloadBindingAddedActivityLogEntry.id": if e.ComplexityRoot.ServiceAccountWorkloadBindingAddedActivityLogEntry.ID == nil { break @@ -14656,6 +15037,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ServiceAccountWorkloadBindingRemovedActivityLogEntry.EnvironmentName(childComplexity), true + case "ServiceAccountWorkloadBindingRemovedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ServiceAccountWorkloadBindingRemovedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ServiceAccountWorkloadBindingRemovedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ServiceAccountWorkloadBindingRemovedActivityLogEntry.id": if e.ComplexityRoot.ServiceAccountWorkloadBindingRemovedActivityLogEntry.ID == nil { break @@ -14768,6 +15156,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ServiceMaintenanceActivityLogEntry.EnvironmentName(childComplexity), true + case "ServiceMaintenanceActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ServiceMaintenanceActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ServiceMaintenanceActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ServiceMaintenanceActivityLogEntry.id": if e.ComplexityRoot.ServiceMaintenanceActivityLogEntry.ID == nil { break @@ -15929,6 +16324,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TeamConfirmDeleteKeyActivityLogEntry.EnvironmentName(childComplexity), true + case "TeamConfirmDeleteKeyActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TeamConfirmDeleteKeyActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TeamConfirmDeleteKeyActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TeamConfirmDeleteKeyActivityLogEntry.id": if e.ComplexityRoot.TeamConfirmDeleteKeyActivityLogEntry.ID == nil { break @@ -16067,6 +16469,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TeamCreateDeleteKeyActivityLogEntry.EnvironmentName(childComplexity), true + case "TeamCreateDeleteKeyActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TeamCreateDeleteKeyActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TeamCreateDeleteKeyActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TeamCreateDeleteKeyActivityLogEntry.id": if e.ComplexityRoot.TeamCreateDeleteKeyActivityLogEntry.ID == nil { break @@ -16123,6 +16532,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TeamCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "TeamCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TeamCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TeamCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TeamCreatedActivityLogEntry.id": if e.ComplexityRoot.TeamCreatedActivityLogEntry.ID == nil { break @@ -16214,6 +16630,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TeamDeployKeyUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "TeamDeployKeyUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TeamDeployKeyUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TeamDeployKeyUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TeamDeployKeyUpdatedActivityLogEntry.id": if e.ComplexityRoot.TeamDeployKeyUpdatedActivityLogEntry.ID == nil { break @@ -16541,6 +16964,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TeamEnvironmentUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "TeamEnvironmentUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TeamEnvironmentUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TeamEnvironmentUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TeamEnvironmentUpdatedActivityLogEntry.id": if e.ComplexityRoot.TeamEnvironmentUpdatedActivityLogEntry.ID == nil { break @@ -16912,6 +17342,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TeamMemberAddedActivityLogEntry.EnvironmentName(childComplexity), true + case "TeamMemberAddedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TeamMemberAddedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TeamMemberAddedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TeamMemberAddedActivityLogEntry.id": if e.ComplexityRoot.TeamMemberAddedActivityLogEntry.ID == nil { break @@ -17031,6 +17468,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TeamMemberRemovedActivityLogEntry.EnvironmentName(childComplexity), true + case "TeamMemberRemovedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TeamMemberRemovedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TeamMemberRemovedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TeamMemberRemovedActivityLogEntry.id": if e.ComplexityRoot.TeamMemberRemovedActivityLogEntry.ID == nil { break @@ -17108,6 +17552,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TeamMemberSetRoleActivityLogEntry.EnvironmentName(childComplexity), true + case "TeamMemberSetRoleActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TeamMemberSetRoleActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TeamMemberSetRoleActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TeamMemberSetRoleActivityLogEntry.id": if e.ComplexityRoot.TeamMemberSetRoleActivityLogEntry.ID == nil { break @@ -17283,6 +17734,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TeamUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "TeamUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TeamUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TeamUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TeamUpdatedActivityLogEntry.id": if e.ComplexityRoot.TeamUpdatedActivityLogEntry.ID == nil { break @@ -17640,6 +18098,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TunnelCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "TunnelCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TunnelCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TunnelCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TunnelCreatedActivityLogEntry.id": if e.ComplexityRoot.TunnelCreatedActivityLogEntry.ID == nil { break @@ -17717,6 +18182,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.TunnelDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "TunnelDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.TunnelDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.TunnelDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "TunnelDeletedActivityLogEntry.id": if e.ComplexityRoot.TunnelDeletedActivityLogEntry.ID == nil { break @@ -17869,6 +18341,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.UnleashInstanceCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "UnleashInstanceCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.UnleashInstanceCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.UnleashInstanceCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "UnleashInstanceCreatedActivityLogEntry.id": if e.ComplexityRoot.UnleashInstanceCreatedActivityLogEntry.ID == nil { break @@ -17925,6 +18404,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.UnleashInstanceDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "UnleashInstanceDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.UnleashInstanceDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.UnleashInstanceDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "UnleashInstanceDeletedActivityLogEntry.id": if e.ComplexityRoot.UnleashInstanceDeletedActivityLogEntry.ID == nil { break @@ -18030,6 +18516,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.UnleashInstanceUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "UnleashInstanceUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.UnleashInstanceUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.UnleashInstanceUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "UnleashInstanceUpdatedActivityLogEntry.id": if e.ComplexityRoot.UnleashInstanceUpdatedActivityLogEntry.ID == nil { break @@ -18827,6 +19320,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ValkeyCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ValkeyCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ValkeyCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ValkeyCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ValkeyCreatedActivityLogEntry.id": if e.ComplexityRoot.ValkeyCreatedActivityLogEntry.ID == nil { break @@ -18925,6 +19425,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ValkeyCredentialsCreatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ValkeyCredentialsCreatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ValkeyCredentialsCreatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ValkeyCredentialsCreatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ValkeyCredentialsCreatedActivityLogEntry.id": if e.ComplexityRoot.ValkeyCredentialsCreatedActivityLogEntry.ID == nil { break @@ -18995,6 +19502,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ValkeyDeletedActivityLogEntry.EnvironmentName(childComplexity), true + case "ValkeyDeletedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ValkeyDeletedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ValkeyDeletedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ValkeyDeletedActivityLogEntry.id": if e.ComplexityRoot.ValkeyDeletedActivityLogEntry.ID == nil { break @@ -19231,6 +19745,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.ValkeyUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "ValkeyUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.ValkeyUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.ValkeyUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "ValkeyUpdatedActivityLogEntry.id": if e.ComplexityRoot.ValkeyUpdatedActivityLogEntry.ID == nil { break @@ -19434,6 +19955,13 @@ func (e *executableSchema) Complexity(ctx context.Context, typeName, field strin return e.ComplexityRoot.VulnerabilityUpdatedActivityLogEntry.EnvironmentName(childComplexity), true + case "VulnerabilityUpdatedActivityLogEntry.gitHubActorClaims": + if e.ComplexityRoot.VulnerabilityUpdatedActivityLogEntry.GitHubActorClaims == nil { + break + } + + return e.ComplexityRoot.VulnerabilityUpdatedActivityLogEntry.GitHubActorClaims(childComplexity), true + case "VulnerabilityUpdatedActivityLogEntry.id": if e.ComplexityRoot.VulnerabilityUpdatedActivityLogEntry.ID == nil { break @@ -20465,6 +20993,9 @@ interface ActivityLogEntry implements Node { """ actor: String! + "GitHub Actions OIDC claims captured when the action was authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -21653,6 +22184,9 @@ type ApplicationDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -21679,6 +22213,9 @@ type ApplicationRestartedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -21707,6 +22244,9 @@ type ApplicationScaledActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -21753,6 +22293,9 @@ type ApplicationCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -21783,6 +22326,7 @@ type ApplicationUpdatedActivityLogEntryData { changedFields: [ResourceChangedField!]! "GitHub Actions OIDC token claims at the time of the apply. Only present when the request was authenticated via a GitHub token." gitHubActorClaims: GitHubActorClaims + @deprecated(reason: "Use gitHubActorClaims on the activity log entry instead.") } """ @@ -21795,6 +22339,9 @@ type ApplicationUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -21856,10 +22403,11 @@ type GenericKubernetesResourceActivityLogEntryData { changedFields: [ResourceChangedField!]! "GitHub Actions OIDC token claims at the time of the apply. Only present when the request was authenticated via a GitHub token." gitHubActorClaims: GitHubActorClaims + @deprecated(reason: "Use gitHubActorClaims on the activity log entry instead.") } """ -GitHub Actions OIDC token claims captured at the time of an apply operation. +GitHub Actions OIDC token claims captured when an activity log entry is created. See https://docs.github.com/en/actions/reference/security/oidc#custom-claims-provided-by-github """ type GitHubActorClaims { @@ -21934,6 +22482,9 @@ type GenericKubernetesResourceActivityLogEntry implements ActivityLogEntry & Nod "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -22349,6 +22900,9 @@ type ClusterAuditActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -22818,6 +23372,9 @@ type ConfigCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -22844,6 +23401,9 @@ type ConfigUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -22889,6 +23449,9 @@ type ConfigDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -23501,6 +24064,9 @@ type TeamDeployKeyUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -23529,6 +24095,9 @@ type DeploymentActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -24931,6 +25500,9 @@ type JobDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -24957,6 +25529,9 @@ type JobTriggeredActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -25002,6 +25577,9 @@ type JobRunDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -25036,6 +25614,9 @@ type JobCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -25068,6 +25649,9 @@ type JobUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -25098,6 +25682,7 @@ type JobUpdatedActivityLogEntryData { changedFields: [ResourceChangedField!]! "GitHub Actions OIDC token claims at the time of the apply. Only present when the request was authenticated via a GitHub token." gitHubActorClaims: GitHubActorClaims + @deprecated(reason: "Use gitHubActorClaims on the activity log entry instead.") } extend enum ActivityLogActivityType { @@ -25426,6 +26011,9 @@ type KafkaCredentialsCreatedActivityLogEntry implements ActivityLogEntry & Node "The identity of the actor who performed the action." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -25460,6 +26048,9 @@ type KafkaTopicUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -26216,6 +26807,9 @@ type OpenSearchCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -26242,6 +26836,9 @@ type OpenSearchUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -26294,6 +26891,9 @@ type OpenSearchDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -26351,6 +26951,9 @@ type OpenSearchCredentialsCreatedActivityLogEntry implements ActivityLogEntry & "The identity of the actor who performed the action." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -26647,6 +27250,9 @@ type PostgresGrantAccessActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -26681,6 +27287,9 @@ type PostgresDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -26954,6 +27563,9 @@ type ReconcilerEnabledActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -26980,6 +27592,9 @@ type ReconcilerDisabledActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -27006,6 +27621,9 @@ type ReconcilerConfiguredActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -27178,6 +27796,9 @@ type RepositoryAddedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -27204,6 +27825,9 @@ type RepositoryRemovedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -27966,6 +28590,9 @@ type SecretCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -27992,6 +28619,9 @@ type SecretUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -28037,6 +28667,9 @@ type SecretValueAddedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -28071,6 +28704,9 @@ type SecretValueUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -28105,6 +28741,9 @@ type SecretValueRemovedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -28139,6 +28778,9 @@ type SecretDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -28185,6 +28827,9 @@ type SecretValuesViewedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -28396,6 +29041,9 @@ type ServiceAccountWorkloadBindingAddedActivityLogEntry implements ActivityLogEn """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -28460,6 +29108,9 @@ type ServiceAccountWorkloadBindingRemovedActivityLogEntry implements ActivityLog """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -29069,6 +29720,9 @@ type ServiceAccountCreatedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -29111,6 +29765,9 @@ type ServiceAccountUpdatedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -29182,6 +29839,9 @@ type ServiceAccountDeletedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -29224,6 +29884,9 @@ type RoleAssignedToServiceAccountActivityLogEntry implements ActivityLogEntry & """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -29278,6 +29941,9 @@ type RoleRevokedFromServiceAccountActivityLogEntry implements ActivityLogEntry & """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -29332,6 +29998,9 @@ type ServiceAccountTokenCreatedActivityLogEntry implements ActivityLogEntry & No """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -29386,6 +30055,9 @@ type ServiceAccountTokenUpdatedActivityLogEntry implements ActivityLogEntry & No """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -29462,6 +30134,9 @@ type ServiceAccountTokenDeletedActivityLogEntry implements ActivityLogEntry & No """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -29690,6 +30365,9 @@ type ServiceMaintenanceActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -30458,6 +31136,9 @@ type TeamCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -30484,6 +31165,9 @@ type TeamUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -30529,6 +31213,9 @@ type TeamCreateDeleteKeyActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -30555,6 +31242,9 @@ type TeamConfirmDeleteKeyActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -30581,6 +31271,9 @@ type TeamMemberAddedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -30621,6 +31314,9 @@ type TeamMemberRemovedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -30658,6 +31354,9 @@ type TeamMemberSetRoleActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -30698,6 +31397,9 @@ type TeamEnvironmentUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -30977,6 +31679,9 @@ type TunnelCreatedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -31036,6 +31741,9 @@ type TunnelDeletedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -31266,6 +31974,9 @@ type UnleashInstanceCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -31292,6 +32003,9 @@ type UnleashInstanceUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -31332,6 +32046,9 @@ type UnleashInstanceDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -32358,6 +33075,9 @@ type ValkeyCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -32384,6 +33104,9 @@ type ValkeyUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -32436,6 +33159,9 @@ type ValkeyDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -32493,6 +33219,9 @@ type ValkeyCredentialsCreatedActivityLogEntry implements ActivityLogEntry & Node "The identity of the actor who performed the action." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -33380,6 +34109,9 @@ type VulnerabilityUpdatedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ diff --git a/internal/graph/gengql/secret.generated.go b/internal/graph/gengql/secret.generated.go index 9caf66762..5fc522d9c 100644 --- a/internal/graph/gengql/secret.generated.go +++ b/internal/graph/gengql/secret.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" @@ -903,6 +904,38 @@ func (ec *executionContext) fieldContext_SecretCreatedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("SecretCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _SecretCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *secret.SecretCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_SecretCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_SecretCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "SecretCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _SecretCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *secret.SecretCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1087,6 +1120,38 @@ func (ec *executionContext) fieldContext_SecretDeletedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("SecretDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _SecretDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *secret.SecretDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_SecretDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_SecretDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "SecretDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _SecretDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *secret.SecretDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1422,6 +1487,38 @@ func (ec *executionContext) fieldContext_SecretUpdatedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("SecretUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _SecretUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *secret.SecretUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_SecretUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_SecretUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "SecretUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _SecretUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *secret.SecretUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1808,6 +1905,38 @@ func (ec *executionContext) fieldContext_SecretValueAddedActivityLogEntry_actor( return graphql.NewScalarFieldContext("SecretValueAddedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _SecretValueAddedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *secret.SecretValueAddedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_SecretValueAddedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_SecretValueAddedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "SecretValueAddedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _SecretValueAddedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *secret.SecretValueAddedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2047,6 +2176,38 @@ func (ec *executionContext) fieldContext_SecretValueRemovedActivityLogEntry_acto return graphql.NewScalarFieldContext("SecretValueRemovedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _SecretValueRemovedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *secret.SecretValueRemovedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_SecretValueRemovedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_SecretValueRemovedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "SecretValueRemovedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _SecretValueRemovedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *secret.SecretValueRemovedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2286,6 +2447,38 @@ func (ec *executionContext) fieldContext_SecretValueUpdatedActivityLogEntry_acto return graphql.NewScalarFieldContext("SecretValueUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _SecretValueUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *secret.SecretValueUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_SecretValueUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_SecretValueUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "SecretValueUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _SecretValueUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *secret.SecretValueUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2525,6 +2718,38 @@ func (ec *executionContext) fieldContext_SecretValuesViewedActivityLogEntry_acto return graphql.NewScalarFieldContext("SecretValuesViewedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _SecretValuesViewedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *secret.SecretValuesViewedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_SecretValuesViewedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_SecretValuesViewedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "SecretValuesViewedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _SecretValuesViewedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *secret.SecretValuesViewedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3880,6 +4105,8 @@ func (ec *executionContext) _SecretCreatedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._SecretCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._SecretCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -3951,6 +4178,8 @@ func (ec *executionContext) _SecretDeletedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._SecretDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._SecretDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4208,6 +4437,8 @@ func (ec *executionContext) _SecretUpdatedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._SecretUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._SecretUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4415,6 +4646,8 @@ func (ec *executionContext) _SecretValueAddedActivityLogEntry(ctx context.Contex if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._SecretValueAddedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._SecretValueAddedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4530,6 +4763,8 @@ func (ec *executionContext) _SecretValueRemovedActivityLogEntry(ctx context.Cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._SecretValueRemovedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._SecretValueRemovedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4645,6 +4880,8 @@ func (ec *executionContext) _SecretValueUpdatedActivityLogEntry(ctx context.Cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._SecretValueUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._SecretValueUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4760,6 +4997,8 @@ func (ec *executionContext) _SecretValuesViewedActivityLogEntry(ctx context.Cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._SecretValuesViewedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._SecretValuesViewedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/serviceaccount_workload_bindings.generated.go b/internal/graph/gengql/serviceaccount_workload_bindings.generated.go index 021dde1d4..62467a6c9 100644 --- a/internal/graph/gengql/serviceaccount_workload_bindings.generated.go +++ b/internal/graph/gengql/serviceaccount_workload_bindings.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/pagination" "github.com/nais/api/internal/serviceaccount" @@ -431,6 +432,38 @@ func (ec *executionContext) fieldContext_ServiceAccountWorkloadBindingAddedActiv return graphql.NewScalarFieldContext("ServiceAccountWorkloadBindingAddedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ServiceAccountWorkloadBindingAddedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountWorkloadBindingAddedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ServiceAccountWorkloadBindingAddedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ServiceAccountWorkloadBindingAddedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ServiceAccountWorkloadBindingAddedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ServiceAccountWorkloadBindingAddedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountWorkloadBindingAddedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -867,6 +900,38 @@ func (ec *executionContext) fieldContext_ServiceAccountWorkloadBindingRemovedAct return graphql.NewScalarFieldContext("ServiceAccountWorkloadBindingRemovedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ServiceAccountWorkloadBindingRemovedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountWorkloadBindingRemovedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ServiceAccountWorkloadBindingRemovedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ServiceAccountWorkloadBindingRemovedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ServiceAccountWorkloadBindingRemovedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ServiceAccountWorkloadBindingRemovedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountWorkloadBindingRemovedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1462,6 +1527,8 @@ func (ec *executionContext) _ServiceAccountWorkloadBindingAddedActivityLogEntry( if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ServiceAccountWorkloadBindingAddedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ServiceAccountWorkloadBindingAddedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -1674,6 +1741,8 @@ func (ec *executionContext) _ServiceAccountWorkloadBindingRemovedActivityLogEntr if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ServiceAccountWorkloadBindingRemovedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ServiceAccountWorkloadBindingRemovedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/serviceaccounts.generated.go b/internal/graph/gengql/serviceaccounts.generated.go index 12f8bc26b..77ca34291 100644 --- a/internal/graph/gengql/serviceaccounts.generated.go +++ b/internal/graph/gengql/serviceaccounts.generated.go @@ -13,6 +13,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" "github.com/nais/api/internal/auth/authz" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/pagination" "github.com/nais/api/internal/graph/scalar" @@ -512,6 +513,38 @@ func (ec *executionContext) fieldContext_RoleAssignedToServiceAccountActivityLog return graphql.NewScalarFieldContext("RoleAssignedToServiceAccountActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _RoleAssignedToServiceAccountActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.RoleAssignedToServiceAccountActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_RoleAssignedToServiceAccountActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_RoleAssignedToServiceAccountActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "RoleAssignedToServiceAccountActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _RoleAssignedToServiceAccountActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.RoleAssignedToServiceAccountActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -751,6 +784,38 @@ func (ec *executionContext) fieldContext_RoleRevokedFromServiceAccountActivityLo return graphql.NewScalarFieldContext("RoleRevokedFromServiceAccountActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _RoleRevokedFromServiceAccountActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.RoleRevokedFromServiceAccountActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_RoleRevokedFromServiceAccountActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_RoleRevokedFromServiceAccountActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "RoleRevokedFromServiceAccountActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _RoleRevokedFromServiceAccountActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.RoleRevokedFromServiceAccountActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1432,6 +1497,38 @@ func (ec *executionContext) fieldContext_ServiceAccountCreatedActivityLogEntry_a return graphql.NewScalarFieldContext("ServiceAccountCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ServiceAccountCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ServiceAccountCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ServiceAccountCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ServiceAccountCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ServiceAccountCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1616,6 +1713,38 @@ func (ec *executionContext) fieldContext_ServiceAccountDeletedActivityLogEntry_a return graphql.NewScalarFieldContext("ServiceAccountDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ServiceAccountDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ServiceAccountDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ServiceAccountDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ServiceAccountDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ServiceAccountDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2112,6 +2241,38 @@ func (ec *executionContext) fieldContext_ServiceAccountTokenCreatedActivityLogEn return graphql.NewScalarFieldContext("ServiceAccountTokenCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ServiceAccountTokenCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountTokenCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ServiceAccountTokenCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ServiceAccountTokenCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ServiceAccountTokenCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ServiceAccountTokenCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountTokenCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2351,6 +2512,38 @@ func (ec *executionContext) fieldContext_ServiceAccountTokenDeletedActivityLogEn return graphql.NewScalarFieldContext("ServiceAccountTokenDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ServiceAccountTokenDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountTokenDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ServiceAccountTokenDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ServiceAccountTokenDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ServiceAccountTokenDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ServiceAccountTokenDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountTokenDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2645,6 +2838,38 @@ func (ec *executionContext) fieldContext_ServiceAccountTokenUpdatedActivityLogEn return graphql.NewScalarFieldContext("ServiceAccountTokenUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ServiceAccountTokenUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountTokenUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ServiceAccountTokenUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ServiceAccountTokenUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ServiceAccountTokenUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ServiceAccountTokenUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountTokenUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2985,6 +3210,38 @@ func (ec *executionContext) fieldContext_ServiceAccountUpdatedActivityLogEntry_a return graphql.NewScalarFieldContext("ServiceAccountUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ServiceAccountUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ServiceAccountUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ServiceAccountUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ServiceAccountUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ServiceAccountUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *serviceaccount.ServiceAccountUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3917,6 +4174,8 @@ func (ec *executionContext) _RoleAssignedToServiceAccountActivityLogEntry(ctx co if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._RoleAssignedToServiceAccountActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._RoleAssignedToServiceAccountActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4029,6 +4288,8 @@ func (ec *executionContext) _RoleRevokedFromServiceAccountActivityLogEntry(ctx c if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._RoleRevokedFromServiceAccountActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._RoleRevokedFromServiceAccountActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4459,6 +4720,8 @@ func (ec *executionContext) _ServiceAccountCreatedActivityLogEntry(ctx context.C if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ServiceAccountCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ServiceAccountCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4527,6 +4790,8 @@ func (ec *executionContext) _ServiceAccountDeletedActivityLogEntry(ctx context.C if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ServiceAccountDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ServiceAccountDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4751,6 +5016,8 @@ func (ec *executionContext) _ServiceAccountTokenCreatedActivityLogEntry(ctx cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ServiceAccountTokenCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ServiceAccountTokenCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4863,6 +5130,8 @@ func (ec *executionContext) _ServiceAccountTokenDeletedActivityLogEntry(ctx cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ServiceAccountTokenDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ServiceAccountTokenDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -5019,6 +5288,8 @@ func (ec *executionContext) _ServiceAccountTokenUpdatedActivityLogEntry(ctx cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ServiceAccountTokenUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ServiceAccountTokenUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -5176,6 +5447,8 @@ func (ec *executionContext) _ServiceAccountUpdatedActivityLogEntry(ctx context.C if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ServiceAccountUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ServiceAccountUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/servicemaintenance.generated.go b/internal/graph/gengql/servicemaintenance.generated.go index e70268bf8..6e008f316 100644 --- a/internal/graph/gengql/servicemaintenance.generated.go +++ b/internal/graph/gengql/servicemaintenance.generated.go @@ -13,6 +13,7 @@ import ( "github.com/99designs/gqlgen/graphql" activitylog1 "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" "github.com/nais/api/internal/graph/pagination" @@ -532,6 +533,38 @@ func (ec *executionContext) fieldContext_ServiceMaintenanceActivityLogEntry_acto return graphql.NewScalarFieldContext("ServiceMaintenanceActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ServiceMaintenanceActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *activitylog.ServiceMaintenanceActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ServiceMaintenanceActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ServiceMaintenanceActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ServiceMaintenanceActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ServiceMaintenanceActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *activitylog.ServiceMaintenanceActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1471,6 +1504,8 @@ func (ec *executionContext) _ServiceMaintenanceActivityLogEntry(ctx context.Cont if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ServiceMaintenanceActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ServiceMaintenanceActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/teams.generated.go b/internal/graph/gengql/teams.generated.go index 0480e03c0..093689558 100644 --- a/internal/graph/gengql/teams.generated.go +++ b/internal/graph/gengql/teams.generated.go @@ -13,6 +13,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" "github.com/nais/api/internal/alerts" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/cost" "github.com/nais/api/internal/deployment" "github.com/nais/api/internal/environment" @@ -3390,6 +3391,38 @@ func (ec *executionContext) fieldContext_TeamConfirmDeleteKeyActivityLogEntry_ac return graphql.NewScalarFieldContext("TeamConfirmDeleteKeyActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TeamConfirmDeleteKeyActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *team.TeamConfirmDeleteKeyActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TeamConfirmDeleteKeyActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TeamConfirmDeleteKeyActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TeamConfirmDeleteKeyActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TeamConfirmDeleteKeyActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *team.TeamConfirmDeleteKeyActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3670,6 +3703,38 @@ func (ec *executionContext) fieldContext_TeamCreateDeleteKeyActivityLogEntry_act return graphql.NewScalarFieldContext("TeamCreateDeleteKeyActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TeamCreateDeleteKeyActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *team.TeamCreateDeleteKeyActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TeamCreateDeleteKeyActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TeamCreateDeleteKeyActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TeamCreateDeleteKeyActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TeamCreateDeleteKeyActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *team.TeamCreateDeleteKeyActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3854,6 +3919,38 @@ func (ec *executionContext) fieldContext_TeamCreatedActivityLogEntry_actor(_ con return graphql.NewScalarFieldContext("TeamCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TeamCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *team.TeamCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TeamCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TeamCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TeamCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TeamCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *team.TeamCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -5053,6 +5150,38 @@ func (ec *executionContext) fieldContext_TeamEnvironmentUpdatedActivityLogEntry_ return graphql.NewScalarFieldContext("TeamEnvironmentUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TeamEnvironmentUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *team.TeamEnvironmentUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TeamEnvironmentUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TeamEnvironmentUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TeamEnvironmentUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TeamEnvironmentUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *team.TeamEnvironmentUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -6038,6 +6167,38 @@ func (ec *executionContext) fieldContext_TeamMemberAddedActivityLogEntry_actor(_ return graphql.NewScalarFieldContext("TeamMemberAddedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TeamMemberAddedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *team.TeamMemberAddedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TeamMemberAddedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TeamMemberAddedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TeamMemberAddedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TeamMemberAddedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *team.TeamMemberAddedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -6474,6 +6635,38 @@ func (ec *executionContext) fieldContext_TeamMemberRemovedActivityLogEntry_actor return graphql.NewScalarFieldContext("TeamMemberRemovedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TeamMemberRemovedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *team.TeamMemberRemovedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TeamMemberRemovedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TeamMemberRemovedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TeamMemberRemovedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TeamMemberRemovedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *team.TeamMemberRemovedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -6736,6 +6929,38 @@ func (ec *executionContext) fieldContext_TeamMemberSetRoleActivityLogEntry_actor return graphql.NewScalarFieldContext("TeamMemberSetRoleActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TeamMemberSetRoleActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *team.TeamMemberSetRoleActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TeamMemberSetRoleActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TeamMemberSetRoleActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TeamMemberSetRoleActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TeamMemberSetRoleActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *team.TeamMemberSetRoleActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -7021,6 +7246,38 @@ func (ec *executionContext) fieldContext_TeamUpdatedActivityLogEntry_actor(_ con return graphql.NewScalarFieldContext("TeamUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TeamUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *team.TeamUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TeamUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TeamUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TeamUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TeamUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *team.TeamUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -9488,6 +9745,8 @@ func (ec *executionContext) _TeamConfirmDeleteKeyActivityLogEntry(ctx context.Co if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TeamConfirmDeleteKeyActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TeamConfirmDeleteKeyActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -9608,6 +9867,8 @@ func (ec *executionContext) _TeamCreateDeleteKeyActivityLogEntry(ctx context.Con if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TeamCreateDeleteKeyActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TeamCreateDeleteKeyActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -9679,6 +9940,8 @@ func (ec *executionContext) _TeamCreatedActivityLogEntry(ctx context.Context, se if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TeamCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TeamCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -10614,6 +10877,8 @@ func (ec *executionContext) _TeamEnvironmentUpdatedActivityLogEntry(ctx context. if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TeamEnvironmentUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TeamEnvironmentUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -11474,6 +11739,8 @@ func (ec *executionContext) _TeamMemberAddedActivityLogEntry(ctx context.Context if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TeamMemberAddedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TeamMemberAddedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -11692,6 +11959,8 @@ func (ec *executionContext) _TeamMemberRemovedActivityLogEntry(ctx context.Conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TeamMemberRemovedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TeamMemberRemovedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -11812,6 +12081,8 @@ func (ec *executionContext) _TeamMemberSetRoleActivityLogEntry(ctx context.Conte if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TeamMemberSetRoleActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TeamMemberSetRoleActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -11937,6 +12208,8 @@ func (ec *executionContext) _TeamUpdatedActivityLogEntry(ctx context.Context, se if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TeamUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TeamUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/tunnel.generated.go b/internal/graph/gengql/tunnel.generated.go index dc1795c78..9c0ce7d8b 100644 --- a/internal/graph/gengql/tunnel.generated.go +++ b/internal/graph/gengql/tunnel.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/slug" "github.com/nais/api/internal/tunnel" @@ -326,6 +327,38 @@ func (ec *executionContext) fieldContext_TunnelCreatedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("TunnelCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TunnelCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *tunnel.TunnelCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TunnelCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TunnelCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TunnelCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TunnelCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *tunnel.TunnelCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -588,6 +621,38 @@ func (ec *executionContext) fieldContext_TunnelDeletedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("TunnelDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _TunnelDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *tunnel.TunnelDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_TunnelDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_TunnelDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "TunnelDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _TunnelDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *tunnel.TunnelDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1114,6 +1179,8 @@ func (ec *executionContext) _TunnelCreatedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TunnelCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TunnelCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -1231,6 +1298,8 @@ func (ec *executionContext) _TunnelDeletedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._TunnelDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._TunnelDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/unleash.generated.go b/internal/graph/gengql/unleash.generated.go index ef71b90ea..a1a93f2a5 100644 --- a/internal/graph/gengql/unleash.generated.go +++ b/internal/graph/gengql/unleash.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/pagination" "github.com/nais/api/internal/slug" @@ -517,6 +518,38 @@ func (ec *executionContext) fieldContext_UnleashInstanceCreatedActivityLogEntry_ return graphql.NewScalarFieldContext("UnleashInstanceCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _UnleashInstanceCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *unleash.UnleashInstanceCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_UnleashInstanceCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_UnleashInstanceCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "UnleashInstanceCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _UnleashInstanceCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *unleash.UnleashInstanceCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -701,6 +734,38 @@ func (ec *executionContext) fieldContext_UnleashInstanceDeletedActivityLogEntry_ return graphql.NewScalarFieldContext("UnleashInstanceDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _UnleashInstanceDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *unleash.UnleashInstanceDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_UnleashInstanceDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_UnleashInstanceDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "UnleashInstanceDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _UnleashInstanceDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *unleash.UnleashInstanceDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1023,6 +1088,38 @@ func (ec *executionContext) fieldContext_UnleashInstanceUpdatedActivityLogEntry_ return graphql.NewScalarFieldContext("UnleashInstanceUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _UnleashInstanceUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *unleash.UnleashInstanceUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_UnleashInstanceUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_UnleashInstanceUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "UnleashInstanceUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _UnleashInstanceUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *unleash.UnleashInstanceUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1884,6 +1981,8 @@ func (ec *executionContext) _UnleashInstanceCreatedActivityLogEntry(ctx context. if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._UnleashInstanceCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._UnleashInstanceCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -1955,6 +2054,8 @@ func (ec *executionContext) _UnleashInstanceDeletedActivityLogEntry(ctx context. if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._UnleashInstanceDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._UnleashInstanceDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -2214,6 +2315,8 @@ func (ec *executionContext) _UnleashInstanceUpdatedActivityLogEntry(ctx context. if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._UnleashInstanceUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._UnleashInstanceUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/valkey.generated.go b/internal/graph/gengql/valkey.generated.go index 1e3eab3b2..76f44e743 100644 --- a/internal/graph/gengql/valkey.generated.go +++ b/internal/graph/gengql/valkey.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/cost" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/model" @@ -1315,6 +1316,38 @@ func (ec *executionContext) fieldContext_ValkeyCreatedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("ValkeyCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ValkeyCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *valkey.ValkeyCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ValkeyCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ValkeyCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ValkeyCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ValkeyCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *valkey.ValkeyCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1614,6 +1647,38 @@ func (ec *executionContext) fieldContext_ValkeyCredentialsCreatedActivityLogEntr return graphql.NewScalarFieldContext("ValkeyCredentialsCreatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ValkeyCredentialsCreatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *valkey.ValkeyCredentialsCreatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ValkeyCredentialsCreatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ValkeyCredentialsCreatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ValkeyCredentialsCreatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ValkeyCredentialsCreatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *valkey.ValkeyCredentialsCreatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -1876,6 +1941,38 @@ func (ec *executionContext) fieldContext_ValkeyDeletedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("ValkeyDeletedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ValkeyDeletedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *valkey.ValkeyDeletedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ValkeyDeletedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ValkeyDeletedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ValkeyDeletedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ValkeyDeletedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *valkey.ValkeyDeletedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -2257,6 +2354,38 @@ func (ec *executionContext) fieldContext_ValkeyUpdatedActivityLogEntry_actor(_ c return graphql.NewScalarFieldContext("ValkeyUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _ValkeyUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *valkey.ValkeyUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_ValkeyUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_ValkeyUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "ValkeyUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _ValkeyUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *valkey.ValkeyUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -3908,6 +4037,8 @@ func (ec *executionContext) _ValkeyCreatedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ValkeyCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ValkeyCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4038,6 +4169,8 @@ func (ec *executionContext) _ValkeyCredentialsCreatedActivityLogEntry(ctx contex if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ValkeyCredentialsCreatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ValkeyCredentialsCreatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4155,6 +4288,8 @@ func (ec *executionContext) _ValkeyDeletedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ValkeyDeletedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ValkeyDeletedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { @@ -4456,6 +4591,8 @@ func (ec *executionContext) _ValkeyUpdatedActivityLogEntry(ctx context.Context, if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._ValkeyUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._ValkeyUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/gengql/vulnerability.generated.go b/internal/graph/gengql/vulnerability.generated.go index 184b1cb9a..606f6b577 100644 --- a/internal/graph/gengql/vulnerability.generated.go +++ b/internal/graph/gengql/vulnerability.generated.go @@ -12,6 +12,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/nais/api/internal/activitylog" + "github.com/nais/api/internal/auth/middleware/github" "github.com/nais/api/internal/graph/ident" "github.com/nais/api/internal/graph/pagination" "github.com/nais/api/internal/slug" @@ -2905,6 +2906,38 @@ func (ec *executionContext) fieldContext_VulnerabilityUpdatedActivityLogEntry_ac return graphql.NewScalarFieldContext("VulnerabilityUpdatedActivityLogEntry", field, false, false, errors.New("field of type String does not have child fields")) } +func (ec *executionContext) _VulnerabilityUpdatedActivityLogEntry_gitHubActorClaims(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityUpdatedActivityLogEntry) (ret graphql.Marshaler) { + return graphql.ResolveField( + ctx, + ec.OperationContext, + field, + func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.fieldContext_VulnerabilityUpdatedActivityLogEntry_gitHubActorClaims(ctx, field) + }, + func(ctx context.Context) (any, error) { + return obj.GitHubActorClaims, nil + }, + nil, + func(ctx context.Context, selections ast.SelectionSet, v *github.GitHubActorClaims) graphql.Marshaler { + return ec.marshalOGitHubActorClaims2ᚖgithubᚗcomᚋnaisᚋapiᚋinternalᚋauthᚋmiddlewareᚋgithubᚐGitHubActorClaims(ctx, selections, v) + }, + true, + false, + ) +} +func (ec *executionContext) fieldContext_VulnerabilityUpdatedActivityLogEntry_gitHubActorClaims(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "VulnerabilityUpdatedActivityLogEntry", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return ec.childFields_GitHubActorClaims(ctx, field) + }, + } + return fc, nil +} + func (ec *executionContext) _VulnerabilityUpdatedActivityLogEntry_createdAt(ctx context.Context, field graphql.CollectedField, obj *vulnerability.VulnerabilityUpdatedActivityLogEntry) (ret graphql.Marshaler) { return graphql.ResolveField( ctx, @@ -5264,6 +5297,8 @@ func (ec *executionContext) _VulnerabilityUpdatedActivityLogEntry(ctx context.Co if out.Values[i] == graphql.Null { out.Invalids++ } + case "gitHubActorClaims": + out.Values[i] = ec._VulnerabilityUpdatedActivityLogEntry_gitHubActorClaims(ctx, field, obj) case "createdAt": out.Values[i] = ec._VulnerabilityUpdatedActivityLogEntry_createdAt(ctx, field, obj) if out.Values[i] == graphql.Null { diff --git a/internal/graph/schema/activitylog.graphqls b/internal/graph/schema/activitylog.graphqls index 55c7f5c79..a5e147736 100644 --- a/internal/graph/schema/activitylog.graphqls +++ b/internal/graph/schema/activitylog.graphqls @@ -268,6 +268,9 @@ interface ActivityLogEntry implements Node { """ actor: String! + "GitHub Actions OIDC claims captured when the action was authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ diff --git a/internal/graph/schema/applications.graphqls b/internal/graph/schema/applications.graphqls index 25d1a010f..777e23807 100644 --- a/internal/graph/schema/applications.graphqls +++ b/internal/graph/schema/applications.graphqls @@ -742,6 +742,9 @@ type ApplicationDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -768,6 +771,9 @@ type ApplicationRestartedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -796,6 +802,9 @@ type ApplicationScaledActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -842,6 +851,9 @@ type ApplicationCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -872,6 +884,7 @@ type ApplicationUpdatedActivityLogEntryData { changedFields: [ResourceChangedField!]! "GitHub Actions OIDC token claims at the time of the apply. Only present when the request was authenticated via a GitHub token." gitHubActorClaims: GitHubActorClaims + @deprecated(reason: "Use gitHubActorClaims on the activity log entry instead.") } """ @@ -884,6 +897,9 @@ type ApplicationUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/apply.graphqls b/internal/graph/schema/apply.graphqls index e746cd1e8..62ec3d627 100644 --- a/internal/graph/schema/apply.graphqls +++ b/internal/graph/schema/apply.graphqls @@ -15,10 +15,11 @@ type GenericKubernetesResourceActivityLogEntryData { changedFields: [ResourceChangedField!]! "GitHub Actions OIDC token claims at the time of the apply. Only present when the request was authenticated via a GitHub token." gitHubActorClaims: GitHubActorClaims + @deprecated(reason: "Use gitHubActorClaims on the activity log entry instead.") } """ -GitHub Actions OIDC token claims captured at the time of an apply operation. +GitHub Actions OIDC token claims captured when an activity log entry is created. See https://docs.github.com/en/actions/reference/security/oidc#custom-claims-provided-by-github """ type GitHubActorClaims { @@ -93,6 +94,9 @@ type GenericKubernetesResourceActivityLogEntry implements ActivityLogEntry & Nod "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/cluster.graphqls b/internal/graph/schema/cluster.graphqls index fa9c42283..465238c66 100644 --- a/internal/graph/schema/cluster.graphqls +++ b/internal/graph/schema/cluster.graphqls @@ -15,6 +15,9 @@ type ClusterAuditActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/config.graphqls b/internal/graph/schema/config.graphqls index b34f9a0d6..b30a699bd 100644 --- a/internal/graph/schema/config.graphqls +++ b/internal/graph/schema/config.graphqls @@ -438,6 +438,9 @@ type ConfigCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -464,6 +467,9 @@ type ConfigUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -509,6 +515,9 @@ type ConfigDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/deployment.graphqls b/internal/graph/schema/deployment.graphqls index 0816a6685..bf63282a9 100644 --- a/internal/graph/schema/deployment.graphqls +++ b/internal/graph/schema/deployment.graphqls @@ -378,6 +378,9 @@ type TeamDeployKeyUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -406,6 +409,9 @@ type DeploymentActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/jobs.graphqls b/internal/graph/schema/jobs.graphqls index ea70381cd..91a66bc71 100644 --- a/internal/graph/schema/jobs.graphqls +++ b/internal/graph/schema/jobs.graphqls @@ -496,6 +496,9 @@ type JobDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -522,6 +525,9 @@ type JobTriggeredActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -567,6 +573,9 @@ type JobRunDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -601,6 +610,9 @@ type JobCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -633,6 +645,9 @@ type JobUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -663,6 +678,7 @@ type JobUpdatedActivityLogEntryData { changedFields: [ResourceChangedField!]! "GitHub Actions OIDC token claims at the time of the apply. Only present when the request was authenticated via a GitHub token." gitHubActorClaims: GitHubActorClaims + @deprecated(reason: "Use gitHubActorClaims on the activity log entry instead.") } extend enum ActivityLogActivityType { diff --git a/internal/graph/schema/kafka.graphqls b/internal/graph/schema/kafka.graphqls index 55acd2746..99a56e685 100644 --- a/internal/graph/schema/kafka.graphqls +++ b/internal/graph/schema/kafka.graphqls @@ -278,6 +278,9 @@ type KafkaCredentialsCreatedActivityLogEntry implements ActivityLogEntry & Node "The identity of the actor who performed the action." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -312,6 +315,9 @@ type KafkaTopicUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/opensearch.graphqls b/internal/graph/schema/opensearch.graphqls index 4aba769ec..d93cf80a2 100644 --- a/internal/graph/schema/opensearch.graphqls +++ b/internal/graph/schema/opensearch.graphqls @@ -374,6 +374,9 @@ type OpenSearchCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -400,6 +403,9 @@ type OpenSearchUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -452,6 +458,9 @@ type OpenSearchDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -509,6 +518,9 @@ type OpenSearchCredentialsCreatedActivityLogEntry implements ActivityLogEntry & "The identity of the actor who performed the action." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/postgres.graphqls b/internal/graph/schema/postgres.graphqls index 1e9c5ceec..07b96706a 100644 --- a/internal/graph/schema/postgres.graphqls +++ b/internal/graph/schema/postgres.graphqls @@ -212,6 +212,9 @@ type PostgresGrantAccessActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -246,6 +249,9 @@ type PostgresDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/reconcilers.graphqls b/internal/graph/schema/reconcilers.graphqls index 3d471e5c4..fbfbbc3ef 100644 --- a/internal/graph/schema/reconcilers.graphqls +++ b/internal/graph/schema/reconcilers.graphqls @@ -180,6 +180,9 @@ type ReconcilerEnabledActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -206,6 +209,9 @@ type ReconcilerDisabledActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -232,6 +238,9 @@ type ReconcilerConfiguredActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/repository.graphqls b/internal/graph/schema/repository.graphqls index 02a7c75be..d128c1e2b 100644 --- a/internal/graph/schema/repository.graphqls +++ b/internal/graph/schema/repository.graphqls @@ -114,6 +114,9 @@ type RepositoryAddedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -140,6 +143,9 @@ type RepositoryRemovedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/secret.graphqls b/internal/graph/schema/secret.graphqls index b4ac5c832..7b149a847 100644 --- a/internal/graph/schema/secret.graphqls +++ b/internal/graph/schema/secret.graphqls @@ -460,6 +460,9 @@ type SecretCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -486,6 +489,9 @@ type SecretUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -531,6 +537,9 @@ type SecretValueAddedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -565,6 +574,9 @@ type SecretValueUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -599,6 +611,9 @@ type SecretValueRemovedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -633,6 +648,9 @@ type SecretDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -679,6 +697,9 @@ type SecretValuesViewedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/serviceaccount_workload_bindings.graphqls b/internal/graph/schema/serviceaccount_workload_bindings.graphqls index db6728e15..5cbe2c9b8 100644 --- a/internal/graph/schema/serviceaccount_workload_bindings.graphqls +++ b/internal/graph/schema/serviceaccount_workload_bindings.graphqls @@ -179,6 +179,9 @@ type ServiceAccountWorkloadBindingAddedActivityLogEntry implements ActivityLogEn """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -243,6 +246,9 @@ type ServiceAccountWorkloadBindingRemovedActivityLogEntry implements ActivityLog """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ diff --git a/internal/graph/schema/serviceaccounts.graphqls b/internal/graph/schema/serviceaccounts.graphqls index bc0b2e8be..23602f0c4 100644 --- a/internal/graph/schema/serviceaccounts.graphqls +++ b/internal/graph/schema/serviceaccounts.graphqls @@ -547,6 +547,9 @@ type ServiceAccountCreatedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -589,6 +592,9 @@ type ServiceAccountUpdatedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -660,6 +666,9 @@ type ServiceAccountDeletedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -702,6 +711,9 @@ type RoleAssignedToServiceAccountActivityLogEntry implements ActivityLogEntry & """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -756,6 +768,9 @@ type RoleRevokedFromServiceAccountActivityLogEntry implements ActivityLogEntry & """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -810,6 +825,9 @@ type ServiceAccountTokenCreatedActivityLogEntry implements ActivityLogEntry & No """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -864,6 +882,9 @@ type ServiceAccountTokenUpdatedActivityLogEntry implements ActivityLogEntry & No """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -940,6 +961,9 @@ type ServiceAccountTokenDeletedActivityLogEntry implements ActivityLogEntry & No """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ diff --git a/internal/graph/schema/servicemaintenance.graphqls b/internal/graph/schema/servicemaintenance.graphqls index 0f5feb705..ae0015094 100644 --- a/internal/graph/schema/servicemaintenance.graphqls +++ b/internal/graph/schema/servicemaintenance.graphqls @@ -164,6 +164,9 @@ type ServiceMaintenanceActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/teams.graphqls b/internal/graph/schema/teams.graphqls index d57795bee..68bf4d91f 100644 --- a/internal/graph/schema/teams.graphqls +++ b/internal/graph/schema/teams.graphqls @@ -453,6 +453,9 @@ type TeamCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -479,6 +482,9 @@ type TeamUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -524,6 +530,9 @@ type TeamCreateDeleteKeyActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -550,6 +559,9 @@ type TeamConfirmDeleteKeyActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -576,6 +588,9 @@ type TeamMemberAddedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -616,6 +631,9 @@ type TeamMemberRemovedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -653,6 +671,9 @@ type TeamMemberSetRoleActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -693,6 +714,9 @@ type TeamEnvironmentUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/tunnel.graphqls b/internal/graph/schema/tunnel.graphqls index c26a8df56..979f23c72 100644 --- a/internal/graph/schema/tunnel.graphqls +++ b/internal/graph/schema/tunnel.graphqls @@ -168,6 +168,9 @@ type TunnelCreatedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ @@ -227,6 +230,9 @@ type TunnelDeletedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ diff --git a/internal/graph/schema/unleash.graphqls b/internal/graph/schema/unleash.graphqls index e803c4447..3a6eebd49 100644 --- a/internal/graph/schema/unleash.graphqls +++ b/internal/graph/schema/unleash.graphqls @@ -185,6 +185,9 @@ type UnleashInstanceCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -211,6 +214,9 @@ type UnleashInstanceUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -251,6 +257,9 @@ type UnleashInstanceDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/valkey.graphqls b/internal/graph/schema/valkey.graphqls index 4d1280922..0277dd45d 100644 --- a/internal/graph/schema/valkey.graphqls +++ b/internal/graph/schema/valkey.graphqls @@ -398,6 +398,9 @@ type ValkeyCreatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -424,6 +427,9 @@ type ValkeyUpdatedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -476,6 +482,9 @@ type ValkeyDeletedActivityLogEntry implements ActivityLogEntry & Node { "The identity of the actor who performed the action. The value is either the name of a service account, or the email address of a user." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! @@ -533,6 +542,9 @@ type ValkeyCredentialsCreatedActivityLogEntry implements ActivityLogEntry & Node "The identity of the actor who performed the action." actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + "Creation time of the entry." createdAt: Time! diff --git a/internal/graph/schema/vulnerability.graphqls b/internal/graph/schema/vulnerability.graphqls index cb85562c3..e7f244b2a 100644 --- a/internal/graph/schema/vulnerability.graphqls +++ b/internal/graph/schema/vulnerability.graphqls @@ -851,6 +851,9 @@ type VulnerabilityUpdatedActivityLogEntry implements ActivityLogEntry & Node { """ actor: String! + "GitHub Actions OIDC claims when authenticated by a GitHub repository." + gitHubActorClaims: GitHubActorClaims + """ Creation time of the entry. """ diff --git a/internal/workload/application/activitylog.go b/internal/workload/application/activitylog.go index 3c2f22156..841a402c6 100644 --- a/internal/workload/application/activitylog.go +++ b/internal/workload/application/activitylog.go @@ -62,6 +62,7 @@ func init() { if err != nil { return nil, fmt.Errorf("transforming application created activity log entry data: %w", err) } + data.GitHubActorClaims = entry.GitHubActorClaims return ApplicationCreatedActivityLogEntry{ GenericActivityLogEntry: entry.WithMessage(fmt.Sprintf("Application %s created", entry.ResourceName)), Data: data, @@ -71,6 +72,7 @@ func init() { if err != nil { return nil, fmt.Errorf("transforming application updated activity log entry data: %w", err) } + data.GitHubActorClaims = entry.GitHubActorClaims return ApplicationUpdatedActivityLogEntry{ GenericActivityLogEntry: entry.WithMessage(fmt.Sprintf("Application %s updated", entry.ResourceName)), Data: data, @@ -121,5 +123,5 @@ type ApplicationUpdatedActivityLogEntry struct { type ApplicationUpdatedActivityLogEntryData struct { ChangedFields []*activitylog.ResourceChangedField `json:"changedFields"` - GitHubActorClaims *github.GitHubActorClaims `json:"gitHubActorClaims,omitempty"` + GitHubActorClaims *github.GitHubActorClaims `json:"-"` } diff --git a/internal/workload/job/activitylog.go b/internal/workload/job/activitylog.go index fb8cdfaee..b9aad7e0d 100644 --- a/internal/workload/job/activitylog.go +++ b/internal/workload/job/activitylog.go @@ -59,6 +59,7 @@ func init() { if err != nil { return nil, fmt.Errorf("transforming job created activity log entry data: %w", err) } + data.GitHubActorClaims = entry.GitHubActorClaims return JobCreatedActivityLogEntry{ GenericActivityLogEntry: entry.WithMessage(fmt.Sprintf("Job %s created", entry.ResourceName)), Data: data, @@ -68,6 +69,7 @@ func init() { if err != nil { return nil, fmt.Errorf("transforming job updated activity log entry data: %w", err) } + data.GitHubActorClaims = entry.GitHubActorClaims return JobUpdatedActivityLogEntry{ GenericActivityLogEntry: entry.WithMessage(fmt.Sprintf("Job %s updated", entry.ResourceName)), Data: data, @@ -116,5 +118,5 @@ type JobUpdatedActivityLogEntry struct { type JobUpdatedActivityLogEntryData struct { ChangedFields []*activitylog.ResourceChangedField `json:"changedFields"` - GitHubActorClaims *github.GitHubActorClaims `json:"gitHubActorClaims,omitempty"` + GitHubActorClaims *github.GitHubActorClaims `json:"-"` }