chore: remove ic_oss_cose

Cargo.toml

@@ -6,7 +6,6 @@ members = [
   "src/ic_oss_can",
   "src/ic_oss",
   "src/ic_oss_cli",
-  "src/ic_oss_cose",
   "examples/ai_canister",
 ]
 resolver = "2"
@@ -18,7 +17,7 @@ strip = true
 opt-level = 's'
 
 [workspace.package]
-version = "0.7.1"
+version = "0.7.2"
 edition = "2021"
 repository = "https://github.com/ldclabs/ic-oss"
 keywords = ["file", "storage", "oss", "s3", "icp"]

src/ic_oss_bucket/Cargo.toml

@@ -37,4 +37,3 @@ getrandom = { workspace = true }
 lazy_static = "1.4"
 hyperx = { git = "https://github.com/ldclabs/hyperx", rev = "4b9bd373b8c4d29a32e59912bf598ba69273c032" }
 ic-oss-types = { path = "../ic_oss_types", version = "0.7" }
-ic-oss-cose = { path = "../ic_oss_cose", version = "0.7" }

src/ic_oss_bucket/src/store.rs

@@ -4,8 +4,8 @@ use ic_http_certification::{
     cel::{create_cel_expr, DefaultCelBuilder},
     HttpCertification, HttpCertificationPath, HttpCertificationTree, HttpCertificationTreeEntry,
 };
-use ic_oss_cose::{Token, BUCKET_TOKEN_AAD};
 use ic_oss_types::{
+    cose::{Token, BUCKET_TOKEN_AAD},
     file::{
         FileChunk, FileInfo, UpdateFileInput, CHUNK_SIZE, MAX_FILE_SIZE, MAX_FILE_SIZE_PER_CALL,
     },

src/ic_oss_cluster/Cargo.toml

@@ -28,4 +28,3 @@ serde = { workspace = true }
 serde_bytes = { workspace = true }
 getrandom = { workspace = true }
 ic-oss-types = { path = "../ic_oss_types", version = "0.7" }
-ic-oss-cose = { path = "../ic_oss_cose", version = "0.7" }

src/ic_oss_cluster/src/api_admin.rs

@@ -1,12 +1,12 @@
 use candid::Principal;
 use ic_cdk::api::management_canister::main::*;
-use ic_oss_cose::{
-    cose_sign1, coset::CborSerializable, sha256, Token as CoseToken, BUCKET_TOKEN_AAD,
-    CLUSTER_TOKEN_AAD, ES256K,
-};
 use ic_oss_types::{
     bucket::Token,
     cluster::{AddWasmInput, DeployWasmInput},
+    cose::{
+        cose_sign1, coset::CborSerializable, sha256, Token as CoseToken, BUCKET_TOKEN_AAD,
+        CLUSTER_TOKEN_AAD, ES256K,
+    },
     format_error,
     permission::Policies,
 };

src/ic_oss_cluster/src/api_auth.rs

@@ -1,5 +1,5 @@
 use candid::Principal;
-use ic_oss_cose::{
+use ic_oss_types::cose::{
     cose_sign1, coset::CborSerializable, sha256, Token, BUCKET_TOKEN_AAD, CLUSTER_TOKEN_AAD, ES256K,
 };
 use serde_bytes::ByteBuf;

src/ic_oss_cluster/src/store.rs

@@ -1,8 +1,8 @@
 use candid::Principal;
 use ciborium::{from_reader, into_writer};
-use ic_oss_cose::{sha256, CLUSTER_TOKEN_AAD};
 use ic_oss_types::{
     cluster::{AddWasmInput, BucketDeploymentInfo, ClusterInfo},
+    cose::{sha256, CLUSTER_TOKEN_AAD},
     permission::Policies,
 };
 use ic_stable_structures::{

src/ic_oss_types/Cargo.toml

@@ -23,3 +23,4 @@ icrc-ledger-types = { workspace = true }
 k256 = { workspace = true }
 ed25519-dalek = { workspace = true }
 sha2 = { workspace = true }
+coset = "0.3.8"

src/ic_oss_cose/src/lib.rs → src/ic_oss_types/src/cose.rs

@@ -4,7 +4,6 @@ use coset::{
     iana, Algorithm, CborSerializable, CoseSign1, CoseSign1Builder, HeaderBuilder,
 };
 use ed25519_dalek::{Signature, VerifyingKey};
-use ic_oss_types::bucket;
 use k256::{ecdsa, ecdsa::signature::hazmat::PrehashVerifier};
 use num_traits::ToPrimitive;
 use serde::{Deserialize, Serialize};
@@ -14,6 +13,8 @@ use sha2::Digest;
 pub use coset;
 pub use iana::Algorithm::{EdDSA, ES256K};
 
+use crate::bucket;
+
 const CLOCK_SKEW: i64 = 5 * 60; // 5 minutes
 const ALG_ED25519: Algorithm = Algorithm::Assigned(EdDSA);
 const ALG_SECP256K1: Algorithm = Algorithm::Assigned(ES256K);
@@ -197,8 +198,8 @@ pub fn sha256(data: &[u8]) -> [u8; 32] {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::permission::{Operation, Permission, Policies, Policy, Resource, Resources};
     use ed25519_dalek::Signer;
-    use ic_oss_types::permission::{Operation, Permission, Policies, Policy, Resource, Resources};
 
     #[test]
     fn test_ed25519_token() {

src/ic_oss_types/src/lib.rs

@@ -9,6 +9,7 @@ use std::collections::BTreeMap;
 
 pub mod bucket;
 pub mod cluster;
+pub mod cose;
 pub mod file;
 pub mod folder;
 pub mod permission;