Skip to content

Commit 82d93a5

Browse files
authored
Merge pull request #163 from arsenetar/as/no-fatal-outside-main
fix: Remove fatal errors outside main.go to improve flexibility
2 parents 1a25437 + 03dbbab commit 82d93a5

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

cloudflare.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ func fetchZones() []cloudflare.Zone {
283283
ctx := context.Background()
284284
z, err := cloudflareAPI.ListZones(ctx)
285285
if err != nil {
286-
log.Fatalf("Error fetching zones: %s", err)
286+
log.Errorf("Error fetching zones: %s", err)
287+
return nil
287288
}
288289

289290
return z
@@ -295,7 +296,8 @@ func fetchFirewallRules(zoneID string) map[string]string {
295296
cloudflare.ZoneIdentifier(zoneID),
296297
cloudflare.FirewallRuleListParams{})
297298
if err != nil {
298-
log.Fatalf("Error fetching firewall rules: %s", err)
299+
log.Errorf("Error fetching firewall rules: %s", err)
300+
return nil
299301
}
300302
firewallRulesMap := make(map[string]string)
301303

@@ -305,13 +307,15 @@ func fetchFirewallRules(zoneID string) map[string]string {
305307

306308
listOfRulesets, err := cloudflareAPI.ListRulesets(ctx, cloudflare.ZoneIdentifier(zoneID), cloudflare.ListRulesetsParams{})
307309
if err != nil {
308-
log.Fatalf("Error listing rulesets: %s", err)
310+
log.Errorf("Error listing rulesets: %s", err)
311+
return nil
309312
}
310313
for _, rulesetDesc := range listOfRulesets {
311314
if rulesetDesc.Phase == "http_request_firewall_managed" {
312315
ruleset, err := cloudflareAPI.GetRuleset(ctx, cloudflare.ZoneIdentifier(zoneID), rulesetDesc.ID)
313316
if err != nil {
314-
log.Fatalf("Error fetching ruleset for firewall rules: %s", err)
317+
log.Errorf("Error fetching ruleset for firewall rules: %s", err)
318+
return nil
315319
}
316320
for _, rule := range ruleset.Rules {
317321
firewallRulesMap[rule.ID] = rule.Description
@@ -321,7 +325,8 @@ func fetchFirewallRules(zoneID string) map[string]string {
321325
if rulesetDesc.Phase == "http_request_firewall_custom" {
322326
ruleset, err := cloudflareAPI.GetRuleset(ctx, cloudflare.ZoneIdentifier(zoneID), rulesetDesc.ID)
323327
if err != nil {
324-
log.Fatalf("Error fetching custom firewall rulesets: %s", err)
328+
log.Errorf("Error fetching custom firewall rulesets: %s", err)
329+
return nil
325330
}
326331
for _, rule := range ruleset.Rules {
327332
firewallRulesMap[rule.ID] = rule.Description
@@ -336,7 +341,8 @@ func fetchAccounts() []cloudflare.Account {
336341
ctx := context.Background()
337342
a, _, err := cloudflareAPI.Accounts(ctx, cloudflare.AccountsListParams{PaginationOptions: cloudflare.PaginationOptions{PerPage: 100}})
338343
if err != nil {
339-
log.Fatalf("Error fetching accounts: %s", err)
344+
log.Errorf("Error fetching accounts: %s", err)
345+
return nil
340346
}
341347

342348
return a

0 commit comments

Comments
 (0)