Skip to content

Commit 960f978

Browse files
alkak95alkak95
authored
test: Fix issues in TestSecretScanningService tests (#3760)
1 parent 3f8720b commit 960f978

File tree

1 file changed

+119
-120
lines changed

1 file changed

+119
-120
lines changed

‎github/secret_scanning_pattern_configs_test.go‎

Lines changed: 119 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -155,65 +155,64 @@ func TestSecretScanningService_ListPatternConfigsForOrg(t *testing.T) {
155155
}
156156
]
157157
}`)
158+
})
159+
ctx := t.Context()
160+
161+
patternConfigs, _, err := client.SecretScanning.ListPatternConfigsForOrg(ctx, "o")
162+
if err != nil {
163+
t.Errorf("SecretScanning.ListPatternConfigsForOrg returned error: %v", err)
164+
}
158165

159-
ctx := t.Context()
160-
161-
patternConfigs, _, err := client.SecretScanning.ListPatternConfigsForOrg(ctx, "o")
162-
if err != nil {
163-
t.Errorf("SecretScanning.ListPatternConfigsForOrg returned error: %v", err)
164-
}
165-
166-
want := &SecretScanningPatternConfigs{
167-
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
168-
ProviderPatternOverrides: []*SecretScanningPatternOverride{
169-
{
170-
TokenType: Ptr("GITHUB_PERSONAL_ACCESS_TOKEN"),
171-
CustomPatternVersion: nil,
172-
Slug: Ptr("github_personal_access_token_legacy_v2"),
173-
DisplayName: Ptr("GitHub Personal Access Token (Legacy v2)"),
174-
AlertTotal: Ptr(15),
175-
AlertTotalPercentage: Ptr(36),
176-
FalsePositives: Ptr(2),
177-
FalsePositiveRate: Ptr(13),
178-
Bypassrate: Ptr(13),
179-
DefaultSetting: Ptr("enabled"),
180-
EnterpriseSetting: Ptr("enabled"),
181-
Setting: Ptr("enabled"),
182-
},
166+
want := &SecretScanningPatternConfigs{
167+
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
168+
ProviderPatternOverrides: []*SecretScanningPatternOverride{
169+
{
170+
TokenType: Ptr("GITHUB_PERSONAL_ACCESS_TOKEN"),
171+
CustomPatternVersion: nil,
172+
Slug: Ptr("github_personal_access_token_legacy_v2"),
173+
DisplayName: Ptr("GitHub Personal Access Token (Legacy v2)"),
174+
AlertTotal: Ptr(15),
175+
AlertTotalPercentage: Ptr(36),
176+
FalsePositives: Ptr(2),
177+
FalsePositiveRate: Ptr(13),
178+
Bypassrate: Ptr(13),
179+
DefaultSetting: Ptr("enabled"),
180+
EnterpriseSetting: Ptr("enabled"),
181+
Setting: Ptr("enabled"),
183182
},
184-
CustomPatternOverrides: []*SecretScanningPatternOverride{
185-
{
186-
TokenType: Ptr("cp_2"),
187-
CustomPatternVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
188-
Slug: Ptr("custom-api-key"),
189-
DisplayName: Ptr("Custom API Key"),
190-
AlertTotal: Ptr(15),
191-
AlertTotalPercentage: Ptr(36),
192-
FalsePositives: Ptr(3),
193-
FalsePositiveRate: Ptr(20),
194-
Bypassrate: Ptr(20),
195-
DefaultSetting: Ptr("disabled"),
196-
EnterpriseSetting: nil,
197-
Setting: Ptr("enabled"),
198-
},
183+
},
184+
CustomPatternOverrides: []*SecretScanningPatternOverride{
185+
{
186+
TokenType: Ptr("cp_2"),
187+
CustomPatternVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
188+
Slug: Ptr("custom-api-key"),
189+
DisplayName: Ptr("Custom API Key"),
190+
AlertTotal: Ptr(15),
191+
AlertTotalPercentage: Ptr(36),
192+
FalsePositives: Ptr(3),
193+
FalsePositiveRate: Ptr(20),
194+
Bypassrate: Ptr(20),
195+
DefaultSetting: Ptr("disabled"),
196+
EnterpriseSetting: nil,
197+
Setting: Ptr("enabled"),
199198
},
200-
}
199+
},
200+
}
201201

202-
if !cmp.Equal(patternConfigs, want) {
203-
t.Errorf("SecretScanning.ListPatternConfigsForOrg returned %+v, want %+v", patternConfigs, want)
204-
}
202+
if !cmp.Equal(patternConfigs, want) {
203+
t.Errorf("SecretScanning.ListPatternConfigsForOrg returned %+v, want %+v", patternConfigs, want)
204+
}
205205

206-
const methodName = "ListPatternConfigsForOrg"
206+
const methodName = "ListPatternConfigsForOrg"
207207

208-
testBadOptions(t, methodName, func() (err error) {
209-
_, _, err = client.SecretScanning.ListPatternConfigsForOrg(ctx, "\n")
210-
return err
211-
})
208+
testBadOptions(t, methodName, func() (err error) {
209+
_, _, err = client.SecretScanning.ListPatternConfigsForOrg(ctx, "\n")
210+
return err
211+
})
212212

213-
testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
214-
_, resp, err := client.SecretScanning.ListPatternConfigsForOrg(ctx, "o")
215-
return resp, err
216-
})
213+
testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
214+
_, resp, err := client.SecretScanning.ListPatternConfigsForOrg(ctx, "o")
215+
return resp, err
217216
})
218217
}
219218

@@ -227,50 +226,50 @@ func TestSecretScanningService_UpdatePatternConfigsForEnterprise(t *testing.T) {
227226
fmt.Fprint(w, `{
228227
"pattern_config_version": "0ujsswThIGTUYm2K8FjOOfXtY1K"
229228
}`)
229+
})
230230

231-
ctx := t.Context()
231+
ctx := t.Context()
232232

233-
opts := &SecretScanningPatternConfigsUpdateOptions{
234-
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
235-
ProviderPatternSettings: []*SecretScanningProviderPatternSetting{
236-
{
237-
TokenType: "GITHUB_PERSONAL_ACCESS_TOKEN",
238-
PushProtectionSetting: "enabled",
239-
},
233+
opts := &SecretScanningPatternConfigsUpdateOptions{
234+
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
235+
ProviderPatternSettings: []*SecretScanningProviderPatternSetting{
236+
{
237+
TokenType: "GITHUB_PERSONAL_ACCESS_TOKEN",
238+
PushProtectionSetting: "enabled",
240239
},
241-
CustomPatternSettings: []*SecretScanningCustomPatternSetting{
242-
{
243-
TokenType: "cp_2",
244-
CustomPatternVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
245-
PushProtectionSetting: "enabled",
246-
},
240+
},
241+
CustomPatternSettings: []*SecretScanningCustomPatternSetting{
242+
{
243+
TokenType: "cp_2",
244+
CustomPatternVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
245+
PushProtectionSetting: "enabled",
247246
},
248-
}
247+
},
248+
}
249249

250-
configsUpdate, _, err := client.SecretScanning.UpdatePatternConfigsForEnterprise(ctx, "e", opts)
251-
if err != nil {
252-
t.Errorf("SecretScanning.UpdatePatternConfigsForEnterprise returned error: %v", err)
253-
}
250+
configsUpdate, _, err := client.SecretScanning.UpdatePatternConfigsForEnterprise(ctx, "e", opts)
251+
if err != nil {
252+
t.Errorf("SecretScanning.UpdatePatternConfigsForEnterprise returned error: %v", err)
253+
}
254254

255-
want := &SecretScanningPatternConfigsUpdate{
256-
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
257-
}
255+
want := &SecretScanningPatternConfigsUpdate{
256+
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
257+
}
258258

259-
if !cmp.Equal(configsUpdate, want) {
260-
t.Errorf("SecretScanning.UpdatePatternConfigsForEnterprise returned %+v, want %+v", configsUpdate, want)
261-
}
259+
if !cmp.Equal(configsUpdate, want) {
260+
t.Errorf("SecretScanning.UpdatePatternConfigsForEnterprise returned %+v, want %+v", configsUpdate, want)
261+
}
262262

263-
const methodName = "UpdatePatternConfigsForEnterprise"
263+
const methodName = "UpdatePatternConfigsForEnterprise"
264264

265-
testBadOptions(t, methodName, func() (err error) {
266-
_, _, err = client.SecretScanning.UpdatePatternConfigsForEnterprise(ctx, "\n", opts)
267-
return err
268-
})
265+
testBadOptions(t, methodName, func() (err error) {
266+
_, _, err = client.SecretScanning.UpdatePatternConfigsForEnterprise(ctx, "\n", opts)
267+
return err
268+
})
269269

270-
testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
271-
_, resp, err := client.SecretScanning.UpdatePatternConfigsForEnterprise(ctx, "o", opts)
272-
return resp, err
273-
})
270+
testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
271+
_, resp, err := client.SecretScanning.UpdatePatternConfigsForEnterprise(ctx, "o", opts)
272+
return resp, err
274273
})
275274
}
276275

@@ -284,50 +283,50 @@ func TestSecretScanningService_UpdatePatternConfigsForOrg(t *testing.T) {
284283
fmt.Fprint(w, `{
285284
"pattern_config_version": "0ujsswThIGTUYm2K8FjOOfXtY1K"
286285
}`)
286+
})
287287

288-
ctx := t.Context()
288+
ctx := t.Context()
289289

290-
opts := &SecretScanningPatternConfigsUpdateOptions{
291-
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
292-
ProviderPatternSettings: []*SecretScanningProviderPatternSetting{
293-
{
294-
TokenType: "GITHUB_PERSONAL_ACCESS_TOKEN",
295-
PushProtectionSetting: "enabled",
296-
},
290+
opts := &SecretScanningPatternConfigsUpdateOptions{
291+
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
292+
ProviderPatternSettings: []*SecretScanningProviderPatternSetting{
293+
{
294+
TokenType: "GITHUB_PERSONAL_ACCESS_TOKEN",
295+
PushProtectionSetting: "enabled",
297296
},
298-
CustomPatternSettings: []*SecretScanningCustomPatternSetting{
299-
{
300-
TokenType: "cp_2",
301-
CustomPatternVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
302-
PushProtectionSetting: "enabled",
303-
},
297+
},
298+
CustomPatternSettings: []*SecretScanningCustomPatternSetting{
299+
{
300+
TokenType: "cp_2",
301+
CustomPatternVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
302+
PushProtectionSetting: "enabled",
304303
},
305-
}
304+
},
305+
}
306306

307-
configsUpdate, _, err := client.SecretScanning.UpdatePatternConfigsForOrg(ctx, "o", opts)
308-
if err != nil {
309-
t.Errorf("SecretScanning.UpdatePatternConfigsForOrg returned err: %v", err)
310-
}
307+
configsUpdate, _, err := client.SecretScanning.UpdatePatternConfigsForOrg(ctx, "o", opts)
308+
if err != nil {
309+
t.Errorf("SecretScanning.UpdatePatternConfigsForOrg returned err: %v", err)
310+
}
311311

312-
want := &SecretScanningPatternConfigsUpdate{
313-
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
314-
}
312+
want := &SecretScanningPatternConfigsUpdate{
313+
PatternConfigVersion: Ptr("0ujsswThIGTUYm2K8FjOOfXtY1K"),
314+
}
315315

316-
if !cmp.Equal(configsUpdate, want) {
317-
t.Errorf("SecretScanning.UpdatePatternConfigsForOrg returned %+v, want %+v", configsUpdate, want)
318-
}
316+
if !cmp.Equal(configsUpdate, want) {
317+
t.Errorf("SecretScanning.UpdatePatternConfigsForOrg returned %+v, want %+v", configsUpdate, want)
318+
}
319319

320-
const methodName = "UpdatePatternConfigsForOrg"
320+
const methodName = "UpdatePatternConfigsForOrg"
321321

322-
testBadOptions(t, methodName, func() (err error) {
323-
_, _, err = client.SecretScanning.UpdatePatternConfigsForOrg(ctx, "\n", opts)
324-
return err
325-
})
322+
testBadOptions(t, methodName, func() (err error) {
323+
_, _, err = client.SecretScanning.UpdatePatternConfigsForOrg(ctx, "\n", opts)
324+
return err
325+
})
326326

327-
testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
328-
_, resp, err := client.SecretScanning.UpdatePatternConfigsForOrg(ctx, "o", opts)
329-
return resp, err
330-
})
327+
testNewRequestAndDoFailure(t, methodName, client, func() (*Response, error) {
328+
_, resp, err := client.SecretScanning.UpdatePatternConfigsForOrg(ctx, "o", opts)
329+
return resp, err
331330
})
332331
}
333332

0 commit comments

Comments
 (0)