From ecf08e3f28e3dd505cb3cc0a756beee6c672410e Mon Sep 17 00:00:00 2001
From: Kaan Genc <genc.5@osu.edu>
Date: Sun, 23 Jan 2022 16:38:16 -0500
Subject: [PATCH] fix type errors

---
 .gitignore  |  2 +-
 src/main.rs | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 36ef3bc..4a3b37d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /target
-secret.toml
+config.toml
diff --git a/src/main.rs b/src/main.rs
index 83c38fb..d28495e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -42,13 +42,21 @@ async fn main() -> anyhow::Result<()> {
     let conf = config::load_config(&opts)
         .die_with(|error| format!("Failed to read config file: {}", error));
     config::validate_config(&conf).die_with(|error| format!("Invalid config: {}", error));
-    println!("Finding out the API address...");
-    let ipv4 = get_ip("https://api.ipify.org").await;
-    let ipv6 = get_ip("https://api6.ipify.org").await;
+    println!("Finding out the IP address...");
+    let ipv4_result = get_ip("https://api.ipify.org").await;
+    let ipv6_result = get_ip("https://api6.ipify.org").await;
+    let ipv4 = ipv4_result.as_ref();
+    let ipv6 = ipv6_result.as_ref();
     println!("Found these:");
-    println!("\tIPv4: {}", ipv4.unwrap_or_else(|error| error.to_string()));
-    println!("\tIPv6: {}", ipv6.unwrap_or_else(|error| error.to_string()));
-
+    match ipv4 {
+        Ok(ip) => println!("\tIPv4: {}", ip),
+        Err(err) => eprintln!("\tIPv4 failed: {}", err),
+    }
+    match ipv4 {
+        Ok(ip) => println!("\tIPv6: {}", ip),
+        Err(err) => eprintln!("\tIPv7 failed: {}", err),
+    }
+    
     let client = api_client(&conf.api_key)?;
     let mut tasks: Vec<JoinHandle<(StatusCode, String)>> = Vec::new();
     println!("Attempting to update DNS entries now");
@@ -58,12 +66,7 @@ async fn main() -> anyhow::Result<()> {
             let fqdn = Config::fqdn(&entry, &conf);
             let url = gandi_api_url(fqdn, entry.name.as_str(), entry_type);
             let ip = match entry_type {
-                "A" => ipv4.unwrap_or_else(|error| {
-                    panic!(
-                        "Need IPv4 address for {} but failed to get it: {}",
-                        fqdn, error
-                    )
-                }),
+                "A" => ipv4.die_with(|error| format!("Needed IPv4: {}", error)),
                 "AAA" => ipv6.unwrap_or_else(|error| {
                     panic!(
                         "Need IPv6 address for {} but failed to get it: {}",