version bumps

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sync_app_rust"
-version = "0.11.4"
+version = "0.11.5"
 authors = ["Daniel Boline <[email protected]>"]
 edition = "2018"
 

gdrive_lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gdrive_lib"
-version = "0.11.4"
+version = "0.11.5"
 authors = ["Daniel Boline <[email protected]>"]
 edition = "2018"
 
@@ -15,8 +15,7 @@ deadqueue = "0.2"
 derive_more = "0.99"
 futures = "0.3"
 hyper-rustls = "0.24"
-hyper = { version = "0.14", features = ["stream"] }
-itertools = "0.11"
+itertools = "0.12"
 lazy_static = "1.4"
 log = "0.4"
 maplit = "1.0"

gdrive_lib/src/gcs_instance.rs

@@ -1,7 +1,7 @@
 use anyhow::{format_err, Error};
 use async_google_apis_common as common;
 use common::{
-    yup_oauth2::{self, ServiceAccountAuthenticator},
+    yup_oauth2::{self, hyper, ServiceAccountAuthenticator},
     DownloadResult, TlsClient,
 };
 use lazy_static::lazy_static;

gdrive_lib/src/gdrive_instance.rs

@@ -1,7 +1,7 @@
 use anyhow::{format_err, Error};
 use async_google_apis_common as common;
 use common::{
-    yup_oauth2::{self, InstalledFlowAuthenticator},
+    yup_oauth2::{self, hyper, InstalledFlowAuthenticator},
     DownloadResult, TlsClient,
 };
 use crossbeam::atomic::AtomicCell;

sync_app_http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sync_app_http"
-version = "0.11.4"
+version = "0.11.5"
 authors = ["Daniel Boline <[email protected]>"]
 edition = "2018"
 
@@ -9,14 +9,13 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-authorized_users = { git = "https://github.com/ddboline/auth_server_rust.git", tag="0.11.0"}
+authorized_users = { git = "https://github.com/ddboline/auth_server_rust.git", tag="0.11.3"}
 deadqueue = "0.2"
 dioxus = "0.4"
 dioxus-ssr = "0.4"
 dirs = "5.0"
 futures = "0.3"
-http = "0.2"
-itertools = "0.11"
+itertools = "0.12"
 lazy_static = "1.4"
 log = "0.4"
 maplit = "1.0"

sync_app_http/src/errors.rs

@@ -1,8 +1,8 @@
 use anyhow::Error as AnyhowError;
-use http::StatusCode;
 use log::error;
 use postgres_query::Error as PqError;
 use rweb::{
+    http::StatusCode,
     openapi::{
         ComponentDescriptor, ComponentOrInlineSchema, Entity, Response, ResponseEntity, Responses,
     },

sync_app_lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sync_app_lib"
-version = "0.11.4"
+version = "0.11.5"
 authors = ["Daniel Boline <[email protected]>"]
 edition = "2018"
 
@@ -9,9 +9,9 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-aws-config = "0.56"
-aws-types = "0.56"
-aws-sdk-s3 = "0.31"
+aws-config = {version="1.0", features=["behavior-version-latest"]}
+aws-types = "1.0"
+aws-sdk-s3 = "1.1"
 bytes = "1.1"
 checksums = "0.9"
 clap = {version="4.0", features=["derive"]}
@@ -24,7 +24,7 @@ dotenv = "0.15"
 envy = "0.4"
 futures = "0.3"
 gdrive_lib = {path="../gdrive_lib"}
-itertools = "0.11"
+itertools = "0.12"
 lazy_static = "1.4"
 log = "0.4"
 maplit = "1.0"

sync_app_lib/src/file_info_s3.rs

@@ -1,7 +1,7 @@
 use anyhow::{format_err, Error};
 use aws_sdk_s3::types::Object;
 use stack_string::{format_sstr, StackString};
-use std::path::Path;
+use std::{convert::TryInto, path::Path};
 use url::Url;
 
 use crate::{
@@ -92,7 +92,10 @@ impl FileInfoS3 {
             .as_ref()
             .ok_or_else(|| format_err!("No last modified"))?;
         let st_mtime = last_modified.as_secs_f64() as i64;
-        let size = item.size as u32;
+        let size: u32 = item
+            .size
+            .ok_or_else(|| format_err!("No size"))?
+            .try_into()?;
         let fileurl = format_sstr!("s3://{bucket}/{key}");
         let fileurl: Url = fileurl.parse()?;
         let id_str: StackString = bucket.into();

sync_app_lib/src/s3_instance.rs

@@ -242,7 +242,7 @@ impl S3Instance {
                     }
                     list_of_keys.extend_from_slice(&contents);
                 }
-                if !output.is_truncated {
+                if output.is_truncated == Some(false) || output.is_truncated.is_none() {
                     break;
                 }
             }
@@ -281,7 +281,7 @@ impl S3Instance {
                     callback(object)?;
                 }
             }
-            if !output.is_truncated {
+            if output.is_truncated == Some(false) || output.is_truncated.is_none() {
                 break;
             }
         }