replaced rusoto with aws-sdk

components/builder-api/Cargo.toml

@@ -37,10 +37,12 @@ futures = "*"
 rand = "*"
 r2d2 = "*"
 regex = "*"
-rusoto_core = "*"
-rusoto_s3 = "*"
+aws-config = "*"
+aws-sdk-s3 = "*"
 tempfile = "*"
 uuid = { version = "*", features = ["v4"] }
+tokio = { version = "*", features = ["rt", "time"] }
+aws-smithy-types = "*"
 
 [dependencies.actix-web]
 version = "*"

components/builder-api/src/lib.rs

@@ -29,7 +29,6 @@ use builder_core as bldr_core;
 use habitat_builder_db as db;
 use habitat_builder_protocol as protocol;
 use habitat_core as hab_core;
-use rusoto_core as rusoto;
 
 pub mod config;
 pub mod server;

components/builder-api/src/server/error.rs

@@ -20,7 +20,15 @@ use artifactory_client::error::ArtifactoryError;
 use github_api_client::HubError;
 use oauth_client::error::Error as OAuthError;
 
-use rusoto_core::RusotoError;
+use aws_sdk_s3::{error::SdkError,
+                 operation::{complete_multipart_upload::CompleteMultipartUploadError,
+                             create_bucket::CreateBucketError,
+                             create_multipart_upload::CreateMultipartUploadError,
+                             get_object::GetObjectError,
+                             head_object::HeadObjectError,
+                             list_buckets::ListBucketsError,
+                             put_object::PutObjectError,
+                             upload_part::UploadPartError}};
 
 use std::{fmt,
           fs,
@@ -40,23 +48,23 @@ pub enum Error {
     BadRequest,
     BuilderCore(bldr_core::Error),
     Conflict,
-    CreateBucketError(RusotoError<rusoto_s3::CreateBucketError>),
+    CreateBucketError(Box<SdkError<CreateBucketError>>),
     DbError(db::error::Error),
     DieselError(diesel::result::Error),
     Github(HubError),
     HabitatCore(hab_core::Error),
-    HeadObject(RusotoError<rusoto_s3::HeadObjectError>),
+    HeadObject(Box<SdkError<HeadObjectError>>),
     HttpClient(reqwest::Error),
     InnerError(io::IntoInnerError<io::BufWriter<fs::File>>),
     IO(io::Error),
-    ListBuckets(RusotoError<rusoto_s3::ListBucketsError>),
-    MultipartCompletion(RusotoError<rusoto_s3::CompleteMultipartUploadError>),
-    MultipartUploadReq(RusotoError<rusoto_s3::CreateMultipartUploadError>),
+    ListBuckets(Box<SdkError<ListBucketsError>>),
+    MultipartCompletion(Box<SdkError<CompleteMultipartUploadError>>),
+    MultipartUploadReq(Box<SdkError<CreateMultipartUploadError>>),
     NotFound,
     OAuth(OAuthError),
-    PackageDownload(RusotoError<rusoto_s3::GetObjectError>),
-    PackageUpload(RusotoError<rusoto_s3::PutObjectError>),
-    PartialUpload(RusotoError<rusoto_s3::UploadPartError>),
+    PackageDownload(Box<SdkError<GetObjectError>>),
+    PackageUpload(Box<SdkError<PutObjectError>>),
+    PartialUpload(Box<SdkError<UploadPartError>>),
     PayloadError(actix_web::error::PayloadError),
     Protobuf(protobuf::ProtobufError),
     SerdeJson(serde_json::Error),
@@ -239,3 +247,39 @@ impl From<string::FromUtf8Error> for Error {
 impl From<actix_web::error::BlockingError> for Error {
     fn from(err: actix_web::error::BlockingError) -> Error { Error::BlockingError(err) }
 }
+
+impl From<SdkError<CreateBucketError>> for Error {
+    fn from(e: SdkError<CreateBucketError>) -> Self { Error::CreateBucketError(Box::new(e)) }
+}
+
+impl From<SdkError<HeadObjectError>> for Error {
+    fn from(e: SdkError<HeadObjectError>) -> Self { Error::HeadObject(Box::new(e)) }
+}
+
+impl From<SdkError<ListBucketsError>> for Error {
+    fn from(e: SdkError<ListBucketsError>) -> Self { Error::ListBuckets(Box::new(e)) }
+}
+
+impl From<SdkError<CompleteMultipartUploadError>> for Error {
+    fn from(e: SdkError<CompleteMultipartUploadError>) -> Self {
+        Error::MultipartCompletion(Box::new(e))
+    }
+}
+
+impl From<SdkError<CreateMultipartUploadError>> for Error {
+    fn from(e: SdkError<CreateMultipartUploadError>) -> Self {
+        Error::MultipartUploadReq(Box::new(e))
+    }
+}
+
+impl From<SdkError<GetObjectError>> for Error {
+    fn from(e: SdkError<GetObjectError>) -> Self { Error::PackageDownload(Box::new(e)) }
+}
+
+impl From<SdkError<PutObjectError>> for Error {
+    fn from(e: SdkError<PutObjectError>) -> Self { Error::PackageUpload(Box::new(e)) }
+}
+
+impl From<SdkError<UploadPartError>> for Error {
+    fn from(e: SdkError<UploadPartError>) -> Self { Error::PartialUpload(Box::new(e)) }
+}