wip

miton18 · miton18 · commit 58c3c1a375d1 · 2025-10-07T11:54:09.000+02:00
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module go.clever-cloud.com/terraform-provider
 
-go 1.23.7
+go 1.24.0
 
 toolchain go1.24.5
 
@@ -93,6 +93,7 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/miton18/helper v0.0.2-0.20251001163320-ee4c86a86792
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/oklog/run v1.0.0 // indirect
 	github.com/philhofer/fwd v1.2.0 // indirect
diff --git a/go.sum b/go.sum
@@ -425,6 +425,8 @@ github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
 github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/miton18/helper v0.0.2-0.20251001163320-ee4c86a86792 h1:XeA098d0RWNJacxHe2zs7nQxVb8Ls67bv161EMsUu/g=
+github.com/miton18/helper v0.0.2-0.20251001163320-ee4c86a86792/go.mod h1:BpVJIypihdfdxycOj7PqtgCvyhNppV97AlmDrGgOjec=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
diff --git a/pkg/attributes/addon.go b/pkg/attributes/addon.go
@@ -1,11 +1,15 @@
 package attributes
 
 import (
+	"context"
+	"regexp"
+
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"go.clever-cloud.com/terraform-provider/pkg"
 )
@@ -21,7 +25,11 @@ type Addon struct {
 var addonCommon = map[string]schema.Attribute{
 	"id":   schema.StringAttribute{Computed: true, MarkdownDescription: "Generated unique identifier", PlanModifiers: []planmodifier.String{stringplanmodifier.UseStateForUnknown()}},
 	"name": schema.StringAttribute{Required: true, MarkdownDescription: "Name of the service"},
-	"plan": schema.StringAttribute{Required: true, MarkdownDescription: "Database size and spec"},
+	"plan": schema.StringAttribute{
+		Required:            true,
+		MarkdownDescription: "Database size and spec",
+		Validators:          []validator.String{slugValidator},
+	},
 	"region": schema.StringAttribute{
 		Optional:            true,
 		Computed:            true,
@@ -34,3 +42,17 @@ var addonCommon = map[string]schema.Attribute{
 func WithAddonCommons(runtimeSpecifics map[string]schema.Attribute) map[string]schema.Attribute {
 	return pkg.Merge(addonCommon, runtimeSpecifics)
 }
+
+// https://regex101.com/r/bMOotf/1
+var slugRegex = regexp.MustCompile(`^[a-z1-9_]*$`)
+var slugValidator = pkg.NewStringValidator(
+	"expect slug value",
+	func(ctx context.Context, req validator.StringRequest, res *validator.StringResponse) {
+		if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
+			return
+		}
+
+		if !slugRegex.MatchString(req.ConfigValue.ValueString()) {
+			res.Diagnostics.AddAttributeError(req.Path, "expect lowercase and underscore characters only", "Invalid slug, expect something like `xs_tny`")
+		}
+	})
diff --git a/pkg/attributes/runtime.go b/pkg/attributes/runtime.go
@@ -61,6 +61,12 @@ type Runtime struct {
 	Environment types.Map    `tfsdk:"environment"`
 }
 
+/*func (r *Runtime) SetEnvironment(env map[string]string) {
+	r.Environment = types.MapValueMust(
+		types.StringType,
+		maps.MapValue())
+}*/
+
 type RuntimeV0 struct {
 	ID               types.String `tfsdk:"id"`
 	Name             types.String `tfsdk:"name"`
diff --git a/pkg/resources/addon/crud.go b/pkg/resources/addon/crud.go
@@ -105,7 +105,7 @@ func (r *ResourceAddon) Read(ctx context.Context, req resource.ReadRequest, resp
 
 	a := addonRes.Payload()
 	ad.Name = pkg.FromStr(a.Name)
-	ad.Plan = pkg.FromStr(a.Plan.Slug)
+	ad.Plan = pkg.FromStr(strings.ToLower(a.Plan.Slug))
 	ad.Region = pkg.FromStr(a.Region)
 	ad.ThirdPartyProvider = pkg.FromStr(a.Provider.ID)
 	ad.CreationDate = pkg.FromI(a.CreationDate)
diff --git a/pkg/resources/frankenphp/crud.go b/pkg/resources/frankenphp/crud.go
@@ -106,7 +106,7 @@ func (r *ResourceFrankenPHP) Read(ctx context.Context, req resource.ReadRequest,
 	state.BiggestFlavor = pkg.FromStr(appFrankenPHP.App.Instance.MaxFlavor.Name)
 	state.Region = pkg.FromStr(appFrankenPHP.App.Zone)
 	state.DeployURL = pkg.FromStr(appFrankenPHP.App.DeployURL)
-
+	state.fromEnv(ctx, appFrankenPHP.EnvAsMap())
 	state.VHosts = helper.VHostsFromAPIHosts(ctx, appFrankenPHP.App.Vhosts.AsString(), state.VHosts, &resp.Diagnostics)
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, state)...)
diff --git a/pkg/resources/frankenphp/frankenphp.go b/pkg/resources/frankenphp/frankenphp.go
@@ -11,6 +11,8 @@ type ResourceFrankenPHP struct {
 	helper.Configurer
 }
 
+const CC_PHP_DEV_DEPENDENCIES = "CC_PHP_DEV_DEPENDENCIES"
+
 func NewResourceFrankenPHP() resource.Resource {
 	return &ResourceFrankenPHP{}
 }
diff --git a/pkg/resources/frankenphp/schema.go b/pkg/resources/frankenphp/schema.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	_ "embed"
 
+	"github.com/miton18/helper/maps"
+
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -53,14 +55,30 @@ func (fp *FrankenPHP) toEnv(ctx context.Context, diags *diag.Diagnostics) map[st
 
 	pkg.IfIsSetB(fp.DevDependencies, func(devDeps bool) {
 		if devDeps {
-			env["CC_PHP_DEV_DEPENDENCIES"] = "install"
+			env[CC_PHP_DEV_DEPENDENCIES] = "install"
 		}
 	})
 	env = pkg.Merge(env, fp.Hooks.ToEnv())
 
 	return env
 }
 
+// fromEnv iter on environment set on the clever application and
+// handle language specific env vars
+// put the others on Environment field
+func (fp *FrankenPHP) fromEnv(ctx context.Context, env map[string]string) diag.Diagnostics {
+	diags := diag.Diagnostics{}
+	m := maps.NewMap(env)
+
+	fp.DevDependencies = pkg.FromBool(m.Pop(CC_PHP_DEV_DEPENDENCIES) == "install")
+
+	x, d := types.MapValueFrom(ctx, types.StringType, m)
+	diags.Append(d...)
+	fp.Environment = x
+
+	return diags
+}
+
 func (fp *FrankenPHP) toDeployment(gitAuth *http.BasicAuth) *application.Deployment {
 	if fp.Deployment == nil || fp.Deployment.Repository.IsNull() {
 		return nil
diff --git a/pkg/resources/mongodb/crud.go b/pkg/resources/mongodb/crud.go
@@ -42,14 +42,15 @@ func (r *ResourceMongoDB) Create(ctx context.Context, req resource.CreateRequest
 		resp.Diagnostics.AddError("failed to create addon", res.Error().Error())
 		return
 	}
+	addon := res.Payload()
 
-	mg.ID = pkg.FromStr(res.Payload().RealID)
-	mg.CreationDate = pkg.FromI(res.Payload().CreationDate)
-	mg.Plan = pkg.FromStr(res.Payload().Plan.Slug)
+	mg.ID = pkg.FromStr(addon.RealID)
+	mg.CreationDate = pkg.FromI(addon.CreationDate)
+	mg.Plan = pkg.FromStr(strings.ToLower(addon.Plan.Slug))
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, mg)...)
 
-	mgInfoRes := tmp.GetMongoDB(ctx, r.Client(), res.Payload().ID)
+	mgInfoRes := tmp.GetMongoDB(ctx, r.Client(), addon.ID)
 	if mgInfoRes.HasError() {
 		resp.Diagnostics.AddError("failed to get MongoDB connection infos", mgInfoRes.Error().Error())
 		return
diff --git a/pkg/resources/mysql/crud.go b/pkg/resources/mysql/crud.go
@@ -89,7 +89,7 @@ func (r *ResourceMySQL) Create(ctx context.Context, req resource.CreateRequest,
 
 	my.ID = pkg.FromStr(createdMy.RealID)
 	my.CreationDate = pkg.FromI(createdMy.CreationDate)
-	my.Plan = pkg.FromStr(createdMy.Plan.Slug)
+	my.Plan = pkg.FromStr(strings.ToLower(createdMy.Plan.Slug))
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, my)...)
 
@@ -164,7 +164,7 @@ func (r *ResourceMySQL) Read(ctx context.Context, req resource.ReadRequest, resp
 	tflog.Debug(ctx, "API", map[string]any{"my": addonMy})
 	my.ID = pkg.FromStr(addon.RealID)
 	my.Name = pkg.FromStr(addon.Name)
-	my.Plan = pkg.FromStr(addonMy.Plan)
+	my.Plan = pkg.FromStr(strings.ToLower(addonMy.Plan))
 	my.Region = pkg.FromStr(addonMy.Zone)
 	my.CreationDate = pkg.FromI(addon.CreationDate)
 	my.Host = pkg.FromStr(addonMy.Host)
diff --git a/pkg/resources/postgresql/crud.go b/pkg/resources/postgresql/crud.go
@@ -51,7 +51,7 @@ func (r *ResourcePostgreSQL) Create(ctx context.Context, req resource.CreateRequ
 	addonsProviders := addonsProvidersRes.Payload()
 
 	prov := pkg.LookupAddonProvider(*addonsProviders, "postgresql-addon")
-	plan := pkg.LookupProviderPlan(prov, pg.Plan.ValueString())
+	plan := pkg.LookupProviderPlan(prov, strings.ToLower(pg.Plan.ValueString()))
 	if plan == nil {
 		resp.Diagnostics.AddError("failed to find plan", "expect: "+strings.Join(pkg.ProviderPlansAsList(prov), ", ")+", got: "+pg.Plan.String())
 		return
@@ -85,7 +85,8 @@ func (r *ResourcePostgreSQL) Create(ctx context.Context, req resource.CreateRequ
 
 	pg.ID = pkg.FromStr(createdPg.RealID)
 	pg.CreationDate = pkg.FromI(createdPg.CreationDate)
-	pg.Plan = pkg.FromStr(createdPg.Plan.Slug)
+	// Normalize plan to lowercase
+	pg.Plan = pkg.FromStr(strings.ToLower(pg.Plan.ValueString()))
 
 	resp.Diagnostics.Append(resp.State.Set(ctx, pg)...)
 
@@ -99,6 +100,7 @@ func (r *ResourcePostgreSQL) Create(ctx context.Context, req resource.CreateRequ
 	tflog.Debug(ctx, "API response", map[string]any{
 		"payload": fmt.Sprintf("%+v", addonPG),
 	})
+	pg.Plan = pkg.FromStr(strings.ToLower(addonPG.Plan))
 	pg.Host = pkg.FromStr(addonPG.Host)
 	pg.Port = pkg.FromI(int64(addonPG.Port))
 	pg.Database = pkg.FromStr(addonPG.Database)
@@ -166,7 +168,7 @@ func (r *ResourcePostgreSQL) Read(ctx context.Context, req resource.ReadRequest,
 	tflog.Debug(ctx, "API", map[string]any{"pg": addonPG})
 	pg.ID = pkg.FromStr(realID)
 	pg.Name = pkg.FromStr(addon.Name)
-	pg.Plan = pkg.FromStr(addonPG.Plan)
+	pg.Plan = pkg.FromStr(strings.ToLower(addonPG.Plan))
 	pg.Region = pkg.FromStr(addonPG.Zone)
 	pg.CreationDate = pkg.FromI(addon.CreationDate)
 	pg.Host = pkg.FromStr(addonPG.Host)
diff --git a/pkg/resources/postgresql/postgresql_test.go b/pkg/resources/postgresql/postgresql_test.go
@@ -34,7 +34,7 @@ func TestAccPostgreSQL_basic(t *testing.T) {
 		helper.SetKeyValues(map[string]any{
 			"name":   rName,
 			"region": "par",
-			"plan":   "dev",
+			"plan":   "xs_tny", // Plan names are case-insensitive in the API
 			"backup": true,
 		}))
 
@@ -76,7 +76,7 @@ func TestAccPostgreSQL_basic(t *testing.T) {
 				statecheck.ExpectKnownValue(fullName, tfjsonpath.New("database"), knownvalue.StringRegexp(regexp.MustCompile(`^[a-zA-Z0-9]+$`))),
 				statecheck.ExpectKnownValue(fullName, tfjsonpath.New("user"), knownvalue.StringRegexp(regexp.MustCompile(`^[a-zA-Z0-9]+$`))),
 				statecheck.ExpectSensitiveValue(fullName, tfjsonpath.New("password")),
-				statecheck.ExpectKnownValue(fullName, tfjsonpath.New("plan"), knownvalue.StringExact("dev")),
+				statecheck.ExpectKnownValue(fullName, tfjsonpath.New("plan"), knownvalue.StringExact("xs_tny")), // Normalized to lowercase
 				statecheck.ExpectKnownValue(fullName, tfjsonpath.New("backup"), knownvalue.Bool(true)),
 			},
 		}, {
@@ -144,15 +144,15 @@ func TestAccPostgreSQL_RefreshDeleted(t *testing.T) {
 		PreCheck:                 tests.ExpectOrganisation(t),
 		CheckDestroy: func(state *terraform.State) error {
 			for _, resource := range state.RootModule().Resources {
-				addonId, err := tmp.RealIDToAddonID(context.Background(), cc, tests.ORGANISATION, resource.Primary.ID)
+				addonID, err := tmp.RealIDToAddonID(context.Background(), cc, tests.ORGANISATION, resource.Primary.ID)
 				if err != nil {
 					if strings.Contains(err.Error(), "not found") {
 						continue
 					}
 					return fmt.Errorf("failed to get addon ID: %s", err.Error())
 				}
 
-				res := tmp.GetPostgreSQL(context.Background(), cc, addonId)
+				res := tmp.GetPostgreSQL(context.Background(), cc, addonID)
 				if res.IsNotFoundError() {
 					continue
 				}
diff --git a/pkg/resources/redis/crud.go b/pkg/resources/redis/crud.go
@@ -132,7 +132,7 @@ func (r *ResourceRedis) Read(ctx context.Context, req resource.ReadRequest, resp
 
 	rd.Name = pkg.FromStr(addonRD.Name)
 	rd.Host = envAsMap["REDIS_HOST"]
-	rd.Plan = pkg.FromStr(addonRD.Plan.Slug)
+	rd.Plan = pkg.FromStr(strings.ToLower(addonRD.Plan.Slug))
 	rd.Port = pkg.FromI(port)
 	rd.Region = pkg.FromStr(addonRD.Region)
 	rd.Token = envAsMap["REDIS_PASSWORD"]

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ type ResourceFrankenPHP struct {`
`11`	`11`	`helper.Configurer`
`12`	`12`	`}`
`13`	`13`
	`14`	`+const CC_PHP_DEV_DEPENDENCIES = "CC_PHP_DEV_DEPENDENCIES"`
	`15`	`+`
`14`	`16`	`func NewResourceFrankenPHP() resource.Resource {`
`15`	`17`	`return &ResourceFrankenPHP{}`
`16`	`18`	`}`