Skip to content

Commit 8c7680e

Browse files
jremy42jremy42
committed
fix: remove redundant else block in TEM domain resource
1 parent 9c1e507 commit 8c7680e

File tree

12 files changed

+794
-567
lines changed

12 files changed

+794
-567
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/nats-io/jwt/v2 v2.8.0
3030
github.com/nats-io/nats.go v1.45.0
3131
github.com/robfig/cron/v3 v3.0.1
32-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250721082157-a9b7a7bd9686
32+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250929150437-c65b49480cff
3333
github.com/stretchr/testify v1.11.1
3434
golang.org/x/crypto v0.42.0
3535
gopkg.in/dnaeon/go-vcr.v3 v3.2.0

‎go.sum‎

Lines changed: 65 additions & 0 deletions
Large diffs are not rendered by default.

‎internal/services/container/namespace.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func ResourceContainerNamespaceCreate(ctx context.Context, d *schema.ResourceDat
122122
Name: types.ExpandOrGenerateString(d.Get("name").(string), "ns"),
123123
ProjectID: d.Get("project_id").(string),
124124
Region: region,
125-
ActivateVpcIntegration: true,
125+
ActivateVpcIntegration: scw.BoolPtr(true),
126126
}
127127

128128
rawTag, tagExist := d.GetOk("tags")

‎internal/services/function/namespace.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func ResourceFunctionNamespaceCreate(ctx context.Context, d *schema.ResourceData
113113
Name: types.ExpandOrGenerateString(d.Get("name").(string), "func"),
114114
ProjectID: d.Get("project_id").(string),
115115
Region: region,
116-
ActivateVpcIntegration: true,
116+
ActivateVpcIntegration: scw.BoolPtr(true),
117117
}
118118

119119
rawTag, tagExist := d.GetOk("tags")

‎internal/services/iam/user.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func resourceIamUserRead(ctx context.Context, d *schema.ResourceData, m any) dia
188188
_ = d.Set("deletable", user.Deletable)
189189
_ = d.Set("last_login_at", types.FlattenTime(user.LastLoginAt))
190190
_ = d.Set("type", user.Type)
191-
_ = d.Set("status", user.Status)
191+
_ = d.Set("status", user.Status) //nolint:staticcheck // user.Status is deprecated in SDK but kept for backward-compat in state
192192
_ = d.Set("mfa", user.Mfa)
193193
_ = d.Set("account_root_user_id", user.AccountRootUserID)
194194
_ = d.Set("locked", user.Locked)

‎internal/services/tem/domain.go‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -268,17 +268,26 @@ func ResourceDomainRead(ctx context.Context, d *schema.ResourceData, m any) diag
268268
_ = d.Set("dmarc_config", "")
269269
}
270270

271-
// TODO: These fields will be available in a future SDK version
272-
// DKIM, SPF, and MX records will be added to DomainRecords
273-
_ = d.Set("dkim_name", "")
274-
_ = d.Set("spf_value", "")
275-
_ = d.Set("mx_config", "")
276-
} else {
277-
_ = d.Set("dmarc_name", "")
278-
_ = d.Set("dmarc_config", "")
279-
_ = d.Set("dkim_name", "")
280-
_ = d.Set("spf_value", "")
281-
_ = d.Set("mx_config", "")
271+
// DKIM
272+
if domain.Records.Dkim != nil {
273+
_ = d.Set("dkim_name", domain.Records.Dkim.Name)
274+
} else {
275+
_ = d.Set("dkim_name", "")
276+
}
277+
278+
// SPF
279+
if domain.Records.Spf != nil {
280+
_ = d.Set("spf_value", domain.Records.Spf.Value)
281+
} else {
282+
_ = d.Set("spf_value", "")
283+
}
284+
285+
// MX
286+
if domain.Records.Mx != nil {
287+
_ = d.Set("mx_config", domain.Records.Mx.Value)
288+
} else {
289+
_ = d.Set("mx_config", "")
290+
}
282291
}
283292

284293
_ = d.Set("smtp_host", tem.SMTPHost)

‎internal/services/tem/domain_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ func TestAccDomain_Basic(t *testing.T) {
3636
Check: resource.ComposeTestCheckFunc(
3737
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
3838
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", domainName),
39-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_config"),
40-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_name"),
41-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dkim_name"),
42-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "spf_value"),
43-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "mx_config"),
39+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_config", "v=DMARC1; p=none"),
40+
resource.TestMatchResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", regexp.MustCompile(`^_dmarc\.terraform-rs\.test\.local\.$`)),
41+
resource.TestMatchResourceAttr("scaleway_tem_domain.cr01", "dkim_name", regexp.MustCompile(`^[a-f0-9-]+\._domainkey\.terraform-rs\.test\.local\.$`)),
42+
resource.TestMatchResourceAttr("scaleway_tem_domain.cr01", "spf_value", regexp.MustCompile(`^v=spf1 include:terraform-rs\.test\.local -all$`)),
43+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "mx_config", "10 blackhole.tem.scaleway.com."),
4444
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "last_error", ""), // last_error is deprecated
4545
acctest.CheckResourceAttrUUID("scaleway_tem_domain.cr01", "id"),
4646
),
@@ -109,11 +109,11 @@ func TestAccDomain_Autoconfig(t *testing.T) {
109109
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
110110
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", subDomainName+"."+domainNameValidation),
111111
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "true"),
112-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_config"),
113-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_name"),
114-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dkim_name"),
115-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "spf_value"),
116-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "mx_config"),
112+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_config", "v=DMARC1; p=none"),
113+
resource.TestMatchResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", regexp.MustCompile(`^_dmarc\.`+regexp.QuoteMeta(subDomainName+"."+domainNameValidation)+`\.$`)),
114+
resource.TestMatchResourceAttr("scaleway_tem_domain.cr01", "dkim_name", regexp.MustCompile(`^[a-f0-9-]+\._domainkey\.`+regexp.QuoteMeta(subDomainName+"."+domainNameValidation)+`\.$`)),
115+
resource.TestMatchResourceAttr("scaleway_tem_domain.cr01", "spf_value", regexp.MustCompile(`^v=spf1 include:`+regexp.QuoteMeta(subDomainName+"."+domainNameValidation)+` -all$`)),
116+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "mx_config", "10 blackhole.tem.scaleway.com."),
117117
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "last_error", ""), // last_error is deprecated
118118
acctest.CheckResourceAttrUUID("scaleway_tem_domain.cr01", "id"),
119119
resource.TestCheckResourceAttr("scaleway_tem_domain_validation.valid", "validated", "true"),
@@ -152,11 +152,11 @@ func TestAccDomain_AutoconfigUpdate(t *testing.T) {
152152
isDomainPresent(tt, "scaleway_tem_domain.cr01"),
153153
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "name", subDomainName+"."+domainNameValidation),
154154
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "autoconfig", "false"),
155-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_config"),
156-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dmarc_name"),
157-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "dkim_name"),
158-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "spf_value"),
159-
resource.TestCheckResourceAttrSet("scaleway_tem_domain.cr01", "mx_config"),
155+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "dmarc_config", "v=DMARC1; p=none"),
156+
resource.TestMatchResourceAttr("scaleway_tem_domain.cr01", "dmarc_name", regexp.MustCompile(`^_dmarc\.`+regexp.QuoteMeta(subDomainName+"."+domainNameValidation)+`\.$`)),
157+
resource.TestMatchResourceAttr("scaleway_tem_domain.cr01", "dkim_name", regexp.MustCompile(`^[a-f0-9-]+\._domainkey\.`+regexp.QuoteMeta(subDomainName+"."+domainNameValidation)+`\.$`)),
158+
resource.TestMatchResourceAttr("scaleway_tem_domain.cr01", "spf_value", regexp.MustCompile(`^v=spf1 include:`+regexp.QuoteMeta(subDomainName+"."+domainNameValidation)+` -all$`)),
159+
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "mx_config", "10 blackhole.tem.scaleway.com."),
160160
resource.TestCheckResourceAttr("scaleway_tem_domain.cr01", "last_error", ""), // last_error is deprecated
161161
acctest.CheckResourceAttrUUID("scaleway_tem_domain.cr01", "id"),
162162
),

0 commit comments

Comments
 (0)