Skip to content

fix(deploy): preserve resolved image digest for Machines #5010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ruizkinio wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −8
Open

fix(deploy): preserve resolved image digest for Machines #5010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/command/deploy/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ func deployToMachines(

status.AppName = app.Name
status.OrgSlug = app.Organization.Slug
status.Image = img.Tag
status.Image = img.String()
status.Strategy = cfg.DeployStrategy()
if flag.GetString(ctx, "strategy") != "" {
status.Strategy = flag.GetString(ctx, "strategy")
Expand Down Expand Up @@ -650,7 +650,7 @@ func deployToMachines(

args := MachineDeploymentArgs{
App: app,
DeploymentImage: img.Tag,
DeploymentImage: img.String(),
Strategy: flag.GetString(ctx, "strategy"),
EnvFromFlags: flag.GetStringArray(ctx, "env"),
PrimaryRegionFlag: status.PrimaryRegion,
Expand Down
25 changes: 22 additions & 3 deletions internal/command/deploy/deploy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ var testdata embed.FS

func TestCommand_Execute(t *testing.T) {
makeTerminalLoggerQuiet(t)
const (
imageTag = "test-registry.fly.io/my-image:deployment-00000000000000000000000000"
imageDigest = "sha256:f107dbfaa732063b31ee94aa728c4f5648a672259fd62bfaa245f9b7a53b5479"
imageReference = imageTag + "@" + imageDigest
)

// Set FLY_ACCESS_TOKEN to simulate CI/CD environment
t.Setenv("FLY_ACCESS_TOKEN", "test-token")
Expand All @@ -43,7 +48,7 @@ func TestCommand_Execute(t *testing.T) {
cmd := New()
cmd.SetOut(&buf)
cmd.SetErr(&buf)
cmd.SetArgs([]string{"--image", "test-registry.fly.io/my-image:deployment-00000000000000000000000000"})
cmd.SetArgs([]string{"--image", imageTag})

ctx := context.Background()
ctx = iostreams.NewContext(ctx, &iostreams.IOStreams{Out: &buf, ErrOut: &buf})
Expand All @@ -62,9 +67,10 @@ func TestCommand_Execute(t *testing.T) {
Name: "test-basic",
Organization: fly.Organization{Slug: "my-org"},
})
if err := server.CreateImage(context.Background(), "test-basic", "test-registry.fly.io/my-image:deployment-00000000000000000000000000", &fly.Image{
if err := server.CreateImage(context.Background(), "test-basic", imageTag, &fly.Image{
ID: "IMAGE1",
Ref: "test-registry.fly.io/my-image:deployment-00000000000000000000000000",
Ref: imageTag,
Digest: imageDigest,
CompressedSize: "1000",
}); err != nil {
t.Fatal(err)
Expand All @@ -77,6 +83,19 @@ func TestCommand_Execute(t *testing.T) {
if err := cmd.ExecuteContext(ctx); err != nil {
t.Fatal(err)
}

machines, err := server.FlapsClient("test-basic").ListActive(ctx, "test-basic")
if err != nil {
t.Fatal(err)
}
if len(machines) == 0 {
t.Fatal("expected at least one active app machine")
}
for _, machine := range machines {
if got := machine.Config.Image; got != imageReference {
t.Fatalf("expected immutable deployment image %q, got %q", imageReference, got)
}
}
}

// copyFS writes the contents of a file system to a destination path on disk.
Expand Down
9 changes: 6 additions & 3 deletions internal/command/deploy/machines_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ func testMachineDeploymentForSetMachines(t *testing.T, strategy string, flyLaunc
// Test any LaunchMachineInput field that must not be set on a machine
// used to run release command.
func Test_resolveUpdatedMachineConfig_ReleaseCommand(t *testing.T) {
const immutableImage = "super/balloon@sha256:f107dbfaa732063b31ee94aa728c4f5648a672259fd62bfaa245f9b7a53b5479"

md, err := stabMachineDeployment(&appconfig.Config{
AppName: "my-cool-app",
Env: map[string]string{
Expand Down Expand Up @@ -228,6 +230,7 @@ func Test_resolveUpdatedMachineConfig_ReleaseCommand(t *testing.T) {
}},
})
require.NoError(t, err)
md.img = immutableImage

md.volumes = map[string][]fly.Volume{
"data": {{ID: "vol_12345"}},
Expand All @@ -244,7 +247,7 @@ func Test_resolveUpdatedMachineConfig_ReleaseCommand(t *testing.T) {
"OTHER": "value",
"FLY_PROCESS_GROUP": "app",
},
Image: "super/balloon",
Image: immutableImage,
Metadata: map[string]string{
"fly_platform_version": "v2",
"fly_process_group": "app",
Expand Down Expand Up @@ -294,7 +297,7 @@ func Test_resolveUpdatedMachineConfig_ReleaseCommand(t *testing.T) {
"RELEASE_COMMAND": "1",
"FLY_PROCESS_GROUP": "fly_app_release_command",
},
Image: "super/balloon",
Image: immutableImage,
Metadata: map[string]string{
"fly_platform_version": "v2",
"fly_process_group": "fly_app_release_command",
Expand Down Expand Up @@ -343,7 +346,7 @@ func Test_resolveUpdatedMachineConfig_ReleaseCommand(t *testing.T) {
"RELEASE_COMMAND": "1",
"FLY_PROCESS_GROUP": "fly_app_release_command",
},
Image: "super/balloon",
Image: immutableImage,
Metadata: map[string]string{
"fly_platform_version": "v2",
"fly_process_group": "fly_app_release_command",
Expand Down