Upgrade AWS libraries.

This comes with some substantial removals, because the AWS libs no longer treat every last field as optional when it's inappropriate to do so. Hooray!

1 files changed, 6 insertions, 15 deletions

diff --git a/src/route53.rs b/src/route53.rs
index b9d4c34..3c34e9c 100644
--- a/src/route53.rs
+++ b/src/route53.rs
@@ -31,13 +31,9 @@ where
             .send()
             .await?;
 
-        let zones = zones_resp.hosted_zones().unwrap_or(&[]);
+        let zones = zones_resp.hosted_zones();
         for candidate_zone in zones.iter() {
-            let zone_name = match candidate_zone.name() {
-                None => continue,
-                Some(name) => name,
-            };
-            let zone_name = Name::from_str(zone_name)?;
+            let zone_name = Name::from_str(candidate_zone.name())?;
             let match_position = names.iter().position(|name| *name == zone_name);
             match (depth, match_position) {
                 (None, Some(matched_depth)) => {
@@ -89,21 +85,16 @@ where
             .send()
             .await?;
 
-        let recordsets = records_resp.resource_record_sets().unwrap_or(&[]);
+        let recordsets = records_resp.resource_record_sets();
         for recordset in recordsets {
-            let recordset_name = recordset.name().ok_or(anyhow!(
-                "Record set with no name found in zone: {}",
-                zone_id
-            ))?;
+            let recordset_name = recordset.name();
             let recordset_name = Name::from_str(recordset_name)?;
             if &recordset_name != dns_name {
                 break;
             }
 
-            if let Some(rr_type) = recordset.r#type() {
-                if [RrType::A, RrType::Aaaa].contains(rr_type) {
-                    suffix_records.insert(recordset.clone().into());
-                }
+            if [RrType::A, RrType::Aaaa].contains(recordset.r#type()) {
+                suffix_records.insert(recordset.clone().into());
             }
         }