Merge branch 'master' into comp-analysis

Author: andrewjohnsonsmarty

.gitignore

@@ -13,4 +13,19 @@
 *DS_Store*
 *.swp
 *.iml
-__MACOSX
+__MACOSX
+
+# Devenv
+.devenv*
+devenv.local.nix
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml
+
+devenv.lock
+devenv.nix
+devenv.yaml
+.envrc

Makefile

@@ -47,6 +47,9 @@ us_street_api:
 us_zipcode_api:
 	RUST_LOG=trace cargo run --example us_zipcode_api
 
+us_enrichment_api:
+	RUST_LOG=trace cargo run --example us_enrichment_api
+
 examples: international_autocomplete_api international_street_api logger us_autocomplete_pro_api us_extract_api us_reverse_geo_api us_street_api us_zipcode_api
 
-.PHONY: clean test dependencies package examples clippy international_autocomplete_api international_street_api logger us_autocomplete_pro_api us_extract_api us_reverse_geo_api us_street_api us_zipcode_api
+.PHONY: clean test dependencies package examples clippy international_autocomplete_api international_street_api logger us_autocomplete_pro_api us_extract_api us_reverse_geo_api us_street_api us_zipcode_api us_enrichment_api

smarty-rust-sdk/examples/international_autocomplete_api.rs

@@ -23,10 +23,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     );
 
     let options = OptionsBuilder::new(Some(authentication))
-        // The appropriate license values to be used for your subscriptions
-        // can be found on the Subscriptions page of the account dashboard.
-        // https://www.smartystreets.com/docs/cloud/licensing
-        .with_license("international-autocomplete-v2-cloud")
+        .with_logging()
         .build();
 
     let client = InternationalAutocompleteClient::new(options)?;

smarty-rust-sdk/examples/international_street_api.rs

@@ -28,10 +28,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     );
 
     let options = OptionsBuilder::new(Some(authentication))
-        // The appropriate license values to be used for your subscriptions
-        // can be found on the Subscriptions page of the account dashboard.
-        // https://www.smartystreets.com/docs/cloud/licensing
-        .with_license("international-global-plus-cloud")
+        .with_logging()
         .build();
 
     let client = InternationalStreetClient::new(options)?;

smarty-rust-sdk/examples/logger.rs

@@ -42,10 +42,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     // Create the options from it's builder pattern
     let options = OptionsBuilder::new(Some(authentication))
-        // The appropriate license values to be used for your subscriptions
-        // can be found on the Subscriptions page the account dashboard.
-        // https://www.smartystreets.com/docs/cloud/licensing
-        .with_license("us-core-cloud")
         .with_logging()
         .with_retries(2)
         .build();

smarty-rust-sdk/examples/us_autocomplete_pro_api.rs

@@ -28,10 +28,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     );
 
     let options = OptionsBuilder::new(Some(authentication))
-        // The appropriate license values to be used for your subscriptions
-        // can be found on the Subscriptions page of the account dashboard.
-        // https://www.smartystreets.com/docs/cloud/licensing
-        .with_license("us-autocomplete-pro-cloud")
+        .with_logging()
         .build();
 
     let client = USAutocompleteProClient::new(options)?;

smarty-rust-sdk/examples/us_enrichment_api.rs

@@ -1,10 +1,17 @@
 use smarty_rust_sdk::sdk::authentication::SecretKeyCredential;
 use smarty_rust_sdk::sdk::options::OptionsBuilder;
-use smarty_rust_sdk::us_enrichment_api::client::USEnrichmentClient;
+
+use smarty_rust_sdk::us_enrichment_api::client::*;
+use smarty_rust_sdk::us_enrichment_api::financial::*;
+use smarty_rust_sdk::us_enrichment_api::geo::*;
+use smarty_rust_sdk::us_enrichment_api::principal::*;
+
 use smarty_rust_sdk::us_enrichment_api::lookup::EnrichmentLookup;
-use smarty_rust_sdk::us_enrichment_api::results::{
-    EnrichmentResponse, FinancialResponse, PrincipalResponse,
-};
+use smarty_rust_sdk::us_enrichment_api::response::EnrichmentResponse;
+use smarty_rust_sdk::us_enrichment_api::secondary::SecondaryCountResponse;
+use smarty_rust_sdk::us_enrichment_api::secondary::SecondaryResponse;
+use smarty_rust_sdk::us_enrichment_api::risk::RiskResponse;
+
 use std::error::Error;
 
 #[tokio::main]
@@ -13,23 +20,29 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     lookup::<FinancialResponse>(key).await?;
     lookup::<PrincipalResponse>(key).await?;
+    lookup::<GeoReferenceResponse>(key).await?;
+    lookup::<GeoReference2010Response>(key).await?;
+    lookup::<GeoReference2020Response>(key).await?;
+    lookup::<SecondaryResponse>(key).await?;
+    lookup::<SecondaryCountResponse>(key).await?;
+    lookup::<RiskResponse>(key).await?;
 
     Ok(())
 }
 
 async fn lookup<R: EnrichmentResponse>(key: u32) -> Result<(), Box<dyn Error>> {
-    let mut lookup = EnrichmentLookup::<R>::new(key);
+    let mut lookup = EnrichmentLookup::<R> {
+        smarty_key: key,
+        etag: "".to_string(),
+        ..Default::default()
+    };
 
     let authentication = SecretKeyCredential::new(
         std::env::var("SMARTY_AUTH_ID").expect("Missing SMARTY_AUTH_ID env variable"),
         std::env::var("SMARTY_AUTH_TOKEN").expect("Missing SMARTY_AUTH_TOKEN env variable"),
     );
 
     let options = OptionsBuilder::new(Some(authentication))
-        // The appropriate license values to be used for your subscriptions
-        // can be found on the Subscriptions page of the account dashboard.
-        // https://www.smartystreets.com/docs/cloud/licensing
-        .with_license(&format!("us-property-data-{}-cloud", R::lookup_type()))
         .with_logging()
         .build();
 

smarty-rust-sdk/examples/us_extract_api.rs

@@ -28,10 +28,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
     );
 
     let options = OptionsBuilder::new(Some(authentication))
-        // The appropriate license values to be used for your subscriptions
-        // can be found on the Subscriptions page of the account dashboard.
-        // https://www.smartystreets.com/docs/cloud/licensing
-        .with_license("us-core-cloud")
         .with_logging()
         .build();
 

smarty-rust-sdk/examples/us_reverse_geo_api.rs

@@ -23,10 +23,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     );
 
     let options = OptionsBuilder::new(Some(authentication))
-        // The appropriate license values to be used for your subscriptions
-        // can be found on the Subscriptions page of the account dashboard.
-        // https://www.smartystreets.com/docs/cloud/licensing
-        .with_license("us-reverse-geocoding-cloud")
+        .with_logging()
         .build();
 
     let client = USReverseGeoClient::new(options)?;

smarty-rust-sdk/examples/us_street_api.rs

@@ -37,10 +37,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     );
 
     let options = OptionsBuilder::new(Some(authentication))
-        // The appropriate license values to be used for your subscriptions
-        // can be found on the Subscriptions page of the account dashboard.
-        // https://www.smartystreets.com/docs/cloud/licensing
-        .with_license("us-core-cloud")
+        .with_logging()
         .build();
 
     let client = USStreetAddressClient::new(options)?;