Merge branch 'master' into update-flygo-version

Author: timflyio

.golangci.yml

@@ -1,7 +1,7 @@
 version: "2"
 run:
   concurrency: 4
-  go: "1.21"
+  go: "1.24"
   issues-exit-code: 1
   tests: true
 linters:
@@ -52,7 +52,7 @@ linters:
     rules:
       - linters:
           - lll
-        source: '^//go:generate '
+        source: "^//go:generate "
     paths:
       - third_party$
       - builtin$

.pre-commit-config.yaml

@@ -1,24 +1,24 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
     hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
 
--   repo: https://github.com/tekwizely/pre-commit-golang
-    rev: v1.0.0-rc.1
+  - repo: https://github.com/tekwizely/pre-commit-golang
+    rev: v1.0.0-rc.2
     hooks:
-    -   id: go-mod-tidy
+      - id: go-mod-tidy
 
-# NOTE: This pre-commit hook is ignored when running on Github Workflow
-# because goalngci-lint github action is much more useful than the pre-commit action.
-# The trick is to run github action only for "manual" hook stage
--   repo: https://github.com/golangci/golangci-lint
-    rev: v1.24.0
+  # NOTE: This pre-commit hook is ignored when running on Github Workflow
+  # because goalngci-lint github action is much more useful than the pre-commit action.
+  # The trick is to run github action only for "manual" hook stage
+  - repo: https://github.com/golangci/golangci-lint
+    rev: v2.5.0
     hooks:
-    -   id: golangci-lint
+      - id: golangci-lint
         stages: [pre-commit]

go.mod

@@ -89,13 +89,13 @@ require (
 	go.uber.org/mock v0.6.0
 	golang.org/x/crypto v0.42.0
 	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
-	golang.org/x/mod v0.27.0
-	golang.org/x/net v0.43.0
+	golang.org/x/mod v0.28.0
+	golang.org/x/net v0.44.0
 	golang.org/x/sync v0.17.0
 	golang.org/x/sys v0.36.0
 	golang.org/x/term v0.35.0
 	golang.org/x/text v0.29.0
-	golang.org/x/time v0.12.0
+	golang.org/x/time v0.13.0
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
 	google.golang.org/grpc v1.75.0
 	gopkg.in/yaml.v2 v2.4.0

go.sum

@@ -749,8 +749,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
-golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
+golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
+golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -768,8 +768,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
+golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
 golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -844,8 +844,8 @@ golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
 golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
-golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
-golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=
+golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=

internal/appconfig/config.go

@@ -3,6 +3,7 @@
 package appconfig
 
 import (
+	"context"
 	"encoding/base64"
 	"fmt"
 	"net/url"
@@ -12,6 +13,8 @@ import (
 	"slices"
 
 	fly "github.com/superfly/fly-go"
+	"github.com/superfly/flyctl/internal/flag"
+	"github.com/superfly/flyctl/internal/launchdarkly"
 )
 
 const (
@@ -155,6 +158,7 @@ type Mount struct {
 	Destination             string   `toml:"destination,omitempty" json:"destination,omitempty"`
 	InitialSize             string   `toml:"initial_size,omitempty" json:"initial_size,omitempty"`
 	SnapshotRetention       *int     `toml:"snapshot_retention,omitempty" json:"snapshot_retention,omitempty"`
+	ScheduledSnapshots      *bool    `toml:"scheduled_snapshots,omitempty" json:"scheduled_snapshots,omitempty"`
 	AutoExtendSizeThreshold int      `toml:"auto_extend_size_threshold,omitempty" json:"auto_extend_size_threshold,omitempty"`
 	AutoExtendSizeIncrement string   `toml:"auto_extend_size_increment,omitempty" json:"auto_extend_size_increment,omitempty"`
 	AutoExtendSizeLimit     string   `toml:"auto_extend_size_limit,omitempty" json:"auto_extend_size_limit,omitempty"`
@@ -176,6 +180,8 @@ type Build struct {
 	Ignorefile        string            `toml:"ignorefile,omitempty" json:"ignorefile,omitempty"`
 	DockerBuildTarget string            `toml:"build-target,omitempty" json:"build-target,omitempty"`
 	Compose           *BuildCompose     `toml:"compose,omitempty" json:"compose,omitempty"`
+	Compression       string            `toml:"compression,omitempty" json:"compression,omitempty"`
+	CompressionLevel  *int              `toml:"compression_level,omitempty" json:"compression_level,omitempty"`
 }
 
 type Experimental struct {
@@ -188,7 +194,6 @@ type Experimental struct {
 	LazyLoadImages bool     `toml:"lazy_load_images,omitempty" json:"lazy_load_images,omitempty"`
 	Attached       Attached `toml:"attached,omitempty" json:"attached,omitempty"`
 	MachineConfig  string   `toml:"machine_config,omitempty" json:"machine_config,omitempty"`
-	UseZstd        bool     `toml:"use_zstd,omitempty" json:"use_zstd,omitempty"`
 }
 
 type Attached struct {
@@ -247,6 +252,41 @@ func (c *Config) DetermineIPType(ipType string) string {
 	return "shared"
 }
 
+func (c *Config) DetermineCompression(ctx context.Context) (compression string, compressionLevel int) {
+	// Set default values
+	compression = "gzip"
+	compressionLevel = 7
+
+	// LaunchDarkly provides the base settings
+	ldClient := launchdarkly.ClientFromContext(ctx)
+	if ldClient.UseZstdEnabled() {
+		compression = "zstd"
+	}
+	if strength, ok := ldClient.GetCompressionStrength().(float64); ok {
+		compressionLevel = int(strength)
+	}
+
+	// fly.toml overrides LaunchDarkly
+	if c.Build != nil {
+		if c.Build.Compression != "" {
+			compression = c.Build.Compression
+		}
+		if c.Build.CompressionLevel != nil {
+			compressionLevel = *c.Build.CompressionLevel
+		}
+	}
+
+	// CLI flags override everything
+	if flag.IsSpecified(ctx, "compression") {
+		compression = flag.GetString(ctx, "compression")
+	}
+	if flag.IsSpecified(ctx, "compression-level") {
+		compressionLevel = flag.GetInt(ctx, "compression-level")
+	}
+
+	return
+}
+
 // IsUsingGPU returns true if any VMs have a gpu-kind set.
 func (c *Config) IsUsingGPU() bool {
 	for _, vm := range c.Compute {

internal/appconfig/definition_test.go

@@ -304,10 +304,11 @@ func TestToDefinition(t *testing.T) {
 			},
 		},
 		"mounts": []any{map[string]any{
-			"source":             "data",
-			"destination":        "/data",
-			"initial_size":       "30gb",
-			"snapshot_retention": int64(17),
+			"source":              "data",
+			"destination":         "/data",
+			"initial_size":        "30gb",
+			"snapshot_retention":  int64(17),
+			"scheduled_snapshots": true,
 		}},
 		"processes": map[string]any{
 			"web":  "run web",

internal/appconfig/serde_test.go

@@ -592,10 +592,11 @@ func TestLoadTOMLAppConfigReferenceFormat(t *testing.T) {
 		},
 
 		Mounts: []Mount{{
-			Source:            "data",
-			Destination:       "/data",
-			InitialSize:       "30gb",
-			SnapshotRetention: fly.Pointer(17),
+			Source:             "data",
+			Destination:        "/data",
+			InitialSize:        "30gb",
+			SnapshotRetention:  fly.Pointer(17),
+			ScheduledSnapshots: fly.BoolPointer(true),
 		}},
 
 		Processes: map[string]string{

internal/appconfig/testdata/full-reference.toml

@@ -128,6 +128,7 @@ host_dedication_id = "06031957"
   initial_size = "30gb"
   destination = "/data"
   snapshot_retention = 17
+  scheduled_snapshots = true
 
 [[vm]]
   size = "shared-cpu-1x"

internal/appconfig/validation.go

@@ -13,6 +13,7 @@ import (
 	"github.com/logrusorgru/aurora"
 	fly "github.com/superfly/fly-go"
 	"github.com/superfly/flyctl/helpers"
+	"github.com/superfly/flyctl/internal/flag/validation"
 	"github.com/superfly/flyctl/internal/sentry"
 )
 
@@ -36,6 +37,7 @@ func (c *Config) Validate(ctx context.Context) (err error, extra_info string) {
 		c.validateConsoleCommand,
 		c.validateMounts,
 		c.validateRestartPolicy,
+		c.validateCompression,
 	}
 
 	extra_info = fmt.Sprintf("Validating %s\n", c.ConfigFilePath())
@@ -175,7 +177,7 @@ func (c *Config) validateServicesSection() (extraInfo string, err error) {
 					"Check docs at https://fly.io/docs/reference/configuration/#services-ports \n " +
 					"Validation for _services without ports_ will hard fail after February 15, 2024.",
 			)
-			//err = ValidationError
+			// err = ValidationError
 		}
 
 		for _, check := range service.TCPChecks {
@@ -355,3 +357,23 @@ func (c *Config) validateRestartPolicy() (extraInfo string, err error) {
 
 	return
 }
+
+func (c *Config) validateCompression() (extraInfo string, err error) {
+	if c.Build != nil {
+		if c.Build.Compression != "" {
+			if vErr := validation.ValidateCompressionFlag(c.Build.Compression); vErr != nil {
+				extraInfo += fmt.Sprintf("%s\n", vErr.Error())
+				err = ValidationError
+			}
+		}
+
+		if c.Build.CompressionLevel != nil {
+			if vErr := validation.ValidateCompressionLevelFlag(*c.Build.CompressionLevel); vErr != nil {
+				extraInfo += fmt.Sprintf("%s\n", vErr.Error())
+				err = ValidationError
+			}
+		}
+	}
+
+	return
+}

internal/appsecrets/secrets.go

@@ -2,6 +2,9 @@ package appsecrets
 
 import (
 	"context"
+	crand "crypto/rand"
+	"encoding/hex"
+	"fmt"
 
 	"github.com/superfly/fly-go"
 
@@ -45,3 +48,15 @@ func Update(ctx context.Context, client flapsutil.FlapsClient, appName string, s
 	}
 	return nil
 }
+
+// Sync sets the min version for the app to the current min version, allowing
+// any previously set secret to be visible in deploys.
+func Sync(ctx context.Context, client flapsutil.FlapsClient, appName string) error {
+	// This is somewhat of a hack -- we unset an non-existent secret and
+	// we get back the latest min version after the unset.
+	rand := make([]byte, 8)
+	_, _ = crand.Read(rand)
+	bogusDummySecret := fmt.Sprintf("BogusDummySecret_%s", hex.EncodeToString(rand))
+	unsetSecrets := []string{bogusDummySecret}
+	return Update(ctx, client, appName, nil, unsetSecrets)
+}