Put the CMK feature behind a feature flag (#157)

yugabyte · Jun 23, 2023 · 9e87fed · 9e87fed
1 parent c2575e6
commit 9e87fed
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 40 deletions.
diff --git a/cmd/cluster/encryption/encryption.go b/cmd/cluster/encryption/encryption.go
@@ -21,6 +21,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"github.com/yugabyte/ybm-cli/cmd/util"
 	ybmAuthClient "github.com/yugabyte/ybm-cli/internal/client"
 	"github.com/yugabyte/ybm-cli/internal/formatter"
 	ybmclient "github.com/yugabyte/yugabytedb-managed-go-client-internal"
@@ -161,7 +162,7 @@ var updateCmk = &cobra.Command{
 func init() {
 	EncryptionCmd.AddCommand(listCmk)
 	EncryptionCmd.AddCommand(updateCmk)
-	EncryptionCmd.AddCommand(updateCmkState)
+	util.AddCommandIfFeatureFlag(EncryptionCmd, updateCmkState, util.CLUSTER_CMK_UPDATE)
 	updateCmk.Flags().String("encryption-spec", "", `[REQUIRED] The customer managed key spec for the cluster.
 	Please provide key value pairs as follows:
 	For AWS: 

diff --git a/cmd/util/feature_flags.go b/cmd/util/feature_flags.go
@@ -30,6 +30,7 @@ const (
 	NODE_OP            FeatureFlag = "NODE_OPS"
 	TOOLS              FeatureFlag = "TOOLS"
 	AZURE_CIDR_ALLOWED FeatureFlag = "AZURE_CIDR_ALLOWED"
+	CLUSTER_CMK_UPDATE FeatureFlag = "CLUSTER_CMK_UPDATE"
 )
 
 func (f FeatureFlag) String() string {

diff --git a/docs/ybm_cluster_encryption.md b/docs/ybm_cluster_encryption.md
@@ -35,5 +35,4 @@ ybm cluster encryption [flags]
 * [ybm cluster](ybm_cluster.md)	 - Manage cluster operations
 * [ybm cluster encryption list](ybm_cluster_encryption_list.md)	 - List Encryption at Rest (EaR) configurations for a cluster
 * [ybm cluster encryption update](ybm_cluster_encryption_update.md)	 - Update Encryption at Rest (EaR) configurations for a cluster
-* [ybm cluster encryption update-state](ybm_cluster_encryption_update-state.md)	 - Update Encryption at Rest (EaR) state for a cluster
 
diff --git a/docs/ybm_cluster_encryption_update-state.md b/docs/ybm_cluster_encryption_update-state.md