Skip to content

Commit

Permalink
fix: return count for new api endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
@iljaSL
iljaSL committed Jun 20, 2024
1 parent a2e1e5e commit 309fed0
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 43 deletions.
24 changes: 12 additions & 12 deletions api/authorizer/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,65 +482,65 @@ func (auth *Client) GetCertByID(ID string) (ApiCertificateObject, error) {

// MARK: Secrets
// AccountSecrets lists all account secrets
func (auth *Client) AccountSecrets(limit int, sortdir string) ([]AccountSecrets, error) {
func (auth *Client) AccountSecrets(limit int, sortdir string) (AccountSecretsResult, error) {
filters := Params{
Limit: limit,
Sortdir: sortdir,
}
result := accountSecretsResult{}
result := AccountSecretsResult{}

_, err := auth.api.
URL("/authorizer/api/v1/secrets").
Query(&filters).
Get(&result)

return result.Items, err
return result, err
}

// SearchAccountSecrets search for account secrets
func (auth *Client) SearchAccountSecrets(limit int, sortdir string, search *AccountSecretsSearchRequest) ([]AccountSecrets, error) {
func (auth *Client) SearchAccountSecrets(limit int, sortdir string, search *AccountSecretsSearchRequest) (AccountSecretsResult, error) {
filters := Params{
Limit: limit,
Sortdir: sortdir,
}
result := accountSecretsResult{}
result := AccountSecretsResult{}

_, err := auth.api.
URL("/authorizer/api/v1/secrets/search").
Query(&filters).
Post(search, &result)

return result.Items, err
return result, err
}

// CheckoutAccountSecret checkout account secret
func (auth *Client) CheckoutAccountSecret(path string) ([]Checkout, error) {
func (auth *Client) CheckoutAccountSecret(path string) (CheckoutResult, error) {
checkoutReq := CheckoutRequest{
Path: path,
}
result := checkoutResult{}
result := CheckoutResult{}

_, err := auth.api.
URL("/authorizer/api/v1/secrets/checkouts").
Post(checkoutReq, &result)

return result.Items, err
return result, err
}

// Checkouts lists secret checkouts
func (auth *Client) Checkouts(limit int, sortdir string) ([]Checkout, error) {
func (auth *Client) Checkouts(limit int, sortdir string) (CheckoutResult, error) {
filters := Params{
Limit: limit,
Sortdir: sortdir,
}
result := checkoutResult{}
result := CheckoutResult{}

_, err := auth.api.
URL("/authorizer/api/v1/secrets/checkouts").
Query(&filters).
Get(&result)

return result.Items, err
return result, err
}

// Checkout get checkout by id
Expand Down
4 changes: 2 additions & 2 deletions api/authorizer/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,12 @@ type apiCertificateResult struct {
Items []APICertificate `json:"items"`
}

type accountSecretsResult struct {
type AccountSecretsResult struct {
Count int `json:"count"`
Items []AccountSecrets `json:"items"`
}

type checkoutResult struct {
type CheckoutResult struct {
Count int `json:"count"`
Items []Checkout `json:"items"`
}
48 changes: 24 additions & 24 deletions api/secretsmanager/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ func (s *Client) SecretsManagerStatus() (*common.ServiceStatus, error) {

// MARK: Password Policies
// PasswordPolicies lists all password policies
func (s *Client) PasswordPolicies() ([]PasswordPolicy, error) {
result := pwPolicyResult{}
func (s *Client) PasswordPolicies() (PwPolicyResult, error) {
result := PwPolicyResult{}

_, err := s.api.
URL("/secrets-manager/api/v1/password-policies").
Get(&result)

return result.Items, err
return result, err
}

// CreatePasswordPolicy create a password policy
Expand Down Expand Up @@ -94,14 +94,14 @@ func (s *Client) RotatePassword(hostId, account string) error {

// MARK: Manage rotation scripts
// ScriptTemplates lists all script templates
func (s *Client) ScriptTemplates() ([]ScriptTemplate, error) {
result := scriptTemplateResult{}
func (s *Client) ScriptTemplates() (ScriptTemplateResult, error) {
result := ScriptTemplateResult{}

_, err := s.api.
URL("/secrets-manager/api/v1/script-templates").
Get(&result)

return result.Items, err
return result, err
}

// CreateScriptTemplate create a script template
Expand Down Expand Up @@ -161,8 +161,8 @@ func (s *Client) CompileScript(r CompileScriptRequest) (string, error) {

// MARK: Target domains
// TargetDomains lists all target domains
func (s *Client) TargetDomains(offset, limit int, sortkey, sortdir string) ([]TargetDomain, error) {
result := tdResult{}
func (s *Client) TargetDomains(offset, limit int, sortkey, sortdir string) (TdResult, error) {
result := TdResult{}
filters := Params{
Offset: offset,
Limit: limit,
Expand All @@ -175,7 +175,7 @@ func (s *Client) TargetDomains(offset, limit int, sortkey, sortdir string) ([]Ta
Query(&filters).
Get(&result)

return result.Items, err
return result, err
}

// CreateTargetDomain create a target domain
Expand All @@ -192,8 +192,8 @@ func (s *Client) CreateTargetDomain(td TargetDomain) (string, error) {
}

// SearchTargetDomain search for existing target domain
func (s *Client) SearchTargetDomain(sortkey, sortdir string, offset, limit int, searchObject TargetDomainsSearch) ([]TargetDomain, error) {
result := tdResult{}
func (s *Client) SearchTargetDomain(sortkey, sortdir string, offset, limit int, searchObject TargetDomainsSearch) (TdResult, error) {
result := TdResult{}
filters := Params{
Offset: offset,
Limit: limit,
Expand All @@ -206,7 +206,7 @@ func (s *Client) SearchTargetDomain(sortkey, sortdir string, offset, limit int,
Query(&filters).
Post(&searchObject, &result)

return result.Items, err
return result, err
}

// TargetDomain get target domain by id
Expand Down Expand Up @@ -249,8 +249,8 @@ func (s *Client) RefreshTargetDomain(tdId string) error {

// MARK: Target domain accounts
// TargetDomainAccounts lists all accounts in target domain
func (s *Client) TargetDomainAccounts(offset, limit int, sortkey, sortdir, tdId string) ([]ScannedAccount, error) {
result := scannedAccountResult{}
func (s *Client) TargetDomainAccounts(offset, limit int, sortkey, sortdir, tdId string) (ScannedAccountResult, error) {
result := ScannedAccountResult{}
filters := Params{
Offset: offset,
Limit: limit,
Expand All @@ -263,12 +263,12 @@ func (s *Client) TargetDomainAccounts(offset, limit int, sortkey, sortdir, tdId
Query(&filters).
Get(&result)

return result.Items, err
return result, err
}

// SearchTargetDomainAccounts search accounts in target domain
func (s *Client) SearchTargetDomainAccounts(sortkey, sortdir, tdId string, offset, limit int, searchObject ScannedAccountsSearch) ([]ScannedAccount, error) {
result := scannedAccountResult{}
func (s *Client) SearchTargetDomainAccounts(sortkey, sortdir, tdId string, offset, limit int, searchObject ScannedAccountsSearch) (ScannedAccountResult, error) {
result := ScannedAccountResult{}
filters := Params{
Offset: offset,
Limit: limit,
Expand All @@ -281,7 +281,7 @@ func (s *Client) SearchTargetDomainAccounts(sortkey, sortdir, tdId string, offse
Query(&filters).
Post(&searchObject, &result)

return result.Items, err
return result, err
}

// TargetDomainAccount get target domain account
Expand Down Expand Up @@ -315,8 +315,8 @@ func (s *Client) BatchUpdateTargetDomain(tdId string, change ScannedAccountEditB

// MARK: Managed accounts
// ManagedAccounts lists all managed accounts in a target domain
func (s *Client) ManagedAccounts(offset, limit int, sortkey, sortdir, tdId string) ([]ManagedAccount, error) {
result := managedAccountResult{}
func (s *Client) ManagedAccounts(offset, limit int, sortkey, sortdir, tdId string) (ManagedAccountResult, error) {
result := ManagedAccountResult{}
filters := Params{
Offset: offset,
Limit: limit,
Expand All @@ -329,7 +329,7 @@ func (s *Client) ManagedAccounts(offset, limit int, sortkey, sortdir, tdId strin
Query(&filters).
Get(&result)

return result.Items, err
return result, err
}

// CreateManagedAccount create a managed account
Expand All @@ -346,8 +346,8 @@ func (s *Client) CreateManagedAccount(tdId string, ma ManagedAccount) (string, e
}

// SearchManagedAccounts search managed accounts in a target domain
func (s *Client) SearchManagedAccounts(sortkey, sortdir, tdId string, offset, limit int, searchObject ManagedAccountsSearch) ([]ManagedAccount, error) {
result := managedAccountResult{}
func (s *Client) SearchManagedAccounts(sortkey, sortdir, tdId string, offset, limit int, searchObject ManagedAccountsSearch) (ManagedAccountResult, error) {
result := ManagedAccountResult{}
filters := Params{
Offset: offset,
Limit: limit,
Expand All @@ -360,7 +360,7 @@ func (s *Client) SearchManagedAccounts(sortkey, sortdir, tdId string, offset, li
Query(&filters).
Post(&searchObject, &result)

return result.Items, err
return result, err
}

// ManagedAccount get managed account
Expand Down
10 changes: 5 additions & 5 deletions api/secretsmanager/model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,27 +251,27 @@ type ManagedAccountBatch struct {
IDs []string `json:"ids"`
}

type pwPolicyResult struct {
type PwPolicyResult struct {
Count int `json:"count"`
Items []PasswordPolicy `json:"items"`
}

type scriptTemplateResult struct {
type ScriptTemplateResult struct {
Count int `json:"count"`
Items []ScriptTemplate `json:"items"`
}

type tdResult struct {
type TdResult struct {
Count int `json:"count"`
Items []TargetDomain `json:"items"`
}

type scannedAccountResult struct {
type ScannedAccountResult struct {
Count int `json:"count"`
Items []ScannedAccount `json:"items"`
}

type managedAccountResult struct {
type ManagedAccountResult struct {
Count int `json:"count"`
Items []ManagedAccount `json:"items"`
}

0 comments on commit 309fed0

Please sign in to comment.