Merge pull request #49 from ThinkParQ/rb/pin-rust-deps

Fix rust deps to 0.13, update protoc-rs to 0.5.0

Author: rustybee42

.github/workflows/checks.yml

@@ -31,7 +31,6 @@ jobs:
       - name: Install tools
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          git config --global url."https://${{ secrets.CI_PROTOBUF_ACCESS }}@github.com/thinkparq/protoc-rs".insteadOf https://github.com/thinkparq/protoc-rs
           make install-tools
       - run: echo "${HOME}/.local/bin" >> $GITHUB_PATH
       - name: Check diff

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "protobuf"
-version = "0.1.0"
+version = "0.0.0"
 edition = "2021"
 
 authors = ["ThinkparQ Development Team <development@thinkparq.com>"]
@@ -10,9 +10,11 @@ homepage = "https://github.com/thinkparq/protobuf"
 publish = false
 
 [dependencies]
-tonic = "~0"
-prost = "~0"
-prost-types = "~0"
+# The version requirements of these must match the version requirement of protoc-rs used to
+# generate the code
+tonic = "0.13"
+prost = "0.13"
+prost-types = "0.13"
 
 [lib]
 path = "rust/lib.rs"

Makefile

@@ -23,7 +23,7 @@ protos: check-tools
 		--go-grpc_out=$(GO_OUT_DIR) \
 		--cpp_out=$(CPP_OUT_DIR) \
 		$(SRC_DIR)/*.proto
-	protoc-rs compile -I $(SRC_DIR) --out=$(RUST_OUT_DIR) $(SRC_DIR)/*.proto
+	protoc-rs -I $(SRC_DIR) --out=$(RUST_OUT_DIR) $(SRC_DIR)/*.proto
 
 
 # Test targets: 
@@ -57,7 +57,7 @@ clean:
 PROTOC_VERSION := 29.2
 PROTOC_GEN_GO_VERSION := 1.36.2
 PROTOC_GEN_GO_GRPC_VERSION := 1.5.1
-PROTOC_RS_VERSION := 0.3.0
+PROTOC_RS_VERSION := 0.5.0
 
 # Checks the versions of the installed tools, making sure they are what we expect
 .PHONY: check-tools

rust/beegfs.rs

@@ -2,8 +2,7 @@
 /// The "legacy" BeeGFS numeric Id-NodeType combination that can be used to identify an entity like
 /// a node or target. Because each entity type has its own id space (meaning a combination is not
 /// globally unique), the entity type must be known in addition to uniquely identify an entity.
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
 pub struct LegacyId {
     /// BeeGFS numeric id.
     /// Required, 0 is invalid.
@@ -23,7 +22,6 @@ pub struct LegacyId {
 /// 2) In a response message (from the management), _all_ fields should be set. The request processor
 /// should have all info about an entity available. If that isn't the case, leaving fields empty is
 /// allowed.
-#[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EntityIdSet {
     /// The global, unique entity id. Identifies an entity from all types without any additional
@@ -59,11 +57,11 @@ impl EntityType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            EntityType::Unspecified => "ENTITY_TYPE_UNSPECIFIED",
-            EntityType::Node => "NODE",
-            EntityType::Target => "TARGET",
-            EntityType::BuddyGroup => "BUDDY_GROUP",
-            EntityType::Pool => "POOL",
+            Self::Unspecified => "ENTITY_TYPE_UNSPECIFIED",
+            Self::Node => "NODE",
+            Self::Target => "TARGET",
+            Self::BuddyGroup => "BUDDY_GROUP",
+            Self::Pool => "POOL",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -94,11 +92,11 @@ impl NodeType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            NodeType::Unspecified => "NODE_TYPE_UNSPECIFIED",
-            NodeType::Client => "CLIENT",
-            NodeType::Meta => "META",
-            NodeType::Storage => "STORAGE",
-            NodeType::Management => "MANAGEMENT",
+            Self::Unspecified => "NODE_TYPE_UNSPECIFIED",
+            Self::Client => "CLIENT",
+            Self::Meta => "META",
+            Self::Storage => "STORAGE",
+            Self::Management => "MANAGEMENT",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -128,10 +126,10 @@ impl ReachabilityState {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            ReachabilityState::Unspecified => "REACHABILITY_STATE_UNSPECIFIED",
-            ReachabilityState::Online => "ONLINE",
-            ReachabilityState::Poffline => "POFFLINE",
-            ReachabilityState::Offline => "OFFLINE",
+            Self::Unspecified => "REACHABILITY_STATE_UNSPECIFIED",
+            Self::Online => "ONLINE",
+            Self::Poffline => "POFFLINE",
+            Self::Offline => "OFFLINE",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -160,10 +158,10 @@ impl ConsistencyState {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            ConsistencyState::Unspecified => "CONSISTENCY_STATE_UNSPECIFIED",
-            ConsistencyState::Good => "GOOD",
-            ConsistencyState::NeedsResync => "NEEDS_RESYNC",
-            ConsistencyState::Bad => "BAD",
+            Self::Unspecified => "CONSISTENCY_STATE_UNSPECIFIED",
+            Self::Good => "GOOD",
+            Self::NeedsResync => "NEEDS_RESYNC",
+            Self::Bad => "BAD",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -192,10 +190,10 @@ impl CapacityPool {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            CapacityPool::Unspecified => "CAPACITY_POOL_UNSPECIFIED",
-            CapacityPool::Normal => "NORMAL",
-            CapacityPool::Low => "LOW",
-            CapacityPool::Emergency => "EMERGENCY",
+            Self::Unspecified => "CAPACITY_POOL_UNSPECIFIED",
+            Self::Normal => "NORMAL",
+            Self::Low => "LOW",
+            Self::Emergency => "EMERGENCY",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -223,9 +221,9 @@ impl NicType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            NicType::Unspecified => "NIC_TYPE_UNSPECIFIED",
-            NicType::Ethernet => "ETHERNET",
-            NicType::Rdma => "RDMA",
+            Self::Unspecified => "NIC_TYPE_UNSPECIFIED",
+            Self::Ethernet => "ETHERNET",
+            Self::Rdma => "RDMA",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -252,9 +250,9 @@ impl QuotaIdType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            QuotaIdType::Unspecified => "QUOTA_ID_TYPE_UNSPECIFIED",
-            QuotaIdType::User => "QUOTA_ID_TYPE_USER",
-            QuotaIdType::Group => "QUOTA_ID_TYPE_GROUP",
+            Self::Unspecified => "QUOTA_ID_TYPE_UNSPECIFIED",
+            Self::User => "QUOTA_ID_TYPE_USER",
+            Self::Group => "QUOTA_ID_TYPE_GROUP",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -281,9 +279,9 @@ impl QuotaType {
     /// (if the ProtoBuf definition does not change) and safe for programmatic use.
     pub fn as_str_name(&self) -> &'static str {
         match self {
-            QuotaType::Unspecified => "QUOTA_TYPE_UNSPECIFIED",
-            QuotaType::Space => "QUOTA_TYPE_SPACE",
-            QuotaType::Inode => "QUOTA_TYPE_INODE",
+            Self::Unspecified => "QUOTA_TYPE_UNSPECIFIED",
+            Self::Space => "QUOTA_TYPE_SPACE",
+            Self::Inode => "QUOTA_TYPE_INODE",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.