Skip to content

Commit 3b8ef20

Browse files
AvareiAvarei
committed
fix tests
1 parent fd5c88b commit 3b8ef20

File tree

5 files changed

+34
-26
lines changed

5 files changed

+34
-26
lines changed

‎internal/controller/disposablerequest/disposablerequest_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ func httpDisposableRequest(rm ...httpDisposableRequestModifier) *v1alpha2.Dispos
103103
return r
104104
}
105105

106-
type MockSendRequestFn func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error)
106+
type MockSendRequestFn func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error)
107107

108108
type MockHttpClient struct {
109109
MockSendRequest MockSendRequestFn
110110
}
111111

112-
func (c *MockHttpClient) SendRequest(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
113-
return c.MockSendRequest(ctx, method, url, body, headers, skipTLSVerify)
112+
func (c *MockHttpClient) SendRequest(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
113+
return c.MockSendRequest(ctx, method, url, body, headers)
114114
}
115115

116116
type notHttpDisposableRequest struct {
@@ -143,7 +143,7 @@ func Test_httpExternal_Create(t *testing.T) {
143143
"DisposableRequestFailed": {
144144
args: args{
145145
http: &MockHttpClient{
146-
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
146+
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
147147
return httpClient.HttpDetails{}, errBoom
148148
},
149149
},
@@ -161,7 +161,7 @@ func Test_httpExternal_Create(t *testing.T) {
161161
"Success": {
162162
args: args{
163163
http: &MockHttpClient{
164-
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
164+
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
165165
return httpClient.HttpDetails{}, nil
166166
},
167167
},
@@ -219,7 +219,7 @@ func Test_httpExternal_Update(t *testing.T) {
219219
"DisposableRequestFailed": {
220220
args: args{
221221
http: &MockHttpClient{
222-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
222+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
223223
return httpClient.HttpDetails{}, errBoom
224224
},
225225
},
@@ -236,7 +236,7 @@ func Test_httpExternal_Update(t *testing.T) {
236236
"Success": {
237237
args: args{
238238
http: &MockHttpClient{
239-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
239+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
240240
return httpClient.HttpDetails{}, nil
241241
},
242242
},
@@ -290,7 +290,7 @@ func Test_deployAction(t *testing.T) {
290290
"SuccessUpdateStatusRequestFailure": {
291291
args: args{
292292
http: &MockHttpClient{
293-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
293+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
294294
return httpClient.HttpDetails{}, errors.Errorf(utils.ErrInvalidURL, "invalid-url")
295295
},
296296
},
@@ -318,7 +318,7 @@ func Test_deployAction(t *testing.T) {
318318
"SuccessUpdateStatusCodeError": {
319319
args: args{
320320
http: &MockHttpClient{
321-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
321+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
322322
return httpClient.HttpDetails{
323323
HttpResponse: httpClient.HttpResponse{
324324
StatusCode: 400,
@@ -356,7 +356,7 @@ func Test_deployAction(t *testing.T) {
356356
"SuccessUpdateStatusSuccessfulRequest": {
357357
args: args{
358358
http: &MockHttpClient{
359-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
359+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
360360
return httpClient.HttpDetails{
361361
HttpResponse: httpClient.HttpResponse{
362362
StatusCode: 200,

‎internal/controller/request/observe_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func Test_isUpToDate(t *testing.T) {
3636
"ObjectNotFoundEmptyBody": {
3737
args: args{
3838
http: &MockHttpClient{
39-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
39+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
4040
return httpClient.HttpDetails{}, nil
4141
},
4242
},
@@ -54,7 +54,7 @@ func Test_isUpToDate(t *testing.T) {
5454
"ObjectNotFoundPostFailed": {
5555
args: args{
5656
http: &MockHttpClient{
57-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
57+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
5858
return httpClient.HttpDetails{}, nil
5959
},
6060
},
@@ -73,7 +73,7 @@ func Test_isUpToDate(t *testing.T) {
7373
"ObjectNotFound404StatusCode": {
7474
args: args{
7575
http: &MockHttpClient{
76-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
76+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
7777
return httpClient.HttpDetails{}, nil
7878
},
7979
},
@@ -91,7 +91,7 @@ func Test_isUpToDate(t *testing.T) {
9191
"FailBodyNotJSON": {
9292
args: args{
9393
http: &MockHttpClient{
94-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
94+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
9595
return httpClient.HttpDetails{
9696
HttpResponse: httpClient.HttpResponse{
9797
Body: "not a JSON",
@@ -113,7 +113,7 @@ func Test_isUpToDate(t *testing.T) {
113113
"SuccessNotSynced": {
114114
args: args{
115115
http: &MockHttpClient{
116-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
116+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
117117
return httpClient.HttpDetails{
118118
HttpResponse: httpClient.HttpResponse{
119119
Body: `{"username":"old_name"}`,
@@ -147,7 +147,7 @@ func Test_isUpToDate(t *testing.T) {
147147
"SuccessNoPUTMapping": {
148148
args: args{
149149
http: &MockHttpClient{
150-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
150+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
151151
return httpClient.HttpDetails{
152152
HttpResponse: httpClient.HttpResponse{
153153
Body: `{"username":"old_name"}`,
@@ -187,7 +187,7 @@ func Test_isUpToDate(t *testing.T) {
187187
"SuccessJSONBody": {
188188
args: args{
189189
http: &MockHttpClient{
190-
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
190+
MockSendRequest: func(ctx context.Context, method string, url string, body, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
191191
return httpClient.HttpDetails{
192192
HttpResponse: httpClient.HttpResponse{
193193
Body: `{"username":"john_doe_new_username"}`,

‎internal/controller/request/request_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ type notHttpRequest struct {
7272
resource.Managed
7373
}
7474

75-
type MockSendRequestFn func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error)
75+
type MockSendRequestFn func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error)
7676

7777
type MockHttpClient struct {
7878
MockSendRequest MockSendRequestFn
7979
}
8080

81-
func (c *MockHttpClient) SendRequest(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
82-
return c.MockSendRequest(ctx, method, url, body, headers, skipTLSVerify)
81+
func (c *MockHttpClient) SendRequest(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
82+
return c.MockSendRequest(ctx, method, url, body, headers)
8383
}
8484

8585
type MockSetRequestStatusFn func() error
@@ -126,7 +126,7 @@ func Test_httpExternal_Create(t *testing.T) {
126126
"RequestFailed": {
127127
args: args{
128128
http: &MockHttpClient{
129-
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
129+
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
130130
return httpClient.HttpDetails{}, errBoom
131131
},
132132
},
@@ -143,7 +143,7 @@ func Test_httpExternal_Create(t *testing.T) {
143143
"Success": {
144144
args: args{
145145
http: &MockHttpClient{
146-
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
146+
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
147147
return httpClient.HttpDetails{}, nil
148148
},
149149
},
@@ -201,7 +201,7 @@ func Test_httpExternal_Update(t *testing.T) {
201201
"RequestFailed": {
202202
args: args{
203203
http: &MockHttpClient{
204-
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
204+
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
205205
return httpClient.HttpDetails{}, errBoom
206206
},
207207
},
@@ -218,7 +218,7 @@ func Test_httpExternal_Update(t *testing.T) {
218218
"Success": {
219219
args: args{
220220
http: &MockHttpClient{
221-
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
221+
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
222222
return httpClient.HttpDetails{}, nil
223223
},
224224
},
@@ -276,7 +276,7 @@ func Test_httpExternal_Delete(t *testing.T) {
276276
"RequestFailed": {
277277
args: args{
278278
http: &MockHttpClient{
279-
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
279+
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
280280
return httpClient.HttpDetails{}, errBoom
281281
},
282282
},
@@ -293,7 +293,7 @@ func Test_httpExternal_Delete(t *testing.T) {
293293
"Success": {
294294
args: args{
295295
http: &MockHttpClient{
296-
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data, skipTLSVerify bool) (resp httpClient.HttpDetails, err error) {
296+
MockSendRequest: func(ctx context.Context, method string, url string, body httpClient.Data, headers httpClient.Data) (resp httpClient.HttpDetails, err error) {
297297
return httpClient.HttpDetails{}, nil
298298
},
299299
},

‎internal/controller/request/requestgen/request_generator_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,10 @@ func Test_generateRequestObject(t *testing.T) {
424424
"body": map[string]any{"id": "123"},
425425
"statusCode": float64(200),
426426
},
427+
"tlsSecretRef": map[string]any{
428+
"name": "",
429+
"namespace": "",
430+
},
427431
},
428432
},
429433
},

‎internal/json/util_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,10 @@ func Test_StructToMap(t *testing.T) {
248248
"baseUrl": "https://api.example.com/users",
249249
"body": `{"username": "john_doe", "email": "[email protected]"}`,
250250
},
251+
"tlsSecretRef": map[string]any{
252+
"name": "",
253+
"namespace": "",
254+
},
251255
},
252256
errMessage: "",
253257
},

0 commit comments

Comments
 (0)