Skip to content

Commit 176d87a

Browse files
authored
Merge branch 'master' into feat/rdb-engine-upgrade-management
2 parents 93916d5 + 3f5b763 commit 176d87a

11 files changed

+3751
-3935
lines changed

GNUmakefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ test-compile:
5353
website:
5454
@echo "Use this site to preview markdown rendering: https://registry.terraform.io/tools/doc-preview"
5555

56-
.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website
56+
.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website docs
5757

5858
tfproviderlint:
5959
go tool tfproviderlint -R014=false -AT001.ignored-filename-suffixes=_data_source_test.go ./...
@@ -63,3 +63,8 @@ tfproviderdocs:
6363

6464
tfproviderlintx:
6565
go tool tfproviderlintx -XR001=false -XS002=false ./...
66+
67+
docs:
68+
go tool tfplugindocs validate
69+
rm -fr ./docs
70+
go tool tfplugindocs generate

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/nats-io/jwt/v2 v2.8.0
3131
github.com/nats-io/nats.go v1.46.1
3232
github.com/robfig/cron/v3 v3.0.1
33-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250929150437-c65b49480cff
33+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911
3434
github.com/stretchr/testify v1.11.1
3535
golang.org/x/crypto v0.43.0
3636
golang.org/x/sync v0.17.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
457457
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
458458
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
459459
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
460-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250929150437-c65b49480cff h1:1XC8rVPK4hr2lHdHajSurEV2Orp8eMGQ42vqh4hVX7M=
461-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20250929150437-c65b49480cff/go.mod h1:DVB9HV7nK7TdTRqlpdxw6T0Wxg+aB9xPBEpO3aM2iqQ=
460+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911 h1:puwRtGGoGw9Rw3qlB7ltimV2+uugkalN08DyVEL1VoE=
461+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.35.0.20251015050748-12aafea99911/go.mod h1:SVm1Zk6UpZtqZN6KtEQpjC+v+Lir4tyVfhQTU19q3PA=
462462
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
463463
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
464464
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

templates/template_test.go renamed to internal/docs/template_test.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package template_test
1+
package docs_test
22

33
import (
44
"bufio"
@@ -13,23 +13,30 @@ import (
1313
var gotypeRE = regexp.MustCompile(`\{\{.*gotype:.*}}`)
1414

1515
func TestGoTypeDefined(t *testing.T) {
16-
err := filepath.WalkDir("resources", func(path string, _ fs.DirEntry, _ error) error {
16+
err := filepath.WalkDir("../../templates/resources", func(path string, _ fs.DirEntry, _ error) error {
1717
if isTemplate := strings.Contains(path, "tmpl"); isTemplate {
1818
f, err := os.Open(path)
1919
if err != nil {
2020
t.Fatalf("cannot open %s", path)
2121
}
22-
defer f.Close()
22+
defer func(f *os.File) {
23+
err := f.Close()
24+
if err != nil {
25+
t.Fatal(err.Error())
26+
}
27+
}(f)
2328

2429
scanner := bufio.NewScanner(f)
2530
if !scanner.Scan() {
2631
t.Logf("❌ %s: file is empty", path)
2732
t.Fail()
2833
}
34+
2935
firstLine := scanner.Text()
3036
if gotypeRE.MatchString(firstLine) {
3137
return nil
3238
}
39+
3340
t.Logf("gotype missing at top of file: %s", path)
3441
t.Fail()
3542
}

internal/services/rdb/testdata/data-source-database-backup-basic.cassette.yaml

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

internal/services/rdb/testdata/data-source-database-basic.cassette.yaml

Lines changed: 285 additions & 383 deletions
Large diffs are not rendered by default.

internal/services/rdb/testdata/data-source-privilege-basic.cassette.yaml

Lines changed: 898 additions & 947 deletions
Large diffs are not rendered by default.

internal/services/rdb/testdata/database-backup-basic.cassette.yaml

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

internal/services/rdb/testdata/database-basic.cassette.yaml

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

internal/services/rdb/testdata/database-manual-delete.cassette.yaml

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

0 commit comments

Comments
 (0)