From 02c4c426ad9199072a23dcf0d709d87af7dfa336 Mon Sep 17 00:00:00 2001 From: mabhi Date: Tue, 14 Feb 2023 23:35:07 +0530 Subject: [PATCH] reverted back kubeconfig validation Signed-off-by: mabhi --- internal/models/kubeconfig_setting.go | 2 +- pkg/service/kubeconfig_settings.go | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/internal/models/kubeconfig_setting.go b/internal/models/kubeconfig_setting.go index 5fb9253..0ef67b5 100644 --- a/internal/models/kubeconfig_setting.go +++ b/internal/models/kubeconfig_setting.go @@ -15,7 +15,7 @@ type KubeconfigSetting struct { PartnerId uuid.UUID `bun:"partner_id,type:uuid,notnull"` AccountId uuid.UUID `bun:"account_id,type:uuid,notnull"` Scope string `bun:"scope,notnull"` - ValiditySeconds int64 `bun:"validity_seconds,notnull,default:28800"` + ValiditySeconds int64 `bun:"validity_seconds,notnull,default:0"` SaValiditySeconds int64 `bun:"sa_validity_seconds,notnull,default:28800"` CreatedAt time.Time `bun:"created_at,notnull,default:current_timestamp"` ModifiedAt time.Time `bun:"modified_at"` diff --git a/pkg/service/kubeconfig_settings.go b/pkg/service/kubeconfig_settings.go index 0c64dad..1ec4305 100644 --- a/pkg/service/kubeconfig_settings.go +++ b/pkg/service/kubeconfig_settings.go @@ -61,13 +61,6 @@ func (kss *kubeconfigSettingService) Patch(ctx context.Context, ks *sentry.Kubec minTimeDuration := time.Second * time.Duration(minSeconds) // min. 10 mins maxTimeDuration := time.Second * time.Duration(maxSeconds) // max. 30 days - validityDuration := time.Second * time.Duration(ks.ValiditySeconds) - if validityDuration < minTimeDuration || validityDuration > maxTimeDuration { - maxTimeDisplay, _ := time.ParseDuration(fmt.Sprintf("%ds", maxSeconds)) - minTimeDisplay, _ := time.ParseDuration(fmt.Sprintf("%ds", minSeconds)) - return fmt.Errorf("invalid validity duration. should be between %.0f mins and %.0f hours", minTimeDisplay.Minutes(), maxTimeDisplay.Hours()) - } - saValidityDuration := time.Second * time.Duration(ks.SaValiditySeconds) if saValidityDuration < minTimeDuration || saValidityDuration > maxTimeDuration { maxTimeDisplay, _ := time.ParseDuration(fmt.Sprintf("%ds", maxSeconds))