Skip to content

Commit a41f7d0

Browse files
Replace a bunch of confusing/unnecessary loops with ifs (#535)
1 parent af97481 commit a41f7d0

19 files changed

+51
-51
lines changed

actions.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (customActionsTriggerDefinition *CustomActionsTriggerDefinition) ExtendedTe
3030
return nil, err
3131
}
3232

33-
for q.Account.CustomActionsTriggerDefinition.ExtendedTeamAccess.PageInfo.HasNextPage {
33+
if q.Account.CustomActionsTriggerDefinition.ExtendedTeamAccess.PageInfo.HasNextPage {
3434
(*variables)["after"] = q.Account.CustomActionsTriggerDefinition.ExtendedTeamAccess.PageInfo.End
3535
resp, err := customActionsTriggerDefinition.ExtendedTeamAccess(client, variables)
3636
if err != nil {
@@ -94,7 +94,7 @@ func (client *Client) ListCustomActions(variables *PayloadVariables) (*CustomAct
9494
if err := client.Query(&q, *variables, WithName("ExternalActionList")); err != nil {
9595
return nil, err
9696
}
97-
for q.Account.Actions.PageInfo.HasNextPage {
97+
if q.Account.Actions.PageInfo.HasNextPage {
9898
(*variables)["after"] = q.Account.Actions.PageInfo.End
9999
resp, err := client.ListCustomActions(variables)
100100
if err != nil {
@@ -174,7 +174,7 @@ func (client *Client) ListTriggerDefinitions(variables *PayloadVariables) (*Cust
174174
return nil, HandleErrors(err)
175175
}
176176
q.Account.Definitions.TotalCount = len(q.Account.Definitions.Nodes)
177-
for q.Account.Definitions.PageInfo.HasNextPage {
177+
if q.Account.Definitions.PageInfo.HasNextPage {
178178
(*variables)["after"] = q.Account.Definitions.PageInfo.End
179179
resp, err := client.ListTriggerDefinitions(variables)
180180
if err != nil {

category.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (client *Client) ListCategories(variables *PayloadVariables) (*CategoryConn
6161
if err := client.Query(&q, *variables, WithName("CategoryList")); err != nil {
6262
return nil, err
6363
}
64-
for q.Account.Rubric.Categories.PageInfo.HasNextPage {
64+
if q.Account.Rubric.Categories.PageInfo.HasNextPage {
6565
(*variables)["after"] = q.Account.Rubric.Categories.PageInfo.End
6666
resp, err := client.ListCategories(variables)
6767
if err != nil {

check.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func (client *Client) ListChecks(variables *PayloadVariables) (*CheckConnection,
202202
if err := client.Query(&q, *variables, WithName("CheckList")); err != nil {
203203
return nil, err
204204
}
205-
for q.Account.Rubric.Checks.PageInfo.HasNextPage {
205+
if q.Account.Rubric.Checks.PageInfo.HasNextPage {
206206
(*variables)["after"] = q.Account.Rubric.Checks.PageInfo.End
207207
resp, err := client.ListChecks(variables)
208208
if err != nil {

component.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (s *ComponentType) GetProperties(client *Client, v *PayloadVariables) (*Pro
4040
s.Properties.Nodes = append(s.Properties.Nodes, q.Account.ComponentType.Properties.Nodes...)
4141
s.Properties.PageInfo = q.Account.ComponentType.Properties.PageInfo
4242
s.Properties.TotalCount += q.Account.ComponentType.Properties.TotalCount
43-
for s.Properties.PageInfo.HasNextPage {
43+
if s.Properties.PageInfo.HasNextPage {
4444
(*v)["after"] = s.Properties.PageInfo.End
4545
_, err := s.GetProperties(client, v)
4646
if err != nil {
@@ -96,7 +96,7 @@ func (client *Client) ListComponentTypes(variables *PayloadVariables) (*Componen
9696
if err := client.Query(&q, *variables, WithName("ComponentTypeList")); err != nil {
9797
return nil, err
9898
}
99-
for q.Account.ComponentTypes.PageInfo.HasNextPage {
99+
if q.Account.ComponentTypes.PageInfo.HasNextPage {
100100
(*variables)["after"] = q.Account.ComponentTypes.PageInfo.End
101101
resp, err := client.ListComponentTypes(variables)
102102
if err != nil {

dependencies.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (service *Service) GetDependencies(client *Client, variables *PayloadVariab
6767
}
6868
service.Dependencies.Edges = append(service.Dependencies.Edges, q.Account.Service.Dependencies.Edges...)
6969
service.Dependencies.PageInfo = q.Account.Service.Dependencies.PageInfo
70-
for service.Dependencies.PageInfo.HasNextPage {
70+
if service.Dependencies.PageInfo.HasNextPage {
7171
(*variables)["after"] = service.Dependencies.PageInfo.End
7272
_, err := service.GetDependencies(client, variables)
7373
if err != nil {
@@ -100,7 +100,7 @@ func (service *Service) GetDependents(client *Client, variables *PayloadVariable
100100
}
101101
service.Dependents.Edges = append(service.Dependents.Edges, q.Account.Service.Dependents.Edges...)
102102
service.Dependents.PageInfo = q.Account.Service.Dependents.PageInfo
103-
for service.Dependents.PageInfo.HasNextPage {
103+
if service.Dependents.PageInfo.HasNextPage {
104104
(*variables)["after"] = service.Dependents.PageInfo.End
105105
_, err := service.GetDependents(client, variables)
106106
if err != nil {

domain.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func (domainId *DomainId) GetTags(client *Client, variables *PayloadVariables) (
6060
if err := client.Query(&q, *variables, WithName("DomainTagsList")); err != nil {
6161
return nil, err
6262
}
63-
for q.Account.Domain.Tags.PageInfo.HasNextPage {
63+
if q.Account.Domain.Tags.PageInfo.HasNextPage {
6464
(*variables)["after"] = q.Account.Domain.Tags.PageInfo.End
6565
resp, err := domainId.GetTags(client, variables)
6666
if err != nil {
@@ -114,7 +114,7 @@ func (domainId *DomainId) ChildSystems(client *Client, variables *PayloadVariabl
114114
if err := client.Query(&q, *variables, WithName("DomainChildSystemsList")); err != nil {
115115
return nil, err
116116
}
117-
for q.Account.Domain.ChildSystems.PageInfo.HasNextPage {
117+
if q.Account.Domain.ChildSystems.PageInfo.HasNextPage {
118118
(*variables)["after"] = q.Account.Domain.ChildSystems.PageInfo.End
119119
resp, err := domainId.ChildSystems(client, variables)
120120
if err != nil {
@@ -175,7 +175,7 @@ func (client *Client) ListDomains(variables *PayloadVariables) (*DomainConnectio
175175
if err := client.Query(&q, *variables, WithName("DomainsList")); err != nil {
176176
return nil, err
177177
}
178-
for q.Account.Domains.PageInfo.HasNextPage {
178+
if q.Account.Domains.PageInfo.HasNextPage {
179179
(*variables)["after"] = q.Account.Domains.PageInfo.End
180180
resp, err := client.ListDomains(variables)
181181
if err != nil {

filters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func (client *Client) ListFilters(variables *PayloadVariables) (*FilterConnectio
228228
if err := client.Query(&q, *variables, WithName("FilterList")); err != nil {
229229
return nil, err
230230
}
231-
for q.Account.Filters.PageInfo.HasNextPage {
231+
if q.Account.Filters.PageInfo.HasNextPage {
232232
(*variables)["after"] = q.Account.Filters.PageInfo.End
233233
resp, err := client.ListFilters(variables)
234234
if err != nil {

infra.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (infrastructureResource *InfrastructureResource) GetTags(client *Client, va
9191
if err := client.Query(&q, *variables, WithName("InfrastructureResourceTags")); err != nil {
9292
return nil, err
9393
}
94-
for q.Account.InfrastructureResource.Tags.PageInfo.HasNextPage {
94+
if q.Account.InfrastructureResource.Tags.PageInfo.HasNextPage {
9595
(*variables)["after"] = q.Account.InfrastructureResource.Tags.PageInfo.End
9696
resp, err := infrastructureResource.GetTags(client, variables)
9797
if err != nil {
@@ -182,7 +182,7 @@ func (client *Client) ListInfrastructureSchemas(variables *PayloadVariables) (*I
182182
if err := client.Query(&q, *variables, WithName("InfrastructureResourceSchemaList")); err != nil {
183183
return nil, err
184184
}
185-
for q.Account.InfrastructureResourceSchemas.PageInfo.HasNextPage {
185+
if q.Account.InfrastructureResourceSchemas.PageInfo.HasNextPage {
186186
(*variables)["after"] = q.Account.InfrastructureResourceSchemas.PageInfo.End
187187
resp, err := client.ListInfrastructureSchemas(variables)
188188
if err != nil {
@@ -208,7 +208,7 @@ func (client *Client) ListInfrastructure(variables *PayloadVariables) (*Infrastr
208208
if err := client.Query(&q, *variables, WithName("InfrastructureResourceList")); err != nil {
209209
return nil, err
210210
}
211-
for q.Account.InfrastructureResource.PageInfo.HasNextPage {
211+
if q.Account.InfrastructureResource.PageInfo.HasNextPage {
212212
(*variables)["after"] = q.Account.InfrastructureResource.PageInfo.End
213213
resp, err := client.ListInfrastructure(variables)
214214
if err != nil {

integration.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func (client *Client) ListIntegrations(variables *PayloadVariables) (*Integratio
135135
if err := client.Query(&q, *variables, WithName("IntegrationList")); err != nil {
136136
return nil, err
137137
}
138-
for q.Account.Integrations.PageInfo.HasNextPage {
138+
if q.Account.Integrations.PageInfo.HasNextPage {
139139
(*variables)["after"] = q.Account.Integrations.PageInfo.End
140140
resp, err := client.ListIntegrations(variables)
141141
if err != nil {

level.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (conn *LevelConnection) Hydrate(client *Client) error {
2424
"first": client.pageSize,
2525
}
2626
q.Account.Rubric.Levels.PageInfo = conn.PageInfo
27-
for q.Account.Rubric.Levels.PageInfo.HasNextPage {
27+
if q.Account.Rubric.Levels.PageInfo.HasNextPage {
2828
v["after"] = q.Account.Rubric.Levels.PageInfo.End
2929
if err := client.Query(&q, v); err != nil {
3030
return err

0 commit comments

Comments
 (0)