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
7 changes: 6 additions & 1 deletion cmd/api/handlers/v1/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ func parseConfigArgs(c *fiber.Ctx) (*configArgs, error) {
return nil, fmt.Errorf("could not parse total ram: %w", err)
}

envName, err := profile.Parse(c.Query("environment_name", "WEB"))
if err != nil {
return nil, fmt.Errorf("could not parse environment name: %w", err)
}

// Set default log format based on PostgreSQL version
defaultLogFormat := "stderr"
if float32(pgVersion) >= 15.0 {
Expand All @@ -182,7 +187,7 @@ func parseConfigArgs(c *fiber.Ctx) (*configArgs, error) {
pgVersion: float32(pgVersion),
totalRAM: parsedRAM,
maxConn: maxConn,
envName: profile.Profile(c.Query("environment_name", "WEB")),
envName: envName,
osType: c.Query("os_type", "linux"),
arch: c.Query("arch", "amd64"),
driveType: c.Query("drive_type", "HDD"),
Expand Down
69 changes: 69 additions & 0 deletions cmd/api/handlers/v1/config_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package v1

import (
"net/http/httptest"
"testing"

"github.com/gofiber/fiber/v2"
"github.com/pgconfig/api/pkg/input/profile"
)

func TestParseConfigArgs_ProfileCaseInsensitive(t *testing.T) {
// Regression test for issue #37: environment_name should be case-insensitive
tests := []struct {
name string
environmentName string
expectedProfile profile.Profile
}{
{
name: "uppercase MIXED",
environmentName: "MIXED",
expectedProfile: profile.Mixed,
},
{
name: "mixed case Mixed",
environmentName: "Mixed",
expectedProfile: profile.Mixed,
},
{
name: "lowercase mixed",
environmentName: "mixed",
expectedProfile: profile.Mixed,
},
{
name: "mixed case WEB",
environmentName: "Web",
expectedProfile: profile.Web,
},
{
name: "lowercase web",
environmentName: "web",
expectedProfile: profile.Web,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
app := fiber.New()

app.Get("/test", func(c *fiber.Ctx) error {
args, err := parseConfigArgs(c)
if err != nil {
return err
}

if args.envName != tt.expectedProfile {
t.Errorf("expected profile %v, got %v", tt.expectedProfile, args.envName)
}

return c.SendStatus(200)
})

req := httptest.NewRequest("GET", "/test?environment_name="+tt.environmentName, nil)
_, err := app.Test(req)
if err != nil {
t.Fatalf("request failed: %v", err)
}
})
}
}
11 changes: 11 additions & 0 deletions pkg/input/profile/profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,14 @@ func (e *Profile) Set(v string) error {
func (e *Profile) Type() string {
return "Profile"
}

// Parse parses a profile string and returns the normalized Profile.
// It normalizes the input to uppercase to ensure case-insensitive matching.
// Returns an error if the profile string is not valid.
func Parse(s string) (Profile, error) {
var p Profile
if err := p.Set(s); err != nil {
return "", err
}
return p, nil
}