Remove feature toggle for cr (#474)

* remove feature toggle for cr

* add test for toggle so it doesn't have linting error

Author: david049

app/connectivity_rule.go

@@ -118,12 +118,6 @@ func NewConnectivityRuleCommand(getConnectivityRuleClientFn GetConnectivityRuleC
 		Required: false,
 	}
 
-	if !IsFeatureEnabled(ConnectivityRuleFeatureFlag) {
-		return CommandOut{
-			Command: nil,
-		}, nil
-	}
-
 	return CommandOut{
 		Command: &cli.Command{
 			Name:    "connectivity-rule",

app/connectivity_rule_test.go

@@ -25,10 +25,6 @@ type ConnectivityRuleTestSuite struct {
 }
 
 func (s *ConnectivityRuleTestSuite) SetupTest() {
-	if !IsFeatureEnabled(ConnectivityRuleFeatureFlag) {
-		err := toggleFeature(ConnectivityRuleFeatureFlag)
-		s.Require().NoError(err)
-	}
 	s.mockCtrl = gomock.NewController(s.T())
 	s.mockCloudService = cloudservicemock.NewMockCloudServiceClient(s.mockCtrl)
 	out, err := NewConnectivityRuleCommand(func(ctx *cli.Context) (*ConnectivityRuleClient, error) {

app/feature.go

@@ -11,12 +11,11 @@ import (
 )
 
 var (
-	GCPSinkFeatureFlag          = "enable-gcp-sink"
-	ConnectivityRuleFeatureFlag = "enable-connectivity-rule"
-	featureflagFileName         = "feature.json"
+	GCPSinkFeatureFlag  = "enable-gcp-sink"
+	featureflagFileName = "feature.json"
 )
 
-var supportFeatureFlags = []string{ConnectivityRuleFeatureFlag}
+var supportFeatureFlags = []string{GCPSinkFeatureFlag}
 
 type FeatureFlag struct {
 	Name  string `json:"Name"`
@@ -134,14 +133,6 @@ func NewFeatureCommand() (CommandOut, error) {
 				// 		return toggleFeature(GCPSinkFeatureFlag)
 				// 	},
 				// },
-				{
-					Name:    "toggle-connectivity-rule",
-					Aliases: []string{"tcr"},
-					Usage:   "switch connectivity rule on/off",
-					Action: func(c *cli.Context) error {
-						return toggleFeature(ConnectivityRuleFeatureFlag)
-					},
-				},
 				{
 					Name:    "get",
 					Aliases: []string{"g"},

app/feature_test.go

@@ -8,6 +8,43 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TestToggleFeature(t *testing.T) {
+	tmpDir, err := os.MkdirTemp("", "tcld-test-*")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(tmpDir) // clean up
+
+	// Set the config directory flag to our temp directory
+	originalConfigDir := ConfigDirFlag.Value
+	ConfigDirFlag.Value = tmpDir
+	defer func() {
+		ConfigDirFlag.Value = originalConfigDir
+	}()
+
+	testFeatureName := supportFeatureFlags[0]
+
+	err = toggleFeature(testFeatureName)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	featureFlags, err := getFeatureFlags()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	found := false
+	for _, flag := range featureFlags {
+		if flag.Name == testFeatureName {
+			assert.Equal(t, true, flag.Value)
+			found = true
+			break
+		}
+	}
+	assert.True(t, found)
+}
+
 func TestToggleFeatureAndRead(t *testing.T) {
 	testFileName := uuid.NewString() + ".json"
 	_, err := getFeatureFlagsFromConfigFile(testFileName)

app/namespace.go

@@ -596,10 +596,7 @@ func getCreateNamespaceFlags() []cli.Flag {
 			Usage:   "Add tags to the namespace (format: key=value). Flag can be used multiple times.",
 			Aliases: []string{"t"},
 		},
-	}
-
-	if IsFeatureEnabled(ConnectivityRuleFeatureFlag) {
-		baseFlags = append(baseFlags, connectivityRuleIdsFlag)
+		connectivityRuleIdsFlag,
 	}
 
 	return baseFlags
@@ -2267,9 +2264,7 @@ func NewNamespaceCommand(getNamespaceClientFn GetNamespaceClientFn) (CommandOut,
 
 	subCommands = append(subCommands, exportCommand)
 
-	if IsFeatureEnabled(ConnectivityRuleFeatureFlag) {
-		subCommands = append(subCommands, coonectivityRuleCommand)
-	}
+	subCommands = append(subCommands, coonectivityRuleCommand)
 
 	command := &cli.Command{
 		Name:    "namespace",

app/namespace_test.go

@@ -42,11 +42,6 @@ type NamespaceTestSuite struct {
 }
 
 func (s *NamespaceTestSuite) SetupTest() {
-	if !IsFeatureEnabled(ConnectivityRuleFeatureFlag) {
-		err := toggleFeature(ConnectivityRuleFeatureFlag)
-		s.Require().NoError(err)
-	}
-
 	s.mockCtrl = gomock.NewController(s.T())
 	s.mockService = namespaceservicemock.NewMockNamespaceServiceClient(s.mockCtrl)
 	s.mockAuthService = authservicemock.NewMockAuthServiceClient(s.mockCtrl)