From 417df990161816a67e3880bdab782796e837c4f7 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Thu, 18 Jan 2024 19:02:11 -0500
Subject: [PATCH 01/16] feat: added retention policy for v2 api

---
 influxdb/src/client/mod.rs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/influxdb/src/client/mod.rs b/influxdb/src/client/mod.rs
index ad198bc..7d0ead1 100644
--- a/influxdb/src/client/mod.rs
+++ b/influxdb/src/client/mod.rs
@@ -141,6 +141,23 @@ impl Client {
         self
     }
 
+    /// Add a retention policy to [`Client`](crate::Client)
+    ///
+    /// This is designed for InfluxDB 2.x's backward-compatible API, which
+    /// maps databases and retention policies to buckets using the **database
+    /// and retention policy (DBRP) mapping service**.
+    /// See [InfluxDB Docs](https://docs.influxdata.com/influxdb/v2/reference/api/influxdb-1x/dbrp/) for more details.
+    #[must_use = "Creating a client is pointless unless you use it"]
+    pub fn with_retention_policy<S>(mut self, retention_policy: S) -> Self
+    where
+        S: Into<String>,
+    {
+        let mut with_retention_policy = self.parameters.as_ref().clone();
+        with_retention_policy.insert("rp", retention_policy.into());
+        self.parameters = Arc::new(with_retention_policy);
+        self
+    }
+
     /// Returns the name of the database the client is using
     pub fn database_name(&self) -> &str {
         // safe to unwrap: we always set the database name in `Self::new`

From 4f0354d88ca4532867d397725aa70082400311b2 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Fri, 2 Feb 2024 16:51:20 -0600
Subject: [PATCH 02/16] wip changes

---
 .github/workflows/rust.yml             | 12 +++++++++
 influxdb/src/client/mod.rs             | 18 +++++++++----
 influxdb/src/query/mod.rs              |  7 +++++-
 influxdb/src/query/write_query.rs      |  2 +-
 influxdb/tests/integration_tests_v2.rs | 35 ++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b56b977..729dc08 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -134,6 +134,18 @@ jobs:
             ~/.cargo/registry
             target
           key: "${{runner.os}} Rust ${{steps.rust-toolchain.outputs.cachekey}}"
+          
+      - name: Setup InfluxDB
+        uses: influxdata/influxdb-action@v3
+        with:
+          influxdb_version: 2.6
+          influxdb_start: false
+          
+      - name: Create Org
+        run: |
+          influx org create --name testing2 --token admintoken --skip-verify --host http://localhost:2086
+          influx bucket create --name mydb --org example-org --token admintoken --skip-verify --host http://localhost:2086
+      
       - name: Run tests
         run: |
           for test in integration_tests{,_v2}
diff --git a/influxdb/src/client/mod.rs b/influxdb/src/client/mod.rs
index 7d0ead1..fa32fac 100644
--- a/influxdb/src/client/mod.rs
+++ b/influxdb/src/client/mod.rs
@@ -86,8 +86,11 @@ impl Client {
     {
         let mut parameters = HashMap::<&str, String>::new();
         parameters.insert("db", database.into());
+        let url = url.into();
+        // todo: should probably use actual URL parsing here
+        let url = url.trim_end_matches('/').to_string();
         Client {
-            url: Arc::new(url.into()),
+            url: Arc::new(url),
             parameters: Arc::new(parameters),
             client: HttpClient::new(),
             token: None,
@@ -264,11 +267,14 @@ impl Client {
                 }
             }
             QueryType::WriteQuery(precision) => {
-                let url = &format!("{}/write", &self.url);
+                let url = &format!("{}write", &self.url);
                 let mut parameters = self.parameters.as_ref().clone();
                 parameters.insert("precision", precision);
 
-                self.client.post(url).body(query.get()).query(&parameters)
+                let body = query.get();
+                println!("body: {}", body);
+
+                self.client.post(url).body(body).query(&parameters)
             }
         };
 
@@ -277,8 +283,10 @@ impl Client {
             error: err.to_string(),
         })?;
 
-        let res = self
-            .auth_if_needed(request_builder)
+        let res = self.auth_if_needed(request_builder);
+        println!("res: {:#?}", res);
+
+        let res = res
             .send()
             .map_err(|err| Error::ConnectionError {
                 error: err.to_string(),
diff --git a/influxdb/src/query/mod.rs b/influxdb/src/query/mod.rs
index 0546b2b..b0f8304 100644
--- a/influxdb/src/query/mod.rs
+++ b/influxdb/src/query/mod.rs
@@ -89,7 +89,12 @@ where
     T: TimeZone,
 {
     fn from(date_time: DateTime<T>) -> Self {
-        Timestamp::Nanoseconds(date_time.timestamp_nanos() as u128)
+        Timestamp::Nanoseconds(
+            date_time
+                .timestamp_nanos_opt()
+                .expect("value can not be represented in a timestamp with nanosecond precision.")
+                as u128,
+        )
     }
 }
 
diff --git a/influxdb/src/query/write_query.rs b/influxdb/src/query/write_query.rs
index 7014731..75d8b02 100644
--- a/influxdb/src/query/write_query.rs
+++ b/influxdb/src/query/write_query.rs
@@ -267,7 +267,7 @@ impl Query for Vec<WriteQuery> {
 
     fn get_type(&self) -> QueryType {
         QueryType::WriteQuery(
-            self.get(0)
+            self.first()
                 .map(|q| q.get_precision())
                 // use "ms" as placeholder if query is empty
                 .unwrap_or_else(|| "ms".to_owned()),
diff --git a/influxdb/tests/integration_tests_v2.rs b/influxdb/tests/integration_tests_v2.rs
index 74e17a7..6d91377 100644
--- a/influxdb/tests/integration_tests_v2.rs
+++ b/influxdb/tests/integration_tests_v2.rs
@@ -42,6 +42,41 @@ async fn test_authed_write_and_read() {
     .await;
 }
 
+/// This test case
+#[async_std::test]
+#[cfg(not(tarpaulin))]
+async fn test_rp_write_and_read() {
+    run_test(
+        || async move {
+            let client = Client::new("http://127.0.0.1:2086", "mydb")
+                .with_token("admintoken")
+                .with_retention_policy("autogen");
+
+            let write_query = Timestamp::Hours(11)
+                .into_query("weather")
+                .add_field("temperature", 82);
+            let write_result = client.query(&write_query).await;
+            assert_result_ok(&write_result);
+
+            let read_query = ReadQuery::new("SELECT * FROM weather");
+            let read_result = client.query(read_query).await;
+            assert_result_ok(&read_result);
+            assert!(
+                !read_result.unwrap().contains("error"),
+                "Data contained a database error"
+            );
+        },
+        || async move {
+            let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");
+            let read_query = ReadQuery::new("DELETE MEASUREMENT weather");
+            let read_result = client.query(read_query).await;
+            assert_result_ok(&read_result);
+            assert!(!read_result.unwrap().contains("error"), "Teardown failed");
+        },
+    )
+    .await;
+}
+
 /// INTEGRATION TEST
 ///
 /// This test case tests the Authentication

From 5fe5d35b3650b901437e2616fa23e1fb9a71a9d2 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 11:38:37 -0600
Subject: [PATCH 03/16] wip changes

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 729dc08..3577844 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -138,7 +138,7 @@ jobs:
       - name: Setup InfluxDB
         uses: influxdata/influxdb-action@v3
         with:
-          influxdb_version: 2.6
+          influxdb_version: 2.6.1
           influxdb_start: false
           
       - name: Create Org

From 1df117bc1675d099f66d72ca941a07fb88f617b9 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 11:40:39 -0600
Subject: [PATCH 04/16] added workflow_dispatch to ci for testing

---
 .github/workflows/rust.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 3577844..72668b7 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
   pull_request:
+  workflow_dispatch: 
 
 jobs:
   # this checks that the readme created from rustdoc is up to date

From 5f5a6ec09181e355806ecc992620ecc4b5bd635c Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 11:45:00 -0600
Subject: [PATCH 05/16] wip changes

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 72668b7..af4f8bc 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -95,7 +95,7 @@ jobs:
           - name: Stable
             toolchain: stable
             nightly: false
-        http-backend: [curl-client, h1-client, h1-client-rustls, hyper-client, reqwest-client, reqwest-client-rustls]
+        http-backend: [curl-client] #, h1-client, h1-client-rustls, hyper-client, reqwest-client, reqwest-client-rustls]
     services:
       influxdb:
         image: influxdb:1.8
@@ -145,7 +145,7 @@ jobs:
       - name: Create Org
         run: |
           influx org create --name testing2 --token admintoken --skip-verify --host http://localhost:2086
-          influx bucket create --name mydb --org example-org --token admintoken --skip-verify --host http://localhost:2086
+          influx bucket create --name mydb --org testing2 --token admintoken --skip-verify --host http://localhost:2086
       
       - name: Run tests
         run: |

From 44521aba35ac099185660928f7fb140e6b9eaf9e Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 11:47:08 -0600
Subject: [PATCH 06/16] Revert "added workflow_dispatch to ci for testing"

This reverts commit 1df117bc1675d099f66d72ca941a07fb88f617b9.
---
 .github/workflows/rust.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index af4f8bc..c4daea0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -5,7 +5,6 @@ on:
     branches:
       - main
   pull_request:
-  workflow_dispatch: 
 
 jobs:
   # this checks that the readme created from rustdoc is up to date

From 1e715b0cb4cba16a185472c2660270d72f9d4f19 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 11:47:59 -0600
Subject: [PATCH 07/16] disable other CI

---
 .github/workflows/rust.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index c4daea0..6c305d1 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   # this checks that the readme created from rustdoc is up to date
   readmecheck:
+    if: false
     name: README Format Check
     runs-on: ubuntu-latest
     steps:
@@ -20,6 +21,7 @@ jobs:
 
   # this checks that there are no clippy lints
   clippy:
+    if: false
     name: Style Check (clippy)
     runs-on: ubuntu-latest
     steps:
@@ -34,6 +36,7 @@ jobs:
 
   # this checks that the code is formatted with rustfmt
   rustfmt:
+    if: false
     name: Style Checks (rustfmt)
     runs-on: ubuntu-latest
     steps:
@@ -46,6 +49,7 @@ jobs:
 
   # this tests that all unit and doc tests are successful
   unit_tests:
+    if: false
     name: Unit and Doc Tests (Rust ${{matrix.rust.name}} on ${{matrix.os}})
     runs-on: ${{matrix.os}}
     continue-on-error: ${{matrix.rust.nightly}}
@@ -155,6 +159,7 @@ jobs:
 
   # this uses cargo-tarpaulin to inspect the code coverage
   coverage:
+    if: false
     name: Code Coverage (stable/ubuntu-latest)
     runs-on: ubuntu-latest
     services:
@@ -214,10 +219,11 @@ jobs:
 
   # this uploads the code coverage to github pages
   pages:
+    if: false
     runs-on: ubuntu-latest
     needs:
       - coverage
-    if: github.ref == 'refs/heads/main'
+#    if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v3
         with:

From 2400392254f85669ae4747c28909cd602e65001e Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 11:53:13 -0600
Subject: [PATCH 08/16] disable other CI

---
 .github/workflows/rust.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 6c305d1..a9af90e 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -152,7 +152,8 @@ jobs:
       
       - name: Run tests
         run: |
-          for test in integration_tests{,_v2}
+#          for test in integration_tests{,_v2}
+          for test in integration_tests_v2
           do
             cargo test -p influxdb --no-default-features --features 'use-serde derive ${{matrix.http-backend}}' --no-fail-fast --test $test
           done

From 2793042960a7630f8c4188e830c6b0180ff3bed9 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 11:53:52 -0600
Subject: [PATCH 09/16] wip

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index a9af90e..34da333 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -151,8 +151,8 @@ jobs:
           influx bucket create --name mydb --org testing2 --token admintoken --skip-verify --host http://localhost:2086
       
       - name: Run tests
-        run: |
 #          for test in integration_tests{,_v2}
+        run: |
           for test in integration_tests_v2
           do
             cargo test -p influxdb --no-default-features --features 'use-serde derive ${{matrix.http-backend}}' --no-fail-fast --test $test

From 6a97a26ae3f380d14fe086db71ae0e8a7d018f15 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 12:36:29 -0600
Subject: [PATCH 10/16] wip

---
 .github/workflows/rust.yml               | 17 ++++--
 influxdb/tests/integration_tests_dbrp.rs | 26 ++++++++
 influxdb/tests/integration_tests_v2.rs   | 75 ++++++++----------------
 3 files changed, 62 insertions(+), 56 deletions(-)
 create mode 100644 influxdb/tests/integration_tests_dbrp.rs

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 34da333..42d211d 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -144,19 +144,26 @@ jobs:
         with:
           influxdb_version: 2.6.1
           influxdb_start: false
+#      - name: Run tests
+#        run: |
+#          for test in integration_tests{,_v2}
+#          do
+#            cargo test -p influxdb --no-default-features --features 'use-serde derive ${{matrix.http-backend}}' --no-fail-fast --test $test
+#          done
           
       - name: Create Org
         run: |
           influx org create --name testing2 --token admintoken --skip-verify --host http://localhost:2086
-          influx bucket create --name mydb --org testing2 --token admintoken --skip-verify --host http://localhost:2086
-      
-      - name: Run tests
-#          for test in integration_tests{,_v2}
+          influx bucket create --name mydb --org testing2 --token admintoken --skip-verify --host http://localhost:2086 --json
+          influx v1 dbrp create --db mydb --rp testing2 --org testing2 --token admintoken --skip-verify --host http://localhost:2086
+          
+      - name: Run dbrp tests
         run: |
-          for test in integration_tests_v2
+          for test in integration_tests_dbrp
           do
             cargo test -p influxdb --no-default-features --features 'use-serde derive ${{matrix.http-backend}}' --no-fail-fast --test $test
           done
+      
 
   # this uses cargo-tarpaulin to inspect the code coverage
   coverage:
diff --git a/influxdb/tests/integration_tests_dbrp.rs b/influxdb/tests/integration_tests_dbrp.rs
new file mode 100644
index 0000000..4bdb938
--- /dev/null
+++ b/influxdb/tests/integration_tests_dbrp.rs
@@ -0,0 +1,26 @@
+extern crate influxdb;
+
+use influxdb::Client;
+
+mod integration_tests_v2;
+
+/// INTEGRATION TEST
+///
+
+/// This test case tests the Authentication without rp. It should panic
+#[async_std::test]
+#[should_panic]
+#[cfg(not(tarpaulin))]
+async fn test_authed_write_and_read() {
+    integration_tests_v2::test_authed_write_and_read();
+}
+
+/// This test case adds in the set retention policy to the write and read test
+#[async_std::test]
+#[cfg(not(tarpaulin))]
+async fn test_rp_write_and_read() {
+    let client = Client::new("http://127.0.0.1:2086", "mydb")
+        .with_token("admintoken")
+        .with_retention_policy("autogen");
+    integration_tests_v2::test_authd_write_and_read_helper(&client).await;
+}
diff --git a/influxdb/tests/integration_tests_v2.rs b/influxdb/tests/integration_tests_v2.rs
index 6d91377..93f9efd 100644
--- a/influxdb/tests/integration_tests_v2.rs
+++ b/influxdb/tests/integration_tests_v2.rs
@@ -1,7 +1,7 @@
 extern crate influxdb;
 
 #[path = "./utilities.rs"]
-mod utilities;
+pub mod utilities;
 use utilities::{assert_result_err, assert_result_ok, run_test};
 
 use influxdb::InfluxDbWriteable;
@@ -10,29 +10,29 @@ use influxdb::{Client, Error, ReadQuery, Timestamp};
 /// INTEGRATION TEST
 ///
 
-/// This test case tests the Authentication
-#[async_std::test]
-#[cfg(not(tarpaulin))]
-async fn test_authed_write_and_read() {
+pub async fn test_authd_write_and_read_helper(client: &Client) {
+    // run_test needs UnwindSafe
+    let safe_client = std::sync::Mutex::new(client.clone());
     run_test(
-        || async move {
-            let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");
-            let write_query = Timestamp::Hours(11)
-                .into_query("weather")
-                .add_field("temperature", 82);
-            let write_result = client.query(&write_query).await;
-            assert_result_ok(&write_result);
+        {
+            || async move {
+                let client = safe_client.lock().unwrap().clone();
+                let write_query = Timestamp::Hours(11)
+                    .into_query("weather")
+                    .add_field("temperature", 82);
+                let write_result = client.query(&write_query).await;
+                assert_result_ok(&write_result);
 
-            let read_query = ReadQuery::new("SELECT * FROM weather");
-            let read_result = client.query(read_query).await;
-            assert_result_ok(&read_result);
-            assert!(
-                !read_result.unwrap().contains("error"),
-                "Data contained a database error"
-            );
+                let read_query = ReadQuery::new("SELECT * FROM weather");
+                let read_result = client.query(read_query).await;
+                assert_result_ok(&read_result);
+                assert!(
+                    !read_result.unwrap().contains("error"),
+                    "Data contained a database error"
+                );
+            }
         },
         || async move {
-            let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");
             let read_query = ReadQuery::new("DELETE MEASUREMENT weather");
             let read_result = client.query(read_query).await;
             assert_result_ok(&read_result);
@@ -42,39 +42,12 @@ async fn test_authed_write_and_read() {
     .await;
 }
 
-/// This test case
+/// This test case tests the Authentication
 #[async_std::test]
 #[cfg(not(tarpaulin))]
-async fn test_rp_write_and_read() {
-    run_test(
-        || async move {
-            let client = Client::new("http://127.0.0.1:2086", "mydb")
-                .with_token("admintoken")
-                .with_retention_policy("autogen");
-
-            let write_query = Timestamp::Hours(11)
-                .into_query("weather")
-                .add_field("temperature", 82);
-            let write_result = client.query(&write_query).await;
-            assert_result_ok(&write_result);
-
-            let read_query = ReadQuery::new("SELECT * FROM weather");
-            let read_result = client.query(read_query).await;
-            assert_result_ok(&read_result);
-            assert!(
-                !read_result.unwrap().contains("error"),
-                "Data contained a database error"
-            );
-        },
-        || async move {
-            let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");
-            let read_query = ReadQuery::new("DELETE MEASUREMENT weather");
-            let read_result = client.query(read_query).await;
-            assert_result_ok(&read_result);
-            assert!(!read_result.unwrap().contains("error"), "Teardown failed");
-        },
-    )
-    .await;
+pub async fn test_authed_write_and_read() {
+    let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");
+    test_authd_write_and_read_helper(&client).await;
 }
 
 /// INTEGRATION TEST

From eacdaf1a44e132aa4b96cfd4737a2757d13787ab Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 12:41:52 -0600
Subject: [PATCH 11/16] wip

---
 .github/workflows/rust.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 42d211d..9563b7f 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -154,8 +154,8 @@ jobs:
       - name: Create Org
         run: |
           influx org create --name testing2 --token admintoken --skip-verify --host http://localhost:2086
-          influx bucket create --name mydb --org testing2 --token admintoken --skip-verify --host http://localhost:2086 --json
-          influx v1 dbrp create --db mydb --rp testing2 --org testing2 --token admintoken --skip-verify --host http://localhost:2086
+          NEW_BUCKET_ID=$(influx bucket create --name mydb --org testing2 --token admintoken --skip-verify --host http://localhost:2086 --json | jq .id) 
+          influx v1 dbrp create --db mydb --rp testing2 --org testing2 --bucket-id "$NEW_BUCKET_ID" --token admintoken --skip-verify --host http://localhost:2086
           
       - name: Run dbrp tests
         run: |

From ac6eff7f2310ab7d5404daeb1f14f6888457f21b Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 12:43:04 -0600
Subject: [PATCH 12/16] wip

---
 .github/workflows/rust.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 9563b7f..0b8c77a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -154,7 +154,7 @@ jobs:
       - name: Create Org
         run: |
           influx org create --name testing2 --token admintoken --skip-verify --host http://localhost:2086
-          NEW_BUCKET_ID=$(influx bucket create --name mydb --org testing2 --token admintoken --skip-verify --host http://localhost:2086 --json | jq .id) 
+          NEW_BUCKET_ID=$(influx bucket create --name mydb --org testing2 --token admintoken --skip-verify --host http://localhost:2086 --json | jq -r .id) 
           influx v1 dbrp create --db mydb --rp testing2 --org testing2 --bucket-id "$NEW_BUCKET_ID" --token admintoken --skip-verify --host http://localhost:2086
           
       - name: Run dbrp tests

From 842acd496426f2a4bb8394031fec33d87c4e5e04 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 12:48:46 -0600
Subject: [PATCH 13/16] wip

---
 .github/workflows/rust.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 0b8c77a..a05b08c 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -159,10 +159,7 @@ jobs:
           
       - name: Run dbrp tests
         run: |
-          for test in integration_tests_dbrp
-          do
-            cargo test -p influxdb --no-default-features --features 'use-serde derive ${{matrix.http-backend}}' --no-fail-fast --test $test
-          done
+            cargo test -p influxdb --no-default-features --features 'use-serde derive ${{matrix.http-backend}}' --no-fail-fast --test integration_tests_dbrp
       
 
   # this uses cargo-tarpaulin to inspect the code coverage

From a0cef5f27ebfc000e0781b850e17fc50f5d7f6a9 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Sun, 11 Feb 2024 13:05:09 -0600
Subject: [PATCH 14/16] wip

---
 influxdb/tests/integration_tests_dbrp.rs | 69 +++++++++++++++++++-----
 influxdb/tests/integration_tests_v2.rs   | 47 +++++++---------
 2 files changed, 74 insertions(+), 42 deletions(-)

diff --git a/influxdb/tests/integration_tests_dbrp.rs b/influxdb/tests/integration_tests_dbrp.rs
index 4bdb938..e198bda 100644
--- a/influxdb/tests/integration_tests_dbrp.rs
+++ b/influxdb/tests/integration_tests_dbrp.rs
@@ -1,26 +1,67 @@
 extern crate influxdb;
 
-use influxdb::Client;
+#[path = "./utilities.rs"]
+pub mod utilities;
+use utilities::{assert_result_err, assert_result_ok, run_test};
 
-mod integration_tests_v2;
+use influxdb::InfluxDbWriteable;
+use influxdb::{Client, Error, ReadQuery, Timestamp};
 
 /// INTEGRATION TEST
 ///
-
-/// This test case tests the Authentication without rp. It should panic
+/// This test case tests connection error
 #[async_std::test]
-#[should_panic]
-#[cfg(not(tarpaulin))]
-async fn test_authed_write_and_read() {
-    integration_tests_v2::test_authed_write_and_read();
+#[cfg(not(tarpaulin_include))]
+async fn test_no_rp() {
+    let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");
+    let read_query = ReadQuery::new("SELECT * FROM weather");
+    let read_result = client.query(read_query).await;
+    assert_result_err(&read_result);
+    match read_result {
+        Err(Error::ConnectionError { error: s }) => {
+            println!("NO_RP_ERROR: {}", s);
+        }
+        _ => panic!(
+            "Should cause a ConnectionError: {}",
+            read_result.unwrap_err()
+        ),
+    }
 }
 
-/// This test case adds in the set retention policy to the write and read test
+/// INTEGRATION TEST
+///
+/// This test case tests using the retention policy with DBRP mapping
 #[async_std::test]
 #[cfg(not(tarpaulin))]
-async fn test_rp_write_and_read() {
-    let client = Client::new("http://127.0.0.1:2086", "mydb")
-        .with_token("admintoken")
-        .with_retention_policy("autogen");
-    integration_tests_v2::test_authd_write_and_read_helper(&client).await;
+pub async fn test_authed_write_and_read_with_rp() {
+    run_test(
+        || async move {
+            let client = Client::new("http://127.0.0.1:2086", "mydb")
+                .with_token("admintoken")
+                .with_retention_policy("testing2");
+            let write_query = Timestamp::Hours(11)
+                .into_query("weather")
+                .add_field("temperature", 82);
+            let write_result = client.query(&write_query).await;
+            assert_result_ok(&write_result);
+
+            let read_query = ReadQuery::new("SELECT * FROM weather");
+            let read_result = client.query(read_query).await;
+            assert_result_ok(&read_result);
+            assert!(
+                !read_result.unwrap().contains("error"),
+                "Data contained a database error"
+            );
+        },
+        || async move {
+            let client = Client::new("http://127.0.0.1:2086", "mydb")
+                .with_token("admintoken")
+                .with_retention_policy("testing2");
+            let read_query = ReadQuery::new("DELETE MEASUREMENT weather");
+            let read_result = client.query(read_query).await;
+            assert_result_ok(&read_result);
+            assert!(!read_result.unwrap().contains("error"), "Teardown failed");
+        },
+    )
+    .await;
 }
diff --git a/influxdb/tests/integration_tests_v2.rs b/influxdb/tests/integration_tests_v2.rs
index 93f9efd..9506490 100644
--- a/influxdb/tests/integration_tests_v2.rs
+++ b/influxdb/tests/integration_tests_v2.rs
@@ -9,30 +9,29 @@ use influxdb::{Client, Error, ReadQuery, Timestamp};
 
 /// INTEGRATION TEST
 ///
-
-pub async fn test_authd_write_and_read_helper(client: &Client) {
-    // run_test needs UnwindSafe
-    let safe_client = std::sync::Mutex::new(client.clone());
+/// This test case tests the Authentication
+#[async_std::test]
+#[cfg(not(tarpaulin))]
+pub async fn test_authed_write_and_read() {
     run_test(
-        {
-            || async move {
-                let client = safe_client.lock().unwrap().clone();
-                let write_query = Timestamp::Hours(11)
-                    .into_query("weather")
-                    .add_field("temperature", 82);
-                let write_result = client.query(&write_query).await;
-                assert_result_ok(&write_result);
+        || async move {
+            let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");
+            let write_query = Timestamp::Hours(11)
+                .into_query("weather")
+                .add_field("temperature", 82);
+            let write_result = client.query(&write_query).await;
+            assert_result_ok(&write_result);
 
-                let read_query = ReadQuery::new("SELECT * FROM weather");
-                let read_result = client.query(read_query).await;
-                assert_result_ok(&read_result);
-                assert!(
-                    !read_result.unwrap().contains("error"),
-                    "Data contained a database error"
-                );
-            }
+            let read_query = ReadQuery::new("SELECT * FROM weather");
+            let read_result = client.query(read_query).await;
+            assert_result_ok(&read_result);
+            assert!(
+                !read_result.unwrap().contains("error"),
+                "Data contained a database error"
+            );
         },
         || async move {
+            let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");
             let read_query = ReadQuery::new("DELETE MEASUREMENT weather");
             let read_result = client.query(read_query).await;
             assert_result_ok(&read_result);
@@ -42,14 +41,6 @@ pub async fn test_authd_write_and_read_helper(client: &Client) {
     .await;
 }
 
-/// This test case tests the Authentication
-#[async_std::test]
-#[cfg(not(tarpaulin))]
-pub async fn test_authed_write_and_read() {
-    let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");
-    test_authd_write_and_read_helper(&client).await;
-}
-
 /// INTEGRATION TEST
 ///
 /// This test case tests the Authentication

From acba7aa3b04d4350d26b432086b6145f8f35d6d6 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Wed, 14 Feb 2024 12:08:48 -0600
Subject: [PATCH 15/16] remove some debugging logs

---
 influxdb/src/client/mod.rs | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/influxdb/src/client/mod.rs b/influxdb/src/client/mod.rs
index fa32fac..7d0ead1 100644
--- a/influxdb/src/client/mod.rs
+++ b/influxdb/src/client/mod.rs
@@ -86,11 +86,8 @@ impl Client {
     {
         let mut parameters = HashMap::<&str, String>::new();
         parameters.insert("db", database.into());
-        let url = url.into();
-        // todo: should probably use actual URL parsing here
-        let url = url.trim_end_matches('/').to_string();
         Client {
-            url: Arc::new(url),
+            url: Arc::new(url.into()),
             parameters: Arc::new(parameters),
             client: HttpClient::new(),
             token: None,
@@ -267,14 +264,11 @@ impl Client {
                 }
             }
             QueryType::WriteQuery(precision) => {
-                let url = &format!("{}write", &self.url);
+                let url = &format!("{}/write", &self.url);
                 let mut parameters = self.parameters.as_ref().clone();
                 parameters.insert("precision", precision);
 
-                let body = query.get();
-                println!("body: {}", body);
-
-                self.client.post(url).body(body).query(&parameters)
+                self.client.post(url).body(query.get()).query(&parameters)
             }
         };
 
@@ -283,10 +277,8 @@ impl Client {
             error: err.to_string(),
         })?;
 
-        let res = self.auth_if_needed(request_builder);
-        println!("res: {:#?}", res);
-
-        let res = res
+        let res = self
+            .auth_if_needed(request_builder)
             .send()
             .map_err(|err| Error::ConnectionError {
                 error: err.to_string(),

From 9ab3e2bc80adebb24a77f7ffbdf77cf581944405 Mon Sep 17 00:00:00 2001
From: Sammy Harris <sammy@stegabob.com>
Date: Wed, 14 Feb 2024 12:10:10 -0600
Subject: [PATCH 16/16] remove vis changes

---
 influxdb/tests/integration_tests_v2.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/influxdb/tests/integration_tests_v2.rs b/influxdb/tests/integration_tests_v2.rs
index 9506490..0beca5d 100644
--- a/influxdb/tests/integration_tests_v2.rs
+++ b/influxdb/tests/integration_tests_v2.rs
@@ -1,7 +1,7 @@
 extern crate influxdb;
 
 #[path = "./utilities.rs"]
-pub mod utilities;
+mod utilities;
 use utilities::{assert_result_err, assert_result_ok, run_test};
 
 use influxdb::InfluxDbWriteable;
@@ -12,7 +12,7 @@ use influxdb::{Client, Error, ReadQuery, Timestamp};
 /// This test case tests the Authentication
 #[async_std::test]
 #[cfg(not(tarpaulin))]
-pub async fn test_authed_write_and_read() {
+async fn test_authed_write_and_read() {
     run_test(
         || async move {
             let client = Client::new("http://127.0.0.1:2086", "mydb").with_token("admintoken");