Skip to content

Revert "feat: Fetch service account OIDC data (#402)" #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bec-callow-oct merged 1 commit into from
Feb 26, 2026
Merged

Revert "feat: Fetch service account OIDC data (#402)" #404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 2 additions & 34 deletions pkg/serviceaccounts/oidc_identities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import (
)

type OIDCIdentityQuery struct {
ServiceAccountId string `uri:"serviceAccountId" url:"serviceAccountId"`
Skip int `uri:"skip" url:"skip"`
Take int `uri:"take" url:"take"`
Skip int `uri:"skip,omitempty" url:"skip,omitempty"`
Take int `uri:"take,omitempty" url:"take,omitempty"`
}

type OIDCIdentity struct {
Expand All @@ -23,13 +22,6 @@ type OIDCIdentity struct {
resources.Resource
}

type ServiceAccountOIDCIdentitiesResponse struct {
ServerUrl string `json:"ServerUrl"`
ExternalId string `json:"ExternalId"`
OidcIdentities []*OIDCIdentity `json:"OidcIdentities"`
Count int `json:"Count"`
}

// NewOIDCIdentity initializes a Service Account with required fields.
func NewOIDCIdentity(serviceAccountID string, name string, issuer string, subject string) *OIDCIdentity {
return &OIDCIdentity{
Expand Down Expand Up @@ -85,30 +77,6 @@ func GetOIDCIdentities(client newclient.Client, query OIDCIdentityQuery) (*resou
return res, nil
}

// GetServiceAccountOIDCData queries the service account and identities for the provided service account ID
func GetServiceAccountOIDCData(client newclient.Client, query OIDCIdentityQuery) (*ServiceAccountOIDCIdentitiesResponse, error) {
if internal.IsEmpty(query.ServiceAccountId) {
return nil, internal.CreateInvalidParameterError("GetServiceAccountOIDCData", "query.ServiceAccountId")
}

values, _ := uritemplates.Struct2map(query)
if values == nil {
values = map[string]any{}
}

path, err := client.URITemplateCache().Expand(serviceAccountOIDCIDQueryTemplate, values)
if err != nil {
return nil, err
}

res, err := newclient.Get[ServiceAccountOIDCIdentitiesResponse](client.HttpSession(), path)
if err != nil {
return nil, err
}

return res, nil
}

// GetOIDCIdentityByID queries OIDC identities by ID for the provided service account ID
func GetOIDCIdentityByID(client newclient.Client, serviceAccountID string, ID string) (*OIDCIdentity, error) {
path, err := client.URITemplateCache().Expand(serviceAccountOIDC, map[string]any{
Expand Down
Loading