From e402fe63e7ab4fa40d6ba9081065843e3ab619b5 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Sat, 25 May 2024 19:42:25 +0000
Subject: [PATCH] Use grep -E instead of egrep

---
 lib/tiny-cloud/cloud/hetzner/imds  | 2 +-
 lib/tiny-cloud/cloud/scaleway/imds | 2 +-
 tests/imds.test                    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/tiny-cloud/cloud/hetzner/imds b/lib/tiny-cloud/cloud/hetzner/imds
index 428e1e7..bfb716c 100644
--- a/lib/tiny-cloud/cloud/hetzner/imds
+++ b/lib/tiny-cloud/cloud/hetzner/imds
@@ -15,7 +15,7 @@ _imds_header() {
 }
 
 _imds_ssh_keys() {
-	_imds "$IMDS_SSH_KEYS" | sed 's/"/\n/g' | egrep -v '(\[|\]|,)' | sort -u
+	_imds "$IMDS_SSH_KEYS" | sed 's/"/\n/g' | grep -E -v '(\[|\]|,)' | sort -u
 }
 
 _imds_userdata() {
diff --git a/lib/tiny-cloud/cloud/scaleway/imds b/lib/tiny-cloud/cloud/scaleway/imds
index 21792a8..9f67ea2 100644
--- a/lib/tiny-cloud/cloud/scaleway/imds
+++ b/lib/tiny-cloud/cloud/scaleway/imds
@@ -10,7 +10,7 @@ IMDS_LOCAL_HOSTNAME="$IMDS_HOSTNAME"
 IMDS_SSH_KEYS="SSH_PUBLIC_KEYS_[0-9]+_KEY"
 
 _imds() {
-	wget --quiet --timeout 1 --output-document - "http://$IMDS_ENDPOINT/$IMDS_URI$IMDS_QUERY" | egrep "^${1}=" | cut -d'=' -f2
+	wget --quiet --timeout 1 --output-document - "http://$IMDS_ENDPOINT/$IMDS_URI$IMDS_QUERY" | grep -E "^${1}=" | cut -d'=' -f2
 }
 
 _imds_ssh_keys() {
diff --git a/tests/imds.test b/tests/imds.test
index fa3db05..366e763 100755
--- a/tests/imds.test
+++ b/tests/imds.test
@@ -106,8 +106,9 @@ imds_local_hostname_oci_body()	{ check_local_hostname oci; }
 imds_local_hostname_scaleway_body()	{
 	fake_metadata scaleway <<-EOF
 HOSTNAME=myhostname
+FOO=bar
 EOF
-	CLOUD="scaleway" atf_check -o match:"myhostname" imds @local-hostname
+	CLOUD="scaleway" atf_check -o match:"^myhostname$" imds @local-hostname
 }
 imds_local_hostname_hetzner_body()	{ check_local_hostname hetzner; }