Skip to content

Commit a23ff32

Browse files
yossig-aquasecyossig-aquasec
authored
Merge pull request #230 from yossig-aquasec/client_auth_crashing_fix
bug: fixing gorequest crashing
2 parents 784ae36 + 328d809 commit a23ff32

23 files changed

+82
-137
lines changed

‎DEVELOPMENT.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ git clone https://github.com/aquasecurity/terraform-provider-aquasec.git
3232
3333
cd terraform-provider-aquasec
3434
35-
git checkout v0.8.17
35+
git checkout v0.8.20
3636
```
3737

3838
**Build and install the provider**
@@ -55,7 +55,7 @@ In order to test the provider installed locally, the provider block will have to
5555
terraform {
5656
required_providers {
5757
aquasec = {
58-
version = "0.8.17"
58+
version = "0.8.20"
5959
source = "terraform-provider-aquasec/aquasec/aquasec"
6060
}
6161
}

‎GNUmakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ HOSTNAME := github.com
66
NAMESPACE := aquasec
77
NAME := aquasec
88
BINARY := terraform-provider-${NAME}
9-
VERSION := 0.8.19
9+
VERSION := 0.8.20
1010
OS_ARCH := $(shell go env GOOS)_$(shell go env GOARCH)
1111

1212
default: build

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ To quickly get started using the Aquasec provider for Terraform, configure the p
4040
terraform {
4141
required_providers {
4242
aquasec = {
43-
version = "0.8.17"
43+
version = "0.8.20"
4444
source = "aquasecurity/aquasec"
4545
}
4646
}

‎aquasec/resource_permission_set_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ func TestAquasecPermissionSetManagement(t *testing.T) {
2020
actions := "risks.vulnerabilities.read,images.read"
2121

2222
if isSaasEnv() {
23+
// todo: remove this after solving the following issue: https://scalock.atlassian.net/browse/SLK-62403
24+
t.Skip("Skipping user test because its saas env")
2325
author = os.Getenv("AQUA_USER")
2426
}
2527

‎client/acknowledge.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,12 @@ func (cli *Client) AcknowledgeCreate(acknowledgePost AcknowledgePost) error {
5454
}
5555

5656
request := cli.gorequest
57-
request.Set("Authorization", "Bearer "+cli.token)
5857
apiPath := fmt.Sprintf("/api/v2/risks/acknowledge")
5958
err = cli.limiter.Wait(context.Background())
6059
if err != nil {
6160
return err
6261
}
63-
resp, data, errs := request.Clone().Post(cli.url + apiPath).Send(string(payload)).End()
62+
resp, data, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Post(cli.url + apiPath).Send(string(payload)).End()
6463
if errs != nil {
6564
return errors.Wrap(err, "failed creating security acknowledges")
6665
}
@@ -77,13 +76,13 @@ func (cli *Client) AcknowledgeRead() (*AcknowledgeList, error) {
7776
var response AcknowledgeList
7877

7978
request := cli.gorequest
80-
request.Set("Authorization", "Bearer "+cli.token)
79+
8180
apiPath := fmt.Sprintf("/api/v2/risks/acknowledge?order_by=date")
8281
err = cli.limiter.Wait(context.Background())
8382
if err != nil {
8483
return nil, err
8584
}
86-
events, body, errs := request.Clone().Get(cli.url + apiPath).End()
85+
events, body, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Get(cli.url + apiPath).End()
8786
if errs != nil {
8887
err = fmt.Errorf("error calling %s", apiPath)
8988
return nil, err
@@ -105,13 +104,12 @@ func (cli *Client) AcknowledgeDelete(acknowledgePost AcknowledgePost) error {
105104
return err
106105
}
107106
request := cli.gorequest
108-
request.Set("Authorization", "Bearer "+cli.token)
109107
apiPath := fmt.Sprintf("/api/v2/risks/acknowledge/multiple")
110108
err = cli.limiter.Wait(context.Background())
111109
if err != nil {
112110
return err
113111
}
114-
resp, data, errs := request.Clone().Delete(cli.url + apiPath).Send(string(payload)).End()
112+
resp, data, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Delete(cli.url + apiPath).Send(string(payload)).End()
115113
if errs != nil {
116114
return errors.Wrap(err, "failed deleting security acknowledges")
117115
}

‎client/application_scope.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,12 @@ func (cli *Client) CreateApplicationScope(applicationscope *ApplicationScope) er
100100
return err
101101
}
102102
request := cli.gorequest
103-
request.Set("Authorization", "Bearer "+cli.token)
104103
apiPath := fmt.Sprintf("/api/v2/access_management/scopes")
105104
err = cli.limiter.Wait(context.Background())
106105
if err != nil {
107106
return err
108107
}
109-
resp, _, errs := request.Clone().Post(cli.url + apiPath).Send(string(payload)).End()
108+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Post(cli.url + apiPath).Send(string(payload)).End()
110109
if errs != nil {
111110
return errors.Wrap(getMergedError(errs), "failed creating Application Scope.")
112111
}
@@ -134,13 +133,12 @@ func (cli *Client) UpdateApplicationScope(applicationscope *ApplicationScope, na
134133
return err
135134
}
136135
request := cli.gorequest
137-
request.Set("Authorization", "Bearer "+cli.token)
138136
apiPath := fmt.Sprintf("/api/v2/access_management/scopes/%s", name)
139137
err = cli.limiter.Wait(context.Background())
140138
if err != nil {
141139
return err
142140
}
143-
resp, _, errs := request.Clone().Put(cli.url + apiPath).Send(string(payload)).End()
141+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Put(cli.url + apiPath).Send(string(payload)).End()
144142
if errs != nil {
145143
return errors.Wrap(getMergedError(errs), "failed modifying Application Scope")
146144
}
@@ -164,13 +162,12 @@ func (cli *Client) UpdateApplicationScope(applicationscope *ApplicationScope, na
164162
// DeleteApplicationScope removes a Application Scope
165163
func (cli *Client) DeleteApplicationScope(name string) error {
166164
request := cli.gorequest
167-
request.Set("Authorization", "Bearer "+cli.token)
168165
apiPath := fmt.Sprintf("/api/v2/access_management/scopes/%s", name)
169166
err := cli.limiter.Wait(context.Background())
170167
if err != nil {
171168
return err
172169
}
173-
resp, _, errs := request.Clone().Delete(cli.url + apiPath).End()
170+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Delete(cli.url + apiPath).End()
174171
if errs != nil {
175172
return errors.Wrap(getMergedError(errs), "failed deleting Application Scope")
176173
}

‎client/assurance_policy.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ type ScanTimeAuto struct {
149149
func (cli *Client) GetAssurancePolicy(name string, at string) (*AssurancePolicy, error) {
150150
var err error
151151
var response AssurancePolicy
152-
cli.gorequest.Set("Authorization", "Bearer "+cli.token)
153152
var atype string
154153
if strings.EqualFold(at, "host") {
155154
atype = "host"
@@ -165,7 +164,7 @@ func (cli *Client) GetAssurancePolicy(name string, at string) (*AssurancePolicy,
165164
if err != nil {
166165
return nil, err
167166
}
168-
resp, body, errs := cli.gorequest.Clone().Get(cli.url + apiPath).End()
167+
resp, body, errs := cli.gorequest.Clone().Set("Authorization", "Bearer "+cli.token).Get(cli.url + apiPath).End()
169168
if errs != nil {
170169
return nil, errors.Wrap(getMergedError(errs), "failed getting Assurance Policy")
171170
}
@@ -214,12 +213,11 @@ func (cli *Client) CreateAssurancePolicy(assurancepolicy *AssurancePolicy, at st
214213
return err
215214
}
216215
request := cli.gorequest
217-
request.Set("Authorization", "Bearer "+cli.token)
218216
err = cli.limiter.Wait(context.Background())
219217
if err != nil {
220218
return err
221219
}
222-
resp, _, errs := request.Clone().Post(cli.url + apiPath).Send(string(payload)).End()
220+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Post(cli.url + apiPath).Send(string(payload)).End()
223221
if errs != nil {
224222
return errors.Wrap(getMergedError(errs), "failed creating Assurance Policy.")
225223
}
@@ -258,12 +256,11 @@ func (cli *Client) UpdateAssurancePolicy(assurancepolicy *AssurancePolicy, at st
258256
}
259257
apiPath := "/api/v2/assurance_policy/" + atype + "/" + assurancepolicy.Name
260258
request := cli.gorequest
261-
request.Set("Authorization", "Bearer "+cli.token)
262259
err = cli.limiter.Wait(context.Background())
263260
if err != nil {
264261
return err
265262
}
266-
resp, _, errs := request.Clone().Put(cli.url + apiPath).Send(string(payload)).End()
263+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Put(cli.url + apiPath).Send(string(payload)).End()
267264
if errs != nil {
268265
return errors.Wrap(getMergedError(errs), "failed modifying Assurance Policy")
269266
}
@@ -287,7 +284,6 @@ func (cli *Client) UpdateAssurancePolicy(assurancepolicy *AssurancePolicy, at st
287284
// DeleteAssurancePolicy removes a Assurance Policy
288285
func (cli *Client) DeleteAssurancePolicy(name string, at string) error {
289286
request := cli.gorequest
290-
request.Set("Authorization", "Bearer "+cli.token)
291287
var atype string
292288
if strings.EqualFold(at, "host") {
293289
atype = "host"
@@ -303,7 +299,7 @@ func (cli *Client) DeleteAssurancePolicy(name string, at string) error {
303299
if err != nil {
304300
return err
305301
}
306-
resp, _, errs := request.Clone().Delete(cli.url + apiPath).End()
302+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Delete(cli.url + apiPath).End()
307303
if errs != nil {
308304
return errors.Wrap(getMergedError(errs), "failed deleting Assurance Policy")
309305
}

‎client/enforcers.go‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,12 @@ func (cli *Client) GetEnforcerGroup(name string) (*EnforcerGroup, error) {
9797
var err error
9898
var response EnforcerGroup
9999
request := cli.gorequest
100-
request.Set("Authorization", "Bearer "+cli.token)
101100
apiPath := fmt.Sprintf("/api/v1/hostsbatch/%s", name)
102101
err = cli.limiter.Wait(context.Background())
103102
if err != nil {
104103
return nil, err
105104
}
106-
events, body, errs := request.Clone().Get(cli.url + apiPath).End()
105+
events, body, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Get(cli.url + apiPath).End()
107106

108107
if errs != nil {
109108
err = fmt.Errorf("error calling %s", apiPath)
@@ -128,13 +127,12 @@ func (cli *Client) GetEnforcerGroups() ([]EnforcerGroup, error) {
128127
var err error
129128
var response []EnforcerGroup
130129
request := cli.gorequest
131-
request.Set("Authorization", "Bearer "+cli.token)
132130
apiPath := fmt.Sprintf("/api/v1/hostsbatch")
133131
err = cli.limiter.Wait(context.Background())
134132
if err != nil {
135133
return nil, err
136134
}
137-
events, body, errs := request.Clone().Get(cli.url + apiPath).End()
135+
events, body, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Get(cli.url + apiPath).End()
138136
if errs != nil {
139137
err = fmt.Errorf("error calling %s", apiPath)
140138
return nil, err
@@ -156,13 +154,12 @@ func (cli *Client) CreateEnforcerGroup(group EnforcerGroup) error {
156154
return err
157155
}
158156
request := cli.gorequest
159-
request.Set("Authorization", "Bearer "+cli.token)
160157
apiPath := fmt.Sprintf("/api/v1/hostsbatch")
161158
err = cli.limiter.Wait(context.Background())
162159
if err != nil {
163160
return err
164161
}
165-
resp, data, errs := request.Clone().Post(cli.url + apiPath).Send(string(payload)).End()
162+
resp, data, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Post(cli.url + apiPath).Send(string(payload)).End()
166163
if errs != nil {
167164
return errors.Wrap(err, "failed creating enforcer group")
168165
}
@@ -183,13 +180,12 @@ func (cli *Client) UpdateEnforcerGroup(group EnforcerGroup) error {
183180
return err
184181
}
185182
request := cli.gorequest
186-
request.Set("Authorization", "Bearer "+cli.token)
187183
apiPath := "/api/v1/hostsbatch"
188184
err = cli.limiter.Wait(context.Background())
189185
if err != nil {
190186
return err
191187
}
192-
resp, _, errs := request.Clone().Put(cli.url+apiPath).Send(string(payload)).Param("update_enforcers", "true").End()
188+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Put(cli.url+apiPath).Send(string(payload)).Param("update_enforcers", "true").End()
193189
//resp, _, errs := request.Clone().Put(cli.url + apiPath).Send(string(payload)).End()
194190

195191
if errs != nil {
@@ -204,13 +200,12 @@ func (cli *Client) UpdateEnforcerGroup(group EnforcerGroup) error {
204200
// DeleteEnforcerGroup removes an enforcer group
205201
func (cli *Client) DeleteEnforcerGroup(name string) error {
206202
request := cli.gorequest
207-
request.Set("Authorization", "Bearer "+cli.token)
208203
apiPath := fmt.Sprintf("/api/v1/hostsbatch/%s?delete_related=true", name)
209204
err := cli.limiter.Wait(context.Background())
210205
if err != nil {
211206
return err
212207
}
213-
events, _, errs := request.Clone().Delete(cli.url + apiPath).End()
208+
events, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Delete(cli.url + apiPath).End()
214209
if errs != nil {
215210
return fmt.Errorf("error while calling DELETE on /api/v1/hostsbatch/%s: %v", name, events.StatusCode)
216211
}

‎client/firewall_policy.go‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,12 @@ func (cli *Client) GetFirewallPolicies() (*FirewallPolicyList, error) {
6868
func (cli *Client) GetFirewallPolicy(name string) (*FirewallPolicy, error) {
6969
var err error
7070
var response FirewallPolicy
71-
cli.gorequest.Set("Authorization", "Bearer "+cli.token)
7271
apiPath := fmt.Sprintf("/api/v2/firewall_policies/%s", name)
7372
err = cli.limiter.Wait(context.Background())
7473
if err != nil {
7574
return nil, err
7675
}
77-
resp, body, errs := cli.gorequest.Clone().Get(cli.url + apiPath).End()
76+
resp, body, errs := cli.gorequest.Clone().Set("Authorization", "Bearer "+cli.token).Get(cli.url + apiPath).End()
7877
if errs != nil {
7978
return nil, errors.Wrap(getMergedError(errs), "failed getting firewall policy")
8079
}
@@ -112,13 +111,12 @@ func (cli *Client) CreateFirewallPolicy(firewallPolicy FirewallPolicy) error {
112111
return err
113112
}
114113
request := cli.gorequest
115-
request.Set("Authorization", "Bearer "+cli.token)
116-
apiPath := fmt.Sprintf("/api/v2/firewall_policies")
114+
apiPath := "/api/v2/firewall_policies"
117115
err = cli.limiter.Wait(context.Background())
118116
if err != nil {
119117
return err
120118
}
121-
resp, _, errs := request.Clone().Post(cli.url + apiPath).Send(string(payload)).End()
119+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Post(cli.url + apiPath).Send(string(payload)).End()
122120
if errs != nil {
123121
return errors.Wrap(getMergedError(errs), "failed creating firewall policy.")
124122
}
@@ -146,13 +144,12 @@ func (cli *Client) UpdateFirewallPolicy(firewallPolicy FirewallPolicy) error {
146144
return err
147145
}
148146
request := cli.gorequest
149-
request.Set("Authorization", "Bearer "+cli.token)
150147
apiPath := fmt.Sprintf("/api/v2/firewall_policies/%s", firewallPolicy.Name)
151148
err = cli.limiter.Wait(context.Background())
152149
if err != nil {
153150
return err
154151
}
155-
resp, _, errs := request.Clone().Put(cli.url + apiPath).Send(string(payload)).End()
152+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Put(cli.url + apiPath).Send(string(payload)).End()
156153
if errs != nil {
157154
return errors.Wrap(getMergedError(errs), "failed modifying firewall policy")
158155
}
@@ -176,13 +173,12 @@ func (cli *Client) UpdateFirewallPolicy(firewallPolicy FirewallPolicy) error {
176173
// DeleteFirewallPolicy removes a Firewall Policy
177174
func (cli *Client) DeleteFirewallPolicy(name string) error {
178175
request := cli.gorequest
179-
request.Set("Authorization", "Bearer "+cli.token)
180176
apiPath := fmt.Sprintf("/api/v2/firewall_policies/%s", name)
181177
err := cli.limiter.Wait(context.Background())
182178
if err != nil {
183179
return err
184180
}
185-
resp, _, errs := request.Clone().Delete(cli.url + apiPath).End()
181+
resp, _, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Delete(cli.url + apiPath).End()
186182
if errs != nil {
187183
return errors.Wrap(getMergedError(errs), "failed deleting firewall policy")
188184
}

‎client/gateway.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ type Gateway struct {
2525
func (cli *Client) GetGateway(name string) (*Gateway, error) {
2626
var err error
2727
var response Gateway
28-
cli.gorequest.Set("Authorization", "Bearer "+cli.token)
2928
apiPath := fmt.Sprintf("/api/v1/servers/%s", name)
3029
err = cli.limiter.Wait(context.Background())
3130
if err != nil {
3231
return nil, err
3332
}
34-
events, body, errs := cli.gorequest.Clone().Get(cli.url + apiPath).End()
33+
events, body, errs := cli.gorequest.Clone().Set("Authorization", "Bearer "+cli.token).Get(cli.url + apiPath).End()
3534
if errs != nil {
3635
log.Println(events.StatusCode)
3736
err = fmt.Errorf("error calling %s", apiPath)
@@ -56,13 +55,12 @@ func (cli *Client) GetGateways() ([]Gateway, error) {
5655
var err error
5756
var response []Gateway
5857
request := cli.gorequest
59-
request.Set("Authorization", "Bearer "+cli.token)
60-
apiPath := fmt.Sprintf("/api/v1/servers")
58+
apiPath := "/api/v1/servers"
6159
err = cli.limiter.Wait(context.Background())
6260
if err != nil {
6361
return nil, err
6462
}
65-
events, body, errs := request.Clone().Get(cli.url + apiPath).End()
63+
events, body, errs := request.Clone().Set("Authorization", "Bearer "+cli.token).Get(cli.url + apiPath).End()
6664
if errs != nil {
6765
err = fmt.Errorf("error calling %s", apiPath)
6866
return nil, err

0 commit comments

Comments
 (0)