Skip to content

Commit 8613442

Browse files
committed
fix linting issues
Signed-off-by: Jorge Turrado <[email protected]>
1 parent 960a8fc commit 8613442

File tree

4 files changed

+39
-14
lines changed

4 files changed

+39
-14
lines changed

core/clients/key_flow.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ func (c *KeyFlow) Init(cfg *KeyFlowConfig) error {
147147

148148
// SetToken can be used to set an access and refresh token manually in the client.
149149
// The other fields in the token field are determined by inspecting the token or setting default values.
150-
// Deprecated
151-
func (c *KeyFlow) SetToken(accessToken, refreshToken string) error {
150+
// Deprecated This method will be removed in future versions. Access tokens are now automatically managed by the client.
151+
func (c *KeyFlow) SetToken(accessToken, _ string) error {
152152
// We can safely use ParseUnverified because we are not authenticating the user,
153153
// We are parsing the token just to get the expiration time claim
154154
parsedAccessToken, _, err := jwt.NewParser().ParseUnverified(accessToken, &jwt.RegisteredClaims{})

core/clients/key_flow_continuous_refresh_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ type fakeAuthFlow struct {
138138
accessToken string
139139
}
140140

141-
func (f *fakeAuthFlow) RoundTrip(req *http.Request) (*http.Response, error) {
141+
func (f *fakeAuthFlow) RoundTrip(_ *http.Request) (*http.Response, error) {
142142
return nil, nil
143143
}
144144
func (f *fakeAuthFlow) GetAccessToken() (string, error) {

core/clients/workload_identity_flow.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import (
1515

1616
const (
1717
clientIDEnv = "STACKIT_SERVICE_ACCOUNT_EMAIL"
18-
FederatedTokenFileEnv = "STACKIT_FEDERATED_TOKEN_FILE"
19-
wifTokenEndpointEnv = "STACKIT_IDP_ENDPOINT"
20-
wifTokenExpirationEnv = "STACKIT_IDP_EXPIRATION_SECONDS"
18+
FederatedTokenFileEnv = "STACKIT_FEDERATED_TOKEN_FILE" //nolint:gosec // This is not a secret, just the env variable name
19+
wifTokenEndpointEnv = "STACKIT_IDP_ENDPOINT" //nolint:gosec // This is not a secret, just the env variable name
20+
wifTokenExpirationEnv = "STACKIT_IDP_EXPIRATION_SECONDS" //nolint:gosec // This is not a secret, just the env variable name
2121

2222
wifClientAssertionType = "urn:schwarz:params:oauth:client-assertion-type:workload-jwt"
2323
wifGrantType = "client_credentials"
24-
defaultWifTokenEndpoint = "https://accounts.stackit.cloud/oauth/v2/token"
25-
defaultFederatedTokenPath = "/var/run/secrets/stackit.cloud/serviceaccount/token"
24+
defaultWifTokenEndpoint = "https://accounts.stackit.cloud/oauth/v2/token" //nolint:gosec // This is not a secret, just the public endpoint for default value
25+
defaultFederatedTokenPath = "/var/run/secrets/stackit.cloud/serviceaccount/token" //nolint:gosec // This is not a secret, just the default path for workload identity token
2626
defaultWifExpirationToken = "1h"
2727
)
2828

core/clients/workload_identity_flow_test.go

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,21 @@ func TestWorkloadIdentityFlowInit(t *testing.T) {
9595
if err != nil {
9696
log.Fatal(err)
9797
}
98-
defer os.Remove(file.Name())
98+
defer func() {
99+
err := os.Remove(file.Name())
100+
if err != nil {
101+
t.Fatalf("Removing temporary file: %s", err)
102+
}
103+
}()
99104
if tt.validAssertion {
100105
token, err := signTokenWithSubject("subject", time.Minute)
101106
if err != nil {
102107
t.Fatalf("failed to create token: %v", err)
103108
}
104-
os.WriteFile(file.Name(), []byte(token), os.ModeAppend)
109+
err = os.WriteFile(file.Name(), []byte(token), os.ModeAppend)
110+
if err != nil {
111+
t.Fatalf("writing temporary file: %s", err)
112+
}
105113
}
106114
if tt.tokenFilePathAsEnv {
107115
t.Setenv("STACKIT_FEDERATED_TOKEN_FILE", file.Name())
@@ -184,7 +192,10 @@ func TestWorkloadIdentityFlowRoundTrip(t *testing.T) {
184192
for _, tt := range tests {
185193
t.Run(tt.name, func(t *testing.T) {
186194
authServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
187-
r.ParseForm()
195+
err := r.ParseForm()
196+
if err != nil {
197+
t.Fatalf("failed to parse form: %v", err)
198+
}
188199
assertionType := r.PostForm.Get("client_assertion_type")
189200
if assertionType != "urn:schwarz:params:oauth:client-assertion-type:workload-jwt" {
190201
t.Fatalf("invalid assertion type: %s", assertionType)
@@ -224,7 +235,10 @@ func TestWorkloadIdentityFlowRoundTrip(t *testing.T) {
224235

225236
w.Header().Set("Content-Type", "application/json")
226237
w.WriteHeader(http.StatusOK)
227-
w.Write(payload)
238+
_, err = w.Write(payload)
239+
if err != nil {
240+
t.Fatalf("writing response: %s", err)
241+
}
228242
}))
229243
t.Cleanup(authServer.Close)
230244

@@ -268,9 +282,17 @@ func TestWorkloadIdentityFlowRoundTrip(t *testing.T) {
268282
if err != nil {
269283
log.Fatal(err)
270284
}
271-
defer os.Remove(file.Name())
285+
defer func() {
286+
err := os.Remove(file.Name())
287+
if err != nil {
288+
t.Fatalf("Removing temporary file: %s", err)
289+
}
290+
}()
272291
flowConfig.FederatedTokenFilePath = file.Name()
273-
os.WriteFile(file.Name(), []byte(token), os.ModeAppend)
292+
err = os.WriteFile(file.Name(), []byte(token), os.ModeAppend)
293+
if err != nil {
294+
t.Fatalf("writing temporary file: %s", err)
295+
}
274296
}
275297

276298
if err := flow.Init(flowConfig); err != nil {
@@ -287,6 +309,9 @@ func TestWorkloadIdentityFlowRoundTrip(t *testing.T) {
287309
if (err != nil || resp.StatusCode != http.StatusOK) && !tt.wantErr {
288310
t.Fatalf("failed request to protected resource: %v", err)
289311
}
312+
if err := resp.Body.Close(); err != nil {
313+
t.Errorf("resp.Body.Close() error = %v", err)
314+
}
290315
})
291316
}
292317
}

0 commit comments

Comments
 (0)