[CLI-3590] Rename tableflow topic [create | delete] to [enable | disable] and add [create | delete] as aliases

internal/api-key/command_delete.go

@@ -43,7 +43,7 @@ func (c *command) delete(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	deletedIds, err := deletion.Delete(args, deleteFunc, resource.ApiKey)
+	deletedIds, err := deletion.Delete(cmd, args, deleteFunc, resource.ApiKey)
 
 	errs := multierror.Append(err, c.deleteKeysFromKeyStore(deletedIds))
 	if errs.ErrorOrNil() != nil {

internal/byok/command_delete.go

@@ -41,7 +41,7 @@ func (c *command) delete(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	if _, err := deletion.Delete(args, deleteFunc, resource.ByokKey); err != nil {
+	if _, err := deletion.Delete(cmd, args, deleteFunc, resource.ByokKey); err != nil {
 		return errors.NewErrorWithSuggestions(err.Error(), errors.ByokKeyNotFoundSuggestions)
 	}
 

internal/connect/command_artifact_delete.go

@@ -66,7 +66,7 @@ func (c *artifactCommand) delete(cmd *cobra.Command, args []string) error {
 		return c.V2Client.DeleteConnectArtifact(cloud, environment, id)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.ConnectArtifact)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.ConnectArtifact)
 
 	return err
 }

internal/connect/command_cluster_delete.go

@@ -67,7 +67,7 @@ func (c *clusterCommand) delete(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.Connector)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.Connector)
 	return err
 }
 

internal/connect/command_custom_plugin_delete.go

@@ -41,7 +41,7 @@ func (c *customPluginCommand) delete(cmd *cobra.Command, args []string) error {
 		return c.V2Client.DeleteCustomPlugin(id)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.CustomConnectorPlugin)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.CustomConnectorPlugin)
 	return err
 }
 

internal/context/command_delete.go

@@ -36,6 +36,6 @@ func (c *command) delete(cmd *cobra.Command, args []string) error {
 		return c.Config.DeleteContext(id)
 	}
 
-	_, err := deletion.Delete(args, deleteFunc, resource.Context)
+	_, err := deletion.Delete(cmd, args, deleteFunc, resource.Context)
 	return err
 }

internal/custom-code-logging/command_custom_code_logging_delete.go

@@ -38,6 +38,6 @@ func (c *customCodeLoggingCommand) delete(cmd *cobra.Command, args []string) err
 	deleteFunc := func(id string) error {
 		return c.V2Client.DeleteCustomCodeLogging(id, environment)
 	}
-	_, err = deletion.Delete(args, deleteFunc, resource.CustomCodeLogging)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.CustomCodeLogging)
 	return err
 }

internal/environment/command_delete.go

@@ -40,7 +40,7 @@ func (c *command) delete(cmd *cobra.Command, args []string) error {
 		return c.V2Client.DeleteOrgEnvironment(id)
 	}
 
-	deletedIds, err := deletion.Delete(args, deleteFunc, resource.Environment)
+	deletedIds, err := deletion.Delete(cmd, args, deleteFunc, resource.Environment)
 
 	errs := multierror.Append(err, c.deleteEnvironmentsFromConfig(deletedIds))
 

internal/flink/command_application_delete.go

@@ -53,6 +53,6 @@ func (c *command) applicationDelete(cmd *cobra.Command, args []string) error {
 		return client.DeleteApplication(c.createContext(), environment, name)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.FlinkApplication)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.FlinkApplication)
 	return err
 }

internal/flink/command_artifact_delete.go

@@ -75,7 +75,7 @@ func (c *command) delete(cmd *cobra.Command, args []string) error {
 		return c.V2Client.DeleteFlinkArtifact(cloud, region, environment, id)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.FlinkArtifact)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.FlinkArtifact)
 	return err
 }
 

internal/flink/command_catalog_delete.go

@@ -45,6 +45,6 @@ func (c *command) catalogDelete(cmd *cobra.Command, args []string) error {
 		return client.DeleteCatalog(c.createContext(), name)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.FlinkCatalog)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.FlinkCatalog)
 	return err
 }

internal/flink/command_compute_pool_delete.go

@@ -53,7 +53,7 @@ func (c *command) computePoolDelete(cmd *cobra.Command, args []string) error {
 		return c.V2Client.DeleteFlinkComputePool(id, environmentId)
 	}
 
-	deletedIds, err := deletion.Delete(args, deleteFunc, resource.FlinkComputePool)
+	deletedIds, err := deletion.Delete(cmd, args, deleteFunc, resource.FlinkComputePool)
 
 	errs := multierror.Append(err, c.removePoolFromConfigIfCurrent(deletedIds))
 

internal/flink/command_compute_pool_delete_onprem.go

@@ -56,6 +56,6 @@ func (c *command) computePoolDeleteOnPrem(cmd *cobra.Command, args []string) err
 		return client.DeleteComputePool(c.createContext(), environment, name)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.FlinkComputePool)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.FlinkComputePool)
 	return err
 }

internal/flink/command_connection_delete.go

@@ -60,6 +60,6 @@ func (c *command) connectionDelete(cmd *cobra.Command, args []string) error {
 		return client.DeleteConnection(environmentId, id, c.Context.GetCurrentOrganization())
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.FlinkConnection)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.FlinkConnection)
 	return err
 }

internal/flink/command_environment_delete.go

@@ -47,6 +47,6 @@ func (c *command) environmentDelete(cmd *cobra.Command, args []string) error {
 		return client.DeleteEnvironment(c.createContext(), name)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.FlinkEnvironment)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.FlinkEnvironment)
 	return err
 }

internal/flink/command_statement_delete.go

@@ -50,6 +50,6 @@ func (c *command) statementDelete(cmd *cobra.Command, args []string) error {
 		return client.DeleteStatement(environmentId, id, c.Context.GetCurrentOrganization())
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.FlinkStatement)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.FlinkStatement)
 	return err
 }

internal/flink/command_statement_delete_onprem.go

@@ -54,6 +54,6 @@ func (c *command) statementDeleteOnPrem(cmd *cobra.Command, args []string) error
 		return client.DeleteStatement(c.createContext(), environment, name)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.FlinkStatement)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.FlinkStatement)
 	return err
 }

internal/iam/command_certificate_authority_delete.go

@@ -44,6 +44,6 @@ func (c *certificateAuthorityCommand) delete(cmd *cobra.Command, args []string)
 		return c.V2Client.DeleteCertificateAuthority(id)
 	}
 
-	_, err := deletion.Delete(args, deleteFunc, resource.CertificateAuthority)
+	_, err := deletion.Delete(cmd, args, deleteFunc, resource.CertificateAuthority)
 	return err
 }

internal/iam/command_certificate_pool_delete.go

@@ -52,6 +52,6 @@ func (c *certificatePoolCommand) delete(cmd *cobra.Command, args []string) error
 		return c.V2Client.DeleteCertificatePool(id, provider)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.CertificatePool)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.CertificatePool)
 	return err
 }

internal/iam/command_groupmapping_delete.go

@@ -44,6 +44,6 @@ func (c *groupMappingCommand) delete(cmd *cobra.Command, args []string) error {
 		return c.V2Client.DeleteGroupMapping(id)
 	}
 
-	_, err := deletion.Delete(args, deleteFunc, resource.SsoGroupMapping)
+	_, err := deletion.Delete(cmd, args, deleteFunc, resource.SsoGroupMapping)
 	return err
 }

internal/iam/command_pool_delete.go

@@ -52,6 +52,6 @@ func (c *poolCommand) delete(cmd *cobra.Command, args []string) error {
 		return c.V2Client.DeleteIdentityPool(id, provider)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.IdentityPool)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.IdentityPool)
 	return err
 }

internal/iam/command_provider_delete.go

@@ -44,6 +44,6 @@ func (c *identityProviderCommand) delete(cmd *cobra.Command, args []string) erro
 		return c.V2Client.DeleteIdentityProvider(id)
 	}
 
-	_, err := deletion.Delete(args, deleteFunc, resource.IdentityProvider)
+	_, err := deletion.Delete(cmd, args, deleteFunc, resource.IdentityProvider)
 	return err
 }

internal/iam/command_service_account_delete.go

@@ -1,13 +1,10 @@
 package iam
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 
 	pcmd "github.com/confluentinc/cli/v4/pkg/cmd"
 	"github.com/confluentinc/cli/v4/pkg/deletion"
-	"github.com/confluentinc/cli/v4/pkg/errors"
 	"github.com/confluentinc/cli/v4/pkg/examples"
 	"github.com/confluentinc/cli/v4/pkg/resource"
 )
@@ -44,12 +41,9 @@ func (c *serviceAccountCommand) delete(cmd *cobra.Command, args []string) error
 	}
 
 	deleteFunc := func(id string) error {
-		if err := c.V2Client.DeleteIamServiceAccount(id); err != nil {
-			return fmt.Errorf(errors.DeleteResourceErrorMsg, resource.ServiceAccount, id, err)
-		}
-		return nil
+		return c.V2Client.DeleteIamServiceAccount(id)
 	}
 
-	_, err := deletion.Delete(args, deleteFunc, resource.ServiceAccount)
+	_, err := deletion.Delete(cmd, args, deleteFunc, resource.ServiceAccount)
 	return err
 }

internal/iam/command_user_delete.go

@@ -1,13 +1,10 @@
 package iam
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 
 	pcmd "github.com/confluentinc/cli/v4/pkg/cmd"
 	"github.com/confluentinc/cli/v4/pkg/deletion"
-	"github.com/confluentinc/cli/v4/pkg/errors"
 	"github.com/confluentinc/cli/v4/pkg/resource"
 )
 
@@ -36,12 +33,9 @@ func (c *userCommand) delete(cmd *cobra.Command, args []string) error {
 	}
 
 	deleteFunc := func(id string) error {
-		if err := c.V2Client.DeleteIamUser(id); err != nil {
-			return fmt.Errorf(errors.DeleteResourceErrorMsg, resource.User, id, err)
-		}
-		return nil
+		return c.V2Client.DeleteIamUser(id)
 	}
 
-	_, err := deletion.Delete(args, deleteFunc, resource.User)
+	_, err := deletion.Delete(cmd, args, deleteFunc, resource.User)
 	return err
 }

internal/kafka/command_broker_delete.go

@@ -60,7 +60,7 @@ func (c *brokerCommand) delete(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	deletedIds, err := deletion.DeleteWithoutMessage(args, deleteFunc)
+	deletedIds, err := deletion.DeleteWithoutMessage(cmd, args, deleteFunc)
 	deleteMsg := "Started deletion of %s %s. To monitor a remove-broker task run `confluent kafka broker task list <id> --task-type remove-broker`.\n"
 	if len(deletedIds) == 1 {
 		output.Printf(c.Config.EnableColor, deleteMsg, resource.Broker, fmt.Sprintf("\"%s\"", deletedIds[0]))

internal/kafka/command_cluster_delete.go

@@ -50,7 +50,7 @@ func (c *clusterCommand) delete(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	deletedIds, err := deletion.Delete(args, deleteFunc, resource.KafkaCluster)
+	deletedIds, err := deletion.Delete(cmd, args, deleteFunc, resource.KafkaCluster)
 
 	errs := multierror.Append(err, c.removeKafkaClusterConfigs(deletedIds))
 	if errs.ErrorOrNil() != nil {

internal/kafka/command_link_delete.go

@@ -44,6 +44,6 @@ func (c *linkCommand) delete(cmd *cobra.Command, args []string) error {
 		return kafkaREST.CloudClient.DeleteKafkaLink(id)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.ClusterLink)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.ClusterLink)
 	return err
 }

internal/kafka/command_link_delete_onprem.go

@@ -45,6 +45,6 @@ func (c *linkCommand) deleteOnPrem(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.ClusterLink)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.ClusterLink)
 	return err
 }

internal/kafka/command_quota_delete.go

@@ -37,6 +37,6 @@ func (c *quotaCommand) delete(cmd *cobra.Command, args []string) error {
 		return c.V2Client.DeleteKafkaQuota(id)
 	}
 
-	_, err := deletion.Delete(args, deleteFunc, resource.ClientQuota)
+	_, err := deletion.Delete(cmd, args, deleteFunc, resource.ClientQuota)
 	return err
 }

internal/kafka/command_topic_delete.go

@@ -69,6 +69,6 @@ func (c *command) delete(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.Topic)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.Topic)
 	return err
 }

internal/kafka/command_topic_delete_onprem.go

@@ -63,6 +63,6 @@ func DeleteTopic(cmd *cobra.Command, restClient *kafkarestv3.APIClient, restCont
 		return nil
 	}
 
-	_, err := deletion.Delete(args, deleteFunc, resource.Topic)
+	_, err := deletion.Delete(cmd, args, deleteFunc, resource.Topic)
 	return err
 }

internal/ksql/command_cluster_delete.go

@@ -65,7 +65,7 @@ func (c *ksqlCommand) delete(cmd *cobra.Command, args []string) error {
 		return c.V2Client.DeleteKsqlCluster(id, environmentId)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.KsqlCluster)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.KsqlCluster)
 	return err
 }
 

internal/network/command_access_point_private_link_egress_endpoint_delete.go

@@ -7,7 +7,6 @@ import (
 
 	pcmd "github.com/confluentinc/cli/v4/pkg/cmd"
 	"github.com/confluentinc/cli/v4/pkg/deletion"
-	"github.com/confluentinc/cli/v4/pkg/errors"
 	"github.com/confluentinc/cli/v4/pkg/output"
 	"github.com/confluentinc/cli/v4/pkg/plural"
 	"github.com/confluentinc/cli/v4/pkg/resource"
@@ -46,13 +45,10 @@ func (c *accessPointCommand) delete(cmd *cobra.Command, args []string) error {
 	}
 
 	deleteFunc := func(id string) error {
-		if err := c.V2Client.DeleteAccessPoint(environmentId, id); err != nil {
-			return fmt.Errorf(errors.DeleteResourceErrorMsg, resource.AccessPoint, id, err)
-		}
-		return nil
+		return c.V2Client.DeleteAccessPoint(environmentId, id)
 	}
 
-	deletedIds, err := deletion.DeleteWithoutMessage(args, deleteFunc)
+	deletedIds, err := deletion.DeleteWithoutMessage(cmd, args, deleteFunc)
 	deleteMsg := "Requested to delete %s %s.\n"
 	if len(deletedIds) == 1 {
 		output.Printf(c.Config.EnableColor, deleteMsg, resource.AccessPoint, fmt.Sprintf(`"%s"`, deletedIds[0]))

internal/network/command_access_point_private_network_interface_delete.go

@@ -7,7 +7,6 @@ import (
 
 	pcmd "github.com/confluentinc/cli/v4/pkg/cmd"
 	"github.com/confluentinc/cli/v4/pkg/deletion"
-	"github.com/confluentinc/cli/v4/pkg/errors"
 	"github.com/confluentinc/cli/v4/pkg/output"
 	"github.com/confluentinc/cli/v4/pkg/plural"
 	"github.com/confluentinc/cli/v4/pkg/resource"
@@ -46,13 +45,10 @@ func (c *accessPointCommand) privateNetworkInterfaceDelete(cmd *cobra.Command, a
 	}
 
 	deleteFunc := func(id string) error {
-		if err := c.V2Client.DeleteAccessPoint(environmentId, id); err != nil {
-			return fmt.Errorf(errors.DeleteResourceErrorMsg, resource.AccessPoint, id, err)
-		}
-		return nil
+		return c.V2Client.DeleteAccessPoint(environmentId, id)
 	}
 
-	deletedIds, err := deletion.DeleteWithoutMessage(args, deleteFunc)
+	deletedIds, err := deletion.DeleteWithoutMessage(cmd, args, deleteFunc)
 	deleteMsg := "Requested to delete %s %s.\n"
 	if len(deletedIds) == 1 {
 		output.Printf(c.Config.EnableColor, deleteMsg, resource.AccessPoint, fmt.Sprintf(`"%s"`, deletedIds[0]))

internal/network/command_delete.go

@@ -1,13 +1,10 @@
 package network
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 
 	pcmd "github.com/confluentinc/cli/v4/pkg/cmd"
 	"github.com/confluentinc/cli/v4/pkg/deletion"
-	"github.com/confluentinc/cli/v4/pkg/errors"
 	"github.com/confluentinc/cli/v4/pkg/resource"
 )
 
@@ -43,12 +40,9 @@ func (c *command) delete(cmd *cobra.Command, args []string) error {
 	}
 
 	deleteFunc := func(id string) error {
-		if err := c.V2Client.DeleteNetwork(environmentId, id); err != nil {
-			return fmt.Errorf(errors.DeleteResourceErrorMsg, resource.Network, id, err)
-		}
-		return nil
+		return c.V2Client.DeleteNetwork(environmentId, id)
 	}
 
-	_, err = deletion.Delete(args, deleteFunc, resource.Network)
+	_, err = deletion.Delete(cmd, args, deleteFunc, resource.Network)
 	return err
 }