Release Mdpx (do not merge)

cmd/meroxa/root/apps/apps.go

@@ -53,9 +53,9 @@ type Application struct {
 	Name        string           `json:"name"`
 	State       ApplicationState `json:"state"`
 	Spec        string           `json:"spec"`
-	SpecVersion string           `json:"spec_version"`
+	SpecVersion string           `json:"specVersion"`
 	Archive     string           `json:"archive"`
-	Created     time.Time        `json:"createdt"`
+	Created     time.Time        `json:"created"`
 	Updated     time.Time        `json:"updated"`
 }
 

cmd/meroxa/root/apps/deploy.go

@@ -29,7 +29,6 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/google/uuid"
 	"github.com/meroxa/cli/cmd/meroxa/builder"
 	"github.com/meroxa/cli/cmd/meroxa/global"
 	"github.com/meroxa/cli/cmd/meroxa/turbine"
@@ -38,26 +37,9 @@ import (
 	"github.com/meroxa/turbine-core/pkg/ir"
 )
 
-type environment struct {
-	Name string
-	UUID string
-}
-
-func (e *environment) nameOrUUID() string {
-	switch {
-	case e.UUID != "":
-		return e.UUID
-	case e.Name != "":
-		return e.Name
-	default:
-		panic("bad state: name or uuid should be present")
-	}
-}
-
 type Deploy struct {
 	flags struct {
 		Path                     string `long:"path" usage:"Path to the app directory (default is local directory)"`
-		Environment              string `long:"env" usage:"environment (name or UUID) where application will be deployed to"`
 		Spec                     string `long:"spec" usage:"Deployment specification version to use to build and deploy the app" hidden:"true"`
 		SkipCollectionValidation bool   `long:"skip-collection-validation" usage:"Skips unique destination collection and looping validations"` //nolint:lll
 		Verbose                  bool   `long:"verbose" usage:"Prints more logging messages" hidden:"true"`
@@ -76,7 +58,6 @@ type Deploy struct {
 	fnName        string // is this still necessary?
 	appTarName    string
 	specVersion   string
-	env           *environment
 	gitSha        string
 }
 
@@ -349,28 +330,9 @@ func (d *Deploy) prepareAppName(ctx context.Context) string {
 	return appName
 }
 
-// TODO: Once builds are done much faster we should move early checks like these to the Platform API.
-func (d *Deploy) validateEnvExists(ctx context.Context) error {
-	if _, err := d.client.CollectionRequest(ctx, "GET", "environments", d.env.nameOrUUID(), nil, nil, nil); err != nil {
-		if strings.Contains(err.Error(), "could not find environment") {
-			return fmt.Errorf("environment %q does not exist", d.flags.Environment)
-		}
-		return fmt.Errorf("unable to retrieve environment %q: %w", d.flags.Environment, err)
-	}
-	return nil
-}
-
 func (d *Deploy) assignDeploymentValues(ctx context.Context) error {
 	var err error
 
-	if d.flags.Environment != "" {
-		d.env = envFromFlag(d.flags.Environment)
-		err = d.validateEnvExists(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
 	// Always default to the latest spec version.
 	d.specVersion = ir.LatestSpecVersion
 
@@ -470,12 +432,3 @@ func (d *Deploy) Execute(ctx context.Context) error {
 
 	return nil
 }
-
-// TODO: Reuse this everywhere it's using the environment flag. Maybe make this part of builder so it's automatic.
-func envFromFlag(nameOrUUID string) *environment {
-	_, err := uuid.Parse(nameOrUUID)
-	if err != nil {
-		return &environment{Name: nameOrUUID}
-	}
-	return &environment{UUID: nameOrUUID}
-}

cmd/meroxa/root/apps/deploy_test.go

@@ -29,7 +29,6 @@ func TestDeployAppFlags(t *testing.T) {
 		{name: "spec", required: false, hidden: true},
 		{name: "skip-collection-validation", required: false, hidden: false},
 		{name: "verbose", required: false, hidden: true},
-		{name: "env", required: false, hidden: false},
 	}
 
 	c := builder.BuildCobraCommand(&Deploy{})
@@ -106,9 +105,6 @@ func TestValidateLanguage(t *testing.T) {
 func TestGetPlatformImage(t *testing.T) {
 	ctx := context.Background()
 	logger := log.NewTestLogger()
-	// buildUUID := uuid.NewString()
-	// sourcePutURL := "http://foo.bar"
-	//  sourceGetURL := "http://foo.bar"
 	appName := "my-app"
 	buildPath := ""
 	err := fmt.Errorf("nope")
@@ -117,7 +113,6 @@ func TestGetPlatformImage(t *testing.T) {
 		name           string
 		meroxaClient   func(*gomock.Controller) *basicMock.MockBasicClient
 		mockTurbineCLI func(*gomock.Controller) turbine.CLI
-		env            string
 		err            error
 	}{
 		{
@@ -166,9 +161,6 @@ func TestGetPlatformImage(t *testing.T) {
 				logger:     logger,
 				appName:    appName,
 			}
-			if tc.env != "" {
-				d.env = &environment{Name: tc.env}
-			}
 
 			err := d.getPlatformImage(ctx)
 			if err != nil {
@@ -216,7 +208,6 @@ func TestGetAppImage(t *testing.T) {
 				logger:     logger,
 				appName:    appName,
 			}
-			d.flags.Environment = "my-env"
 
 			err := d.getAppImage(ctx)
 			if err != nil {

docs/cmd/md/meroxa_apps.md

@@ -24,9 +24,7 @@ Manage Turbine Data Applications
 * [meroxa apps describe](meroxa_apps_describe.md)	 - Describe a Turbine Data Application
 * [meroxa apps init](meroxa_apps_init.md)	 - Initialize a Turbine Data Application
 * [meroxa apps list](meroxa_apps_list.md)	 - List Turbine Data Applications
-* [meroxa apps logs](meroxa_apps_logs.md)	 - View relevant logs to the state of the given Turbine Data Application
 * [meroxa apps open](meroxa_apps_open.md)	 - Open the link to a Turbine Data Application in the Dashboard
 * [meroxa apps remove](meroxa_apps_remove.md)	 - Remove a Turbine Data Application
 * [meroxa apps run](meroxa_apps_run.md)	 - Execute a Turbine Data Application locally
-* [meroxa apps upgrade](meroxa_apps_upgrade.md)	 - Upgrade a Turbine Data Application
 

docs/cmd/md/meroxa_apps_deploy.md

@@ -24,7 +24,6 @@ meroxa apps deploy --path ./my-app
 ### Options
 
 ```
-      --env string                   environment (name or UUID) where application will be deployed to
   -h, --help                         help for deploy
       --path string                  Path to the app directory (default is local directory)
       --skip-collection-validation   Skips unique destination collection and looping validations

docs/cmd/www/meroxa-apps-deploy.md

@@ -31,7 +31,6 @@ meroxa apps deploy --path ./my-app
 ### Options
 
 ```
-      --env string                   environment (name or UUID) where application will be deployed to
   -h, --help                         help for deploy
       --path string                  Path to the app directory (default is local directory)
       --skip-collection-validation   Skips unique destination collection and looping validations

docs/cmd/www/meroxa-apps.md

@@ -31,9 +31,7 @@ Manage Turbine Data Applications
 * [meroxa apps describe](/cli/cmd/meroxa-apps-describe/)	 - Describe a Turbine Data Application
 * [meroxa apps init](/cli/cmd/meroxa-apps-init/)	 - Initialize a Turbine Data Application
 * [meroxa apps list](/cli/cmd/meroxa-apps-list/)	 - List Turbine Data Applications
-* [meroxa apps logs](/cli/cmd/meroxa-apps-logs/)	 - View relevant logs to the state of the given Turbine Data Application
 * [meroxa apps open](/cli/cmd/meroxa-apps-open/)	 - Open the link to a Turbine Data Application in the Dashboard
 * [meroxa apps remove](/cli/cmd/meroxa-apps-remove/)	 - Remove a Turbine Data Application
 * [meroxa apps run](/cli/cmd/meroxa-apps-run/)	 - Execute a Turbine Data Application locally
-* [meroxa apps upgrade](/cli/cmd/meroxa-apps-upgrade/)	 - Upgrade a Turbine Data Application
 

etc/completion/meroxa.completion.sh

@@ -402,8 +402,6 @@ _meroxa_apps_deploy()
     flags_with_completion=()
     flags_completion=()
 
-    flags+=("--env=")
-    two_word_flags+=("--env")
     flags+=("--help")
     flags+=("-h")
     flags+=("--path=")
@@ -544,36 +542,6 @@ _meroxa_apps_list()
     noun_aliases=()
 }
 
-_meroxa_apps_logs()
-{
-    last_command="meroxa_apps_logs"
-
-    command_aliases=()
-
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    local_nonpersistent_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--help")
-    flags+=("-h")
-    flags+=("--path=")
-    two_word_flags+=("--path")
-    flags+=("--cli-config-file=")
-    two_word_flags+=("--cli-config-file")
-    flags+=("--debug")
-    flags+=("--json")
-    flags+=("--timeout=")
-    two_word_flags+=("--timeout")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-    noun_aliases=()
-}
-
 _meroxa_apps_open()
 {
     last_command="meroxa_apps_open"
@@ -666,36 +634,6 @@ _meroxa_apps_run()
     noun_aliases=()
 }
 
-_meroxa_apps_upgrade()
-{
-    last_command="meroxa_apps_upgrade"
-
-    command_aliases=()
-
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    local_nonpersistent_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-    flags+=("--help")
-    flags+=("-h")
-    flags+=("--path=")
-    two_word_flags+=("--path")
-    flags+=("--cli-config-file=")
-    two_word_flags+=("--cli-config-file")
-    flags+=("--debug")
-    flags+=("--json")
-    flags+=("--timeout=")
-    two_word_flags+=("--timeout")
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-    noun_aliases=()
-}
-
 _meroxa_apps()
 {
     last_command="meroxa_apps"
@@ -712,11 +650,6 @@ _meroxa_apps()
         command_aliases+=("ls")
         aliashash["ls"]="list"
     fi
-    commands+=("logs")
-    if [[ -z "${BASH_VERSION:-}" || "${BASH_VERSINFO[0]:-}" -gt 3 ]]; then
-        command_aliases+=("log")
-        aliashash["log"]="logs"
-    fi
     commands+=("open")
     commands+=("remove")
     if [[ -z "${BASH_VERSION:-}" || "${BASH_VERSINFO[0]:-}" -gt 3 ]]; then
@@ -726,7 +659,6 @@ _meroxa_apps()
         aliashash["rm"]="remove"
     fi
     commands+=("run")
-    commands+=("upgrade")
 
     flags=()
     two_word_flags=()

etc/man/man1/meroxa-apps-deploy.1

@@ -19,10 +19,6 @@ If deployment was successful, you should expect an application you'll be able to
 
 
 .SH OPTIONS
-.PP
-\fB--env\fP=""
-	environment (name or UUID) where application will be deployed to
-
 .PP
 \fB-h\fP, \fB--help\fP[=false]
 	help for deploy

etc/man/man1/meroxa-apps.1

@@ -42,4 +42,4 @@ Manage Turbine Data Applications
 
 .SH SEE ALSO
 .PP
-\fBmeroxa(1)\fP, \fBmeroxa-apps-deploy(1)\fP, \fBmeroxa-apps-describe(1)\fP, \fBmeroxa-apps-init(1)\fP, \fBmeroxa-apps-list(1)\fP, \fBmeroxa-apps-logs(1)\fP, \fBmeroxa-apps-open(1)\fP, \fBmeroxa-apps-remove(1)\fP, \fBmeroxa-apps-run(1)\fP, \fBmeroxa-apps-upgrade(1)\fP
+\fBmeroxa(1)\fP, \fBmeroxa-apps-deploy(1)\fP, \fBmeroxa-apps-describe(1)\fP, \fBmeroxa-apps-init(1)\fP, \fBmeroxa-apps-list(1)\fP, \fBmeroxa-apps-open(1)\fP, \fBmeroxa-apps-remove(1)\fP, \fBmeroxa-apps-run(1)\fP