Skip to content

Commit 2e0678a

Browse files
committed
fixed linting
1 parent 4838e29 commit 2e0678a

6 files changed

Lines changed: 29 additions & 13 deletions

File tree

internal/integrations/definitions/authentik/builder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ func Builder() registry.Builder {
6767
Handle: HealthCheck{}.Handle(),
6868
},
6969
{
70-
Name: directorySyncOperation.Name(),
71-
Description: "Collect Authentik directory users, groups, and memberships as directory accounts",
72-
Topic: definitionID.OperationTopic(directorySyncOperation.Name()),
73-
ClientRef: authentikClient.ID(),
70+
Name: directorySyncOperation.Name(),
71+
Description: "Collect Authentik directory users, groups, and memberships as directory accounts",
72+
Topic: definitionID.OperationTopic(directorySyncOperation.Name()),
73+
ClientRef: authentikClient.ID(),
7474
ConfigSchema: directorySyncSchema,
7575
Policy: types.ExecutionPolicy{Reconcile: true},
7676
SkipDefaultLookback: true,

internal/integrations/definitions/authentik/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ func extractScheme(baseURL string) (string, error) {
8585
}
8686

8787
return u.Scheme, nil
88-
}
88+
}

internal/integrations/definitions/authentik/installation.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ func resolveInstallationMetadata(ctx context.Context, req types.InstallationRequ
2525

2626
apiClient := client.(*authentikSDK.APIClient)
2727

28-
info, _, err := apiClient.AdminApi.AdminSystemRetrieve(ctx).Execute()
28+
info, resp, err := apiClient.AdminApi.AdminSystemRetrieve(ctx).Execute()
29+
if resp != nil {
30+
_ = resp.Body.Close()
31+
}
32+
2933
if err != nil {
3034
return InstallationMetadata{}, false, ErrHealthCheckFailed
3135
}
@@ -35,4 +39,4 @@ func resolveInstallationMetadata(ctx context.Context, req types.InstallationRequ
3539
Host: info.GetHttpHost(),
3640
BaseURL: cred.BaseURL,
3741
}, true, nil
38-
}
42+
}

internal/integrations/definitions/authentik/mappings.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
// mapExprDirectoryAccount is the CEL mapping expression for Authentik user payloads mapped to DirectoryAccount
1010
var mapExprDirectoryAccount = providerkit.CelMapExpr([]providerkit.CelMapEntry{
11-
{Key: integrationgenerated.IntegrationMappingDirectoryAccountExternalID, Expr: `'uid' in payload ? payload.uid : ""`},
11+
{Key: integrationgenerated.IntegrationMappingDirectoryAccountExternalID, Expr: `'uid' in payload ? payload.uid : ""`},
1212
{Key: integrationgenerated.IntegrationMappingDirectoryAccountCanonicalEmail, Expr: `'email' in payload && payload.email != null ? payload.email : ""`},
1313
{Key: integrationgenerated.IntegrationMappingDirectoryAccountDisplayName, Expr: `'name' in payload && payload.name != null && payload.name != "" ? payload.name : ('username' in payload ? payload.username : "")`},
1414
{Key: integrationgenerated.IntegrationMappingDirectoryAccountStatus, Expr: `dyn('is_active' in payload ? (payload.is_active ? "ACTIVE" : "INACTIVE") : "INACTIVE")`},
@@ -63,4 +63,4 @@ func authentikMappings() []types.MappingRegistration {
6363
},
6464
},
6565
}
66-
}
66+
}

internal/integrations/definitions/authentik/operation_directory_sync.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ func listDirectoryUsers(ctx context.Context, c *authentikSDK.APIClient, lastRunA
127127
req = req.LastUpdatedGt(*lastRunAt)
128128
}
129129

130-
result, _, err := req.Execute()
130+
result, resp, err := req.Execute()
131+
if resp != nil {
132+
_ = resp.Body.Close()
133+
}
134+
131135
if err != nil {
132136
return nil, ErrDirectoryUsersFetchFailed
133137
}
@@ -154,11 +158,15 @@ func listDirectoryGroups(ctx context.Context, c *authentikSDK.APIClient) ([]auth
154158
return nil, err
155159
}
156160

157-
result, _, err := c.CoreApi.CoreGroupsList(ctx).
161+
result, resp, err := c.CoreApi.CoreGroupsList(ctx).
158162
Page(page).
159163
PageSize(directoryDefaultPageSize).
160164
IncludeUsers(true).
161165
Execute()
166+
if resp != nil {
167+
_ = resp.Body.Close()
168+
}
169+
162170
if err != nil {
163171
return nil, ErrDirectoryGroupsFetchFailed
164172
}
@@ -173,4 +181,4 @@ func listDirectoryGroups(ctx context.Context, c *authentikSDK.APIClient) ([]auth
173181
}
174182

175183
return groups, nil
176-
}
184+
}

internal/integrations/definitions/authentik/operation_health.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ func (h HealthCheck) Handle() types.OperationHandler {
2727

2828
// Run executes the Authentik health check
2929
func (HealthCheck) Run(ctx context.Context, c *authentikSDK.APIClient) (json.RawMessage, error) {
30-
me, _, err := c.CoreApi.CoreUsersMeRetrieve(ctx).Execute()
30+
me, resp, err := c.CoreApi.CoreUsersMeRetrieve(ctx).Execute()
31+
if resp != nil {
32+
_ = resp.Body.Close()
33+
}
34+
3135
if err != nil {
3236
return nil, ErrHealthCheckFailed
3337
}

0 commit comments

Comments
 (0)