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

Fix Argus Scrape Config SAML2 field default (#239)

Browse source 
* Fix Argus Scrape Config SAML2 field default

* Adjust acceptance test
This commit is contained in:
João Palet 2024-01-31 09:05:48 +00:00 • committed by GitHub
parent e4f2c40443
commit dfc9e391d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
stackit/internal/services/argus/argus_acc_test.go
View file

@ -278,6 +278,9 @@ func TestAccResource(t *testing.T) {
scrape_interval = "%s" scrape_interval = "%s"
sample_limit = %s sample_limit = %s
metrics_path = "%s" metrics_path = "%s"
saml2 = {
enable_url_parameters = false
}
} }
`, `,
testutil.ArgusProviderConfig(), testutil.ArgusProviderConfig(),

4
stackit/internal/services/argus/scrapeconfig/datasource.go
View file

@ -136,11 +136,11 @@ func (d *scrapeConfigDataSource) Schema(_ context.Context, _ datasource.SchemaRe
Computed: true, Computed: true,
}, },
"saml2": schema.SingleNestedAttribute{ "saml2": schema.SingleNestedAttribute{
Description: "A SAML2 configuration block", Description: "A SAML2 configuration block.",
Computed: true, Computed: true,
Attributes: map[string]schema.Attribute{ Attributes: map[string]schema.Attribute{
"enable_url_parameters": schema.BoolAttribute{ "enable_url_parameters": schema.BoolAttribute{
Description: "Are URL parameters be enabled?", Description: "Specifies if URL parameters are enabled",
Computed: true, Computed: true,
}, },
}, },

14
stackit/internal/services/argus/scrapeconfig/resource.go
View file

@ -16,6 +16,7 @@ import (
"github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault" "github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default" "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/objectdefault"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "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/stringdefault"
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
@ -214,9 +215,20 @@ func (r *scrapeConfigResource) Schema(_ context.Context, _ resource.SchemaReques
"saml2": schema.SingleNestedAttribute{ "saml2": schema.SingleNestedAttribute{
Description: "A SAML2 configuration block.", Description: "A SAML2 configuration block.",
Optional: true, Optional: true,
Computed: true,
Default: objectdefault.StaticValue(
types.ObjectValueMust(
map[string]attr.Type{
"enable_url_parameters": types.BoolType,
},
map[string]attr.Value{
"enable_url_parameters": types.BoolValue(DefaultSAML2EnableURLParameters),
},
),
),
Attributes: map[string]schema.Attribute{ Attributes: map[string]schema.Attribute{
"enable_url_parameters": schema.BoolAttribute{ "enable_url_parameters": schema.BoolAttribute{
Description: "Are URL parameters be enabled?", Description: "Specifies if URL parameters are enabled.",
Optional: true, Optional: true,
Computed: true, Computed: true,
Default: booldefault.StaticBool(DefaultSAML2EnableURLParameters), Default: booldefault.StaticBool(DefaultSAML2EnableURLParameters),