-
Notifications
You must be signed in to change notification settings - Fork 741
feat(service/cloudflare_kv): support cloudflare KV #3348
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
6ea0bc6
feat(service/Cloudflare kv):support cloudflare KV
my-vegetable-has-exploded ce42c98
fix: fmt
my-vegetable-has-exploded a031aaf
fix ..
my-vegetable-has-exploded 7f6e89b
fix clippy
my-vegetable-has-exploded 01586b7
fix licenses
my-vegetable-has-exploded c71606b
fix: comment unused field
my-vegetable-has-exploded 4cc0698
fix: remove unused field
my-vegetable-has-exploded 0597416
fmt
my-vegetable-has-exploded File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,362 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use std::collections::HashMap; | ||
| use std::fmt::Debug; | ||
| use std::fmt::Formatter; | ||
|
|
||
| use async_trait::async_trait; | ||
| use http::header; | ||
| use http::Request; | ||
| use http::StatusCode; | ||
| use serde::Deserialize; | ||
|
|
||
| use super::error::parse_error; | ||
| use crate::raw::adapters::kv; | ||
| use crate::raw::*; | ||
| use crate::ErrorKind; | ||
| use crate::*; | ||
|
|
||
| #[doc = include_str!("docs.md")] | ||
| #[derive(Default)] | ||
| pub struct CloudflareKvBuilder { | ||
| /// The token used to authenticate with CloudFlare. | ||
| token: Option<String>, | ||
| /// The account ID used to authenticate with CloudFlare. Used as URI path parameter. | ||
| account_id: Option<String>, | ||
| /// The namespace ID. Used as URI path parameter. | ||
| namespace_id: Option<String>, | ||
|
|
||
| /// The HTTP client used to communicate with CloudFlare. | ||
| http_client: Option<HttpClient>, | ||
| /// Root within this backend. | ||
| root: Option<String>, | ||
| } | ||
|
|
||
| impl Debug for CloudflareKvBuilder { | ||
| fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { | ||
| f.debug_struct("CloudFlareKvBuilder") | ||
| .field("account_id", &self.account_id) | ||
| .field("namespace_id", &self.namespace_id) | ||
| .field("root", &self.root) | ||
| .finish() | ||
| } | ||
| } | ||
|
|
||
| impl CloudflareKvBuilder { | ||
| /// Set the token used to authenticate with CloudFlare. | ||
| pub fn token(&mut self, token: &str) -> &mut Self { | ||
| if !token.is_empty() { | ||
| self.token = Some(token.to_string()) | ||
| } | ||
| self | ||
| } | ||
|
|
||
| /// Set the account ID used to authenticate with CloudFlare. | ||
| pub fn account_id(&mut self, account_id: &str) -> &mut Self { | ||
| if !account_id.is_empty() { | ||
| self.account_id = Some(account_id.to_string()) | ||
| } | ||
| self | ||
| } | ||
|
|
||
| /// Set the namespace ID. | ||
| pub fn namespace_id(&mut self, namespace_id: &str) -> &mut Self { | ||
| if !namespace_id.is_empty() { | ||
| self.namespace_id = Some(namespace_id.to_string()) | ||
| } | ||
| self | ||
| } | ||
|
|
||
| /// Set the root within this backend. | ||
| pub fn root(&mut self, root: &str) -> &mut Self { | ||
| if !root.is_empty() { | ||
| self.root = Some(root.to_string()) | ||
| } | ||
| self | ||
| } | ||
| } | ||
|
|
||
| impl Builder for CloudflareKvBuilder { | ||
| const SCHEME: Scheme = Scheme::CloudflareKv; | ||
|
|
||
| type Accessor = CloudflareKvBackend; | ||
|
|
||
| fn from_map(map: HashMap<String, String>) -> Self { | ||
| let mut builder = Self::default(); | ||
| map.get("token").map(|v| builder.token(v)); | ||
| map.get("account_id").map(|v| builder.account_id(v)); | ||
| map.get("namespace_id").map(|v| builder.namespace_id(v)); | ||
| map.get("root").map(|v| builder.root(v)); | ||
| builder | ||
| } | ||
|
|
||
| fn build(&mut self) -> Result<Self::Accessor> { | ||
| let authorization = match &self.token { | ||
| Some(token) => format_authorization_by_bearer(token)?, | ||
| None => return Err(Error::new(ErrorKind::ConfigInvalid, "token is required")), | ||
| }; | ||
|
|
||
| let Some(account_id) = self.account_id.clone() else { | ||
| return Err(Error::new( | ||
| ErrorKind::ConfigInvalid, | ||
| "account_id is required", | ||
| )); | ||
| }; | ||
|
|
||
| let Some(namespace_id) = self.namespace_id.clone() else { | ||
| return Err(Error::new( | ||
| ErrorKind::ConfigInvalid, | ||
| "namespace_id is required", | ||
| )); | ||
| }; | ||
|
|
||
| let client = if let Some(client) = self.http_client.take() { | ||
| client | ||
| } else { | ||
| HttpClient::new().map_err(|err| { | ||
| err.with_operation("Builder::build") | ||
| .with_context("service", Scheme::CloudflareKv) | ||
| })? | ||
| }; | ||
|
|
||
| let root = normalize_root( | ||
| self.root | ||
| .clone() | ||
| .unwrap_or_else(|| "/".to_string()) | ||
| .as_str(), | ||
| ); | ||
|
|
||
| let url_prefix = format!( | ||
| r"https://api.cloudflare.com/client/v4/accounts/{}/storage/kv/namespaces/{}", | ||
| account_id, namespace_id | ||
| ); | ||
|
|
||
| Ok(kv::Backend::new(Adapter { | ||
| authorization, | ||
| account_id, | ||
| namespace_id, | ||
| client, | ||
| url_prefix, | ||
| }) | ||
| .with_root(&root)) | ||
| } | ||
| } | ||
|
|
||
| pub type CloudflareKvBackend = kv::Backend<Adapter>; | ||
|
|
||
| #[derive(Clone)] | ||
| pub struct Adapter { | ||
| authorization: String, | ||
| account_id: String, | ||
| namespace_id: String, | ||
| client: HttpClient, | ||
| url_prefix: String, | ||
| } | ||
|
|
||
| impl Debug for Adapter { | ||
| fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { | ||
| f.debug_struct("Adapter") | ||
| .field("account_id", &self.account_id) | ||
| .field("namespace_id", &self.namespace_id) | ||
| .finish() | ||
| } | ||
| } | ||
|
|
||
| impl Adapter { | ||
| fn sign<T>(&self, mut req: Request<T>) -> Result<Request<T>> { | ||
| req.headers_mut() | ||
| .insert(header::AUTHORIZATION, self.authorization.parse().unwrap()); | ||
| Ok(req) | ||
| } | ||
| } | ||
|
|
||
| #[async_trait] | ||
| impl kv::Adapter for Adapter { | ||
| fn metadata(&self) -> kv::Metadata { | ||
| kv::Metadata::new( | ||
| Scheme::CloudflareKv, | ||
| &self.namespace_id, | ||
| Capability { | ||
| read: true, | ||
| write: true, | ||
| list: true, | ||
|
|
||
| ..Default::default() | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| async fn get(&self, path: &str) -> Result<Option<Vec<u8>>> { | ||
| let url = format!("{}/values/{}", self.url_prefix, path); | ||
| let mut req = Request::get(&url); | ||
| req = req.header(header::CONTENT_TYPE, "application/json"); | ||
| let mut req = req | ||
| .body(AsyncBody::Empty) | ||
| .map_err(new_request_build_error)?; | ||
| req = self.sign(req)?; | ||
| let resp = self.client.send(req).await?; | ||
| let status = resp.status(); | ||
| match status { | ||
| StatusCode::OK => { | ||
| let body = resp.into_body().bytes().await?; | ||
| Ok(Some(body.into())) | ||
| } | ||
| _ => Err(parse_error(resp).await?), | ||
| } | ||
| } | ||
|
|
||
| async fn set(&self, path: &str, value: &[u8]) -> Result<()> { | ||
| let url = format!("{}/values/{}", self.url_prefix, path); | ||
| let req = Request::put(&url); | ||
| let multipart = Multipart::new(); | ||
| let multipart = multipart | ||
| .part(FormDataPart::new("metadata").content(serde_json::Value::Null.to_string())) | ||
| .part(FormDataPart::new("value").content(value.to_vec())); | ||
| let mut req = multipart.apply(req)?; | ||
| req = self.sign(req)?; | ||
| let resp = self.client.send(req).await?; | ||
| let status = resp.status(); | ||
| match status { | ||
| StatusCode::OK => Ok(()), | ||
| _ => Err(parse_error(resp).await?), | ||
| } | ||
| } | ||
|
|
||
| async fn delete(&self, path: &str) -> Result<()> { | ||
| let url = format!("{}/values/{}", self.url_prefix, path); | ||
| let mut req = Request::delete(&url); | ||
| req = req.header(header::CONTENT_TYPE, "application/json"); | ||
| let mut req = req | ||
| .body(AsyncBody::Empty) | ||
| .map_err(new_request_build_error)?; | ||
| req = self.sign(req)?; | ||
| let resp = self.client.send(req).await?; | ||
| let status = resp.status(); | ||
| match status { | ||
| StatusCode::OK => Ok(()), | ||
| _ => Err(parse_error(resp).await?), | ||
| } | ||
| } | ||
|
|
||
| async fn scan(&self, path: &str) -> Result<Vec<String>> { | ||
| let mut url = format!("{}/keys", self.url_prefix); | ||
| if !path.is_empty() { | ||
| url = format!("{}?prefix={}", url, path); | ||
| } | ||
| let mut req = Request::get(&url); | ||
| req = req.header(header::CONTENT_TYPE, "application/json"); | ||
| let mut req = req | ||
| .body(AsyncBody::Empty) | ||
| .map_err(new_request_build_error)?; | ||
| req = self.sign(req)?; | ||
| let resp = self.client.send(req).await?; | ||
| let status = resp.status(); | ||
| match status { | ||
| StatusCode::OK => { | ||
| let body = resp.into_body().bytes().await?; | ||
| let response: CfKvScanResponse = serde_json::from_slice(&body).map_err(|e| { | ||
|
Xuanwo marked this conversation as resolved.
|
||
| Error::new( | ||
| crate::ErrorKind::Unexpected, | ||
| &format!("failed to parse error response: {}", e), | ||
| ) | ||
| })?; | ||
| Ok(response.result.into_iter().map(|r| r.name).collect()) | ||
| } | ||
| _ => Err(parse_error(resp).await?), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[derive(Debug, Deserialize)] | ||
| pub(crate) struct CfKvResponse { | ||
| pub(crate) errors: Vec<CfKvError>, | ||
| } | ||
|
|
||
| #[derive(Debug, Deserialize)] | ||
| pub(crate) struct CfKvScanResponse { | ||
| result: Vec<CfKvScanResult>, | ||
| // According to https://developers.cloudflare.com/api/operations/workers-kv-namespace-list-a-namespace'-s-keys, result_info is used to determine if there are more keys to be listed | ||
| // result_info: Option<CfKvResultInfo>, | ||
| } | ||
|
|
||
| #[derive(Debug, Deserialize)] | ||
| struct CfKvScanResult { | ||
| name: String, | ||
| } | ||
|
|
||
| // #[derive(Debug, Deserialize)] | ||
| // struct CfKvResultInfo { | ||
| // count: i64, | ||
| // cursor: String, | ||
| // } | ||
|
|
||
| #[derive(Debug, Deserialize)] | ||
| pub(crate) struct CfKvError { | ||
| pub(crate) code: i32, | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn test_deserialize_scan_json_response() { | ||
| let json_str = r#"{ | ||
| "errors": [], | ||
| "messages": [], | ||
| "result": [ | ||
| { | ||
| "expiration": 1577836800, | ||
| "metadata": { | ||
| "someMetadataKey": "someMetadataValue" | ||
| }, | ||
| "name": "My-Key" | ||
| } | ||
| ], | ||
| "success": true, | ||
| "result_info": { | ||
| "count": 1, | ||
| "cursor": "6Ck1la0VxJ0djhidm1MdX2FyDGxLKVeeHZZmORS_8XeSuhz9SjIJRaSa2lnsF01tQOHrfTGAP3R5X1Kv5iVUuMbNKhWNAXHOl6ePB0TUL8nw" | ||
| } | ||
| }"#; | ||
|
|
||
| let response: CfKvScanResponse = serde_json::from_slice(json_str.as_bytes()).unwrap(); | ||
|
|
||
| assert_eq!(response.result.len(), 1); | ||
| assert_eq!(response.result[0].name, "My-Key"); | ||
| // assert!(response.result_info.is_some()); | ||
| // if let Some(result_info) = response.result_info { | ||
| // assert_eq!(result_info.count, 1); | ||
| // assert_eq!(result_info.cursor, "6Ck1la0VxJ0djhidm1MdX2FyDGxLKVeeHZZmORS_8XeSuhz9SjIJRaSa2lnsF01tQOHrfTGAP3R5X1Kv5iVUuMbNKhWNAXHOl6ePB0TUL8nw"); | ||
| // } | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_deserialize_json_response() { | ||
| let json_str = r#"{ | ||
| "errors": [], | ||
| "messages": [], | ||
| "result": {}, | ||
| "success": true | ||
| }"#; | ||
|
|
||
| let response: CfKvResponse = serde_json::from_slice(json_str.as_bytes()).unwrap(); | ||
|
|
||
| assert_eq!(response.errors.len(), 0); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.