regenerate cargo deps

diff --git a/Cargo.lock b/Cargo.lock
index e8b87c7e95fe17e8b9c7ff203162fb1b8d907f77..50379dfea8258ab0375aac052cadf8167ebc5b75 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -313,6 +313,16 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -2176,6 +2186,7 @@ name = "webhook"
 version = "0.1.0"
 dependencies = [
  "common",
+ "ctor",
  "hex",
  "hyper",
  "lazy_static",

diff --git a/Cargo.toml b/Cargo.toml
index 87ebe395785134449f027c6efc82cfb0bf91eaff..0a828447ed144bca9002d4ea2874193398bd0f8e 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,7 +51,3 @@ compile_data_attr = "glob([\"*/**\"])"
 additional_build_file = "bazel/patch/BUILD_script_patch"\r
 gen_buildrs = false\r
 additional_deps = [":libsodium_sys_build_script"]\r
-\r
-\r
-[package.metadata.raze.crates.value-bag.'*']\r
-gen_buildrs = false
\ No newline at end of file

diff --git a/cargo/crates.bzl b/cargo/crates.bzl
index b0def28682c7bf46693313d1c77e3169d95210a7..78ffdafc663334394cd341d3a0792a34e5f46f49 100644 (file)
--- a/cargo/crates.bzl
+++ b/cargo/crates.bzl
@@ -23,6 +23,7 @@ _DEPENDENCIES = {
     },
     "common/rust": {
         "config": "@raze__config__0_11_0//:config",
+        "enumflags2": "@raze__enumflags2__0_7_1//:enumflags2",
         "hyper": "@raze__hyper__0_14_12//:hyper",
         "log": "@raze__log__0_4_14//:log",
         "nats": "@raze__nats__0_15_2//:nats",
@@ -69,8 +70,10 @@ _DEPENDENCIES = {
 # EXPERIMENTAL -- MAY CHANGE AT ANY TIME: A mapping of package names to a set of proc_macro dependencies for the Rust targets of that package.
 _PROC_MACRO_DEPENDENCIES = {
     "webhook": {
+        "ctor": "@raze__ctor__0_1_21//:ctor",
     },
     "common/rust": {
+        "serde_repr": "@raze__serde_repr__0_1_7//:serde_repr",
     },
     "gateway": {
         "num-derive": "@raze__num_derive__0_3_3//:num_derive",
@@ -581,6 +584,16 @@ def raze_fetch_remote_crates():
         build_file = Label("//cargo/remote:BUILD.crypto-mac-0.10.1.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "raze__ctor__0_1_21",
+        url = "https://crates.io/api/v1/crates/ctor/0.1.21/download",
+        type = "tar.gz",
+        sha256 = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa",
+        strip_prefix = "ctor-0.1.21",
+        build_file = Label("//cargo/remote:BUILD.ctor-0.1.21.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "raze__curve25519_dalek__3_2_0",

diff --git a/cargo/remote/BUILD.ctor-0.1.21.bazel b/cargo/remote/BUILD.ctor-0.1.21.bazel
new file mode 100644 (file)
index 0000000..9aac478
--- /dev/null
+++ b/cargo/remote/BUILD.ctor-0.1.21.bazel
@@ -0,0 +1,57 @@
+"""
+@generated
+cargo-raze crate build file.
+
+DO NOT EDIT! Replaced on runs of cargo-raze
+"""
+
+# buildifier: disable=load
+load("@bazel_skylib//lib:selects.bzl", "selects")
+
+# buildifier: disable=load
+load(
+    "@rules_rust//rust:rust.bzl",
+    "rust_binary",
+    "rust_library",
+    "rust_test",
+)
+
+package(default_visibility = [
+    # Public for visibility by "@raze__crate__version//" targets.
+    #
+    # Prefer access through "//cargo", which limits external
+    # visibility to explicit Cargo.toml dependencies.
+    "//visibility:public",
+])
+
+licenses([
+    "notice",  # Apache-2.0 from expression "Apache-2.0 OR MIT"
+])
+
+# Generated Targets
+
+# Unsupported target "example" with type "example" omitted
+
+rust_library(
+    name = "ctor",
+    srcs = glob(["**/*.rs"]),
+    crate_features = [
+    ],
+    crate_root = "src/lib.rs",
+    crate_type = "proc-macro",
+    data = [],
+    edition = "2018",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+    version = "0.1.21",
+    # buildifier: leave-alone
+    deps = [
+        "@raze__quote__1_0_9//:quote",
+        "@raze__syn__1_0_76//:syn",
+    ],
+)

diff --git a/common/rust/BUILD.bazel b/common/rust/BUILD.bazel
index 0fbd9b2d15041dcf43f73abad09318ac01f5dc2f..a1bbb4e90576f678ed39e045fb718011ddae40eb 100644 (file)
--- a/common/rust/BUILD.bazel
+++ b/common/rust/BUILD.bazel
@@ -1,9 +1,10 @@
 load("@rules_rust//rust:defs.bzl", "rust_library")
-load("//cargo:crates.bzl", "all_crate_deps")
+load("//cargo:crates.bzl", "all_crate_deps", "crate_deps")
 
 rust_library(
     name = "common",
     srcs = glob(["src/**"]),
+    proc_macro_deps = crate_deps(["serde_repr"]),
     visibility = ["//visibility:public"],
     deps = all_crate_deps(),
 )

diff --git a/common/rust/cargo/BUILD.bazel b/common/rust/cargo/BUILD.bazel
index e0e6aa6893a9c7a6aa035149ba3259985fd2bed2..1050df2012c023c5a50e1672200c0aeb6fc9ab93 100644 (file)
--- a/common/rust/cargo/BUILD.bazel
+++ b/common/rust/cargo/BUILD.bazel
@@ -21,6 +21,15 @@ alias(
     ],
 )
 
+alias(
+    name = "enumflags2",
+    actual = "@raze__enumflags2__0_7_1//:enumflags2",
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+)
+
 alias(
     name = "hyper",
     actual = "@raze__hyper__0_14_12//:hyper",
@@ -84,6 +93,15 @@ alias(
     ],
 )
 
+alias(
+    name = "serde_repr",
+    actual = "@raze__serde_repr__0_1_7//:serde_repr",
+    tags = [
+        "cargo-raze",
+        "manual",
+    ],
+)
+
 alias(
     name = "testcontainers",
     actual = "@raze__testcontainers__0_12_0//:testcontainers",

diff --git a/common/rust/src/discord_models/slash_commands.rs b/common/rust/src/discord_models/slash_commands.rs
index ae0f190b94bd755bddce8d191dc344e2404a981e..181a622656bd5b7f332a0b71f32a15984f74c742 100644 (file)
--- a/common/rust/src/discord_models/slash_commands.rs
+++ b/common/rust/src/discord_models/slash_commands.rs
@@ -93,7 +93,7 @@ pub struct Interaction {
     #[serde(rename = "type")]
     pub type_: InteractionRequestType,
     /// i am not sure about this one https://canary.discord.com/developers/docs/interactions/slash-commands#interaction-object-application-command-interaction-data
-    pub data: ApplicationCommand,
+    pub data: Option<ApplicationCommand>,
     pub guild_id: Option<String>,
     pub channel_id: Option<String>,
     pub member: Option<GuildMember>,

diff --git a/common/rust/src/lib.rs b/common/rust/src/lib.rs
index 5418d0a0b5b6f4cb13f0bef01a014fcfedcd37fd..fa2c6fc65433fdda711c7f878ff9445374a721e5 100644 (file)
--- a/common/rust/src/lib.rs
+++ b/common/rust/src/lib.rs
@@ -1,18 +1,18 @@
+pub use ::config as config_crate;
+pub use ::nats as nats_crate;
+pub use ::redis as redis_crate;
+pub use log;
+pub use prometheus;
+pub use serde;
+pub use testcontainers;
+
 /// This crate is all the utilities shared by the nova rust projects
-/// It includes loging, config and protocols.
+/// It includes logging, config and protocols.
 pub mod config;
 pub mod discord_models;
 pub mod error;
 pub mod monitoring;
 pub mod nats;
 pub mod payloads;
-pub mod error;
 pub mod redis;
 
-pub use log as log;
-pub use serde as serde;
-pub use ::config as config_crate;
-pub use prometheus as prometheus;
-pub use ::nats as nats_crate;
-pub use testcontainers as testcontainers;
-pub use ::redis as redis_crate;

diff --git a/common/rust/src/payloads.rs b/common/rust/src/payloads.rs
index d8d06f2697c33be34c9af099de1907339dc73878..fd7717d3407c3a3e74d827f19d99ad6ed5863f51 100644 (file)
--- a/common/rust/src/payloads.rs
+++ b/common/rust/src/payloads.rs
@@ -1,6 +1,7 @@
-use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
 
+use serde::{Deserialize, Serialize};
+
 use crate::discord_models::{
     application::Application,
     channel::{Channel, Message, ThreadMember},
@@ -23,7 +24,7 @@ pub struct CachePayload {
     pub data: CacheData,
 }
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Tracing {
     pub node_id: String,
     pub span: Option<String>,

diff --git a/webhook/src/handler/tests/handler_integration.rs b/webhook/src/handler/tests/handler_integration.rs
index 3ee0a0938b415020f275e81ceb77bc56fd0e66c2..6031428546086ebc1aff269495a04399d21974d7 100644 (file)
--- a/webhook/src/handler/tests/handler_integration.rs
+++ b/webhook/src/handler/tests/handler_integration.rs
@@ -1,23 +1,26 @@
 use std::time::Duration;
-use crate::{
-    config::Config,
-    handler::tests::utils::{generate_keypair, sign_message},
-    start,
-};
+
+use ctor;
+use hyper::{Body, Method, Request, StatusCode};
+use lazy_static::lazy_static;
+use serde_json::json;
+
 use common::{
     config::test_init,
     nats_crate::Connection,
-    testcontainers::{images::generic::WaitFor, Image},
+    testcontainers::{Image, images::generic::WaitFor},
 };
 use common::{
     config::Settings,
     log::info,
-    testcontainers::{clients::Cli, images::generic::GenericImage, Container, Docker},
+    testcontainers::{clients::Cli, Container, Docker, images::generic::GenericImage},
+};
+
+use crate::{
+    config::Config,
+    handler::tests::utils::{generate_keypair, sign_message},
+    start,
 };
-use hyper::{Body, Method, Request, StatusCode};
-use lazy_static::lazy_static;
-use serde_json::json;
-use ctor;
 
 const fn nats_image<'a>() -> &'a str {
     #[cfg(all(unix, target_arch = "x86_64"))]