Skip to content

Commit d4cc6c7

Browse files
committed
rename datasource and update cassette
1 parent 036bb37 commit d4cc6c7

9 files changed

+23574
-27
lines changed

internal/provider/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ func Provider(config *Config) plugin.ProviderFunc {
250250
"scaleway_account_ssh_key": iam.DataSourceSSHKey(),
251251
"scaleway_availability_zones": az.DataSourceAvailabilityZones(),
252252
"scaleway_baremetal_offer": baremetal.DataSourceOffer(),
253-
"scaleway_baremetal_easy_partitioning": baremetal.DataEasyPartitioning(),
253+
"scaleway_baremetal_easy_partitioning": baremetal.DataPartitionSchema(),
254254
"scaleway_baremetal_option": baremetal.DataSourceOption(),
255255
"scaleway_baremetal_os": baremetal.DataSourceOS(),
256256
"scaleway_baremetal_server": baremetal.DataSourceServer(),

internal/services/baremetal/easy_partitioning_data_source.go renamed to internal/services/baremetal/partition_schema_data_source.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/json"
66
"errors"
77
"fmt"
8+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
89
"strings"
910

1011
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -31,12 +32,11 @@ const (
3132
uefi = "uefi"
3233
swap = "swap"
3334
root = "root"
34-
boot = "boot"
3535
)
3636

37-
func DataEasyPartitioning() *schema.Resource {
37+
func DataPartitionSchema() *schema.Resource {
3838
return &schema.Resource{
39-
ReadContext: dataEasyPartitioningRead,
39+
ReadContext: dataPartitionSchemaRead,
4040
Schema: map[string]*schema.Schema{
4141
"offer_id": {
4242
Type: schema.TypeString,
@@ -63,10 +63,11 @@ func DataEasyPartitioning() *schema.Resource {
6363
Description: "set extra ext_4 partition",
6464
},
6565
"ext_4_mountpoint": {
66-
Type: schema.TypeString,
67-
Optional: true,
68-
Default: defaultMountpoint,
69-
Description: "Mount point must be an absolute path with alphanumeric characters and underscores",
66+
Type: schema.TypeString,
67+
Optional: true,
68+
Default: defaultMountpoint,
69+
ValidateFunc: validation.StringInSlice([]string{"/data", "/home"}, false),
70+
Description: "Mount point must be an absolute path",
7071
},
7172
"json_partition": {
7273
Type: schema.TypeString,
@@ -77,7 +78,7 @@ func DataEasyPartitioning() *schema.Resource {
7778
}
7879
}
7980

80-
func dataEasyPartitioningRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
81+
func dataPartitionSchemaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
8182
api, fallBackZone, err := newAPIWithZone(d, m)
8283
if err != nil {
8384
return diag.FromErr(err)

internal/services/baremetal/easy_partitioning_source_test.go renamed to internal/services/baremetal/partition_schema_source_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ const (
2222
mountpoint = "/data"
2323
)
2424

25-
func TestAccEasyPartitioningDataSource_Basic(t *testing.T) {
25+
func TestAccPartitionSchemaDataSource_Basic(t *testing.T) {
2626
tt := acctest.NewTestTools(t)
2727
defer tt.Cleanup()
2828

29-
sshKeyName := "TestAccEasyPartitioningDataSource_Basic"
30-
serverName := "TestAccEasyPartitioningDataSource_Basic"
29+
sshKeyName := "TestAccPartitionSchemaDataSource_Basic"
30+
serverName := "TestAccPartitionSchemaDataSource_Basic"
3131

3232
resource.ParallelTest(t, resource.TestCase{
3333
PreCheck: func() { acctest.PreCheck(t) },
@@ -90,12 +90,12 @@ func TestAccEasyPartitioningDataSource_Basic(t *testing.T) {
9090
})
9191
}
9292

93-
func TestAccEasyPartitioningDataSource_WithoutExtraPart(t *testing.T) {
93+
func TestAccPartitionSchemaDataSource_WithoutExtraPart(t *testing.T) {
9494
tt := acctest.NewTestTools(t)
9595
defer tt.Cleanup()
9696

97-
sshKeyName := "TestAccEasyPartitioningDataSource_WithoutExtraPart"
98-
serverName := "TestAccEasyPartitioningDataSource_WithoutExtraPart"
97+
sshKeyName := "TestAccPartitionSchemaDataSource_WithoutExtraPart"
98+
serverName := "TestAccPartitionSchemaDataSource_WithoutExtraPart"
9999

100100
resource.ParallelTest(t, resource.TestCase{
101101
PreCheck: func() { acctest.PreCheck(t) },
@@ -157,12 +157,12 @@ func TestAccEasyPartitioningDataSource_WithoutExtraPart(t *testing.T) {
157157
})
158158
}
159159

160-
func TestAccEasyPartitioningDataSource_WithoutSwapAndExtraPart(t *testing.T) {
160+
func TestAccPartitionSchemaDataSource_WithoutSwapAndExtraPart(t *testing.T) {
161161
tt := acctest.NewTestTools(t)
162162
defer tt.Cleanup()
163163

164-
sshKeyName := "TestAccEasyPartitioningDataSource_WithoutSwapAndExtraPart"
165-
serverName := "TestAccEasyPartitioningDataSource_WithoutSwapAndExtraPart"
164+
sshKeyName := "TestAccPartitionSchemaDataSource_WithoutSwapAndExtraPart"
165+
serverName := "TestAccPartitionSchemaDataSource_WithoutSwapAndExtraPart"
166166

167167
resource.ParallelTest(t, resource.TestCase{
168168
PreCheck: func() { acctest.PreCheck(t) },
@@ -224,12 +224,12 @@ func TestAccEasyPartitioningDataSource_WithoutSwapAndExtraPart(t *testing.T) {
224224
})
225225
}
226226

227-
func TestAccEasyPartitioningDataSource_WithAlternateOffer(t *testing.T) {
227+
func TestAccPartitionSchemaDataSource_WithAlternateOffer(t *testing.T) {
228228
tt := acctest.NewTestTools(t)
229229
defer tt.Cleanup()
230230

231-
SSHKeyName := "TestAccEasyPartitioningDataSource_WithAlternateOffer"
232-
name := "TestAccEasyPartitioningDataSource_WithAlternateOffer"
231+
SSHKeyName := "TestAccPartitionSchemaDataSource_WithAlternateOffer"
232+
name := "TestAccPartitionSchemaDataSource_WithAlternateOffer"
233233

234234
resource.ParallelTest(t, resource.TestCase{
235235
PreCheck: func() { acctest.PreCheck(t) },
@@ -293,12 +293,12 @@ func TestAccEasyPartitioningDataSource_WithAlternateOffer(t *testing.T) {
293293
})
294294
}
295295

296-
func TestAccEasyPartitioningDataSource_IncompatibleOS(t *testing.T) {
296+
func TestAccPartitionSchemaDataSource_IncompatibleOS(t *testing.T) {
297297
tt := acctest.NewTestTools(t)
298298
defer tt.Cleanup()
299299

300-
SSHKeyName := "TestAccEasyPartitioningDataSource_IncompatibleOS"
301-
name := "TestAccEasyPartitioningDataSource_IncompatibleOS"
300+
SSHKeyName := "TestAccPartitionSchemaDataSource_IncompatibleOS"
301+
name := "TestAccPartitionSchemaDataSource_IncompatibleOS"
302302

303303
resource.ParallelTest(t, resource.TestCase{
304304
PreCheck: func() { acctest.PreCheck(t) },
@@ -355,12 +355,12 @@ func TestAccEasyPartitioningDataSource_IncompatibleOS(t *testing.T) {
355355
})
356356
}
357357

358-
func TestAccEasyPartitioningDataSource_IncompatibleOffer(t *testing.T) {
358+
func TestAccPartitionSchemaDataSource_IncompatibleOffer(t *testing.T) {
359359
tt := acctest.NewTestTools(t)
360360
defer tt.Cleanup()
361361

362-
SSHKeyName := "TestAccEasyPartitioningDataSource_IncompatibleOffer"
363-
name := "TestAccEasyPartitioningDataSource_IncompatibleOffer"
362+
SSHKeyName := "TestAccPartitionSchemaDataSource_IncompatibleOffer"
363+
name := "TestAccPartitionSchemaDataSource_IncompatibleOffer"
364364

365365
resource.ParallelTest(t, resource.TestCase{
366366
PreCheck: func() { acctest.PreCheck(t) },

0 commit comments

Comments
 (0)