diff --git a/controllers/toolchainconfig/configuration.go b/controllers/toolchainconfig/configuration.go index 549a0220b..3daf4bf93 100644 --- a/controllers/toolchainconfig/configuration.go +++ b/controllers/toolchainconfig/configuration.go @@ -313,15 +313,6 @@ func (d TiersConfig) DefaultSpaceTier() string { return commonconfig.GetString(d.tiers.DefaultSpaceTier, "base") } -func (d TiersConfig) DurationBeforeChangeTierRequestDeletion() time.Duration { - v := commonconfig.GetString(d.tiers.DurationBeforeChangeTierRequestDeletion, "24h") - duration, err := time.ParseDuration(v) - if err != nil { - duration = 24 * time.Hour - } - return duration -} - func (d TiersConfig) FeatureToggles() []FeatureToggle { toggles := make([]FeatureToggle, 0, len(d.tiers.FeatureToggles)) for _, t := range d.tiers.FeatureToggles { diff --git a/controllers/toolchainconfig/configuration_test.go b/controllers/toolchainconfig/configuration_test.go index 5542dbc83..896798413 100644 --- a/controllers/toolchainconfig/configuration_test.go +++ b/controllers/toolchainconfig/configuration_test.go @@ -443,28 +443,19 @@ func TestTiers(t *testing.T) { assert.Equal(t, "deactivate30", toolchainCfg.Tiers().DefaultUserTier()) assert.Equal(t, "base", toolchainCfg.Tiers().DefaultSpaceTier()) - assert.Equal(t, 24*time.Hour, toolchainCfg.Tiers().DurationBeforeChangeTierRequestDeletion()) assert.Empty(t, toolchainCfg.Tiers().FeatureToggles()) }) - t.Run("invalid", func(t *testing.T) { - cfg := commonconfig.NewToolchainConfigObjWithReset(t, testconfig.Tiers().DurationBeforeChangeTierRequestDeletion("rapid")) - toolchainCfg := newToolchainConfig(cfg, map[string]map[string]string{}) - - assert.Equal(t, 24*time.Hour, toolchainCfg.Tiers().DurationBeforeChangeTierRequestDeletion()) - }) t.Run("non-default", func(t *testing.T) { weight10 := uint(10) cfg := commonconfig.NewToolchainConfigObjWithReset(t, testconfig.Tiers(). DefaultUserTier("deactivate90"). DefaultSpaceTier("ourtier"). - DurationBeforeChangeTierRequestDeletion("48h"). FeatureToggle("feature-1", nil). // With default weight FeatureToggle("feature-2", &weight10)) toolchainCfg := newToolchainConfig(cfg, map[string]map[string]string{}) assert.Equal(t, "deactivate90", toolchainCfg.Tiers().DefaultUserTier()) assert.Equal(t, "ourtier", toolchainCfg.Tiers().DefaultSpaceTier()) - assert.Equal(t, 48*time.Hour, toolchainCfg.Tiers().DurationBeforeChangeTierRequestDeletion()) assert.Len(t, toolchainCfg.Tiers().FeatureToggles(), 2) assert.Equal(t, "feature-1", toolchainCfg.Tiers().FeatureToggles()[0].Name()) assert.Equal(t, uint(100), toolchainCfg.Tiers().FeatureToggles()[0].Weight()) // default weight