providers/hetzner: fix duplicate attribute prefix

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 <[email protected]>
coreos · Jun 19, 2024 · 6effcd3 · 6effcd3
1 parent a9a70f2
commit 6effcd3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -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
@@ -112,17 +112,17 @@ impl From<HetznerMetadata> for HashMap<String, String> {
 
         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
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,8 @@ Major changes:

		Minor changes:

		- Hetzner: fix duplicate attribute prefix

		Packaging changes:


Expand Down