Merge topic 'update-deps'

dc1aae9 cargo: update `reqwest` and `http`
bf91e1a cargo: update mindeps floor dependencies
de8b473 cargo: update `graphql_client`
801dcbc cargo: update `derive_builder`
bbc6a06 cargo: update `base64`
8de507a cargo: update `itertools`

Acked-by: Kitware Robot <[email protected]>
Tested-by: buildbot <[email protected]>
Merge-request: !462

Author: mathstuf

.gitlab-ci.yml

@@ -98,13 +98,7 @@ clippy-features:build:
 .cargo_audit_ignore:
     variables:
         # Ignored advisories
-        #
-        # Use-after-free due to a lifetime error in `Vec::into_iter()`
-        # https://rustsec.org/advisories/RUSTSEC-2022-0078
-        #
-        # Ascii allows out-of-bounds array indexing in safe code (mindeps)
-        # https://rustsec.org/advisories/RUSTSEC-2023-0015
-        CARGO_AUDIT_ARGS: --ignore RUSTSEC-2022-0078 --ignore RUSTSEC-2023-0015
+        CARGO_AUDIT_ARGS: ""
 
 semver-checks:prep:
     extends:

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.1610.1 (unreleased)
+
+## Breaking changes
+
+  * GraphQL support has been updated to use `graphql_client` 0.14.
+  * The `http` crate has been updated to 1.x.
+
 # v0.1610.0
 
 ## Additions

Cargo.toml

@@ -28,27 +28,27 @@ client_api = [
 ]
 client_der = ["reqwest/native-tls", "client_api"]
 client_pem = ["reqwest/rustls-tls", "client_api"]
-minimal_versions = ["void", "openssl", "tempfile", "h2", "memoffset", "mio", "rustls", "rustls-webpki"]
+minimal_versions = ["void", "openssl", "tempfile", "mio", "rustls", "bumpalo", "combine"]
 # This feature is here to aid with `semver-checks` by hiding the known-unstable
 # parts of the crate.
 _nohooks = []
 
 [dependencies]
-base64 = "~0.13"
+base64 = "~0.22"
 cron = { version = "~0.12", optional = true }
-derive_builder = "~0.11.2"
-itertools = { version = "~0.10", optional = true }
+derive_builder = "~0.20"
+itertools = { version = "~0.12", optional = true }
 log = "~0.4.6"
 percent-encoding = { version = "^2.0", optional = true }
-reqwest = { version = "~0.11.19", features = ["blocking", "json"], default-features = false, optional = true }
+reqwest = { version = "~0.12", features = ["blocking", "json"], default-features = false, optional = true }
 thiserror = { version = "^1.0.2", optional = true }
 async-trait = { version = "~0.1.9", optional = true }
 futures-util = { version = "0.3.14", default-features = false, optional = true }
 
 bytes = "^1.0"
 chrono = { version = "~0.4.23", default-features = false, features = ["clock", "serde"] }
-graphql_client = { version = "~0.11", optional = true }
-http = "~0.2.5"
+graphql_client = { version = "~0.14", optional = true }
+http = "^1"
 serde = { version = "~1.0.103", features = ["derive"] }
 serde_json = "^1.0.70"
 serde_urlencoded = "~0.7"
@@ -64,17 +64,15 @@ void = { version = "^1.0.1", optional = true }
 openssl = { version = "~0.10.60", optional = true }
 # Required to avoid `remove_dir_all` dependency.
 tempfile = { version = "^3.4.0", optional = true }
-# Required to avoid https://rustsec.org/advisories/RUSTSEC-2024-0332
-h2 = { version = "0.3.26", optional = true }
-# Required to avoid https://rustsec.org/advisories/RUSTSEC-2023-0045
-memoffset = { version = "0.6.2", optional = true }
 # Required to avoid https://rustsec.org/advisories/RUSTSEC-2024-0019
 mio = { version = "0.8.11", optional = true }
-# Required to avoid https://rustsec.org/advisories/RUSTSEC-2023-0052
-rustls-webpki = { version = "0.101.4", optional = true }
 # Required to avoid https://rustsec.org/advisories/RUSTSEC-2024-0336
-rustls = { version = "0.21.11", optional = true }
+rustls = { version = "0.22.4", optional = true }
+# Required to avoid https://rustsec.org/advisories/RUSTSEC-2022-0078
+bumpalo = { version = "3.11.1", optional = true }
+# Required to avoid https://rustsec.org/advisories/RUSTSEC-2023-0015
+combine = { version = "3.6.2", optional = true }
 
 [dev-dependencies]
-itertools = { version = "~0.10" }
+itertools = { version = "~0.12" }
 tokio = { version = "1.18.5", features = ["macros", "rt-multi-thread"] }

src/api/projects/repository/files/create.rs

@@ -6,6 +6,7 @@
 
 use std::str;
 
+use base64::Engine;
 use derive_builder::Builder;
 use log::warn;
 
@@ -52,7 +53,10 @@ impl Encoding {
                     panic!("attempting to encode non-utf8 content using text!");
                 }
             },
-            Encoding::Base64 => base64::encode(content).into(),
+            Encoding::Base64 => {
+                let engine = base64::engine::general_purpose::STANDARD;
+                engine.encode(content).into()
+            },
         }
     }