Skip to content

Commit 7b988cf

Browse files
Laure-diLaure-di
committed
fix linter
1 parent e2805da commit 7b988cf

File tree

5 files changed

+50
-35
lines changed

5 files changed

+50
-35
lines changed

‎docs/resources/block_snapshot.md‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ resource "scaleway_block_snapshot" "block_snapshot" {
2929
}
3030
```
3131

32-
### Import from Object Storage
32+
### How to import from Object Storage
3333

3434
```terraform
3535
resource "scaleway_object_bucket" "my-import-bucket" {
@@ -52,16 +52,25 @@ resource "scaleway_block_volume" "imported" {
5252
}
5353
```
5454

55-
### Export to Object Storage
55+
### How to export to Object Storage
5656

5757
```terraform
58+
resource "scaleway_object_bucket" "my-import-bucket" {
59+
name = "snapshot-bucket-to-import"
60+
}
61+
62+
resource "scaleway_object" "qcow-object" {
63+
bucket = scaleway_object_bucket.snapshot-bucket.name
64+
key = "export/my-snapshot.qcow2"
65+
}
66+
5867
resource "scaleway_block_volume" "to_export" {
5968
iops = 5000
6069
name = "to-export"
6170
6271
export {
63-
bucket = "my-export-bucket"
64-
key = "exports/volume.qcow2"
72+
bucket = "snapshot-bucket-to-import"
73+
key = "exports/my-snapshot.qcow2"
6574
}
6675
}
6776
```
@@ -76,11 +85,11 @@ This section lists the arguments that are supported:
7685
- `project_id` - (Defaults to the Project ID specified in the [provider configuration](../index.md#project_id)). The ID of the Scaleway Project the snapshot is associated with.
7786
- `tags` - (Optional) A list of tags to apply to the snapshot.
7887
- `import` - (Optional) Use this block to import a QCOW image from Object Storage to create a volume.
79-
- `bucket` – (Required) The name of the bucket containing the QCOW file.
80-
- `key` – (Required) The key of the QCOW file within the bucket.
88+
- `bucket` – (Required) The name of the bucket containing the QCOW file.
89+
- `key` – (Required) The key of the QCOW file within the bucket.
8190
- `export` - (Optional) Use this block to export the volume as a QCOW file to Object Storage.
82-
- `bucket` – (Required) The name of the bucket where the QCOW file will be saved.
83-
- `key` – (Required) The desired key (path) for the QCOW file within the bucket.
91+
- `bucket` – (Required) The name of the bucket where the QCOW file will be saved.
92+
- `key` – (Required) The desired key (path) for the QCOW file within the bucket.
8493

8594
## Attributes Reference
8695

‎internal/services/block/snapshot.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ func ResourceBlockSnapshotCreate(ctx context.Context, d *schema.ResourceData, m
165165
}
166166

167167
_, err = api.ExportSnapshotToObjectStorage(&req, scw.WithContext(ctx))
168+
if err != nil {
169+
return diag.FromErr(err)
170+
}
168171
}
169172

170173
return ResourceBlockSnapshotRead(ctx, d, m)
@@ -245,6 +248,9 @@ func ResourceBlockSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m
245248
}
246249

247250
_, err = api.ExportSnapshotToObjectStorage(&req, scw.WithContext(ctx))
251+
if err != nil {
252+
return diag.FromErr(err)
253+
}
248254
}
249255

250256
return ResourceBlockSnapshotRead(ctx, d, m)

‎internal/services/block/snapshot_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func TestAccSnapshot_ToS3(t *testing.T) {
130130
blocktestfuncs.IsSnapshotPresent(tt, "scaleway_block_snapshot.qcow-block-snapshot"),
131131
acctest.CheckResourceAttrUUID("scaleway_block_snapshot.qcow-block-snapshot", "id"),
132132
resource.TestCheckResourceAttr("scaleway_block_snapshot.qcow-block-snapshot", "name", "test-acc-export-block-snapshot-qcow2"),
133-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.qcow-object"),
133+
objectchecks.IsObjectExists(tt, "scaleway_object.qcow-object"),
134134
),
135135
},
136136
{
@@ -178,7 +178,7 @@ func TestAccSnapshot_ToS3(t *testing.T) {
178178
blocktestfuncs.IsSnapshotPresent(tt, "scaleway_block_snapshot.qcow-block-export-snapshot"),
179179
acctest.CheckResourceAttrUUID("scaleway_block_snapshot.qcow-block-export-snapshot", "id"),
180180
resource.TestCheckResourceAttr("scaleway_block_snapshot.qcow-block-export-snapshot", "name", "test-acc-export-block-snapshot-qcow2"),
181-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.qcow-object"),
181+
objectchecks.IsObjectExists(tt, "scaleway_object.qcow-object"),
182182
blocktestfuncs.IsSnapshotPresent(tt, "scaleway_block_snapshot.qcow-block-import-snapshot"),
183183
acctest.CheckResourceAttrUUID("scaleway_block_snapshot.qcow-block-import-snapshot", "id"),
184184
resource.TestCheckResourceAttr("scaleway_block_volume.new-volume", "size_in_gb", "10"),

‎internal/services/object/object_test.go‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestAccObject_Basic(t *testing.T) {
5151
`, bucketName, objectTestsMainRegion),
5252
Check: resource.ComposeTestCheckFunc(
5353
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
54-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
54+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
5555
),
5656
},
5757
{
@@ -72,7 +72,7 @@ func TestAccObject_Basic(t *testing.T) {
7272
`, bucketName, objectTestsMainRegion),
7373
Check: resource.ComposeTestCheckFunc(
7474
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
75-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
75+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
7676
),
7777
},
7878
{
@@ -93,7 +93,7 @@ func TestAccObject_Basic(t *testing.T) {
9393
`, bucketName, objectTestsMainRegion),
9494
Check: resource.ComposeTestCheckFunc(
9595
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
96-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
96+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
9797
),
9898
},
9999
},
@@ -131,7 +131,7 @@ func TestAccObject_ContentType(t *testing.T) {
131131
`, bucketName, objectTestsMainRegion),
132132
Check: resource.ComposeTestCheckFunc(
133133
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.main", true),
134-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
134+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
135135
resource.TestCheckResourceAttr("scaleway_object.file", "content_type", "text/html"),
136136
),
137137
},
@@ -171,7 +171,7 @@ func TestAccObject_Hash(t *testing.T) {
171171
`, bucketName, objectTestsMainRegion),
172172
Check: resource.ComposeTestCheckFunc(
173173
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
174-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
174+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
175175
),
176176
},
177177
{
@@ -193,7 +193,7 @@ func TestAccObject_Hash(t *testing.T) {
193193
`, bucketName, objectTestsMainRegion),
194194
Check: resource.ComposeTestCheckFunc(
195195
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
196-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
196+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
197197
),
198198
},
199199
},
@@ -231,7 +231,7 @@ func TestAccObject_Move(t *testing.T) {
231231
`, bucketName, objectTestsMainRegion),
232232
Check: resource.ComposeTestCheckFunc(
233233
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
234-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file")),
234+
objectchecks.IsObjectExists(tt, "scaleway_object.file")),
235235
},
236236
{
237237
Config: fmt.Sprintf(`
@@ -251,7 +251,7 @@ func TestAccObject_Move(t *testing.T) {
251251
`, bucketName, objectTestsMainRegion),
252252
Check: resource.ComposeTestCheckFunc(
253253
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
254-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file")),
254+
objectchecks.IsObjectExists(tt, "scaleway_object.file")),
255255
},
256256
},
257257
})
@@ -290,7 +290,7 @@ func TestAccObject_StorageClass(t *testing.T) {
290290
`, bucketName, objectTestsMainRegion),
291291
Check: resource.ComposeTestCheckFunc(
292292
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
293-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
293+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
294294
resource.TestCheckResourceAttr("scaleway_object.file", "storage_class", "ONEZONE_IA"),
295295
),
296296
},
@@ -314,7 +314,7 @@ func TestAccObject_StorageClass(t *testing.T) {
314314
`, bucketName, objectTestsMainRegion),
315315
Check: resource.ComposeTestCheckFunc(
316316
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
317-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
317+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
318318
resource.TestCheckResourceAttr("scaleway_object.file", "storage_class", "STANDARD"),
319319
),
320320
},
@@ -357,7 +357,7 @@ func TestAccObject_Metadata(t *testing.T) {
357357
`, bucketName, objectTestsMainRegion),
358358
Check: resource.ComposeTestCheckFunc(
359359
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
360-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
360+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
361361
resource.TestCheckResourceAttr("scaleway_object.file", "metadata.key", "value"),
362362
),
363363
},
@@ -384,7 +384,7 @@ func TestAccObject_Metadata(t *testing.T) {
384384
`, bucketName, objectTestsMainRegion),
385385
Check: resource.ComposeTestCheckFunc(
386386
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
387-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
387+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
388388
resource.TestCheckResourceAttr("scaleway_object.file", "metadata.key", "other_value"),
389389
resource.TestCheckResourceAttr("scaleway_object.file", "metadata.other_key", "VALUE"),
390390
),
@@ -425,7 +425,7 @@ func TestAccObject_Tags(t *testing.T) {
425425
`, bucketName, objectTestsMainRegion),
426426
Check: resource.ComposeTestCheckFunc(
427427
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
428-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
428+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
429429
resource.TestCheckResourceAttr("scaleway_object.file", "tags.key", "value"),
430430
),
431431
},
@@ -449,7 +449,7 @@ func TestAccObject_Tags(t *testing.T) {
449449
`, bucketName, objectTestsMainRegion),
450450
Check: resource.ComposeTestCheckFunc(
451451
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
452-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
452+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
453453
resource.TestCheckResourceAttr("scaleway_object.file", "tags.key", "other_value"),
454454
resource.TestCheckResourceAttr("scaleway_object.file", "tags.other_key", "VALUE"),
455455
),
@@ -488,7 +488,7 @@ func TestAccObject_Visibility(t *testing.T) {
488488
`, bucketName, objectTestsMainRegion),
489489
Check: resource.ComposeTestCheckFunc(
490490
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
491-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
491+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
492492
resource.TestCheckResourceAttr("scaleway_object.file", "visibility", "public-read"),
493493
),
494494
},
@@ -509,7 +509,7 @@ func TestAccObject_Visibility(t *testing.T) {
509509
`, bucketName, objectTestsMainRegion),
510510
Check: resource.ComposeTestCheckFunc(
511511
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
512-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
512+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
513513
resource.TestCheckResourceAttr("scaleway_object.file", "visibility", "private"),
514514
),
515515
},
@@ -547,7 +547,7 @@ func TestAccObject_State(t *testing.T) {
547547
`, bucketName, objectTestsMainRegion),
548548
Check: resource.ComposeTestCheckFunc(
549549
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
550-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
550+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
551551
),
552552
},
553553
{
@@ -575,8 +575,8 @@ func TestAccObject_State(t *testing.T) {
575575
ImportStateId: fmt.Sprintf("%s/%s/myfile", objectTestsMainRegion, bucketName),
576576
Check: resource.ComposeTestCheckFunc(
577577
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
578-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
579-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file_imported"),
578+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
579+
objectchecks.IsObjectExists(tt, "scaleway_object.file_imported"),
580580
resource.TestCheckResourceAttrPair("scaleway_object.file_imported", "id", "scaleway_object.file", "id"),
581581
resource.TestCheckResourceAttrPair("scaleway_object.file_imported", "visibility", "scaleway_object.file", "visibility"),
582582
resource.TestCheckResourceAttrPair("scaleway_object.file_imported", "bucket", "scaleway_object.file", "bucket"),
@@ -619,7 +619,7 @@ func TestAccObject_ByContent(t *testing.T) {
619619
`, bucketName, objectTestsMainRegion, fileContentStep1),
620620
Check: resource.ComposeTestCheckFunc(
621621
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
622-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.by-content"),
622+
objectchecks.IsObjectExists(tt, "scaleway_object.by-content"),
623623
resource.TestCheckResourceAttr("scaleway_object.by-content", "content", fileContentStep1),
624624
),
625625
},
@@ -638,7 +638,7 @@ func TestAccObject_ByContent(t *testing.T) {
638638
`, bucketName, objectTestsMainRegion, fileContentStep2),
639639
Check: resource.ComposeTestCheckFunc(
640640
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
641-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.by-content"),
641+
objectchecks.IsObjectExists(tt, "scaleway_object.by-content"),
642642
resource.TestCheckResourceAttr("scaleway_object.by-content", "content", fileContentStep2),
643643
),
644644
},
@@ -680,7 +680,7 @@ func TestAccObject_ByContentBase64(t *testing.T) {
680680
`, bucketName, objectTestsMainRegion, fileContentStep1),
681681
Check: resource.ComposeTestCheckFunc(
682682
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
683-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.by-content-base64"),
683+
objectchecks.IsObjectExists(tt, "scaleway_object.by-content-base64"),
684684
resource.TestCheckResourceAttr("scaleway_object.by-content-base64", "content_base64", fileEncodedStep1),
685685
),
686686
},
@@ -699,7 +699,7 @@ func TestAccObject_ByContentBase64(t *testing.T) {
699699
`, bucketName, objectTestsMainRegion, fileContentStep2),
700700
Check: resource.ComposeTestCheckFunc(
701701
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
702-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.by-content-base64"),
702+
objectchecks.IsObjectExists(tt, "scaleway_object.by-content-base64"),
703703
resource.TestCheckResourceAttr("scaleway_object.by-content-base64", "content_base64", fileEncodedStep2),
704704
),
705705
},
@@ -772,7 +772,7 @@ func TestAccObject_WithBucketName(t *testing.T) {
772772
`, bucketName, objectTestsMainRegion),
773773
Check: resource.ComposeTestCheckFunc(
774774
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.base-01", true),
775-
objectchecks.TestAccCheckObjectExists(tt, "scaleway_object.file"),
775+
objectchecks.IsObjectExists(tt, "scaleway_object.file"),
776776
),
777777
},
778778
},

‎internal/services/object/testfuncs/checks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func IsWebsiteConfigurationPresent(tt *acctest.TestTools, resourceName string) r
205205
}
206206
}
207207

208-
func TestAccCheckObjectExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
208+
func IsObjectExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
209209
return func(state *terraform.State) error {
210210
ctx := context.Background()
211211

0 commit comments

Comments
 (0)