Merge branch 'main' into alpha

# Conflicts:
#	docs/data-sources/sqlserverflexalpha_user.md
#	docs/index.md
#	docs/resources/postgresflexalpha_instance.md
#	docs/resources/sqlserverflexalpha_user.md
#	examples/data-sources/stackitprivatepreview_postgresflexalpha_database/data-source.tf
#	examples/data-sources/stackitprivatepreview_postgresflexalpha_instance/data-source.tf
#	examples/data-sources/stackitprivatepreview_postgresflexalpha_user/data-source.tf
#	examples/data-sources/stackitprivatepreview_sqlserverflexalpha_instance/data-source.tf
#	examples/data-sources/stackitprivatepreview_sqlserverflexalpha_user/data-source.tf
#	examples/provider/provider.tf
#	examples/resources/stackitprivatepreview_postgresflexalpha_database/resource.tf
#	examples/resources/stackitprivatepreview_postgresflexalpha_instance/resource.tf
#	examples/resources/stackitprivatepreview_postgresflexalpha_user/resource.tf
#	examples/resources/stackitprivatepreview_sqlserverflexalpha_instance/resource.tf
#	examples/resources/stackitprivatepreview_sqlserverflexalpha_user/resource.tf
#	go.mod
#	go.sum
#	golang-ci.yaml
#	main.go
#	scripts/check-docs.sh
#	scripts/lint-golangci-lint.sh
#	scripts/project.sh
#	scripts/replace.sh
#	scripts/tfplugindocs.sh
#	stackit/internal/conversion/conversion.go
#	stackit/internal/conversion/conversion_test.go
#	stackit/internal/core/core.go
#	stackit/internal/core/core_test.go
#	stackit/internal/features/beta.go
#	stackit/internal/features/beta_test.go
#	stackit/internal/features/experiments.go
#	stackit/internal/features/experiments_test.go
#	stackit/internal/services/postgresflexalpha/database/datasource.go.bak
#	stackit/internal/services/postgresflexalpha/database/resource.go.bak
#	stackit/internal/services/postgresflexalpha/database/resource_test.go.bak
#	stackit/internal/services/postgresflexalpha/instance/datasource.go.bak
#	stackit/internal/services/postgresflexalpha/instance/resource.go
#	stackit/internal/services/postgresflexalpha/instance/use_state_for_unknown_if_flavor_unchanged_modifier.go
#	stackit/internal/services/postgresflexalpha/postgresflex_acc_test.go
#	stackit/internal/services/postgresflexalpha/user/datasource.go
#	stackit/internal/services/postgresflexalpha/user/datasource_test.go
#	stackit/internal/services/postgresflexalpha/user/resource.go
#	stackit/internal/services/postgresflexalpha/user/resource_test.go
#	stackit/internal/services/postgresflexalpha/utils/util.go
#	stackit/internal/services/postgresflexalpha/utils/util_test.go
#	stackit/internal/services/sqlserverflexalpha/instance/datasource.go
#	stackit/internal/services/sqlserverflexalpha/instance/resource.go
#	stackit/internal/services/sqlserverflexalpha/sqlserverflex_acc_test.go
#	stackit/internal/services/sqlserverflexalpha/testdata/resource-max.tf
#	stackit/internal/services/sqlserverflexalpha/testdata/resource-min.tf
#	stackit/internal/services/sqlserverflexalpha/user/datasource.go
#	stackit/internal/services/sqlserverflexalpha/user/resource.go
#	stackit/internal/services/sqlserverflexalpha/utils/util.go
#	stackit/internal/services/sqlserverflexalpha/utils/util_test.go
#	stackit/internal/testutil/testutil.go
#	stackit/internal/testutil/testutil_test.go
#	stackit/internal/utils/attributes.go
#	stackit/internal/utils/attributes_test.go
#	stackit/internal/utils/headers.go
#	stackit/internal/utils/headers_test.go
#	stackit/internal/utils/regions.go
#	stackit/internal/utils/regions_test.go
#	stackit/internal/utils/use_state_for_unknown_if.go
#	stackit/internal/utils/use_state_for_unknown_if_test.go
#	stackit/internal/utils/utils.go
#	stackit/internal/utils/utils_test.go
#	stackit/internal/validate/validate.go
#	stackit/internal/validate/validate_test.go
#	stackit/provider.go
#	stackit/provider_acc_test.go
#	stackit/testdata/provider-all-attributes.tf
#	stackit/testdata/provider-credentials.tf
#	stackit/testdata/provider-invalid-attribute.tf
This commit is contained in:
Marcel_Henselin 2025-12-19 11:33:29 +01:00
commit 7de63b5b8e
9 changed files with 4 additions and 194 deletions

View file

@ -213,7 +213,7 @@ func (r *barResource) Create(ctx context.Context, req resource.CreateRequest, re
// only in case the create bar API call is asynchronous (Make sure to include *ALL* fields which are part of the
// internal terraform resource id! And please include the comment below in your code):
// Write id attributes to state before polling via the wait handler - just in case anything goes wrong during the wait handler
utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]interface{}{
ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]interface{}{
"project_id": projectId,
"region": region,
"bar_id": resp.BarId,
@ -337,7 +337,7 @@ func (r *barResource) ImportState(ctx context.Context, req resource.ImportStateR
return
}
utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
ctx = utils.SetAndLogStateFields(ctx, &resp.Diagnostics, &resp.State, map[string]any{
"project_id": idParts[0],
"region": idParts[1],
"bar_id": idParts[2],

View file

@ -11,6 +11,7 @@ on:
env:
DAYS_BEFORE_PR_STALE: 7
DAYS_BEFORE_PR_CLOSE: 7
EXEMPT_PR_LABELS: "ignore-stale"
permissions:
issues: write
@ -30,6 +31,7 @@ jobs:
close-pr-message: "This PR was closed automatically because it has been stalled for ${{ env.DAYS_BEFORE_PR_CLOSE }} days with no activity. Feel free to re-open it at any time."
days-before-pr-stale: ${{ env.DAYS_BEFORE_PR_STALE }}
days-before-pr-close: ${{ env.DAYS_BEFORE_PR_CLOSE }}
exempt-pr-labels: ${{ env.EXEMPT_PR_LABELS }}
# never mark issues as stale or close them
days-before-issue-stale: -1
days-before-issue-close: -1