Add more MySQL commands (#3806)

* Add more mysql commands

* lint

Author: Joshua Sierles

gql/generated.go

@@ -357,6 +357,11 @@ enum AddOnType {
   """
   enveloop
 
+  """
+  A MySQL database
+  """
+  fly_mysql
+
   """
   A Kubernetes cluster
   """
@@ -3282,6 +3287,7 @@ input CreateOrganizationInput {
   Whether or not new apps in this org use Apps V2 by default
   """
   appsV2DefaultOn: Boolean
+  billingParentOrganizationId: ID
 
   """
   A unique identifier for the client performing the mutation.
@@ -5071,6 +5077,44 @@ type EnablePostgresConsulPayload {
   consulUrl: String!
 }
 
+"""
+Autogenerated input type of EnsureDepotRemoteBuilder
+"""
+input EnsureDepotRemoteBuilderInput {
+  """
+  The unique application name
+  """
+  appName: String
+
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  The node ID of the organization
+  """
+  organizationId: ID
+
+  """
+  Desired region for the remote builder
+  """
+  region: String
+}
+
+"""
+Autogenerated return type of EnsureDepotRemoteBuilder.
+"""
+type EnsureDepotRemoteBuilderPayload {
+  buildId: String!
+  buildToken: String!
+
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+}
+
 """
 Autogenerated input type of EnsureFlyctlMachineHost
 """
@@ -7000,6 +7044,12 @@ type Mutations {
     """
     input: EnablePostgresConsulInput!
   ): EnablePostgresConsulPayload
+  ensureDepotRemoteBuilder(
+    """
+    Parameters for EnsureDepotRemoteBuilder
+    """
+    input: EnsureDepotRemoteBuilderInput!
+  ): EnsureDepotRemoteBuilderPayload
   ensureFlyctlMachineHost(
     """
     Parameters for EnsureFlyctlMachineHost
@@ -8555,6 +8605,11 @@ type Queries {
   Find a domain by name
   """
   domain(name: String!): Domain
+
+  """
+  internal field for inter-service authz check
+  """
+  flapsAuthzCheck: Boolean!
   githubIntegration: GithubIntegration! @deprecated(reason: "deprecated")
   herokuIntegration: HerokuIntegration!
 
@@ -8973,6 +9028,7 @@ type Release implements Node {
   """
   imageRef: String
   inProgress: Boolean! @deprecated(reason: "use deployment.inProgress")
+  metadata: JSON
 
   """
   The reason for the release
@@ -10850,6 +10906,11 @@ input UpdateReleaseInput {
   """
   clientMutationId: String
 
+  """
+  The metadata for the release
+  """
+  metadata: JSON
+
   """
   The ID of the release
   """
@@ -10858,7 +10919,7 @@ input UpdateReleaseInput {
   """
   The new status for the release
   """
-  status: String!
+  status: String
 }
 
 """

gql/schema.graphql

@@ -7,9 +7,9 @@ import (
 	"github.com/superfly/flyctl/internal/command"
 	"github.com/superfly/flyctl/internal/command/extensions/arcjet"
 	"github.com/superfly/flyctl/internal/command/extensions/enveloop"
+	"github.com/superfly/flyctl/internal/command/extensions/fly_mysql"
 	"github.com/superfly/flyctl/internal/command/extensions/kafka"
 	"github.com/superfly/flyctl/internal/command/extensions/kubernetes"
-	"github.com/superfly/flyctl/internal/command/extensions/mysql"
 	sentry_ext "github.com/superfly/flyctl/internal/command/extensions/sentry"
 	"github.com/superfly/flyctl/internal/command/extensions/supabase"
 	"github.com/superfly/flyctl/internal/command/extensions/tigris"
@@ -36,7 +36,7 @@ func New() (cmd *cobra.Command) {
 		vector.New(),
 		enveloop.New(),
 		arcjet.New(),
-		mysql.New(),
+		fly_mysql.New(),
 		wafris.New(),
 	)
 	return

internal/command/extensions/extensions.go

@@ -1,4 +1,4 @@
-package mysql
+package fly_mysql
 
 import (
 	"context"

internal/command/extensions/mysql/create.go renamed to internal/command/extensions/fly_mysql/create.go

@@ -0,0 +1,79 @@
+package fly_mysql
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/superfly/flyctl/gql"
+	"github.com/superfly/flyctl/iostreams"
+
+	"github.com/superfly/flyctl/internal/command"
+	extensions_core "github.com/superfly/flyctl/internal/command/extensions/core"
+	"github.com/superfly/flyctl/internal/flag"
+	"github.com/superfly/flyctl/internal/flyutil"
+	"github.com/superfly/flyctl/internal/prompt"
+)
+
+func destroy() (cmd *cobra.Command) {
+	const (
+		long = `Permanently destroy a MySQL database`
+
+		short = long
+		usage = "destroy [name]"
+	)
+
+	cmd = command.New(usage, short, long, runDestroy, command.RequireSession, command.LoadAppNameIfPresent)
+
+	cmd.Args = cobra.MaximumNArgs(1)
+
+	flag.Add(cmd,
+		flag.App(),
+		flag.AppConfig(),
+		extensions_core.SharedFlags,
+	)
+
+	return cmd
+}
+
+func runDestroy(ctx context.Context) (err error) {
+	io := iostreams.FromContext(ctx)
+	colorize := io.ColorScheme()
+
+	extension, _, err := extensions_core.Discover(ctx, gql.AddOnTypeFlyMysql)
+	if err != nil {
+		return err
+	}
+
+	if !flag.GetYes(ctx) {
+		const msg = "Destroying a MySQL database is not reversible."
+		fmt.Fprintln(io.ErrOut, colorize.Red(msg))
+
+		switch confirmed, err := prompt.Confirmf(ctx, "Destroy MySQL database %s?", extension.Name); {
+		case err == nil:
+			if !confirmed {
+				return nil
+			}
+		case prompt.IsNonInteractive(err):
+			return prompt.NonInteractiveError("yes flag must be specified when not running interactively")
+		default:
+			return err
+		}
+	}
+
+	var (
+		out    = iostreams.FromContext(ctx).Out
+		client = flyutil.ClientFromContext(ctx).GenqClient()
+	)
+
+	_, err = gql.DeleteAddOn(ctx, client, extension.Name)
+
+	if err != nil {
+		return
+	}
+
+	fmt.Fprintf(out, "Your MySQL database %s was destroyed\n", extension.Name)
+
+	return
+}

internal/command/extensions/fly_mysql/destroy.go

@@ -1,4 +1,4 @@
-package mysql
+package fly_mysql
 
 import (
 	"github.com/spf13/cobra"
@@ -13,7 +13,7 @@ func New() (cmd *cobra.Command) {
 	)
 
 	cmd = command.New("mysql", short, long, nil)
-	cmd.AddCommand(create(), list())
+	cmd.AddCommand(create(), list(), status(), destroy())
 
 	return cmd
 }

internal/command/extensions/mysql/mysql.go renamed to internal/command/extensions/fly_mysql/fly_mysql.go

@@ -1,4 +1,4 @@
-package mysql
+package fly_mysql
 
 import (
 	"context"

internal/command/extensions/mysql/list.go renamed to internal/command/extensions/fly_mysql/list.go

@@ -0,0 +1,38 @@
+package fly_mysql
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+	"github.com/superfly/flyctl/gql"
+	"github.com/superfly/flyctl/internal/command"
+	extensions_core "github.com/superfly/flyctl/internal/command/extensions/core"
+	"github.com/superfly/flyctl/internal/flag"
+)
+
+func status() *cobra.Command {
+	const (
+		short = "Show details about a MySQL database"
+		long  = short + "\n"
+
+		usage = "status [name]"
+	)
+
+	cmd := command.New(usage, short, long, runStatus,
+		command.RequireSession, command.LoadAppNameIfPresent,
+	)
+
+	cmd.Args = cobra.MaximumNArgs(1)
+
+	flag.Add(cmd,
+		flag.App(),
+		flag.AppConfig(),
+		extensions_core.SharedFlags,
+	)
+
+	return cmd
+}
+
+func runStatus(ctx context.Context) (err error) {
+	return extensions_core.Status(ctx, gql.AddOnTypeFlyMysql)
+}

internal/command/extensions/fly_mysql/status.go

@@ -0,0 +1,10 @@
+package mysql
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/superfly/flyctl/internal/command/extensions/fly_mysql"
+)
+
+func New() (cmd *cobra.Command) {
+	return fly_mysql.New()
+}

internal/command/mysql/mysql.go

@@ -41,6 +41,7 @@ import (
 	"github.com/superfly/flyctl/internal/command/machine"
 	"github.com/superfly/flyctl/internal/command/metrics"
 	"github.com/superfly/flyctl/internal/command/move"
+	"github.com/superfly/flyctl/internal/command/mysql"
 	"github.com/superfly/flyctl/internal/command/open"
 	"github.com/superfly/flyctl/internal/command/orgs"
 	"github.com/superfly/flyctl/internal/command/ping"
@@ -109,6 +110,7 @@ func New() *cobra.Command {
 		agent.New(),
 		group(image.New(), "configuring"),
 		group(incidents.New(), "upkeep"),
+		group(mysql.New(), "dbs_and_extensions"),
 		group(ping.New(), "upkeep"),
 		group(proxy.New(), "upkeep"),
 		group(postgres.New(), "dbs_and_extensions"),