Merge v0.15.0 to master (#3130)

* Made sure old sse S3 option if specified, produces error. Signed-off-by: Bartlomiej Plotka <[email protected]> Signed-off-by: Kemal Akkoyun <[email protected]> * Cut v0.15.0-rc.0 Signed-off-by: Bartlomiej Plotka <[email protected]> Signed-off-by: Kemal Akkoyun <[email protected]> * tsdbstore: Optimized response framing if iterator finished. Signed-off-by: Bartlomiej Plotka <[email protected]> Signed-off-by: Kemal Akkoyun <[email protected]> * Apply suggestions from code review Co-authored-by: Krasimir Georgiev <[email protected]> Signed-off-by: Kemal Akkoyun <[email protected]> * Rule: update manager when all rule files are removed (#3095) This bug was already fixed in thanos-io/thanos#2615 but it got lost when we merged thanos-io/thanos#2200. Co-authored-by: johncming <[email protected]> Co-authored-by: Lili Cosic <[email protected]> Signed-off-by: Simon Pasquier <[email protected]> Co-authored-by: johncming <[email protected]> Co-authored-by: Lili Cosic <[email protected]> Signed-off-by: Kemal Akkoyun <[email protected]> * ui: Fix Block Viewer for Compactor and Store (#3098) * ui: Fix Block viewer for Compactor and Store Signed-off-by: Prem Kumar <[email protected]> * Add an entry in CHANGELOG.md Signed-off-by: Prem Kumar <[email protected]> * ui: react: Fixed tests for Blocks Signed-off-by: Prem Kumar <[email protected]> Signed-off-by: Kemal Akkoyun <[email protected]> * querier: Fix overwriting maxSourceResolution when auto downsampling is enabled (#3105) * Fix overwriting maxSourceResolution when auto downsampling is enabled Signed-off-by: Ben Ye <[email protected]> * add changelog Signed-off-by: Ben Ye <[email protected]> Signed-off-by: Kemal Akkoyun <[email protected]> * Author: Krasi Georgiev <[email protected]> Date: Thu Aug 27 14:10:19 2020 +0300 (#3010) Make the PromQL lookBack configurable with a flag Signed-off-by: Krasi Georgiev <[email protected]> Signed-off-by: Kemal Akkoyun <[email protected]> * Cut release v0.15.0-rc.1 (#3103) * Cut release v0.15.0-rc.1 Signed-off-by: Kemal Akkoyun <[email protected]> * Address review issues Signed-off-by: Kemal Akkoyun <[email protected]> * Fix changelog Signed-off-by: Kemal Akkoyun <[email protected]> * Cut release v0.15.0 (#3129) Signed-off-by: Kemal Akkoyun <[email protected]> * Minor fix Signed-off-by: Kemal Akkoyun <[email protected]> * Address review comments Signed-off-by: Kemal Akkoyun <[email protected]> Co-authored-by: Bartlomiej Plotka <[email protected]> Co-authored-by: Krasimir Georgiev <[email protected]> Co-authored-by: Simon Pasquier <[email protected]> Co-authored-by: johncming <[email protected]> Co-authored-by: Lili Cosic <[email protected]> Co-authored-by: Prem Kumar <[email protected]> Co-authored-by: Ben Ye <[email protected]>
brancz · Sep 7, 2020 · bb9c5e8 · bb9c5e8
1 parent f944182
commit bb9c5e8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/s3/s3.go b/s3/s3.go
@@ -107,7 +107,7 @@ type Bucket struct {
 // parseConfig unmarshals a buffer into a Config with default HTTPConfig values.
 func parseConfig(conf []byte) (Config, error) {
 	config := DefaultConfig
-	if err := yaml.Unmarshal(conf, &config); err != nil {
+	if err := yaml.UnmarshalStrict(conf, &config); err != nil {
 		return Config{}, err
 	}
 

diff --git a/s3/s3_test.go b/s3/s3_test.go
@@ -161,7 +161,6 @@ endpoint: "s3-endpoint"
 access_key: "access_key"
 insecure: false
 signature_version2: false
-encrypt_sse: false
 secret_key: "secret_key"
 http_config:
   insecure_skip_verify: false
@@ -176,7 +175,6 @@ endpoint: "s3-endpoint"
 access_key: "access_key"
 insecure: false
 signature_version2: false
-encrypt_sse: false
 secret_key: "secret_key"
 put_user_metadata:
   "X-Amz-Acl": "bucket-owner-full-control"
@@ -195,7 +193,6 @@ endpoint: "s3-endpoint"
 access_key: "access_key"
 insecure: false
 signature_version2: false
-encrypt_sse: false
 secret_key: "secret_key"
 http_config:
   insecure_skip_verify: false
@@ -210,14 +207,29 @@ endpoint: "s3-endpoint"
 access_key: "access_key"
 insecure: false
 signature_version2: false
-encrypt_sse: false
 secret_key: "secret_key"
 part_size: 104857600
 http_config:
   insecure_skip_verify: false
   idle_conn_timeout: 50s`)
-
 	cfg2, err := parseConfig(input2)
 	testutil.Ok(t, err)
 	testutil.Assert(t, cfg2.PartSize == 1024*1024*100, "when part size should be set to 100MiB")
 }
+
+func TestParseConfig_OldSEEncryptionFieldShouldFail(t *testing.T) {
+	input := []byte(`bucket: "bucket-name"
+endpoint: "s3-endpoint"
+access_key: "access_key"
+insecure: false
+signature_version2: false
+encrypt_sse: false
+secret_key: "secret_key"
+see_encryption: true
+put_user_metadata:
+  "X-Amz-Acl": "bucket-owner-full-control"
+http_config:
+  idle_conn_timeout: 0s`)
+	_, err := parseConfig(input)
+	testutil.NotOk(t, err)
+}