Merge pull request #91 from connorsmith256/feat/add-registry-type

add registryType as required field to RegistryCredential
wasmCloud · Sep 21, 2022 · f24afb0 · f24afb0
2 parents 9924a4c + 202a036
commit f24afb0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/configservice/config-service.smithy b/configservice/config-service.smithy
@@ -65,5 +65,9 @@ structure RegistryCredential {
     token: String,
     /// If supplied, username and password will be used for HTTP Basic authentication
     username: String,
-    password: String
+    @sensitive
+    password: String,
+    /// The type of the registry (either "oci" or "bindle")
+    @required
+    registryType: String
 }
diff --git a/lattice-control/lattice-control-interface.smithy b/lattice-control/lattice-control-interface.smithy
@@ -684,6 +684,10 @@ structure RegistryCredential {
     token: String,
     /// If supplied, username and password will be used for HTTP Basic authentication
     username: String,
-    password: String
+    @sensitive
+    password: String,
+    /// The type of the registry (either "oci" or "bindle")
+    @required
+    registryType: String
 }
 
diff --git a/lattice-control/rust/Cargo.toml b/lattice-control/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasmcloud-interface-lattice-control"
-version = "0.14.1"
+version = "0.15.0"
 edition = "2021"
 homepage = "https://wasmcloud.dev"
 repository = "https://github.com/wasmCloud/interfaces"

diff --git a/lattice-control/rust/src/control.rs b/lattice-control/rust/src/control.rs
@@ -2573,6 +2573,10 @@ pub fn decode_provider_descriptions(
 pub struct RegistryCredential {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub password: Option<String>,
+    /// The type of the registry (either "oci" or "bindle")
+    #[serde(rename = "registryType")]
+    #[serde(default)]
+    pub registry_type: String,
     /// If supplied, token authentication will be used for the registry
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub token: Option<String>,
@@ -2591,13 +2595,15 @@ pub fn encode_registry_credential<W: wasmbus_rpc::cbor::Write>(
 where
     <W as wasmbus_rpc::cbor::Write>::Error: std::fmt::Display,
 {
-    e.map(3)?;
+    e.map(4)?;
     if let Some(val) = val.password.as_ref() {
         e.str("password")?;
         e.str(val)?;
     } else {
         e.null()?;
     }
+    e.str("registryType")?;
+    e.str(&val.registry_type)?;
     if let Some(val) = val.token.as_ref() {
         e.str("token")?;
         e.str(val)?;
@@ -2620,6 +2626,7 @@ pub fn decode_registry_credential(
 ) -> Result<RegistryCredential, RpcError> {
     let __result = {
         let mut password: Option<Option<String>> = Some(None);
+        let mut registry_type: Option<String> = None;
         let mut token: Option<Option<String>> = Some(None);
         let mut username: Option<Option<String>> = Some(None);
 
@@ -2644,15 +2651,16 @@ pub fn decode_registry_credential(
                             Some(Some(d.str()?.to_string()))
                         }
                     }
-                    1 => {
+                    1 => registry_type = Some(d.str()?.to_string()),
+                    2 => {
                         token = if wasmbus_rpc::cbor::Type::Null == d.datatype()? {
                             d.skip()?;
                             Some(None)
                         } else {
                             Some(Some(d.str()?.to_string()))
                         }
                     }
-                    2 => {
+                    3 => {
                         username = if wasmbus_rpc::cbor::Type::Null == d.datatype()? {
                             d.skip()?;
                             Some(None)
@@ -2676,6 +2684,7 @@ pub fn decode_registry_credential(
                             Some(Some(d.str()?.to_string()))
                         }
                     }
+                    "registryType" => registry_type = Some(d.str()?.to_string()),
                     "token" => {
                         token = if wasmbus_rpc::cbor::Type::Null == d.datatype()? {
                             d.skip()?;
@@ -2698,6 +2707,14 @@ pub fn decode_registry_credential(
         }
         RegistryCredential {
             password: password.unwrap(),
+
+            registry_type: if let Some(__x) = registry_type {
+                __x
+            } else {
+                return Err(RpcError::Deser(
+                    "missing field RegistryCredential.registry_type (#1)".to_string(),
+                ));
+            },
             token: token.unwrap(),
             username: username.unwrap(),
         }