stackit-dev-tools/terraform-provider-stackitprivatepreview
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: fix wrong order of params #59

Merged
marcel.henselin merged 1 commit from chore/refactorings into alpha 2026-02-13 14:55:37 +00:00
Conversation 0 Commits 1 Files changed 3 +13 -8
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cmd/cmd/build/templates/resource_scaffold.gotmpl
View file

@ -39,11 +39,14 @@ type {{.NameCamel}}Resource struct{
providerData core.ProviderData providerData core.ProviderData
} }
// resourceModel represents the Terraform resource state
type resourceModel = {{.PackageName}}.{{.NamePascal}}Model
type {{.NamePascal}}ResourceIdentityModel struct { type {{.NamePascal}}ResourceIdentityModel struct {
ProjectID types.String `tfsdk:"project_id"` ProjectID types.String `tfsdk:"project_id"`
Region types.String `tfsdk:"region"` Region types.String `tfsdk:"region"`
// TODO: implement further needed parts // TODO: implement further needed parts
{{.NamePascal}}ID types.String `tfsdk:"instance_id"` {{.NamePascal}}ID types.String `tfsdk:"{{.NameSnake}}_id"`
} }
// Metadata defines terraform resource name // Metadata defines terraform resource name
@ -51,6 +54,9 @@ func (r *{{.NameCamel}}Resource) Metadata(ctx context.Context, req resource.Meta
resp.TypeName = req.ProviderTypeName + "_{{.PackageName}}_{{.NameSnake}}" resp.TypeName = req.ProviderTypeName + "_{{.PackageName}}_{{.NameSnake}}"
} }
//go:embed planModifiers.yaml
var modifiersFileByte []byte
// Schema loads the schema from generated files and adds plan modifiers // Schema loads the schema from generated files and adds plan modifiers
func (r *{{.NameCamel}}Resource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) { func (r *{{.NameCamel}}Resource) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
schema = {{.PackageName}}ResGen.{{.NamePascal}}ResourceSchema(ctx) schema = {{.PackageName}}ResGen.{{.NamePascal}}ResourceSchema(ctx)
@ -82,6 +88,7 @@ func (r *instanceResource) IdentitySchema(_ context.Context, _ resource.Identity
"instance_id": identityschema.StringAttribute{ "instance_id": identityschema.StringAttribute{
RequiredForImport: true, // can be defaulted by the provider configuration RequiredForImport: true, // can be defaulted by the provider configuration
}, },
// TODO: implement remaining schema parts
}, },
} }
} }
@ -160,9 +167,6 @@ func (r *{{.NameCamel}}Resource) ModifyPlan(
} }
} }
//go:embed planModifiers.yaml
var modifiersFileByte []byte
// Create creates a new resource // Create creates a new resource
func (r *{{.NameCamel}}Resource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { func (r *{{.NameCamel}}Resource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
var data {{.PackageName}}ResGen.{{.NamePascal}}Model var data {{.PackageName}}ResGen.{{.NamePascal}}Model
@ -180,6 +184,7 @@ func (r *{{.NameCamel}}Resource) Create(ctx context.Context, req resource.Create
region := data.Region.ValueString() region := data.Region.ValueString()
ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "project_id", projectId)
ctx = tflog.SetField(ctx, "region", region) ctx = tflog.SetField(ctx, "region", region)
// TODO: add remaining fields
// TODO: Create API call logic // TODO: Create API call logic
/* /*

6
stackit/internal/services/postgresflexalpha/database/resource.go
View file

@ -290,7 +290,7 @@ func (r *databaseResource) Read(
ctx = core.InitProviderContext(ctx) ctx = core.InitProviderContext(ctx)
projectId, instanceId, region, databaseId, errExt := r.extractIdentityData(model, identityData) projectId, region, instanceId, databaseId, errExt := r.extractIdentityData(model, identityData)
if errExt != nil { if errExt != nil {
core.LogAndAddError( core.LogAndAddError(
ctx, ctx,
@ -376,7 +376,7 @@ func (r *databaseResource) Update(
ctx = core.InitProviderContext(ctx) ctx = core.InitProviderContext(ctx)
projectId, instanceId, region, databaseId64, errExt := r.extractIdentityData(model, identityData) projectId, region, instanceId, databaseId64, errExt := r.extractIdentityData(model, identityData)
if errExt != nil { if errExt != nil {
core.LogAndAddError( core.LogAndAddError(
ctx, ctx,
@ -502,7 +502,7 @@ func (r *databaseResource) Delete(
ctx = core.InitProviderContext(ctx) ctx = core.InitProviderContext(ctx)
projectId, instanceId, region, databaseId64, errExt := r.extractIdentityData(model, identityData) projectId, region, instanceId, databaseId64, errExt := r.extractIdentityData(model, identityData)
if errExt != nil { if errExt != nil {
core.LogAndAddError( core.LogAndAddError(
ctx, ctx,

2
stackit/internal/services/sqlserverflexbeta/user/resource.go
View file

@ -488,7 +488,7 @@ func (r *userResource) ImportState(
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...) resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("instance_id"), idParts[2])...)
resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("user_id"), userId)...) resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("user_id"), userId)...)
tflog.Info(ctx, "Postgres Flex user state imported") tflog.Info(ctx, "SQLServer Flex user state imported")
return return
} }