Skip to content

Commit 398ab02

Browse files
AlevskAlevsk
authored
Removing hardcoded timeouts (#1826)
Signed-off-by: Lenin Alevski <alevsk.8772@gmail.com>
1 parent 1de712c commit 398ab02

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+395
-264
lines changed

‎operatorapi/auth/operator.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ func checkServiceAccountTokenValid(ctx context.Context, operatorClient OperatorC
7676

7777
// GetConsoleCredentialsForOperator will validate the provided JWT (service account token) and return it in the form of credentials.Login
7878
func GetConsoleCredentialsForOperator(jwt string) (*credentials.Credentials, error) {
79-
ctx := context.Background()
79+
ctx, cancel := context.WithCancel(context.Background())
80+
defer cancel()
8081
opClientClientSet, err := cluster.OperatorClient(jwt)
8182
if err != nil {
8283
return nil, err

‎operatorapi/login.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"fmt"
2222
"math/rand"
2323
"net/http"
24-
"time"
2524

2625
xoauth2 "golang.org/x/oauth2"
2726

@@ -127,7 +126,7 @@ func verifyUserAgainstIDP(ctx context.Context, provider auth.IdentityProviderI,
127126
}
128127

129128
func getLoginOauth2AuthResponse(r *http.Request, lr *models.LoginOauth2AuthRequest) (*models.LoginResponse, *models.Error) {
130-
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
129+
ctx, cancel := context.WithCancel(context.Background())
131130
defer cancel()
132131
if oauth2.IsIDPEnabled() {
133132
// initialize new oauth2 client

‎operatorapi/namespaces.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func registerNamespaceHandlers(api *operations.OperatorAPI) {
4444
}
4545

4646
func getNamespaceCreatedResponse(session *models.Principal, params operator_api.CreateNamespaceParams) *models.Error {
47-
ctx := context.Background()
48-
47+
ctx, cancel := context.WithCancel(context.Background())
48+
defer cancel()
4949
clientset, err := cluster.K8sClient(session.STSSessionToken)
5050

5151
if err != nil {

‎operatorapi/nodes.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,8 @@ OUTER:
358358
// Get allocatable resources response
359359

360360
func getAllocatableResourcesResponse(numNodes int32, session *models.Principal) (*models.AllocatableResourcesResponse, *models.Error) {
361-
ctx := context.Background()
361+
ctx, cancel := context.WithCancel(context.Background())
362+
defer cancel()
362363
client, err := cluster.K8sClient(session.STSSessionToken)
363364
if err != nil {
364365
return nil, prepareError(err)

‎operatorapi/resource_quota.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ func getResourceQuota(ctx context.Context, client K8sClientI, namespace, resourc
9494
}
9595

9696
func getResourceQuotaResponse(session *models.Principal, params operator_api.GetResourceQuotaParams) (*models.ResourceQuota, *models.Error) {
97-
ctx := context.Background()
97+
ctx, cancel := context.WithCancel(context.Background())
98+
defer cancel()
9899
client, err := cluster.K8sClient(session.STSSessionToken)
99100
if err != nil {
100101
return nil, prepareError(err)

‎operatorapi/resource_quota_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ func Test_ResourceQuota(t *testing.T) {
7474
// k8sclientGetResourceQuotaMock = func(ctx context.Context, namespace, resource string, opts metav1.GetOptions) (*v1.ResourceQuota, error) {
7575
// return nil, nil
7676
// }
77-
ctx := context.Background()
77+
ctx, cancel := context.WithCancel(context.Background())
78+
defer cancel()
7879
kClient := k8sClientMock{}
7980
type args struct {
8081
ctx context.Context

‎operatorapi/tenant_add.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ import (
4141
func getTenantCreatedResponse(session *models.Principal, params operator_api.CreateTenantParams) (response *models.CreateTenantResponse, mError *models.Error) {
4242
tenantReq := params.Body
4343
minioImage := tenantReq.Image
44-
ctx := context.Background()
44+
ctx, cancel := context.WithCancel(context.Background())
45+
defer cancel()
4546
if minioImage == "" {
4647
minImg, err := cluster.GetMinioImage()
4748
// we can live without figuring out the latest version of MinIO, Operator will use a hardcoded value

‎operatorapi/tenant_get.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package operatorapi
1919
import (
2020
"context"
2121
"fmt"
22-
"time"
2322

2423
"github.com/minio/console/cluster"
2524
"github.com/minio/console/models"
@@ -30,8 +29,7 @@ import (
3029
)
3130

3231
func getTenantDetailsResponse(session *models.Principal, params operator_api.TenantDetailsParams) (*models.Tenant, *models.Error) {
33-
// 5 seconds timeout
34-
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
32+
ctx, cancel := context.WithCancel(context.Background())
3533
defer cancel()
3634
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
3735
if err != nil {

‎operatorapi/tenants.go

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ import (
3333
"strings"
3434
"time"
3535

36-
utils2 "github.com/minio/console/pkg/utils"
37-
3836
"github.com/dustin/go-humanize"
37+
"github.com/minio/madmin-go"
38+
39+
utils2 "github.com/minio/console/pkg/utils"
3940

4041
"github.com/minio/console/restapi"
4142

@@ -51,11 +52,9 @@ import (
5152

5253
corev1 "k8s.io/api/core/v1"
5354

54-
"github.com/minio/console/cluster"
55-
"github.com/minio/madmin-go"
56-
5755
"github.com/go-openapi/runtime/middleware"
5856
"github.com/go-openapi/swag"
57+
"github.com/minio/console/cluster"
5958
"github.com/minio/console/models"
6059
"github.com/minio/console/operatorapi/operations"
6160
miniov2 "github.com/minio/operator/pkg/apis/minio.min.io/v2"
@@ -433,7 +432,8 @@ func deleteTenantAction(
433432

434433
// getDeleteTenantResponse gets the output of deleting a minio instance
435434
func getDeletePodResponse(session *models.Principal, params operator_api.DeletePodParams) *models.Error {
436-
ctx := context.Background()
435+
ctx, cancel := context.WithCancel(context.Background())
436+
defer cancel()
437437
// get Kubernetes Client
438438
clientset, err := cluster.K8sClient(session.STSSessionToken)
439439
if err != nil {
@@ -833,8 +833,8 @@ func updateTenantIdentityProvider(ctx context.Context, operatorClient OperatorCl
833833
}
834834

835835
func getTenantIdentityProviderResponse(session *models.Principal, params operator_api.TenantIdentityProviderParams) (*models.IdpConfiguration, *models.Error) {
836-
// 5 seconds timeout
837-
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
836+
837+
ctx, cancel := context.WithCancel(context.Background())
838838
defer cancel()
839839

840840
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -864,8 +864,8 @@ func getTenantIdentityProviderResponse(session *models.Principal, params operato
864864
}
865865

866866
func getUpdateTenantIdentityProviderResponse(session *models.Principal, params operator_api.UpdateTenantIdentityProviderParams) *models.Error {
867-
// 5 seconds timeout
868-
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
867+
868+
ctx, cancel := context.WithCancel(context.Background())
869869
defer cancel()
870870
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
871871
if err != nil {
@@ -889,8 +889,8 @@ func getUpdateTenantIdentityProviderResponse(session *models.Principal, params o
889889
}
890890

891891
func getTenantSecurityResponse(session *models.Principal, params operator_api.TenantSecurityParams) (*models.TenantSecurityResponse, *models.Error) {
892-
// 5 seconds timeout
893-
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
892+
893+
ctx, cancel := context.WithCancel(context.Background())
894894
defer cancel()
895895
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
896896
if err != nil {
@@ -919,8 +919,8 @@ func getTenantSecurityResponse(session *models.Principal, params operator_api.Te
919919
}
920920

921921
func getUpdateTenantSecurityResponse(session *models.Principal, params operator_api.UpdateTenantSecurityParams) *models.Error {
922-
// 5 seconds timeout
923-
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
922+
923+
ctx, cancel := context.WithCancel(context.Background())
924924
defer cancel()
925925
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
926926
if err != nil {
@@ -1099,7 +1099,8 @@ func listTenants(ctx context.Context, operatorClient OperatorClientI, namespace
10991099
}
11001100

11011101
func getListAllTenantsResponse(session *models.Principal, params operator_api.ListAllTenantsParams) (*models.ListTenantsResponse, *models.Error) {
1102-
ctx := context.Background()
1102+
ctx, cancel := context.WithCancel(context.Background())
1103+
defer cancel()
11031104
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
11041105
if err != nil {
11051106
return nil, prepareError(err)
@@ -1116,7 +1117,8 @@ func getListAllTenantsResponse(session *models.Principal, params operator_api.Li
11161117

11171118
// getListTenantsResponse list tenants by namespace
11181119
func getListTenantsResponse(session *models.Principal, params operator_api.ListTenantsParams) (*models.ListTenantsResponse, *models.Error) {
1119-
ctx := context.Background()
1120+
ctx, cancel := context.WithCancel(context.Background())
1121+
defer cancel()
11201122
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
11211123
if err != nil {
11221124
return nil, prepareError(err)
@@ -1213,7 +1215,8 @@ func removeAnnotations(annotationsOne, annotationsTwo map[string]string) map[str
12131215
}
12141216

12151217
func getUpdateTenantResponse(session *models.Principal, params operator_api.UpdateTenantParams) *models.Error {
1216-
ctx := context.Background()
1218+
ctx, cancel := context.WithCancel(context.Background())
1219+
defer cancel()
12171220
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
12181221
if err != nil {
12191222
return prepareError(err)
@@ -1263,7 +1266,8 @@ func addTenantPool(ctx context.Context, operatorClient OperatorClientI, params o
12631266
}
12641267

12651268
func getTenantAddPoolResponse(session *models.Principal, params operator_api.TenantAddPoolParams) *models.Error {
1266-
ctx := context.Background()
1269+
ctx, cancel := context.WithCancel(context.Background())
1270+
defer cancel()
12671271
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
12681272
if err != nil {
12691273
return prepareError(err)
@@ -1279,8 +1283,8 @@ func getTenantAddPoolResponse(session *models.Principal, params operator_api.Ten
12791283

12801284
// getTenantUsageResponse returns the usage of a tenant
12811285
func getTenantUsageResponse(session *models.Principal, params operator_api.GetTenantUsageParams) (*models.TenantUsage, *models.Error) {
1282-
// 30 seconds timeout
1283-
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
1286+
1287+
ctx, cancel := context.WithCancel(context.Background())
12841288
defer cancel()
12851289

12861290
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -1330,8 +1334,8 @@ func getTenantUsageResponse(session *models.Principal, params operator_api.GetTe
13301334

13311335
// getTenantLogsResponse returns the logs of a tenant
13321336
func getTenantLogsResponse(session *models.Principal, params operator_api.GetTenantLogsParams) (*models.TenantLogs, *models.Error) {
1333-
// 30 seconds timeout
1334-
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
1337+
1338+
ctx, cancel := context.WithCancel(context.Background())
13351339
defer cancel()
13361340

13371341
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -1428,8 +1432,7 @@ func getTenantLogsResponse(session *models.Principal, params operator_api.GetTen
14281432
// setTenantLogsResponse returns the logs of a tenant
14291433
func setTenantLogsResponse(session *models.Principal, params operator_api.SetTenantLogsParams) (bool, *models.Error) {
14301434

1431-
// 30 seconds timeout
1432-
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
1435+
ctx, cancel := context.WithCancel(context.Background())
14331436
defer cancel()
14341437

14351438
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -1595,8 +1598,8 @@ func setTenantLogsResponse(session *models.Principal, params operator_api.SetTen
15951598

15961599
// enableTenantLoggingResponse enables Tenant Logging
15971600
func enableTenantLoggingResponse(session *models.Principal, params operator_api.EnableTenantLoggingParams) (bool, *models.Error) {
1598-
// 30 seconds timeout
1599-
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
1601+
1602+
ctx, cancel := context.WithCancel(context.Background())
16001603
defer cancel()
16011604

16021605
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -1656,8 +1659,8 @@ func enableTenantLoggingResponse(session *models.Principal, params operator_api.
16561659

16571660
// disableTenantLoggingResponse disables Tenant Logging
16581661
func disableTenantLoggingResponse(session *models.Principal, params operator_api.DisableTenantLoggingParams) (bool, *models.Error) {
1659-
// 30 seconds timeout
1660-
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
1662+
1663+
ctx, cancel := context.WithCancel(context.Background())
16611664
defer cancel()
16621665

16631666
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -1687,7 +1690,8 @@ func disableTenantLoggingResponse(session *models.Principal, params operator_api
16871690
}
16881691

16891692
func getTenantPodsResponse(session *models.Principal, params operator_api.GetTenantPodsParams) ([]*models.TenantPod, *models.Error) {
1690-
ctx := context.Background()
1693+
ctx, cancel := context.WithCancel(context.Background())
1694+
defer cancel()
16911695
clientset, err := cluster.K8sClient(session.STSSessionToken)
16921696
if err != nil {
16931697
return nil, prepareError(err)
@@ -1721,7 +1725,8 @@ func getTenantPodsResponse(session *models.Principal, params operator_api.GetTen
17211725
}
17221726

17231727
func getPodLogsResponse(session *models.Principal, params operator_api.GetPodLogsParams) (string, *models.Error) {
1724-
ctx := context.Background()
1728+
ctx, cancel := context.WithCancel(context.Background())
1729+
defer cancel()
17251730
clientset, err := cluster.K8sClient(session.STSSessionToken)
17261731
if err != nil {
17271732
return "", prepareError(err)
@@ -1736,7 +1741,8 @@ func getPodLogsResponse(session *models.Principal, params operator_api.GetPodLog
17361741
}
17371742

17381743
func getPodEventsResponse(session *models.Principal, params operator_api.GetPodEventsParams) (models.EventListWrapper, *models.Error) {
1739-
ctx := context.Background()
1744+
ctx, cancel := context.WithCancel(context.Background())
1745+
defer cancel()
17401746
clientset, err := cluster.K8sClient(session.STSSessionToken)
17411747
if err != nil {
17421748
return nil, prepareError(err)
@@ -1767,7 +1773,8 @@ func getPodEventsResponse(session *models.Principal, params operator_api.GetPodE
17671773

17681774
//get values for prometheus metrics
17691775
func getTenantMonitoringResponse(session *models.Principal, params operator_api.GetTenantMonitoringParams) (*models.TenantMonitoringInfo, *models.Error) {
1770-
ctx := context.Background()
1776+
ctx, cancel := context.WithCancel(context.Background())
1777+
defer cancel()
17711778

17721779
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
17731780
if err != nil {
@@ -1860,8 +1867,8 @@ func getTenantMonitoringResponse(session *models.Principal, params operator_api.
18601867

18611868
//sets tenant Prometheus monitoring cofiguration fields to values provided
18621869
func setTenantMonitoringResponse(session *models.Principal, params operator_api.SetTenantMonitoringParams) (bool, *models.Error) {
1863-
// 30 seconds timeout
1864-
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
1870+
1871+
ctx, cancel := context.WithCancel(context.Background())
18651872
defer cancel()
18661873

18671874
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
@@ -2397,7 +2404,8 @@ func parseNodeSelectorTerm(term *corev1.NodeSelectorTerm) *models.NodeSelectorTe
23972404
}
23982405

23992406
func getTenantUpdatePoolResponse(session *models.Principal, params operator_api.TenantUpdatePoolsParams) (*models.Tenant, *models.Error) {
2400-
ctx := context.Background()
2407+
ctx, cancel := context.WithCancel(context.Background())
2408+
defer cancel()
24012409
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
24022410
if err != nil {
24032411
return nil, prepareError(err)
@@ -2537,7 +2545,8 @@ func getUpdateTenantYAML(session *models.Principal, params operator_api.PutTenan
25372545
}
25382546

25392547
func getTenantEventsResponse(session *models.Principal, params operator_api.GetTenantEventsParams) (models.EventListWrapper, *models.Error) {
2540-
ctx := context.Background()
2548+
ctx, cancel := context.WithCancel(context.Background())
2549+
defer cancel()
25412550
client, err := cluster.OperatorClient(session.STSSessionToken)
25422551
if err != nil {
25432552
return nil, prepareError(err)

‎operatorapi/tenants_helper.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ func tenantUpdateCertificates(ctx context.Context, operatorClient OperatorClient
108108

109109
// getTenantUpdateCertificatesResponse wrapper of tenantUpdateCertificates
110110
func getTenantUpdateCertificatesResponse(session *models.Principal, params operator_api.TenantUpdateCertificateParams) *models.Error {
111-
ctx := context.Background()
111+
ctx, cancel := context.WithCancel(context.Background())
112+
defer cancel()
112113
// get Kubernetes Client
113114
clientSet, err := cluster.K8sClient(session.STSSessionToken)
114115
if err != nil {
@@ -238,7 +239,8 @@ func tenantUpdateEncryption(ctx context.Context, operatorClient OperatorClientI,
238239

239240
// getTenantDeleteEncryptionResponse is a wrapper for tenantDeleteEncryption
240241
func getTenantDeleteEncryptionResponse(session *models.Principal, params operator_api.TenantDeleteEncryptionParams) *models.Error {
241-
ctx := context.Background()
242+
ctx, cancel := context.WithCancel(context.Background())
243+
defer cancel()
242244
opClientClientSet, err := cluster.OperatorClient(session.STSSessionToken)
243245
if err != nil {
244246
return prepareError(err, errorDeletingEncryptionConfig)
@@ -254,7 +256,8 @@ func getTenantDeleteEncryptionResponse(session *models.Principal, params operato
254256

255257
// getTenantUpdateEncryptionResponse is a wrapper for tenantUpdateEncryption
256258
func getTenantUpdateEncryptionResponse(session *models.Principal, params operator_api.TenantUpdateEncryptionParams) *models.Error {
257-
ctx := context.Background()
259+
ctx, cancel := context.WithCancel(context.Background())
260+
defer cancel()
258261
// get Kubernetes Client
259262
clientSet, err := cluster.K8sClient(session.STSSessionToken)
260263
if err != nil {
@@ -450,7 +453,8 @@ func tenantEncryptionInfo(ctx context.Context, operatorClient OperatorClientI, c
450453

451454
// getTenantEncryptionResponse is a wrapper for tenantEncryptionInfo
452455
func getTenantEncryptionInfoResponse(session *models.Principal, params operator_api.TenantEncryptionInfoParams) (*models.EncryptionConfigurationResponse, *models.Error) {
453-
ctx := context.Background()
456+
ctx, cancel := context.WithCancel(context.Background())
457+
defer cancel()
454458
// get Kubernetes Client
455459
clientSet, err := cluster.K8sClient(session.STSSessionToken)
456460
if err != nil {

0 commit comments

Comments
 (0)