Merge pull request #571 from meroxa/remove-ruby-feature-flag

Remove ruby feature flag
meroxa · Jan 24, 2023 · d988bbc · d988bbc
2 parents 7da436b + 226f819
commit d988bbc
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 38 deletions.
diff --git a/cmd/meroxa/root/apps/apps.go b/cmd/meroxa/root/apps/apps.go
@@ -78,9 +78,6 @@ func getTurbineCLIFromLanguage(logger log.Logger, lang, path string) (turbine.CL
 	case "py", turbine.Python3, turbine.Python:
 		return turbinePY.New(logger, path), nil
 	case "rb", turbine.Ruby:
-		if !builder.CheckFeatureFlag(turbineRb.TurbineRubyFeatureFlag) {
-			return nil, turbineRb.ErrTurbineRubyFeatureFlag
-		}
 		return turbineRb.New(logger, path), nil
 	}
 	return nil, fmt.Errorf("language %q not supported. %s", lang, LanguageNotSupportedError)

diff --git a/cmd/meroxa/root/apps/init.go b/cmd/meroxa/root/apps/init.go
@@ -160,9 +160,6 @@ func newTurbineCLI(logger log.Logger, lang, path string) (turbine.CLI, error) {
 	case "py", turbine.Python3, turbine.Python:
 		return turbinePY.New(logger, path), nil
 	case "rb", turbine.Ruby:
-		if !builder.CheckFeatureFlag(turbineRb.TurbineRubyFeatureFlag) {
-			return nil, turbineRb.ErrTurbineRubyFeatureFlag
-		}
 		return turbineRb.New(logger, path), nil
 	default:
 		return nil, fmt.Errorf("language %q not supported. %s", lang, LanguageNotSupportedError)

diff --git a/cmd/meroxa/root/apps/run.go b/cmd/meroxa/root/apps/run.go
@@ -105,9 +105,6 @@ func (r *Run) Execute(ctx context.Context) error {
 		}
 		return r.turbineCLI.Run(ctx)
 	case "rb", turbine.Ruby:
-		if !builder.CheckFeatureFlag(turbineRB.TurbineRubyFeatureFlag) {
-			return turbineRB.ErrTurbineRubyFeatureFlag
-		}
 		if r.turbineCLI == nil {
 			r.turbineCLI = turbineRB.New(r.logger, r.path)
 		}

diff --git a/cmd/meroxa/root/apps/run_test.go b/cmd/meroxa/root/apps/run_test.go
@@ -94,24 +94,7 @@ func TestRunExecute(t *testing.T) {
 				Name:     "ruby-test",
 				Language: turbine.Ruby,
 			},
-			features: map[string]bool{
-				"ruby_implementation": true,
-			},
 		},
-		{
-			desc: "Execute Ruby Run (Missing feature)",
-			cli:  mockturbinecli.NewMockCLI(mockCtrl),
-			config: turbine.AppConfig{
-				Name:     "ruby-test",
-				Language: turbine.Ruby,
-			},
-			features: map[string]bool{
-				"ruby_implementation": false,
-			},
-			err: fmt.Errorf(`no access to the Meroxa Turbine Ruby feature.
-Sign up for the Beta here: https://share.hsforms.com/1Uq6UYoL8Q6eV5QzSiyIQkAc2sme`),
-		},
-
 		{
 			desc: "Execute Python Run with an error",
 			cli: func() turbine.CLI {

diff --git a/cmd/meroxa/root/apps/upgrade.go b/cmd/meroxa/root/apps/upgrade.go
@@ -70,7 +70,6 @@ func (u *Upgrade) Flags() []builder.Flag {
 	return builder.BuildFlags(&u.flags)
 }
 
-//nolint:gocyclo
 func (u *Upgrade) Execute(ctx context.Context) error {
 	var err error
 	if u.config == nil {
@@ -104,10 +103,7 @@ func (u *Upgrade) Execute(ctx context.Context) error {
 		if u.turbineCLI == nil {
 			u.turbineCLI = turbinePY.New(u.logger, u.path)
 		}
-	case "ub", turbine.Ruby:
-		if !builder.CheckFeatureFlag(turbineRB.TurbineRubyFeatureFlag) {
-			return turbineRB.ErrTurbineRubyFeatureFlag
-		}
+	case "rb", turbine.Ruby:
 		if u.turbineCLI == nil {
 			u.turbineCLI = turbineRB.New(u.logger, u.path)
 		}

diff --git a/cmd/meroxa/turbine/ruby/cli.go b/cmd/meroxa/turbine/ruby/cli.go
@@ -4,7 +4,6 @@ package turbinerb
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/meroxa/cli/cmd/meroxa/turbine"
 	"github.com/meroxa/cli/log"
@@ -13,12 +12,6 @@ import (
 	"google.golang.org/grpc"
 )
 
-var (
-	TurbineRubyFeatureFlag    = "ruby_implementation"
-	ErrTurbineRubyFeatureFlag = fmt.Errorf(`no access to the Meroxa Turbine Ruby feature.
-Sign up for the Beta here: https://share.hsforms.com/1Uq6UYoL8Q6eV5QzSiyIQkAc2sme`)
-)
-
 type turbineServer interface {
 	Run(context.Context)
 	GracefulStop()