Skip to content

Commit 35b91f5

Browse files
committed
Align names with current linter requirements
1 parent cfd3a5d commit 35b91f5

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

cloudflare.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,14 +285,14 @@ type lbResp struct {
285285
ZoneTag string `json:"zoneTag"`
286286
}
287287

288-
type cloudflareResponseDnsFirewall struct {
288+
type cloudflareResponseDNSFirewall struct {
289289
Viewer struct {
290290
Accounts []dnsFirewallAccountResp `json:"accounts"`
291291
} `json:"viewer"`
292292
}
293293

294294
type dnsFirewallAccountResp struct {
295-
DnsFirewallAnalyticsAdaptiveGroups []struct {
295+
DNSFirewallAnalyticsAdaptiveGroups []struct {
296296
Count uint64 `json:"count"`
297297
Dimensions struct {
298298
ClusterTag string `json:"clusterTag"`
@@ -1020,7 +1020,7 @@ func filterNonFreePlanZones(zones []cfzones.Zone) (filteredZones []cfzones.Zone)
10201020
return
10211021
}
10221022

1023-
func fetchDnsFirewallTotals(accountID string) (*cloudflareResponseDnsFirewall, error) {
1023+
func fetchDNSFirewallTotals(accountID string) (*cloudflareResponseDNSFirewall, error) {
10241024
request := graphql.NewRequest(`
10251025
query ($accountID: string, $mintime: Time!, $maxtime: Time!, $limit: Int!) {
10261026
viewer {
@@ -1053,7 +1053,7 @@ query ($accountID: string, $mintime: Time!, $maxtime: Time!, $limit: Int!) {
10531053
ctx, cancel := context.WithTimeout(context.Background(), cftimeout)
10541054
defer cancel()
10551055

1056-
var resp cloudflareResponseDnsFirewall
1056+
var resp cloudflareResponseDNSFirewall
10571057
if err := gql.Client.Run(ctx, request, &resp); err != nil {
10581058
log.Errorf("error fetching DNS Firewall totals, err :%v", err)
10591059
return nil, err

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func fetchMetrics(deniedMetricsSet MetricsSet) {
113113
go fetchR2StorageForAccount(a, &wg)
114114
go fetchLoadblancerPoolsHealth(a, &wg, deniedMetricsSet)
115115
go fetchZeroTrustAnalyticsForAccount(a, &wg)
116-
go fetchDnsFirewallAnalytics(a, &wg, deniedMetricsSet)
116+
go fetchDNSFirewallAnalytics(a, &wg, deniedMetricsSet)
117117
}
118118

119119
zones := fetchZones(accounts)

prometheus.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,17 +646,17 @@ func fetchLogpushAnalyticsForZone(zones []cfzones.Zone, wg *sync.WaitGroup, _ Me
646646
}
647647
}
648648

649-
func fetchDnsFirewallAnalytics(account cfaccounts.Account, wg *sync.WaitGroup, deniedMetricsSet MetricsSet) {
649+
func fetchDNSFirewallAnalytics(account cfaccounts.Account, wg *sync.WaitGroup, deniedMetricsSet MetricsSet) {
650650
wg.Add(1)
651651
defer wg.Done()
652652

653-
r, err := fetchDnsFirewallTotals(account.ID)
653+
r, err := fetchDNSFirewallTotals(account.ID)
654654
if err != nil {
655655
return
656656
}
657657

658658
for _, a := range r.Viewer.Accounts {
659-
for _, d := range a.DnsFirewallAnalyticsAdaptiveGroups {
659+
for _, d := range a.DNSFirewallAnalyticsAdaptiveGroups {
660660
if !deniedMetricsSet.Has(dnsFirewallQueryCountMetricName) {
661661
dnsFirewallQueryCount.WithLabelValues(
662662
account.ID,

0 commit comments

Comments
 (0)