From dd431092424fa958372c9676120035f482542409 Mon Sep 17 00:00:00 2001 From: Eugene Pirogov <207112+gmile@users.noreply.github.com> Date: Thu, 12 Nov 2020 13:58:50 +0200 Subject: [PATCH 1/2] mc: change generated S3 API version from v2 to v4 Before this change, using "mc" to generate a pre-sign URL using for uploading an object would not work. After manually updating the config from S3v2 to S3v4 all good now. --- internal/namespaces/object/v1/s3configfile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/namespaces/object/v1/s3configfile.go b/internal/namespaces/object/v1/s3configfile.go index adaa22b813..c3d265f624 100644 --- a/internal/namespaces/object/v1/s3configfile.go +++ b/internal/namespaces/object/v1/s3configfile.go @@ -150,7 +150,7 @@ func (c s3config) getConfigFile(tool s3tool) (core.RawResult, error) { URL: "https://s3." + c.Region.String() + ".scw.cloud", AccessKey: c.AccessKey, SecretKey: c.SecretKey, - API: "S3v2", + API: "S3v4", }, }, } From a4acc0f1014e96f9290589e82e092d4f3e445beb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Thu, 12 Nov 2020 13:51:45 +0100 Subject: [PATCH 2/2] Fix goldens --- .../object/v1/testdata/test-config-get-default-mc.golden | 4 ++-- .../object/v1/testdata/test-config-get-with-region-mc.golden | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/namespaces/object/v1/testdata/test-config-get-default-mc.golden b/internal/namespaces/object/v1/testdata/test-config-get-default-mc.golden index 93151ade08..5734bd2208 100644 --- a/internal/namespaces/object/v1/testdata/test-config-get-default-mc.golden +++ b/internal/namespaces/object/v1/testdata/test-config-get-default-mc.golden @@ -1,5 +1,5 @@ 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 🟩🟩🟩 STDOUT️ 🟩🟩🟩️ -{"version":"9","hosts":{"scaleway":{"url":"https://s3.fr-par.scw.cloud","accessKey":"SCWXXXXXXXXXXXXXXXXX","secretKey":"11111111-1111-1111-1111-111111111111","api":"S3v2"}}} +{"version":"9","hosts":{"scaleway":{"url":"https://s3.fr-par.scw.cloud","accessKey":"SCWXXXXXXXXXXXXXXXXX","secretKey":"11111111-1111-1111-1111-111111111111","api":"S3v4"}}} 🟩🟩🟩 JSON STDOUT 🟩🟩🟩 -{"version":"9","hosts":{"scaleway":{"url":"https://s3.fr-par.scw.cloud","accessKey":"SCWXXXXXXXXXXXXXXXXX","secretKey":"11111111-1111-1111-1111-111111111111","api":"S3v2"}}} +{"version":"9","hosts":{"scaleway":{"url":"https://s3.fr-par.scw.cloud","accessKey":"SCWXXXXXXXXXXXXXXXXX","secretKey":"11111111-1111-1111-1111-111111111111","api":"S3v4"}}} diff --git a/internal/namespaces/object/v1/testdata/test-config-get-with-region-mc.golden b/internal/namespaces/object/v1/testdata/test-config-get-with-region-mc.golden index 9d680387d9..ff758202a2 100644 --- a/internal/namespaces/object/v1/testdata/test-config-get-with-region-mc.golden +++ b/internal/namespaces/object/v1/testdata/test-config-get-with-region-mc.golden @@ -1,5 +1,5 @@ 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 🟩🟩🟩 STDOUT️ 🟩🟩🟩️ -{"version":"9","hosts":{"scaleway":{"url":"https://s3.nl-ams.scw.cloud","accessKey":"SCWXXXXXXXXXXXXXXXXX","secretKey":"11111111-1111-1111-1111-111111111111","api":"S3v2"}}} +{"version":"9","hosts":{"scaleway":{"url":"https://s3.nl-ams.scw.cloud","accessKey":"SCWXXXXXXXXXXXXXXXXX","secretKey":"11111111-1111-1111-1111-111111111111","api":"S3v4"}}} 🟩🟩🟩 JSON STDOUT 🟩🟩🟩 -{"version":"9","hosts":{"scaleway":{"url":"https://s3.nl-ams.scw.cloud","accessKey":"SCWXXXXXXXXXXXXXXXXX","secretKey":"11111111-1111-1111-1111-111111111111","api":"S3v2"}}} +{"version":"9","hosts":{"scaleway":{"url":"https://s3.nl-ams.scw.cloud","accessKey":"SCWXXXXXXXXXXXXXXXXX","secretKey":"11111111-1111-1111-1111-111111111111","api":"S3v4"}}}