Feature/dns skip wait and partial state #1052
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,19 @@ | ||
| #!/usr/bin/env bash | ||
| # This script lints the SDK modules and the internal examples | ||
| # Pre-requisites: golangci-lint (provided by Makefile or system) | ||
| set -eo pipefail | ||
|
|
||
| ROOT_DIR=$(git rev-parse --show-toplevel) | ||
| GOLANG_CI_YAML_PATH="${ROOT_DIR}/golang-ci.yaml" | ||
| GOLANG_CI_ARGS="--allow-parallel-runners --timeout=5m --config=${GOLANG_CI_YAML_PATH}" | ||
|
|
||
| # Use provided golangci-lint binary or fallback to system installation | ||
| GOLANGCI_LINT_BIN="${1:-golangci-lint}" | ||
|
|
||
| if [ ! -x "${GOLANGCI_LINT_BIN}" ] && ! type -p "${GOLANGCI_LINT_BIN}" >/dev/null; then | ||
| echo "golangci-lint not found at ${GOLANGCI_LINT_BIN} and not installed in PATH, unable to proceed." | ||
| exit 1 | ||
| fi | ||
|
|
||
| cd ${ROOT_DIR} | ||
| ${GOLANGCI_LINT_BIN} run ${GOLANG_CI_ARGS} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ package dns | |
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/http" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-framework-validators/int64validator" | ||
|
|
@@ -16,6 +17,7 @@ import ( | |
| "github.com/hashicorp/terraform-plugin-framework/schema/validator" | ||
| "github.com/hashicorp/terraform-plugin-framework/types" | ||
| "github.com/hashicorp/terraform-plugin-log/tflog" | ||
| "github.com/stackitcloud/stackit-sdk-go/core/oapierror" | ||
| "github.com/stackitcloud/stackit-sdk-go/services/dns" | ||
| "github.com/stackitcloud/stackit-sdk-go/services/dns/wait" | ||
| "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" | ||
|
|
@@ -219,15 +221,27 @@ func (r *recordSetResource) Create(ctx context.Context, req resource.CreateReque | |
| } | ||
|
|
||
| // Write id attributes to state before polling via the wait handler - just in case anything goes wrong during the wait handler | ||
| recordSetId := *recordSetResp.Rrset.Id | ||
| model.RecordSetId = types.StringValue(recordSetId) | ||
| model.Id = utils.BuildInternalTerraformId(projectId, zoneId, recordSetId) | ||
|
|
||
| // Set all unknown/null fields to null before saving state | ||
| if err := utils.SetModelFieldsToNull(ctx, &model); err != nil { | ||
|
||
| core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating record set", fmt.Sprintf("Setting model fields to null: %v", err)) | ||
| return | ||
| } | ||
|
|
||
| diags = resp.State.Set(ctx, model) | ||
| resp.Diagnostics.Append(diags...) | ||
| if resp.Diagnostics.HasError() { | ||
| return | ||
| } | ||
|
|
||
| if !utils.ShouldWait() { | ||
| tflog.Info(ctx, "Skipping wait; async mode for Crossplane/Upjet") | ||
| return | ||
| } | ||
|
|
||
| waitResp, err := wait.CreateRecordSetWaitHandler(ctx, r.client, projectId, zoneId, *recordSetResp.Rrset.Id).WaitWithContext(ctx) | ||
| if err != nil { | ||
| core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating record set", fmt.Sprintf("Instance creation waiting: %v", err)) | ||
|
|
@@ -264,8 +278,19 @@ func (r *recordSetResource) Read(ctx context.Context, req resource.ReadRequest, | |
| ctx = tflog.SetField(ctx, "zone_id", zoneId) | ||
| ctx = tflog.SetField(ctx, "record_set_id", recordSetId) | ||
|
|
||
| if recordSetId == "" || zoneId == "" || projectId == "" { | ||
PatrickKoss marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| tflog.Info(ctx, "Record set ID, zone ID, or project ID is empty, removing resource") | ||
| resp.State.RemoveResource(ctx) | ||
| return | ||
| } | ||
|
|
||
| recordSetResp, err := r.client.GetRecordSet(ctx, projectId, zoneId, recordSetId).Execute() | ||
| if err != nil { | ||
| oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped | ||
PatrickKoss marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if ok && (oapiErr.StatusCode == http.StatusNotFound || oapiErr.StatusCode == http.StatusGone) { | ||
| resp.State.RemoveResource(ctx) | ||
| return | ||
| } | ||
| core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading record set", fmt.Sprintf("Calling API: %v", err)) | ||
| return | ||
| } | ||
|
|
@@ -319,6 +344,12 @@ func (r *recordSetResource) Update(ctx context.Context, req resource.UpdateReque | |
| core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating record set", err.Error()) | ||
| return | ||
| } | ||
|
|
||
| if !utils.ShouldWait() { | ||
| tflog.Info(ctx, "Skipping wait; async mode for Crossplane/Upjet") | ||
| return | ||
| } | ||
|
|
||
| waitResp, err := wait.PartialUpdateRecordSetWaitHandler(ctx, r.client, projectId, zoneId, recordSetId).WaitWithContext(ctx) | ||
| if err != nil { | ||
| core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating record set", fmt.Sprintf("Instance update waiting: %v", err)) | ||
|
|
@@ -358,8 +389,22 @@ func (r *recordSetResource) Delete(ctx context.Context, req resource.DeleteReque | |
| // Delete existing record set | ||
| _, err := r.client.DeleteRecordSet(ctx, projectId, zoneId, recordSetId).Execute() | ||
| if err != nil { | ||
| // If resource is already gone (404 or 410), treat as success for idempotency | ||
| oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped | ||
| if ok && | ||
| (oapiErr.StatusCode == http.StatusNotFound || oapiErr.StatusCode == http.StatusGone) { | ||
| tflog.Info(ctx, "Record set already deleted") | ||
| return | ||
| } | ||
| core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting record set", fmt.Sprintf("Calling API: %v", err)) | ||
| return | ||
| } | ||
|
|
||
| if !utils.ShouldWait() { | ||
| tflog.Info(ctx, "Skipping wait; async mode for Crossplane/Upjet") | ||
| return | ||
| } | ||
|
|
||
| _, err = wait.DeleteRecordSetWaitHandler(ctx, r.client, projectId, zoneId, recordSetId).WaitWithContext(ctx) | ||
| if err != nil { | ||
| core.LogAndAddError(ctx, &resp.Diagnostics, "Error deleting record set", fmt.Sprintf("Instance deletion waiting: %v", err)) | ||
|
|
@@ -380,11 +425,23 @@ func (r *recordSetResource) ImportState(ctx context.Context, req resource.Import | |
| return | ||
| } | ||
|
|
||
| var model Model | ||
| model.ProjectId = types.StringValue(idParts[0]) | ||
| model.ZoneId = types.StringValue(idParts[1]) | ||
| model.RecordSetId = types.StringValue(idParts[2]) | ||
| model.Id = utils.BuildInternalTerraformId(idParts[0], idParts[1], idParts[2]) | ||
|
|
||
| if err := utils.SetModelFieldsToNull(ctx, &model); err != nil { | ||
| core.LogAndAddError(ctx, &resp.Diagnostics, "Error importing zone", fmt.Sprintf("Setting model fields to null: %v", err)) | ||
| return | ||
| } | ||
|
|
||
| diags := resp.State.Set(ctx, model) | ||
| resp.Diagnostics.Append(diags...) | ||
| if diags.HasError() { | ||
| return | ||
| } | ||
|
|
||
| tflog.Info(ctx, "DNS record set state imported") | ||
| } | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Running bash scripts blindly from a master branch of another repository is a no-go for me, sorry
Overall, what's the point of this? This whole thing feels wrong to me. For managing development dependencies there are things like dev containers, devenvs, nix flakes, ...
I'm aware we're not providing any of these currently, but this download process inside the Makefile seems pretty hacky to me 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah that was a bit too ambitious. You know once you copy it from somewhere you always copy it :P
I replaced it with downloading from the releases which should be secure.
It is actually quite typically to download binaries that are needed to interact with the application (like linting, kubectl, kind, helm, etc) via scripts/make. In many stackit projects that is already the case. And there are also many opensource projects that do similar things like:
I guess many ways solve the same problem. Currently my biggest problem is that I cannot lint locally since there are version diffs between my installed golangci lint and the one in the pipeline. Therefore I want to have a make command that runs the same version in the pipeline as in our local env. Some might say that is the shift left approach.