Skip to content

Commit 938b9f3

Browse files
Laure-diCodelaxremyleone
authored
fix(test): delete suffix golden (#3950)
Co-authored-by: Jules Castéran <[email protected]> Co-authored-by: Rémy Léone <[email protected]>
1 parent 7b0663f commit 938b9f3

10 files changed

+34
-35
lines changed

‎internal/core/testing.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ func TestCheckS3Golden() TestCheck {
686686
// In order to avoid diff in goldens we set all timestamp to the same date
687687
if *UpdateGoldens {
688688
require.NoError(t, os.MkdirAll(path.Dir(goldenPath), 0755))
689-
require.NoError(t, os.WriteFile(goldenPath, []byte(actual), 0644)) //nolint:gosec
689+
require.NoError(t, os.WriteFile(goldenPath, []byte(normalizedActual), 0644)) //nolint:gosec
690690
}
691691

692692
expected, err := os.ReadFile(goldenPath)
@@ -697,7 +697,7 @@ func TestCheckS3Golden() TestCheck {
697697
}
698698
}
699699

700-
func removeRandomPrefixFromOutput(output string) interface{} {
700+
func removeRandomPrefixFromOutput(output string) string {
701701
begin := strings.Index(output, TestBucketNamePrefix)
702702
if begin < 0 {
703703
return output

‎internal/namespaces/object/v1/custom_bucket_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ const testBucketNameActionUpdate = "-update"
2121

2222
func Test_BucketCreate(t *testing.T) {
2323
bucketName1 := randomNameWithPrefix(core.TestBucketNamePrefix + testBucketNameActionCreate)
24-
2524
t.Run("Simple", core.Test(&core.TestConfig{
2625
Commands: object.GetCommands(),
2726
Cmd: fmt.Sprintf("scw object bucket create %s", bucketName1),

‎internal/namespaces/object/v1/testdata/test-bucket-create-simple.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ Success.
4-
ID cli-test-bucket-create-7998023756007052110
4+
ID cli-test-bucket-create-
55
Region fr-par
66
APIEndpoint https://s3.fr-par.scw.cloud
7-
BucketEndpoint https://cli-test-bucket-create-7998023756007052110.s3.fr-par.scw.cloud
7+
BucketEndpoint https://cli-test-bucket-create-.s3.fr-par.scw.cloud
88
EnableVersioning false
99
Owner 105bdce1-64c0-48ab-899d-868455867ecf
1010

@@ -18,10 +18,10 @@ GRANTEE PERMISSION
1818
"details": ""
1919
},
2020
"BucketInfo": {
21-
"ID": "cli-test-bucket-create-7998023756007052110",
21+
"ID": "cli-test-bucket-create-",
2222
"Region": "fr-par",
2323
"APIEndpoint": "https://s3.fr-par.scw.cloud",
24-
"BucketEndpoint": "https://cli-test-bucket-create-7998023756007052110.s3.fr-par.scw.cloud",
24+
"BucketEndpoint": "https://cli-test-bucket-create-.s3.fr-par.scw.cloud",
2525
"EnableVersioning": false,
2626
"Tags": null,
2727
"ACL": [

‎internal/namespaces/object/v1/testdata/test-bucket-create-with-acl.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ Success.
4-
ID cli-test-bucket-create-3401214659071950850
4+
ID cli-test-bucket-create-
55
Region fr-par
66
APIEndpoint https://s3.fr-par.scw.cloud
7-
BucketEndpoint https://cli-test-bucket-create-3401214659071950850.s3.fr-par.scw.cloud
7+
BucketEndpoint https://cli-test-bucket-create-.s3.fr-par.scw.cloud
88
EnableVersioning false
99
Owner 105bdce1-64c0-48ab-899d-868455867ecf
1010

@@ -19,10 +19,10 @@ AuthenticatedUsers READ
1919
"details": ""
2020
},
2121
"BucketInfo": {
22-
"ID": "cli-test-bucket-create-3401214659071950850",
22+
"ID": "cli-test-bucket-create-",
2323
"Region": "fr-par",
2424
"APIEndpoint": "https://s3.fr-par.scw.cloud",
25-
"BucketEndpoint": "https://cli-test-bucket-create-3401214659071950850.s3.fr-par.scw.cloud",
25+
"BucketEndpoint": "https://cli-test-bucket-create-.s3.fr-par.scw.cloud",
2626
"EnableVersioning": false,
2727
"Tags": null,
2828
"ACL": [

‎internal/namespaces/object/v1/testdata/test-bucket-create-with-tags.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ Success.
4-
ID cli-test-bucket-create-8315042155168597202
4+
ID cli-test-bucket-create-
55
Region fr-par
66
APIEndpoint https://s3.fr-par.scw.cloud
7-
BucketEndpoint https://cli-test-bucket-create-8315042155168597202.s3.fr-par.scw.cloud
7+
BucketEndpoint https://cli-test-bucket-create-.s3.fr-par.scw.cloud
88
EnableVersioning false
99
Owner 105bdce1-64c0-48ab-899d-868455867ecf
1010

@@ -23,10 +23,10 @@ GRANTEE PERMISSION
2323
"details": ""
2424
},
2525
"BucketInfo": {
26-
"ID": "cli-test-bucket-create-8315042155168597202",
26+
"ID": "cli-test-bucket-create-",
2727
"Region": "fr-par",
2828
"APIEndpoint": "https://s3.fr-par.scw.cloud",
29-
"BucketEndpoint": "https://cli-test-bucket-create-8315042155168597202.s3.fr-par.scw.cloud",
29+
"BucketEndpoint": "https://cli-test-bucket-create-.s3.fr-par.scw.cloud",
3030
"EnableVersioning": false,
3131
"Tags": [
3232
{

‎internal/namespaces/object/v1/testdata/test-bucket-create-with-versioning.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ Success.
4-
ID cli-test-bucket-create-3140143146901590452
4+
ID cli-test-bucket-create-
55
Region fr-par
66
APIEndpoint https://s3.fr-par.scw.cloud
7-
BucketEndpoint https://cli-test-bucket-create-3140143146901590452.s3.fr-par.scw.cloud
7+
BucketEndpoint https://cli-test-bucket-create-.s3.fr-par.scw.cloud
88
EnableVersioning true
99
Owner 105bdce1-64c0-48ab-899d-868455867ecf
1010

@@ -18,10 +18,10 @@ GRANTEE PERMISSION
1818
"details": ""
1919
},
2020
"BucketInfo": {
21-
"ID": "cli-test-bucket-create-3140143146901590452",
21+
"ID": "cli-test-bucket-create-",
2222
"Region": "fr-par",
2323
"APIEndpoint": "https://s3.fr-par.scw.cloud",
24-
"BucketEndpoint": "https://cli-test-bucket-create-3140143146901590452.s3.fr-par.scw.cloud",
24+
"BucketEndpoint": "https://cli-test-bucket-create-.s3.fr-par.scw.cloud",
2525
"EnableVersioning": true,
2626
"Tags": null,
2727
"ACL": [

‎internal/namespaces/object/v1/testdata/test-bucket-get-simple.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3-
ID cli-test-bucket-get-5507142107541624615
3+
ID cli-test-bucket-get-
44
Region fr-par
55
APIEndpoint https://s3.fr-par.scw.cloud
6-
BucketEndpoint https://cli-test-bucket-get-5507142107541624615.s3.fr-par.scw.cloud
6+
BucketEndpoint https://cli-test-bucket-get-.s3.fr-par.scw.cloud
77
EnableVersioning false
88
Owner 105bdce1-64c0-48ab-899d-868455867ecf
99

@@ -12,10 +12,10 @@ GRANTEE PERMISSION
1212
105bdce1-64c0-48ab-899d-868455867ecf FULL_CONTROL
1313
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
1414
{
15-
"ID": "cli-test-bucket-get-5507142107541624615",
15+
"ID": "cli-test-bucket-get-",
1616
"Region": "fr-par",
1717
"APIEndpoint": "https://s3.fr-par.scw.cloud",
18-
"BucketEndpoint": "https://cli-test-bucket-get-5507142107541624615.s3.fr-par.scw.cloud",
18+
"BucketEndpoint": "https://cli-test-bucket-get-.s3.fr-par.scw.cloud",
1919
"EnableVersioning": false,
2020
"Tags": null,
2121
"ACL": [

‎internal/namespaces/object/v1/testdata/test-bucket-get-with-size.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3-
ID cli-test-bucket-get-1995208251104244753
3+
ID cli-test-bucket-get-
44
Region fr-par
55
APIEndpoint https://s3.fr-par.scw.cloud
6-
BucketEndpoint https://cli-test-bucket-get-1995208251104244753.s3.fr-par.scw.cloud
6+
BucketEndpoint https://cli-test-bucket-get-.s3.fr-par.scw.cloud
77
EnableVersioning false
88
Owner 105bdce1-64c0-48ab-899d-868455867ecf
99
Size 0 B
@@ -15,10 +15,10 @@ GRANTEE PERMISSION
1515
105bdce1-64c0-48ab-899d-868455867ecf FULL_CONTROL
1616
🟩🟩🟩 JSON STDOUT 🟩🟩🟩
1717
{
18-
"ID": "cli-test-bucket-get-1995208251104244753",
18+
"ID": "cli-test-bucket-get-",
1919
"Region": "fr-par",
2020
"APIEndpoint": "https://s3.fr-par.scw.cloud",
21-
"BucketEndpoint": "https://cli-test-bucket-get-1995208251104244753.s3.fr-par.scw.cloud",
21+
"BucketEndpoint": "https://cli-test-bucket-get-.s3.fr-par.scw.cloud",
2222
"EnableVersioning": false,
2323
"Tags": null,
2424
"ACL": [

‎internal/namespaces/object/v1/testdata/test-bucket-update-all-options.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ Success.
4-
ID cli-test-bucket-update-267526823349285092
4+
ID cli-test-bucket-update-
55
Region fr-par
66
APIEndpoint https://s3.fr-par.scw.cloud
7-
BucketEndpoint https://cli-test-bucket-update-267526823349285092.s3.fr-par.scw.cloud
7+
BucketEndpoint https://cli-test-bucket-update-.s3.fr-par.scw.cloud
88
EnableVersioning true
99
Owner 105bdce1-64c0-48ab-899d-868455867ecf
1010

@@ -25,10 +25,10 @@ AllUsers WRITE
2525
"details": ""
2626
},
2727
"BucketInfo": {
28-
"ID": "cli-test-bucket-update-267526823349285092",
28+
"ID": "cli-test-bucket-update-",
2929
"Region": "fr-par",
3030
"APIEndpoint": "https://s3.fr-par.scw.cloud",
31-
"BucketEndpoint": "https://cli-test-bucket-update-267526823349285092.s3.fr-par.scw.cloud",
31+
"BucketEndpoint": "https://cli-test-bucket-update-.s3.fr-par.scw.cloud",
3232
"EnableVersioning": true,
3333
"Tags": [
3434
{

‎internal/namespaces/object/v1/testdata/test-bucket-update-tags.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
33
✅ Success.
4-
ID cli-test-bucket-update-2198115411528954198
4+
ID cli-test-bucket-update-
55
Region fr-par
66
APIEndpoint https://s3.fr-par.scw.cloud
7-
BucketEndpoint https://cli-test-bucket-update-2198115411528954198.s3.fr-par.scw.cloud
7+
BucketEndpoint https://cli-test-bucket-update-.s3.fr-par.scw.cloud
88
EnableVersioning false
99
Owner 105bdce1-64c0-48ab-899d-868455867ecf
1010

@@ -22,10 +22,10 @@ GRANTEE PERMISSION
2222
"details": ""
2323
},
2424
"BucketInfo": {
25-
"ID": "cli-test-bucket-update-2198115411528954198",
25+
"ID": "cli-test-bucket-update-",
2626
"Region": "fr-par",
2727
"APIEndpoint": "https://s3.fr-par.scw.cloud",
28-
"BucketEndpoint": "https://cli-test-bucket-update-2198115411528954198.s3.fr-par.scw.cloud",
28+
"BucketEndpoint": "https://cli-test-bucket-update-.s3.fr-par.scw.cloud",
2929
"EnableVersioning": false,
3030
"Tags": [
3131
{

0 commit comments

Comments
 (0)