Skip to content

Commit 16b8c19

Browse files
jremy42jremy42
committed
fix: remove redundant else block in TEM domain resource
# Conflicts: # go.mod # go.sum # internal/services/iam/user.go
1 parent 4bbbe2c commit 16b8c19

File tree

7 files changed

+729
-565
lines changed

7 files changed

+729
-565
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.46.1
3131
github.com/robfig/cron/v3 v3.0.1
32-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35
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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
156156
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
157157
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
158158
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
159-
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
160-
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
161159
github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
162160
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
163161
github.com/docker/docker v28.4.0+incompatible h1:KVC7bz5zJY/4AZe/78BIvCnPsLaC9T/zh72xnlrTTOk=
@@ -203,6 +201,8 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
203201
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
204202
github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
205203
github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
204+
github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
205+
github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
206206
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
207207
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
208208
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -456,8 +456,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
456456
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
457457
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
458458
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
459-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35 h1:8xfn1RzeI9yoCUuEwDy08F+No6PcKZGEDOQ6hrRyLts=
460-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35/go.mod h1:47B1d/YXmSAxlJxUJxClzHR6b3T4M1WyCvwENPQNBWc=
459+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250929150437-c65b49480cff h1:1XC8rVPK4hr2lHdHajSurEV2Orp8eMGQ42vqh4hVX7M=
460+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250929150437-c65b49480cff/go.mod h1:DVB9HV7nK7TdTRqlpdxw6T0Wxg+aB9xPBEpO3aM2iqQ=
461461
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
462462
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
463463
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -895,6 +895,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
895895
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
896896
gopkg.in/dnaeon/go-vcr.v3 v3.2.0 h1:Rltp0Vf+Aq0u4rQXgmXgtgoRDStTnFN83cWgSGSoRzM=
897897
gopkg.in/dnaeon/go-vcr.v3 v3.2.0/go.mod h1:2IMOnnlx9I6u9x+YBsM3tAMx6AlOxnJ0pWxQAzZ79Ag=
898+
gopkg.in/dnaeon/go-vcr.v4 v4.0.5 h1:I0hpTIvD5rII+8LgYGrHMA2d4SQPoL6u7ZvJakWKsiA=
899+
gopkg.in/dnaeon/go-vcr.v4 v4.0.5/go.mod h1:dRos81TkW9C1WJt6tTaE+uV2Lo8qJT3AG2b35+CB/nQ=
898900
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
899901
gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
900902
gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=

‎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)