From 0d982b2224d6fa78129b789dbaea634d91579cd5 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 10 May 2023 10:39:46 +0200 Subject: [PATCH 1/2] Fix wrong link in trino-superset-s3 stack --- stacks/stacks-v2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks/stacks-v2.yaml b/stacks/stacks-v2.yaml index 7f10b7fa..52522a8f 100644 --- a/stacks/stacks-v2.yaml +++ b/stacks/stacks-v2.yaml @@ -230,7 +230,7 @@ stacks: - helmChart: https://raw.githubusercontent.com/stackabletech/stackablectl/main/stacks/_templates/minio.yaml - helmChart: https://raw.githubusercontent.com/stackabletech/stackablectl/main/stacks/_templates/postgresql-hive.yaml - helmChart: https://raw.githubusercontent.com/stackabletech/stackablectl/main/stacks/_templates/postgresql-superset.yaml - - plainYaml: https://raw.githubusercontent.com/stackabletech/stackablectl/main/stacks/trino-superset-s3/s3-credentials.yaml + - plainYaml: https://raw.githubusercontent.com/stackabletech/stackablectl/main/stacks/trino-superset-s3/s3-connection.yaml - plainYaml: https://raw.githubusercontent.com/stackabletech/stackablectl/main/stacks/trino-superset-s3/hive-metastore.yaml - plainYaml: https://raw.githubusercontent.com/stackabletech/stackablectl/main/stacks/trino-superset-s3/trino.yaml - plainYaml: https://raw.githubusercontent.com/stackabletech/stackablectl/main/stacks/trino-superset-s3/superset.yaml From 0463a12889f7cb0bc0d869a30d5091cf8510cb93 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 10 May 2023 10:48:19 +0200 Subject: [PATCH 2/2] Check HTTP status code when fetching resources via HTTP --- CHANGELOG.md | 4 ++++ src/helpers.rs | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4286c41..52a958d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - Also print stack parameters when describing a demo ([#251](https://github.com/stackabletech/stackablectl/pull/251)) +### Fixed + +- Check HTTP status code when fetching resources via HTTP ([#258](https://github.com/stackabletech/stackablectl/pull/258)) + ## [0.8.0] - 2023-02-23 ### Changed diff --git a/src/helpers.rs b/src/helpers.rs index ad29abe7..7be9e81d 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -40,8 +40,16 @@ pub async fn read_from_url_or_file(url_or_file: &str) -> Result } match reqwest::get(url_or_file).await { - Ok(response) => response.text().await - .map_err(|err| format!("Failed to read from the response of the file or a URL with the name \"{url_or_file}\": {err}")), + Ok(response) => { + let response_status = response.status(); + if response_status.is_success() { + response.text().await + .map_err(|err| format!("Failed to read from the response of the file or a URL with the name \"{url_or_file}\": {err}")) + } else { + Err(format!("Couldn't read from URL \"{url_or_file}\", got HTTP status code: {response_status}, expected 2xx")) + } + } + Err(err) => Err(format!( "Couldn't read a file or a URL with the name \"{url_or_file}\": {err}" )),