From 9e14f7e14c4430e88753171a2cbecb8e3e801a68 Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Fri, 31 May 2024 13:59:26 +0100 Subject: [PATCH] Remove duplicate URL from deprecation message and fix indentation (#48) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove duplicate URL from deprecation message Fixes the duplicate URL + long ling wrapping seen currently: ``` -----> Redis-stunnel app detected ! This buildpack uses stunnel, which isn’t supported on heroku-24 and later. ! You don’t need this buildpack for Redis 6+. Remove it with the command: ! $ heroku buildpacks:remove heroku/redis ! To use Redis’ native TLS support, see https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance: ! https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance ! Push rejected, failed to compile Redis-stunnel app. ``` * Update indentation to match style used elsewhere The build system (and other buildpacks) indent one space further for warning messages. This fixes the wonky indentation seen here compared to the last log line (which comes from the build system): Before: ``` -----> Redis-stunnel app detected ! This buildpack uses stunnel, which isn’t supported on heroku-24 and later. ! You don’t need this buildpack for Redis 6+. Remove it with the command: ! $ heroku buildpacks:remove heroku/redis ! To use Redis’ native TLS support, see: ! https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance ! Push rejected, failed to compile Redis-stunnel app. ``` After: ``` -----> Redis-stunnel app detected ! This buildpack uses stunnel, which isn’t supported on heroku-24 and later. ! You don’t need this buildpack for Redis 6+. Remove it with the command: ! $ heroku buildpacks:remove heroku/redis ! To use Redis’ native TLS support, see: ! https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance ! Push rejected, failed to compile Redis-stunnel app. ``` --- bin/compile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/compile b/bin/compile index 40e43a6..dac78e1 100755 --- a/bin/compile +++ b/bin/compile @@ -15,11 +15,11 @@ BUILDPACK_DIR="$(dirname $(dirname $0))" if ! command -v stunnel4 > /dev/null; then - echo "! This buildpack uses stunnel, which isn’t supported on heroku-24 and later." >&2 - echo "! You don’t need this buildpack for Redis 6+. Remove it with the command:" >&2 - echo "! $ heroku buildpacks:remove heroku/redis" >&2 - echo "! To use Redis’ native TLS support, see https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance:" >&2 - echo "! https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance" >&2 + echo " ! This buildpack uses stunnel, which isn’t supported on heroku-24 and later." >&2 + echo " ! You don’t need this buildpack for Redis 6+. Remove it with the command:" >&2 + echo " ! $ heroku buildpacks:remove heroku/redis" >&2 + echo " ! To use Redis’ native TLS support, see:" >&2 + echo " ! https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance" >&2 exit 1 fi