use S3_URL for aws_endpoint

Author: neubaner

sqld/src/test/bottomless.rs

@@ -30,26 +30,27 @@ async fn backup_restore() {
     let _ = S3BucketCleaner::new(BUCKET).await;
     assert_bucket_occupancy(BUCKET, true).await;
 
-    let listener_addr = format!("0.0.0.0:{}", PORT)
-        .to_socket_addrs()
-        .unwrap()
-        .next()
-        .unwrap();
-    let connection_addr = Url::parse(&format!("http://localhost:{}", PORT)).unwrap();
-    let db_config = Config {
-        bottomless_replication: Some(bottomless::replicator::Options {
-            create_bucket_if_not_exists: true,
-            verify_crc: true,
-            use_compression: bottomless::replicator::CompressionKind::Gzip,
-            bucket_name: BUCKET.to_string(),
-            max_batch_interval: Duration::from_millis(250),
-            restore_transaction_page_swap_after: 1, // in this test swap should happen at least once
-            ..bottomless::replicator::Options::from_env().unwrap()
-        }),
-        db_path: PATH.into(),
-        http_addr: Some(listener_addr),
-        ..Config::default()
-    };
+        let listener_addr = format!("0.0.0.0:{}", PORT)
+            .to_socket_addrs()
+            .unwrap()
+            .next()
+            .unwrap();
+        let connection_addr = Url::parse(&format!("http://localhost:{}", PORT)).unwrap();
+        let db_config = Config {
+            bottomless_replication: Some(bottomless::replicator::Options {
+                create_bucket_if_not_exists: true,
+                verify_crc: true,
+                use_compression: bottomless::replicator::CompressionKind::Gzip,
+                bucket_name: BUCKET.to_string(),
+                max_batch_interval: Duration::from_millis(250),
+                restore_transaction_page_swap_after: 1, // in this test swap should happen at least once
+                aws_endpoint: Some(S3_URL.to_string()),
+                ..bottomless::replicator::Options::from_env().unwrap()
+            }),
+            db_path: PATH.into(),
+            http_addr: Some(listener_addr),
+            ..Config::default()
+        };
 
     {
         tracing::info!(
@@ -216,26 +217,27 @@ async fn rollback_restore() {
     let _ = S3BucketCleaner::new(BUCKET).await;
     assert_bucket_occupancy(BUCKET, true).await;
 
-    let listener_addr = format!("0.0.0.0:{}", PORT)
-        .to_socket_addrs()
-        .unwrap()
-        .next()
-        .unwrap();
-    let conn = Url::parse(&format!("http://localhost:{}", PORT)).unwrap();
-    let db_config = Config {
-        bottomless_replication: Some(bottomless::replicator::Options {
-            create_bucket_if_not_exists: true,
-            verify_crc: true,
-            use_compression: bottomless::replicator::CompressionKind::Gzip,
-            bucket_name: BUCKET.to_string(),
-            max_batch_interval: Duration::from_millis(250),
-            restore_transaction_page_swap_after: 1, // in this test swap should happen at least once
-            ..bottomless::replicator::Options::from_env().unwrap()
-        }),
-        db_path: PATH.into(),
-        http_addr: Some(listener_addr),
-        ..Config::default()
-    };
+        let listener_addr = format!("0.0.0.0:{}", PORT)
+            .to_socket_addrs()
+            .unwrap()
+            .next()
+            .unwrap();
+        let conn = Url::parse(&format!("http://localhost:{}", PORT)).unwrap();
+        let db_config = Config {
+            bottomless_replication: Some(bottomless::replicator::Options {
+                create_bucket_if_not_exists: true,
+                verify_crc: true,
+                use_compression: bottomless::replicator::CompressionKind::Gzip,
+                bucket_name: BUCKET.to_string(),
+                max_batch_interval: Duration::from_millis(250),
+                restore_transaction_page_swap_after: 1, // in this test swap should happen at least once
+                aws_endpoint: Some(S3_URL.to_string()),
+                ..bottomless::replicator::Options::from_env().unwrap()
+            }),
+            db_path: PATH.into(),
+            http_addr: Some(listener_addr),
+            ..Config::default()
+        };
 
     {
         tracing::info!("---STEP 1: create db, write row, rollback---");