Skip to content

Commit 5796d10

Browse files
pablo-ruthpablo-ruth
authored
Merge pull request #9 from Ouest-France/lint
Fix lint issues
2 parents 840c299 + 53d3011 commit 5796d10

8 files changed

Lines changed: 145 additions & 73 deletions

‎fortiadc/resource_fortiadc_loadbalance_content_rewriting.go‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -126,44 +126,53 @@ func resourceFortiadcLoadbalanceContentRewritingRead(d *schema.ResourceData, m i
126126
return err
127127
}
128128

129-
d.Set("action_type", res.ActionType)
130-
d.Set("action", res.Action)
131-
d.Set("host_match", res.HostContent)
129+
arguments := map[string]interface{}{
130+
"action_type": res.ActionType,
131+
"action": res.Action,
132+
"host_match": res.HostContent,
133+
}
132134

133135
if res.HeaderName == "header-name" {
134-
d.Set("header_name", "")
136+
arguments["header_name"] = ""
135137
} else {
136-
d.Set("header_name", res.HeaderName)
138+
arguments["header_name"] = res.HeaderName
137139
}
138140

139141
if res.Location == "http://" {
140-
d.Set("location", "")
142+
arguments["location"] = ""
141143
} else {
142-
d.Set("location", res.Location)
144+
arguments["location"] = res.Location
143145
}
144146

145147
if res.Redirect == "redirect" {
146-
d.Set("redirect", "")
148+
arguments["redirect"] = ""
147149
} else {
148-
d.Set("redirect", res.Redirect)
150+
arguments["redirect"] = res.Redirect
149151
}
150152

151153
if res.RefererContent == "http://" {
152-
d.Set("referer_match", "")
154+
arguments["referer_match"] = ""
153155
} else {
154-
d.Set("referer_match", res.RefererContent)
156+
arguments["referer_match"] = res.RefererContent
155157
}
156158

157159
if res.URLContent == "/url" {
158-
d.Set("url_match", "")
160+
arguments["url_match"] = ""
159161
} else {
160-
d.Set("url_match", res.URLContent)
162+
arguments["url_match"] = res.URLContent
161163
}
162164

163165
if res.Comments == "comments" {
164-
d.Set("comment", "")
166+
arguments["comment"] = ""
165167
} else {
166-
d.Set("comment", res.Comments)
168+
arguments["comment"] = res.Comments
169+
}
170+
171+
for arg, value := range arguments {
172+
err = d.Set(arg, value)
173+
if err != nil {
174+
return err
175+
}
167176
}
168177

169178
return nil

‎fortiadc/resource_fortiadc_loadbalance_content_rewriting_condition.go‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,20 @@ func resourceFortiadcLoadbalanceContentRewritingConditionRead(d *schema.Resource
114114
ignoreCase = true
115115
}
116116

117-
d.Set("object", res.Object)
118-
d.Set("type", res.Type)
119-
d.Set("content", res.Content)
120-
d.Set("reverse", reverse)
121-
d.Set("ignore_case", ignoreCase)
117+
arguments := map[string]interface{}{
118+
"object": res.Object,
119+
"type": res.Type,
120+
"content": res.Content,
121+
"reverse": reverse,
122+
"ignore_case": ignoreCase,
123+
}
124+
125+
for arg, value := range arguments {
126+
err = d.Set(arg, value)
127+
if err != nil {
128+
return err
129+
}
130+
}
122131

123132
return nil
124133
}

‎fortiadc/resource_fortiadc_loadbalance_content_routing.go‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,20 @@ func resourceFortiadcLoadbalanceContentRoutingRead(d *schema.ResourceData, m int
8686
return err
8787
}
8888

89-
d.Set("type", res.Type)
90-
d.Set("comment", res.Comments)
91-
d.Set("ipv4", res.IP)
92-
d.Set("ipv6", res.IP6)
93-
d.Set("pool", res.Pool)
89+
arguments := map[string]interface{}{
90+
"type": res.Type,
91+
"comment": res.Comments,
92+
"ipv4": res.IP,
93+
"ipv6": res.IP6,
94+
"pool": res.Pool,
95+
}
96+
97+
for arg, value := range arguments {
98+
err = d.Set(arg, value)
99+
if err != nil {
100+
return err
101+
}
102+
}
94103

95104
return nil
96105
}

‎fortiadc/resource_fortiadc_loadbalance_content_routing_condition.go‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,19 @@ func resourceFortiadcLoadbalanceContentRoutingConditionRead(d *schema.ResourceDa
8383
reverse = true
8484
}
8585

86-
d.Set("object", res.Object)
87-
d.Set("type", res.Type)
88-
d.Set("content", res.Content)
89-
d.Set("reverse", reverse)
86+
arguments := map[string]interface{}{
87+
"object": res.Object,
88+
"type": res.Type,
89+
"content": res.Content,
90+
"reverse": reverse,
91+
}
92+
93+
for arg, value := range arguments {
94+
err = d.Set(arg, value)
95+
if err != nil {
96+
return err
97+
}
98+
}
9099

91100
return nil
92101
}

‎fortiadc/resource_fortiadc_loadbalance_pool.go‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,25 @@ func resourceFortiadcLoadbalancePoolRead(d *schema.ResourceData, m interface{})
109109
if len(hcList) > 1 {
110110
hcList = hcList[:len(hcList)-1]
111111
}
112-
if healtcheckEnable == false {
112+
if !healtcheckEnable {
113113
hcList = []string{}
114114
}
115115

116-
d.Set("name", res.Mkey)
117-
d.Set("pool_type", res.PoolType)
118-
d.Set("healtcheck_enable", healtcheckEnable)
119-
d.Set("healtcheck_relationship", res.HealthCheckRelationship)
120-
d.Set("healtcheck_list", hcList)
121-
d.Set("real_server_ssl_profile", res.RsProfile)
116+
arguments := map[string]interface{}{
117+
"name": res.Mkey,
118+
"pool_type": res.PoolType,
119+
"healtcheck_enable": healtcheckEnable,
120+
"healtcheck_relationship": res.HealthCheckRelationship,
121+
"healtcheck_list": hcList,
122+
"real_server_ssl_profile": res.RsProfile,
123+
}
124+
125+
for arg, value := range arguments {
126+
err = d.Set(arg, value)
127+
if err != nil {
128+
return err
129+
}
130+
}
122131

123132
return nil
124133
}

‎fortiadc/resource_fortiadc_loadbalance_pool_member.go‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,50 +119,59 @@ func resourceFortiadcLoadbalancePoolMemberRead(d *schema.ResourceData, m interfa
119119
return err
120120
}
121121

122-
d.Set("name", res.RealServerID)
123-
d.Set("status", res.Status)
122+
arguments := map[string]interface{}{
123+
"name": res.RealServerID,
124+
"status": res.Status,
125+
}
124126

125127
port, err := strconv.ParseInt(res.Port, 10, 64)
126128
if err != nil {
127129
return err
128130
}
129-
d.Set("port", port)
131+
arguments["port"] = port
130132

131133
weight, err := strconv.ParseInt(res.Weight, 10, 64)
132134
if err != nil {
133135
return err
134136
}
135-
d.Set("weight", weight)
137+
arguments["weight"] = weight
136138

137139
connLimit, err := strconv.ParseInt(res.Connlimit, 10, 64)
138140
if err != nil {
139141
return err
140142
}
141-
d.Set("conn_limit", connLimit)
143+
arguments["conn_limit"] = connLimit
142144

143145
recover, err := strconv.ParseInt(res.Recover, 10, 64)
144146
if err != nil {
145147
return err
146148
}
147-
d.Set("recover", recover)
149+
arguments["recover"] = recover
148150

149151
warmup, err := strconv.ParseInt(res.Warmup, 10, 64)
150152
if err != nil {
151153
return err
152154
}
153-
d.Set("warmup", warmup)
155+
arguments["warmup"] = warmup
154156

155157
warmrate, err := strconv.ParseInt(res.Warmrate, 10, 64)
156158
if err != nil {
157159
return err
158160
}
159-
d.Set("warmrate", warmrate)
161+
arguments["warmrate"] = warmrate
160162

161163
connectionRateLimit, err := strconv.ParseInt(res.ConnectionRateLimit, 10, 64)
162164
if err != nil {
163165
return err
164166
}
165-
d.Set("conn_rate_limit", connectionRateLimit)
167+
arguments["conn_rate_limit"] = connectionRateLimit
168+
169+
for arg, value := range arguments {
170+
err = d.Set(arg, value)
171+
if err != nil {
172+
return err
173+
}
174+
}
166175

167176
return nil
168177
}

‎fortiadc/resource_fortiadc_loadbalance_real_server.go‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,19 @@ func resourceFortiadcLoadbalanceRealServerRead(d *schema.ResourceData, m interfa
6464
return err
6565
}
6666

67-
d.Set("name", rs.Mkey)
68-
d.Set("address", rs.Address)
69-
d.Set("address6", rs.Address6)
70-
d.Set("status", rs.Status)
67+
arguments := map[string]interface{}{
68+
"name": rs.Mkey,
69+
"address": rs.Address,
70+
"address6": rs.Address6,
71+
"status": rs.Status,
72+
}
73+
74+
for arg, value := range arguments {
75+
err = d.Set(arg, value)
76+
if err != nil {
77+
return err
78+
}
79+
}
7180

7281
return nil
7382
}

‎fortiadc/resource_fortiadc_loadbalance_virtual_server.go‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -259,55 +259,64 @@ func resourceFortiadcLoadbalanceVirtualServerRead(d *schema.ResourceData, m inte
259259
if len(crList) > 1 {
260260
crList = crList[:len(crList)-1]
261261
}
262-
if contentRouting == false {
262+
if !contentRouting {
263263
crList = []string{}
264264
}
265265

266266
rwList := strings.Split(rs.ContentRewritingList, " ")
267267
if len(rwList) > 1 {
268268
rwList = rwList[:len(rwList)-1]
269269
}
270-
if contentRewriting == false {
270+
if !contentRewriting {
271271
rwList = []string{}
272272
}
273273

274-
d.Set("status", rs.Status)
275-
d.Set("type", rs.Type)
276-
d.Set("address_type", rs.AddrType)
277-
d.Set("address", rs.Address)
278-
d.Set("packet_forward_method", rs.PacketFwdMethod)
279-
d.Set("nat_source_pool", strings.TrimSpace(rs.SrcPool))
280-
d.Set("content_routing_enable", contentRouting)
281-
d.Set("content_routing_list", crList)
282-
d.Set("content_rewriting_enable", contentRewriting)
283-
d.Set("content_rewriting_list", rwList)
284-
d.Set("interface", rs.Interface)
285-
d.Set("profile", rs.Profile)
286-
d.Set("method", rs.Method)
287-
d.Set("pool", rs.Pool)
288-
d.Set("client_ssl_profile", rs.ClientSSLProfile)
289-
d.Set("http_to_https", http2https)
290-
d.Set("persistence", rs.Persistence)
291-
d.Set("error_msg", rs.ErrorMsg)
292-
d.Set("error_page", rs.ErrorPage)
274+
arguments := map[string]interface{}{
275+
"status": rs.Status,
276+
"type": rs.Type,
277+
"address_type": rs.AddrType,
278+
"address": rs.Address,
279+
"packet_forward_method": rs.PacketFwdMethod,
280+
"nat_source_pool": strings.TrimSpace(rs.SrcPool),
281+
"content_routing_enable": contentRouting,
282+
"content_routing_list": crList,
283+
"content_rewriting_enable": contentRewriting,
284+
"content_rewriting_list": rwList,
285+
"interface": rs.Interface,
286+
"profile": rs.Profile,
287+
"method": rs.Method,
288+
"pool": rs.Pool,
289+
"client_ssl_profile": rs.ClientSSLProfile,
290+
"http_to_https": http2https,
291+
"persistence": rs.Persistence,
292+
"error_msg": rs.ErrorMsg,
293+
"error_page": rs.ErrorPage,
294+
}
293295

294296
port, err := strconv.ParseInt(strings.TrimSpace(rs.Port), 10, 64)
295297
if err != nil {
296298
return err
297299
}
298-
d.Set("port", port)
300+
arguments["port"] = port
299301

300302
connectionLimit, err := strconv.ParseInt(rs.ConnectionLimit, 10, 64)
301303
if err != nil {
302304
return err
303305
}
304-
d.Set("connection_limit", connectionLimit)
306+
arguments["connection_limit"] = connectionLimit
305307

306308
connectionRateLimit, err := strconv.ParseInt(rs.ConnectionRateLimit, 10, 64)
307309
if err != nil {
308310
return err
309311
}
310-
d.Set("connection_rate_limit", connectionRateLimit)
312+
arguments["connection_rate_limit"] = connectionRateLimit
313+
314+
for arg, value := range arguments {
315+
err = d.Set(arg, value)
316+
if err != nil {
317+
return err
318+
}
319+
}
311320

312321
return nil
313322
}

0 commit comments

Comments
 (0)