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

Move checkAllowPriviledgedContainers to the Create and Update functions in the SKE resource (#206)

Browse source 
* Move checkAllowPriviledgedContainers to the Create and Update functions

* Remove ValidateConfig

* Add comment
This commit is contained in:
Vicente Pinto 2024-01-12 17:32:08 +00:00 • committed by GitHub
parent 48b8859098
commit 1e103ac7fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
stackit/internal/services/ske/cluster/resource.go
View file

@ -512,21 +512,9 @@ func (r *clusterResource) Schema(_ context.Context, _ resource.SchemaRequest, re
} }
} }
func (r *clusterResource) ValidateConfig(ctx context.Context, req resource.ValidateConfigRequest, resp *resource.ValidateConfigResponse) { // needs to be executed inside the Create and Update methods
var model Model // since ValidateConfig runs before variables are rendered to their value,
diags := req.Config.Get(ctx, &model) // which causes errors like this: https://github.com/stackitcloud/terraform-provider-stackit/issues/201
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
}
diags = checkAllowPrivilegedContainers(model.AllowPrivilegedContainers, model.KubernetesVersion)
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
}
}
func checkAllowPrivilegedContainers(allowPrivilegeContainers types.Bool, kubernetesVersion types.String) diag.Diagnostics { func checkAllowPrivilegedContainers(allowPrivilegeContainers types.Bool, kubernetesVersion types.String) diag.Diagnostics {
var diags diag.Diagnostics var diags diag.Diagnostics
@ -556,6 +544,13 @@ func (r *clusterResource) Create(ctx context.Context, req resource.CreateRequest
if resp.Diagnostics.HasError() { if resp.Diagnostics.HasError() {
return return
} }
diags = checkAllowPrivilegedContainers(model.AllowPrivilegedContainers, model.KubernetesVersion)
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
}
projectId := model.ProjectId.ValueString() projectId := model.ProjectId.ValueString()
clusterName := model.Name.ValueString() clusterName := model.Name.ValueString()
ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "project_id", projectId)
@ -1393,6 +1388,13 @@ func (r *clusterResource) Update(ctx context.Context, req resource.UpdateRequest
if resp.Diagnostics.HasError() { if resp.Diagnostics.HasError() {
return return
} }
diags = checkAllowPrivilegedContainers(model.AllowPrivilegedContainers, model.KubernetesVersion)
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
}
projectId := model.ProjectId.ValueString() projectId := model.ProjectId.ValueString()
clName := model.Name.ValueString() clName := model.Name.ValueString()
ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "project_id", projectId)