From 6effcd345229da6b12d1206681f58e63220c534a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20T=C3=B6lle?= Date: Tue, 4 Jun 2024 22:21:45 +0200 Subject: [PATCH] providers/hetzner: fix duplicate attribute prefix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The attributes generated for the hetzner provider had a duplicate prefix: AFTERBURN_AFTERBURN_HETZNER_HOSTNAME=flatcar-test Afterburn already adds the prefix itself in src/providers/mod.rs `MetadataProvider.write_attributes()`, so the additional prefix added in the hetzner provider was unnecessary. Signed-off-by: Julian Tölle --- docs/release-notes.md | 2 ++ src/providers/hetzner/mock_tests.rs | 10 +++++----- src/providers/hetzner/mod.rs | 10 +++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/docs/release-notes.md b/docs/release-notes.md index e5f4e366..48f96de3 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -10,6 +10,8 @@ Major changes: Minor changes: +- Hetzner: fix duplicate attribute prefix + Packaging changes: diff --git a/src/providers/hetzner/mock_tests.rs b/src/providers/hetzner/mock_tests.rs index 94d52a6f..79a16622 100644 --- a/src/providers/hetzner/mock_tests.rs +++ b/src/providers/hetzner/mock_tests.rs @@ -35,11 +35,11 @@ vendor_data: "blah blah blah""# ); let expected = maplit::hashmap! { - "AFTERBURN_HETZNER_AVAILABILITY_ZONE".to_string() => availability_zone.to_string(), - "AFTERBURN_HETZNER_HOSTNAME".to_string() => hostname.to_string(), - "AFTERBURN_HETZNER_INSTANCE_ID".to_string() => instance_id.to_string(), - "AFTERBURN_HETZNER_PUBLIC_IPV4".to_string() => public_ipv4.to_string(), - "AFTERBURN_HETZNER_REGION".to_string() => region.to_string(), + "HETZNER_AVAILABILITY_ZONE".to_string() => availability_zone.to_string(), + "HETZNER_HOSTNAME".to_string() => hostname.to_string(), + "HETZNER_INSTANCE_ID".to_string() => instance_id.to_string(), + "HETZNER_PUBLIC_IPV4".to_string() => public_ipv4.to_string(), + "HETZNER_REGION".to_string() => region.to_string(), }; // Fail on not found diff --git a/src/providers/hetzner/mod.rs b/src/providers/hetzner/mod.rs index 5a575f05..58f98465 100644 --- a/src/providers/hetzner/mod.rs +++ b/src/providers/hetzner/mod.rs @@ -112,17 +112,17 @@ impl From for HashMap { add_value( &mut out, - "AFTERBURN_HETZNER_AVAILABILITY_ZONE", + "HETZNER_AVAILABILITY_ZONE", meta.availability_zone, ); - add_value(&mut out, "AFTERBURN_HETZNER_HOSTNAME", meta.hostname); + add_value(&mut out, "HETZNER_HOSTNAME", meta.hostname); add_value( &mut out, - "AFTERBURN_HETZNER_INSTANCE_ID", + "HETZNER_INSTANCE_ID", meta.instance_id.map(|i| i.to_string()), ); - add_value(&mut out, "AFTERBURN_HETZNER_PUBLIC_IPV4", meta.public_ipv4); - add_value(&mut out, "AFTERBURN_HETZNER_REGION", meta.region); + add_value(&mut out, "HETZNER_PUBLIC_IPV4", meta.public_ipv4); + add_value(&mut out, "HETZNER_REGION", meta.region); out }