Skip to content
This repository has been archived by the owner on Mar 1, 2024. It is now read-only.

Add support for auto_destroy on machines #239

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add support for auto_destroy on machines #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0acf037
Add support for `auto_destroy` in machines.
sorenhansendk Sep 3, 2023
f1cf633
Add test to ensure `auto_destroy` is set.
sorenhansendk Sep 3, 2023
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
123 changes: 68 additions & 55 deletions internal/provider/machine_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/path"
"github.com/hashicorp/terraform-plugin-framework/resource"
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
"github.com/hashicorp/terraform-plugin-framework/types"
Expand Down Expand Up @@ -50,19 +51,20 @@ type TfService struct {
}

type flyMachineResourceData struct {
Name types.String `tfsdk:"name"`
Region types.String `tfsdk:"region"`
Id types.String `tfsdk:"id"`
PrivateIP types.String `tfsdk:"privateip"`
App types.String `tfsdk:"app"`
Image types.String `tfsdk:"image"`
Cpus types.Int64 `tfsdk:"cpus"`
MemoryMb types.Int64 `tfsdk:"memorymb"`
CpuType types.String `tfsdk:"cputype"`
Env types.Map `tfsdk:"env"`
Cmd []string `tfsdk:"cmd"`
Entrypoint []string `tfsdk:"entrypoint"`
Exec []string `tfsdk:"exec"`
Name types.String `tfsdk:"name"`
Region types.String `tfsdk:"region"`
Id types.String `tfsdk:"id"`
PrivateIP types.String `tfsdk:"privateip"`
App types.String `tfsdk:"app"`
Image types.String `tfsdk:"image"`
Cpus types.Int64 `tfsdk:"cpus"`
MemoryMb types.Int64 `tfsdk:"memorymb"`
CpuType types.String `tfsdk:"cputype"`
Env types.Map `tfsdk:"env"`
Cmd []string `tfsdk:"cmd"`
Entrypoint []string `tfsdk:"entrypoint"`
Exec []string `tfsdk:"exec"`
AutoDestroy bool `tfsdk:"auto_destroy"`

Mounts []TfMachineMount `tfsdk:"mounts"`
Services []TfService `tfsdk:"services"`
Expand Down Expand Up @@ -152,6 +154,12 @@ func (r *flyMachineResource) Schema(_ context.Context, _ resource.SchemaRequest,
Computed: true,
ElementType: types.StringType,
},
"auto_destroy": schema.BoolAttribute{
MarkdownDescription: "Optional boolean telling the Machine to destroy itself once it's complete",
Computed: true,
Optional: true,
Default: booldefault.StaticBool(false),
},
"mounts": schema.ListNestedAttribute{
MarkdownDescription: "Volume mounts",
Optional: true,
Expand Down Expand Up @@ -280,6 +288,7 @@ func (r *flyMachineResource) Create(ctx context.Context, req resource.CreateRequ
Entrypoint: data.Entrypoint,
Exec: data.Exec,
},
AutoDestroy: data.AutoDestroy,
},
}

Expand Down Expand Up @@ -333,20 +342,21 @@ func (r *flyMachineResource) Create(ctx context.Context, req resource.CreateRequ
}

data = flyMachineResourceData{
Name: types.StringValue(newMachine.Name),
Region: types.StringValue(newMachine.Region),
Id: types.StringValue(newMachine.ID),
App: data.App,
PrivateIP: types.StringValue(newMachine.PrivateIP),
Image: types.StringValue(newMachine.Config.Image),
Cpus: types.Int64Value(int64(newMachine.Config.Guest.Cpus)),
MemoryMb: types.Int64Value(int64(newMachine.Config.Guest.MemoryMb)),
CpuType: types.StringValue(newMachine.Config.Guest.CPUKind),
Cmd: newMachine.Config.Init.Cmd,
Entrypoint: newMachine.Config.Init.Entrypoint,
Exec: newMachine.Config.Init.Exec,
Env: env,
Services: tfservices,
Name: types.StringValue(newMachine.Name),
Region: types.StringValue(newMachine.Region),
Id: types.StringValue(newMachine.ID),
App: data.App,
PrivateIP: types.StringValue(newMachine.PrivateIP),
Image: types.StringValue(newMachine.Config.Image),
Cpus: types.Int64Value(int64(newMachine.Config.Guest.Cpus)),
MemoryMb: types.Int64Value(int64(newMachine.Config.Guest.MemoryMb)),
CpuType: types.StringValue(newMachine.Config.Guest.CPUKind),
Cmd: newMachine.Config.Init.Cmd,
Entrypoint: newMachine.Config.Init.Entrypoint,
Exec: newMachine.Config.Init.Exec,
Env: env,
Services: tfservices,
AutoDestroy: newMachine.Config.AutoDestroy,
}

if len(newMachine.Config.Mounts) > 0 {
Expand Down Expand Up @@ -402,20 +412,21 @@ func (r *flyMachineResource) Read(ctx context.Context, req resource.ReadRequest,
}

data = flyMachineResourceData{
Name: types.StringValue(machine.Name),
Id: types.StringValue(machine.ID),
Region: types.StringValue(machine.Region),
App: data.App,
PrivateIP: types.StringValue(machine.PrivateIP),
Image: types.StringValue(machine.Config.Image),
Cpus: types.Int64Value(int64(machine.Config.Guest.Cpus)),
MemoryMb: types.Int64Value(int64(machine.Config.Guest.MemoryMb)),
CpuType: types.StringValue(machine.Config.Guest.CPUKind),
Cmd: machine.Config.Init.Cmd,
Entrypoint: machine.Config.Init.Entrypoint,
Exec: machine.Config.Init.Exec,
Env: env,
Services: tfservices,
Name: types.StringValue(machine.Name),
Id: types.StringValue(machine.ID),
Region: types.StringValue(machine.Region),
App: data.App,
PrivateIP: types.StringValue(machine.PrivateIP),
Image: types.StringValue(machine.Config.Image),
Cpus: types.Int64Value(int64(machine.Config.Guest.Cpus)),
MemoryMb: types.Int64Value(int64(machine.Config.Guest.MemoryMb)),
CpuType: types.StringValue(machine.Config.Guest.CPUKind),
Cmd: machine.Config.Init.Cmd,
Entrypoint: machine.Config.Init.Entrypoint,
Exec: machine.Config.Init.Exec,
Env: env,
Services: tfservices,
AutoDestroy: machine.Config.AutoDestroy,
}

if len(machine.Config.Mounts) > 0 {
Expand Down Expand Up @@ -477,6 +488,7 @@ func (r *flyMachineResource) Update(ctx context.Context, req resource.UpdateRequ
Entrypoint: plan.Entrypoint,
Exec: plan.Exec,
},
AutoDestroy: state.AutoDestroy,
},
}

Expand Down Expand Up @@ -530,20 +542,21 @@ func (r *flyMachineResource) Update(ctx context.Context, req resource.UpdateRequ
tfservices := ServicesToTfServices(updatedMachine.Config.Services)

state = flyMachineResourceData{
Name: types.StringValue(updatedMachine.Name),
Region: types.StringValue(updatedMachine.Region),
Id: types.StringValue(updatedMachine.ID),
App: state.App,
PrivateIP: types.StringValue(updatedMachine.PrivateIP),
Image: types.StringValue(updatedMachine.Config.Image),
Cpus: types.Int64Value(int64(updatedMachine.Config.Guest.Cpus)),
MemoryMb: types.Int64Value(int64(updatedMachine.Config.Guest.MemoryMb)),
CpuType: types.StringValue(updatedMachine.Config.Guest.CPUKind),
Cmd: updatedMachine.Config.Init.Cmd,
Entrypoint: updatedMachine.Config.Init.Entrypoint,
Exec: updatedMachine.Config.Init.Exec,
Env: env,
Services: tfservices,
Name: types.StringValue(updatedMachine.Name),
Region: types.StringValue(updatedMachine.Region),
Id: types.StringValue(updatedMachine.ID),
App: state.App,
PrivateIP: types.StringValue(updatedMachine.PrivateIP),
Image: types.StringValue(updatedMachine.Config.Image),
Cpus: types.Int64Value(int64(updatedMachine.Config.Guest.Cpus)),
MemoryMb: types.Int64Value(int64(updatedMachine.Config.Guest.MemoryMb)),
CpuType: types.StringValue(updatedMachine.Config.Guest.CPUKind),
Cmd: updatedMachine.Config.Init.Cmd,
Entrypoint: updatedMachine.Config.Init.Entrypoint,
Exec: updatedMachine.Config.Init.Exec,
Env: env,
Services: tfservices,
AutoDestroy: updatedMachine.Config.AutoDestroy,
}

if len(updatedMachine.Config.Mounts) > 0 {
Expand Down
35 changes: 33 additions & 2 deletions internal/provider/machine_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package provider

import (
"fmt"
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"os"
"testing"

"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
)

var app = os.Getenv("FLY_TF_TEST_APP")
Expand Down Expand Up @@ -309,3 +310,33 @@ resource "fly_machine" "testMachine" {
}
`, app, region)
}

func TestAccFlyMachineAutoDestroy(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
PreCheck: func() { testAccPreCheck(t) },
Steps: []resource.TestStep{
{
Config: testFlyMachineWithAutoDestroySet("true"),
Check: resource.TestCheckResourceAttr("fly_machine.testMachine", "auto_destroy", "true"),
},
{
Config: testFlyMachineWithAutoDestroySet("false"),
Check: resource.TestCheckResourceAttr("fly_machine.testMachine", "auto_destroy", "false"),
},
},
})
}

func testFlyMachineWithAutoDestroySet(autoDestoy string) string {
return providerConfig() + fmt.Sprintf(`
resource "fly_machine" "testMachine" {
app = "%s"
region = "%s"
image = "nginx"
auto_destroy = "%s"
}

`, app, region, autoDestoy)
}
19 changes: 11 additions & 8 deletions pkg/apiv1/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package apiv1
import (
"errors"
"fmt"
"github.com/Khan/genqlient/graphql"
hreq "github.com/imroc/req/v3"
"net/http"
"time"

"github.com/Khan/genqlient/graphql"
hreq "github.com/imroc/req/v3"
)

var NonceHeader = "fly-machine-lease-nonce"
Expand Down Expand Up @@ -42,12 +43,13 @@ type InitConfig struct {
}

type MachineConfig struct {
Image string `json:"image"`
Env map[string]string `json:"env"`
Init InitConfig `json:"init,omitempty"`
Mounts []MachineMount `json:"mounts,omitempty"`
Services []Service `json:"services"`
Guest GuestConfig `json:"guest,omitempty"`
Image string `json:"image"`
Env map[string]string `json:"env"`
Init InitConfig `json:"init,omitempty"`
Mounts []MachineMount `json:"mounts,omitempty"`
Services []Service `json:"services"`
Guest GuestConfig `json:"guest,omitempty"`
AutoDestroy bool `json:"auto_destroy"`
}

type GuestConfig struct {
Expand Down Expand Up @@ -89,6 +91,7 @@ type MachineResponse struct {
Cpus int `json:"cpus"`
MemoryMb int `json:"memory_mb"`
} `json:"guest"`
AutoDestroy bool `json:"auto_destroy"`
} `json:"config"`
ImageRef struct {
Registry string `json:"registry"`
Expand Down