Skip to content

Commit 480d59f

Browse files
attiasasattiasas
committed
format
1 parent d2b44a0 commit 480d59f

File tree

3 files changed

+67
-69
lines changed

3 files changed

+67
-69
lines changed

‎common/commands/metrics_collector_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func TestDetectCISystem(t *testing.T) {
191191
}
192192

193193
// Restore environment after test
194-
defer func() {
194+
defer func() {
195195
for envVar, value := range originalEnv {
196196
if value != "" {
197197
if err := os.Setenv(envVar, value); err != nil {
@@ -219,7 +219,7 @@ func TestDetectCISystem(t *testing.T) {
219219
{"No CI", "", "", ""},
220220
}
221221

222-
for _, tt := range tests {
222+
for _, tt := range tests {
223223
t.Run(tt.name, func(t *testing.T) {
224224
// Clear all CI environment variables
225225
for _, envVar := range ciEnvVars {

‎common/spec/specfiles.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ type File struct {
9494
TargetPathInArchive string
9595
Include []string `json:"include,omitempty"`
9696
Package string `json:"package,omitempty"`
97-
Version string `json:"version,omitempty"`
98-
Type string `json:"type,omitempty"`
99-
RepoKey string `json:"repoKey,omitempty"`
97+
Version string `json:"version,omitempty"`
98+
Type string `json:"type,omitempty"`
99+
RepoKey string `json:"repoKey,omitempty"`
100100
}
101101

102102
func (f File) GetInclude() []string {

‎utils/config/tokenrefresh_test.go‎

Lines changed: 62 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ func TestCreateInitialRefreshableTokensIfNeededEarlyReturns(t *testing.T) {
2020
name: "EarlyReturn_ArtifactoryTokenRefreshIntervalZero",
2121
serverDetails: &ServerDetails{
2222
ServerId: "test-server",
23-
ArtifactoryTokenRefreshInterval: 0,
24-
ArtifactoryRefreshToken: "",
23+
ArtifactoryTokenRefreshInterval: 0,
24+
ArtifactoryRefreshToken: "",
2525
AccessToken: "",
2626
},
2727
expectedError: nil,
@@ -34,7 +34,7 @@ func TestCreateInitialRefreshableTokensIfNeededEarlyReturns(t *testing.T) {
3434
serverDetails: &ServerDetails{
3535
ServerId: "test-server",
3636
ArtifactoryTokenRefreshInterval: -1,
37-
ArtifactoryRefreshToken: "",
37+
ArtifactoryRefreshToken: "",
3838
AccessToken: "",
3939
},
4040
expectedError: nil,
@@ -46,8 +46,8 @@ func TestCreateInitialRefreshableTokensIfNeededEarlyReturns(t *testing.T) {
4646
name: "EarlyReturn_ArtifactoryRefreshTokenNotEmpty",
4747
serverDetails: &ServerDetails{
4848
ServerId: "test-server",
49-
ArtifactoryTokenRefreshInterval: 60,
50-
ArtifactoryRefreshToken: "existing-refresh-token",
49+
ArtifactoryTokenRefreshInterval: 60,
50+
ArtifactoryRefreshToken: "existing-refresh-token",
5151
AccessToken: "",
5252
},
5353
expectedError: nil,
@@ -59,8 +59,8 @@ func TestCreateInitialRefreshableTokensIfNeededEarlyReturns(t *testing.T) {
5959
name: "EarlyReturn_AccessTokenNotEmpty",
6060
serverDetails: &ServerDetails{
6161
ServerId: "test-server",
62-
ArtifactoryTokenRefreshInterval: 60,
63-
ArtifactoryRefreshToken: "",
62+
ArtifactoryTokenRefreshInterval: 60,
63+
ArtifactoryRefreshToken: "",
6464
AccessToken: "existing-access-token",
6565
},
6666
expectedError: nil,
@@ -72,8 +72,8 @@ func TestCreateInitialRefreshableTokensIfNeededEarlyReturns(t *testing.T) {
7272
name: "EarlyReturn_BothTokensNotEmpty",
7373
serverDetails: &ServerDetails{
7474
ServerId: "test-server",
75-
ArtifactoryTokenRefreshInterval: 60,
76-
ArtifactoryRefreshToken: "existing-refresh-token",
75+
ArtifactoryTokenRefreshInterval: 60,
76+
ArtifactoryRefreshToken: "existing-refresh-token",
7777
AccessToken: "existing-access-token",
7878
},
7979
expectedError: nil,
@@ -85,8 +85,8 @@ func TestCreateInitialRefreshableTokensIfNeededEarlyReturns(t *testing.T) {
8585
name: "EarlyReturn_IntervalZeroWithTokens",
8686
serverDetails: &ServerDetails{
8787
ServerId: "test-server",
88-
ArtifactoryTokenRefreshInterval: 0,
89-
ArtifactoryRefreshToken: "existing-refresh-token",
88+
ArtifactoryTokenRefreshInterval: 0,
89+
ArtifactoryRefreshToken: "existing-refresh-token",
9090
AccessToken: "existing-access-token",
9191
},
9292
expectedError: nil,
@@ -102,7 +102,7 @@ func TestCreateInitialRefreshableTokensIfNeededEarlyReturns(t *testing.T) {
102102
serverDetailsCopy := &ServerDetails{
103103
ServerId: tt.serverDetails.ServerId,
104104
ArtifactoryTokenRefreshInterval: tt.serverDetails.ArtifactoryTokenRefreshInterval,
105-
ArtifactoryRefreshToken: tt.serverDetails.ArtifactoryRefreshToken,
105+
ArtifactoryRefreshToken: tt.serverDetails.ArtifactoryRefreshToken,
106106
AccessToken: tt.serverDetails.AccessToken,
107107
}
108108

@@ -121,18 +121,18 @@ func TestCreateInitialRefreshableTokensIfNeededEarlyReturns(t *testing.T) {
121121

122122
func TestCreateInitialRefreshableTokensIfNeededValidInputs(t *testing.T) {
123123
tests := []struct {
124-
name string
125-
serverDetails *ServerDetails
126-
expectedIntervalAfterCall int
127-
shouldCreateTokens bool
128-
expectError bool
124+
name string
125+
serverDetails *ServerDetails
126+
expectedIntervalAfterCall int
127+
shouldCreateTokens bool
128+
expectError bool
129129
}{
130130
{
131131
name: "ValidInput_PositiveInterval",
132132
serverDetails: &ServerDetails{
133133
ServerId: "test-server",
134-
ArtifactoryTokenRefreshInterval: 60,
135-
ArtifactoryRefreshToken: "",
134+
ArtifactoryTokenRefreshInterval: 60,
135+
ArtifactoryRefreshToken: "",
136136
AccessToken: "",
137137
ArtifactoryUrl: "http://localhost:8081/artifactory/",
138138
User: "testuser",
@@ -146,8 +146,8 @@ func TestCreateInitialRefreshableTokensIfNeededValidInputs(t *testing.T) {
146146
name: "ValidInput_LargeInterval",
147147
serverDetails: &ServerDetails{
148148
ServerId: "test-server",
149-
ArtifactoryTokenRefreshInterval: 1440, // 24 hours
150-
ArtifactoryRefreshToken: "",
149+
ArtifactoryTokenRefreshInterval: 1440, // 24 hours
150+
ArtifactoryRefreshToken: "",
151151
AccessToken: "",
152152
ArtifactoryUrl: "http://localhost:8081/artifactory/",
153153
User: "testuser",
@@ -161,8 +161,8 @@ func TestCreateInitialRefreshableTokensIfNeededValidInputs(t *testing.T) {
161161
name: "ValidInput_MinimalInterval",
162162
serverDetails: &ServerDetails{
163163
ServerId: "test-server",
164-
ArtifactoryTokenRefreshInterval: 1,
165-
ArtifactoryRefreshToken: "",
164+
ArtifactoryTokenRefreshInterval: 1,
165+
ArtifactoryRefreshToken: "",
166166
AccessToken: "",
167167
ArtifactoryUrl: "http://localhost:8081/artifactory/",
168168
User: "testuser",
@@ -187,7 +187,7 @@ func TestCreateInitialRefreshableTokensIfNeededValidInputs(t *testing.T) {
187187
serverDetailsCopy := &ServerDetails{
188188
ServerId: tt.serverDetails.ServerId,
189189
ArtifactoryTokenRefreshInterval: tt.serverDetails.ArtifactoryTokenRefreshInterval,
190-
ArtifactoryRefreshToken: tt.serverDetails.ArtifactoryRefreshToken,
190+
ArtifactoryRefreshToken: tt.serverDetails.ArtifactoryRefreshToken,
191191
AccessToken: tt.serverDetails.AccessToken,
192192
ArtifactoryUrl: tt.serverDetails.ArtifactoryUrl,
193193
User: tt.serverDetails.User,
@@ -225,8 +225,8 @@ func TestCreateInitialRefreshableTokensIfNeededInputValidation(t *testing.T) {
225225
name: "InputValidation_EmptyServerId",
226226
serverDetails: &ServerDetails{
227227
ServerId: "",
228-
ArtifactoryTokenRefreshInterval: 60,
229-
ArtifactoryRefreshToken: "",
228+
ArtifactoryTokenRefreshInterval: 60,
229+
ArtifactoryRefreshToken: "",
230230
AccessToken: "",
231231
},
232232
description: "Should handle empty ServerId",
@@ -235,8 +235,8 @@ func TestCreateInitialRefreshableTokensIfNeededInputValidation(t *testing.T) {
235235
name: "InputValidation_NoArtifactoryUrl",
236236
serverDetails: &ServerDetails{
237237
ServerId: "test-server",
238-
ArtifactoryTokenRefreshInterval: 60,
239-
ArtifactoryRefreshToken: "",
238+
ArtifactoryTokenRefreshInterval: 60,
239+
ArtifactoryRefreshToken: "",
240240
AccessToken: "",
241241
ArtifactoryUrl: "",
242242
},
@@ -246,8 +246,8 @@ func TestCreateInitialRefreshableTokensIfNeededInputValidation(t *testing.T) {
246246
name: "InputValidation_NoCredentials",
247247
serverDetails: &ServerDetails{
248248
ServerId: "test-server",
249-
ArtifactoryTokenRefreshInterval: 60,
250-
ArtifactoryRefreshToken: "",
249+
ArtifactoryTokenRefreshInterval: 60,
250+
ArtifactoryRefreshToken: "",
251251
AccessToken: "",
252252
ArtifactoryUrl: "http://localhost:8081/artifactory/",
253253
User: "",
@@ -259,8 +259,8 @@ func TestCreateInitialRefreshableTokensIfNeededInputValidation(t *testing.T) {
259259
name: "InputValidation_OnlyUser",
260260
serverDetails: &ServerDetails{
261261
ServerId: "test-server",
262-
ArtifactoryTokenRefreshInterval: 60,
263-
ArtifactoryRefreshToken: "",
262+
ArtifactoryTokenRefreshInterval: 60,
263+
ArtifactoryRefreshToken: "",
264264
AccessToken: "",
265265
ArtifactoryUrl: "http://localhost:8081/artifactory/",
266266
User: "testuser",
@@ -272,8 +272,8 @@ func TestCreateInitialRefreshableTokensIfNeededInputValidation(t *testing.T) {
272272
name: "InputValidation_OnlyPassword",
273273
serverDetails: &ServerDetails{
274274
ServerId: "test-server",
275-
ArtifactoryTokenRefreshInterval: 60,
276-
ArtifactoryRefreshToken: "",
275+
ArtifactoryTokenRefreshInterval: 60,
276+
ArtifactoryRefreshToken: "",
277277
AccessToken: "",
278278
ArtifactoryUrl: "http://localhost:8081/artifactory/",
279279
User: "",
@@ -292,7 +292,7 @@ func TestCreateInitialRefreshableTokensIfNeededInputValidation(t *testing.T) {
292292
serverDetailsCopy := &ServerDetails{
293293
ServerId: tt.serverDetails.ServerId,
294294
ArtifactoryTokenRefreshInterval: tt.serverDetails.ArtifactoryTokenRefreshInterval,
295-
ArtifactoryRefreshToken: tt.serverDetails.ArtifactoryRefreshToken,
295+
ArtifactoryRefreshToken: tt.serverDetails.ArtifactoryRefreshToken,
296296
AccessToken: tt.serverDetails.AccessToken,
297297
ArtifactoryUrl: tt.serverDetails.ArtifactoryUrl,
298298
User: tt.serverDetails.User,
@@ -332,8 +332,8 @@ func TestCreateInitialRefreshableTokensIfNeededStateChanges(t *testing.T) {
332332

333333
serverDetails := &ServerDetails{
334334
ServerId: "test-server",
335-
ArtifactoryTokenRefreshInterval: 60,
336-
ArtifactoryRefreshToken: "",
335+
ArtifactoryTokenRefreshInterval: 60,
336+
ArtifactoryRefreshToken: "",
337337
AccessToken: "",
338338
ArtifactoryUrl: "http://localhost:8081/artifactory/",
339339
User: "testuser",
@@ -357,15 +357,14 @@ func TestCreateInitialRefreshableTokensIfNeededStateChanges(t *testing.T) {
357357
}
358358
})
359359

360-
361360
t.Run("StateChange_TokensSetAfterSuccess", func(t *testing.T) {
362361
cleanUpTempEnv := configtests.CreateTempEnv(t, false)
363362
defer cleanUpTempEnv()
364363

365364
serverDetails := &ServerDetails{
366365
ServerId: "test-server",
367-
ArtifactoryTokenRefreshInterval: 60,
368-
ArtifactoryRefreshToken: "",
366+
ArtifactoryTokenRefreshInterval: 60,
367+
ArtifactoryRefreshToken: "",
369368
AccessToken: "",
370369
ArtifactoryUrl: "http://localhost:8081/artifactory/",
371370
User: "testuser",
@@ -398,8 +397,8 @@ func TestCreateInitialRefreshableTokensIfNeededEdgeCases(t *testing.T) {
398397
name: "EdgeCase_AllFieldsEmpty",
399398
serverDetails: &ServerDetails{
400399
ServerId: "",
401-
ArtifactoryTokenRefreshInterval: 0,
402-
ArtifactoryRefreshToken: "",
400+
ArtifactoryTokenRefreshInterval: 0,
401+
ArtifactoryRefreshToken: "",
403402
AccessToken: "",
404403
},
405404
description: "Should handle all fields empty",
@@ -408,8 +407,8 @@ func TestCreateInitialRefreshableTokensIfNeededEdgeCases(t *testing.T) {
408407
name: "EdgeCase_IntervalOne",
409408
serverDetails: &ServerDetails{
410409
ServerId: "test-server",
411-
ArtifactoryTokenRefreshInterval: 1,
412-
ArtifactoryRefreshToken: "",
410+
ArtifactoryTokenRefreshInterval: 1,
411+
ArtifactoryRefreshToken: "",
413412
AccessToken: "",
414413
},
415414
description: "Should handle minimum positive interval",
@@ -418,29 +417,29 @@ func TestCreateInitialRefreshableTokensIfNeededEdgeCases(t *testing.T) {
418417
name: "EdgeCase_IntervalMaxInt",
419418
serverDetails: &ServerDetails{
420419
ServerId: "test-server",
421-
ArtifactoryTokenRefreshInterval: 2147483647, // max int32
422-
ArtifactoryRefreshToken: "", // jfrog-ignore
423-
AccessToken: "", // jfrog-ignore
420+
ArtifactoryTokenRefreshInterval: 2147483647, // max int32
421+
ArtifactoryRefreshToken: "", // jfrog-ignore
422+
AccessToken: "", // jfrog-ignore
424423
},
425424
description: "Should handle maximum interval value",
426425
},
427426
{
428427
name: "EdgeCase_WhitespaceTokens",
429428
serverDetails: &ServerDetails{
430429
ServerId: "test-server",
431-
ArtifactoryTokenRefreshInterval: 60,
432-
ArtifactoryRefreshToken: " ", // jfrog-ignore
433-
AccessToken: "", // jfrog-ignore
430+
ArtifactoryTokenRefreshInterval: 60,
431+
ArtifactoryRefreshToken: " ", // jfrog-ignore
432+
AccessToken: "", // jfrog-ignore
434433
},
435434
description: "Should handle whitespace-only refresh token (treated as non-empty)",
436435
},
437436
{
438437
name: "EdgeCase_WhitespaceAccessToken",
439438
serverDetails: &ServerDetails{
440439
ServerId: "test-server",
441-
ArtifactoryTokenRefreshInterval: 60,
442-
ArtifactoryRefreshToken: "", // jfrog-ignore
443-
AccessToken: " ", // jfrog-ignore
440+
ArtifactoryTokenRefreshInterval: 60,
441+
ArtifactoryRefreshToken: "", // jfrog-ignore
442+
AccessToken: " ", // jfrog-ignore
444443
},
445444
description: "Should handle whitespace-only access token (treated as non-empty)",
446445
},
@@ -454,7 +453,7 @@ func TestCreateInitialRefreshableTokensIfNeededEdgeCases(t *testing.T) {
454453
serverDetailsCopy := &ServerDetails{
455454
ServerId: tt.serverDetails.ServerId,
456455
ArtifactoryTokenRefreshInterval: tt.serverDetails.ArtifactoryTokenRefreshInterval,
457-
ArtifactoryRefreshToken: tt.serverDetails.ArtifactoryRefreshToken,
456+
ArtifactoryRefreshToken: tt.serverDetails.ArtifactoryRefreshToken,
458457
AccessToken: tt.serverDetails.AccessToken,
459458
}
460459

@@ -488,8 +487,8 @@ func TestCreateInitialRefreshableTokensIfNeededOutputValidation(t *testing.T) {
488487
t.Run("OutputValidation_EarlyReturnNilError", func(t *testing.T) {
489488
serverDetails := &ServerDetails{
490489
ServerId: "test-server",
491-
ArtifactoryTokenRefreshInterval: 0,
492-
ArtifactoryRefreshToken: "",
490+
ArtifactoryTokenRefreshInterval: 0,
491+
ArtifactoryRefreshToken: "",
493492
AccessToken: "",
494493
}
495494

@@ -500,8 +499,8 @@ func TestCreateInitialRefreshableTokensIfNeededOutputValidation(t *testing.T) {
500499
t.Run("OutputValidation_ServerDetailsNotNil", func(t *testing.T) {
501500
serverDetails := &ServerDetails{
502501
ServerId: "test-server",
503-
ArtifactoryTokenRefreshInterval: 60,
504-
ArtifactoryRefreshToken: "",
502+
ArtifactoryTokenRefreshInterval: 60,
503+
ArtifactoryRefreshToken: "",
505504
AccessToken: "",
506505
}
507506

@@ -521,7 +520,7 @@ func TestCreateInitialRefreshableTokensIfNeededBranchCoverage(t *testing.T) {
521520
// Test branch: ArtifactoryTokenRefreshInterval <= 0
522521
serverDetails1 := &ServerDetails{
523522
ArtifactoryTokenRefreshInterval: 0,
524-
ArtifactoryRefreshToken: "",
523+
ArtifactoryRefreshToken: "",
525524
AccessToken: "",
526525
}
527526
err1 := CreateInitialRefreshableTokensIfNeeded(serverDetails1)
@@ -530,7 +529,7 @@ func TestCreateInitialRefreshableTokensIfNeededBranchCoverage(t *testing.T) {
530529
// Test branch: ArtifactoryRefreshToken != ""
531530
serverDetails2 := &ServerDetails{
532531
ArtifactoryTokenRefreshInterval: 60,
533-
ArtifactoryRefreshToken: "token",
532+
ArtifactoryRefreshToken: "token",
534533
AccessToken: "",
535534
}
536535
err2 := CreateInitialRefreshableTokensIfNeeded(serverDetails2)
@@ -539,7 +538,7 @@ func TestCreateInitialRefreshableTokensIfNeededBranchCoverage(t *testing.T) {
539538
// Test branch: AccessToken != ""
540539
serverDetails3 := &ServerDetails{
541540
ArtifactoryTokenRefreshInterval: 60,
542-
ArtifactoryRefreshToken: "",
541+
ArtifactoryRefreshToken: "",
543542
AccessToken: "token",
544543
}
545544
err3 := CreateInitialRefreshableTokensIfNeeded(serverDetails3)
@@ -551,8 +550,8 @@ func TestCreateInitialRefreshableTokensIfNeededBranchCoverage(t *testing.T) {
551550
// Note: This will require proper setup or mocking of dependencies
552551
serverDetails := &ServerDetails{
553552
ServerId: "test-server",
554-
ArtifactoryTokenRefreshInterval: 60,
555-
ArtifactoryRefreshToken: "",
553+
ArtifactoryTokenRefreshInterval: 60,
554+
ArtifactoryRefreshToken: "",
556555
AccessToken: "",
557556
ArtifactoryUrl: "http://localhost:8081/artifactory/",
558557
User: "testuser",
@@ -571,4 +570,3 @@ func TestCreateInitialRefreshableTokensIfNeededBranchCoverage(t *testing.T) {
571570
assert.NotNil(t, serverDetails)
572571
})
573572
}
574-

0 commit comments

Comments
 (0)