Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/models/application.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ type EnvironmentVariable struct {
type EnvironmentVariableCreateRequest struct {
Key string `json:"key"`
Value string `json:"value"`
IsBuildTime *bool `json:"is_build_time,omitempty"`
IsBuildTime *bool `json:"is_buildtime,omitempty"`
IsPreview *bool `json:"is_preview,omitempty"`
IsLiteral *bool `json:"is_literal,omitempty"`
IsMultiline *bool `json:"is_multiline,omitempty"`
Expand All @@ -307,7 +307,7 @@ type EnvironmentVariableCreateRequest struct {
type EnvironmentVariableUpdateRequest struct {
Key *string `json:"key,omitempty"`
Value *string `json:"value,omitempty"`
IsBuildTime *bool `json:"is_build_time,omitempty"`
IsBuildTime *bool `json:"is_buildtime,omitempty"`
IsPreview *bool `json:"is_preview,omitempty"`
IsLiteral *bool `json:"is_literal,omitempty"`
IsMultiline *bool `json:"is_multiline,omitempty"`
Expand Down
68 changes: 68 additions & 0 deletions internal/models/application_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,71 @@ func TestDockerComposeDomains_OmittedWhenUnset(t *testing.T) {
require.NoError(t, err)
assert.NotContains(t, string(data), "docker_compose_domains")
}

func TestEnvironmentVariableRequests_MarshalBuildtimeField(t *testing.T) {
buildTime := false
runtime := true
literal := true
key := "EXAMPLE_FLAG"
value := "disabled"

tests := []struct {
name string
req any
}{
{
name: "create request",
req: EnvironmentVariableCreateRequest{
Key: key,
Value: value,
IsBuildTime: &buildTime,
IsRuntime: &runtime,
IsLiteral: &literal,
},
},
{
name: "update request",
req: EnvironmentVariableUpdateRequest{
Key: &key,
Value: &value,
IsBuildTime: &buildTime,
IsRuntime: &runtime,
IsLiteral: &literal,
},
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
data, err := json.Marshal(tt.req)
require.NoError(t, err)

var body map[string]any
require.NoError(t, json.Unmarshal(data, &body))

// The application environment API expects is_buildtime as the
// build-time field name; is_build_time is rejected as unknown.
assert.Equal(t, false, body["is_buildtime"])
assert.NotContains(t, body, "is_build_time")

// Explicitly supplied boolean flags must be preserved.
assert.Equal(t, true, body["is_runtime"])
assert.Equal(t, true, body["is_literal"])
})
}
}

func TestEnvironmentVariableCreateRequest_OmitsUnsetBuildtimeField(t *testing.T) {
// An unset pointer means --build-time was not provided. The field should be
// omitted rather than sent as either spelling of the API field.
req := EnvironmentVariableCreateRequest{
Key: "EXAMPLE_FLAG",
Value: "disabled",
}

data, err := json.Marshal(req)
require.NoError(t, err)

assert.NotContains(t, string(data), `"is_buildtime"`)
assert.NotContains(t, string(data), `"is_build_time"`)
}
5 changes: 3 additions & 2 deletions internal/models/models_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,9 @@ func TestEnvironmentVariableCreateRequest_Marshal(t *testing.T) {
data, err := json.Marshal(request)
require.NoError(t, err)

// Request models should still use is_build_time (with underscore) per API spec
assert.Contains(t, string(data), `"is_build_time":true`)
// Coolify uses is_buildtime for environment-variable requests.
assert.Contains(t, string(data), `"is_buildtime":true`)
assert.NotContains(t, string(data), `"is_build_time"`)

var unmarshaled EnvironmentVariableCreateRequest
err = json.Unmarshal(data, &unmarshaled)
Expand Down
Loading