Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(wit): update bindings to types 0.2.0 #363

Merged
merged 2 commits into from
Aug 5, 2024
Merged

fix(wit): update bindings to types 0.2.0 #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd09414
fix(wit): update bindings to types 0.2.0
brooksmtownsend Aug 1, 2024
8efa1c9
ci(test): ensure entire workspace builds
brooksmtownsend Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@ jobs:
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
default: true
components: clippy, rustfmt

# Cache: rust
- uses: Swatinem/rust-cache@v2
with:
key: "${{ matrix.os }}-rust-cache"
key: '${{ matrix.os }}-rust-cache'

- name: Check that Wadm JSON Schema is up-to-date
shell: bash
Expand All @@ -45,6 +44,10 @@ jobs:
- name: Start NATS
run: docker run --rm -d --name wadm-test -p 127.0.0.1:4222:4222 nats:${{ matrix.nats_version }} -js

- name: Build
run: |
cargo build --all-features --all-targets --workspace

# Run all tests
- name: Run tests
run: |
Expand Down
151 changes: 122 additions & 29 deletions crates/wadm-types/src/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ use crate::{
ComponentStatus, DeleteResult, GetResult, ModelSummary, PutResult, Status, StatusInfo,
StatusResult, StatusType, TraitStatus, VersionInfo,
},
CapabilityProperties, Component, ComponentProperties, ConfigProperty, LinkProperty, Manifest,
Metadata, Properties, Specification, Spread, SpreadScalerProperty, Trait, TraitProperty,
CapabilityProperties, Component, ComponentProperties, ConfigDefinition, ConfigProperty,
LinkProperty, Manifest, Metadata, Policy, Properties, SecretProperty, SecretSourceProperty,
Specification, Spread, SpreadScalerProperty, TargetConfig, Trait, TraitProperty,
};
use wasmcloud::wadm;

Expand All @@ -16,6 +17,8 @@ wit_bindgen_wrpc::generate!({
],
});

// Trait implementations for converting types in the API module to the generated types

impl From<Manifest> for wadm::types::OamManifest {
fn from(manifest: Manifest) -> Self {
wadm::types::OamManifest {
Expand All @@ -41,6 +44,7 @@ impl From<Specification> for wadm::types::Specification {
fn from(spec: Specification) -> Self {
wadm::types::Specification {
components: spec.components.into_iter().map(|c| c.into()).collect(),
policies: spec.policies.into_iter().map(|c| c.into()).collect(),
}
}
}
Expand All @@ -52,10 +56,17 @@ impl From<Component> for wadm::types::Component {
properties: component.properties.into(),
traits: component
.traits
.unwrap_or_default()
.into_iter()
.map(|t| t.into())
.collect(),
.map(|traits| traits.into_iter().map(|t| t.into()).collect()),
}
}
}

impl From<Policy> for wadm::types::Policy {
fn from(policy: Policy) -> Self {
wadm::types::Policy {
name: policy.name,
properties: policy.properties.into_iter().map(|p| p.into()).collect(),
type_: policy.policy_type,
}
}
}
Expand All @@ -79,6 +90,7 @@ impl From<ComponentProperties> for wadm::types::ComponentProperties {
image: properties.image,
id: properties.id,
config: properties.config.into_iter().map(|c| c.into()).collect(),
secrets: properties.secrets.into_iter().map(|c| c.into()).collect(),
}
}
}
Expand All @@ -89,6 +101,7 @@ impl From<CapabilityProperties> for wadm::types::CapabilityProperties {
image: properties.image,
id: properties.id,
config: properties.config.into_iter().map(|c| c.into()).collect(),
secrets: properties.secrets.into_iter().map(|c| c.into()).collect(),
}
}
}
Expand All @@ -102,6 +115,26 @@ impl From<ConfigProperty> for wadm::types::ConfigProperty {
}
}

impl From<SecretProperty> for wadm::types::SecretProperty {
fn from(property: SecretProperty) -> Self {
wadm::types::SecretProperty {
name: property.name,
properties: property.properties.into(),
}
}
}

impl From<SecretSourceProperty> for wadm::types::SecretSourceProperty {
fn from(property: SecretSourceProperty) -> Self {
wadm::types::SecretSourceProperty {
policy: property.policy,
key: property.key,
field: property.field,
version: property.version,
}
}
}

impl From<Trait> for wadm::types::Trait {
fn from(trait_: Trait) -> Self {
wadm::types::Trait {
Expand All @@ -126,25 +159,35 @@ impl From<TraitProperty> for wadm::types::TraitProperty {
impl From<LinkProperty> for wadm::types::LinkProperty {
fn from(property: LinkProperty) -> Self {
wadm::types::LinkProperty {
target: property.target,
source: property.source.map(|c| c.into()),
target: property.target.into(),
namespace: property.namespace,
package: property.package,
interfaces: property.interfaces,
source_config: property
.source_config
.into_iter()
.map(|c| c.into())
.collect(),
target_config: property
.target_config
.into_iter()
.map(|c| c.into())
.collect(),
name: property.name,
}
}
}

impl From<ConfigDefinition> for wadm::types::ConfigDefinition {
fn from(definition: ConfigDefinition) -> Self {
wadm::types::ConfigDefinition {
config: definition.config.into_iter().map(|c| c.into()).collect(),
secrets: definition.secrets.into_iter().map(|s| s.into()).collect(),
}
}
}

impl From<TargetConfig> for wadm::types::TargetConfig {
fn from(config: TargetConfig) -> Self {
wadm::types::TargetConfig {
name: config.name,
config: config.config.into_iter().map(|c| c.into()).collect(),
secrets: config.secrets.into_iter().map(|s| s.into()).collect(),
}
}
}

impl From<SpreadScalerProperty> for wadm::types::SpreadscalerProperty {
fn from(property: SpreadScalerProperty) -> Self {
wadm::types::SpreadscalerProperty {
Expand Down Expand Up @@ -218,6 +261,8 @@ impl From<StatusType> for wadm::types::StatusType {
}
}

// Trait implementations for converting generated types to the types in the API module

impl From<wadm::types::StatusType> for StatusType {
fn from(status: wadm::types::StatusType) -> Self {
match status {
Expand Down Expand Up @@ -300,6 +345,7 @@ impl From<wadm::types::Specification> for Specification {
fn from(spec: wadm::types::Specification) -> Self {
Specification {
components: spec.components.into_iter().map(|c| c.into()).collect(),
policies: spec.policies.into_iter().map(|c| c.into()).collect(),
}
}
}
Expand All @@ -309,7 +355,19 @@ impl From<wadm::types::Component> for Component {
Component {
name: component.name,
properties: component.properties.into(),
traits: Some(component.traits.into_iter().map(|t| t.into()).collect()), // Always wrap in Some
traits: component
.traits
.map(|traits| traits.into_iter().map(|t| t.into()).collect()),
}
}
}

impl From<wadm::types::Policy> for Policy {
fn from(policy: wadm::types::Policy) -> Self {
Policy {
name: policy.name,
properties: policy.properties.into_iter().map(|p| p.into()).collect(),
policy_type: policy.type_,
}
}
}
Expand All @@ -333,6 +391,7 @@ impl From<wadm::types::ComponentProperties> for ComponentProperties {
image: properties.image,
id: properties.id,
config: properties.config.into_iter().map(|c| c.into()).collect(),
secrets: properties.secrets.into_iter().map(|c| c.into()).collect(),
}
}
}
Expand All @@ -343,6 +402,7 @@ impl From<wadm::types::CapabilityProperties> for CapabilityProperties {
image: properties.image,
id: properties.id,
config: properties.config.into_iter().map(|c| c.into()).collect(),
secrets: properties.secrets.into_iter().map(|c| c.into()).collect(),
}
}
}
Expand All @@ -356,6 +416,26 @@ impl From<wadm::types::ConfigProperty> for ConfigProperty {
}
}

impl From<wadm::types::SecretProperty> for SecretProperty {
fn from(property: wadm::types::SecretProperty) -> Self {
SecretProperty {
name: property.name,
properties: property.properties.into(),
}
}
}

impl From<wadm::types::SecretSourceProperty> for SecretSourceProperty {
fn from(property: wadm::types::SecretSourceProperty) -> Self {
SecretSourceProperty {
policy: property.policy,
key: property.key,
field: property.field,
version: property.version,
}
}
}

impl From<wadm::types::Trait> for Trait {
fn from(trait_: wadm::types::Trait) -> Self {
Trait {
Expand All @@ -381,22 +461,35 @@ impl From<wadm::types::TraitProperty> for TraitProperty {

impl From<wadm::types::LinkProperty> for LinkProperty {
fn from(property: wadm::types::LinkProperty) -> Self {
#[allow(deprecated)]
LinkProperty {
target: property.target,
source: property.source.map(|c| c.into()),
target: property.target.into(),
namespace: property.namespace,
package: property.package,
interfaces: property.interfaces,
source_config: property
.source_config
.into_iter()
.map(|c| c.into())
.collect(),
target_config: property
.target_config
.into_iter()
.map(|c| c.into())
.collect(),
name: property.name,
source_config: None,
target_config: None,
}
}
}

impl From<wadm::types::ConfigDefinition> for ConfigDefinition {
fn from(definition: wadm::types::ConfigDefinition) -> Self {
ConfigDefinition {
config: definition.config.into_iter().map(|c| c.into()).collect(),
secrets: definition.secrets.into_iter().map(|s| s.into()).collect(),
}
}
}

impl From<wadm::types::TargetConfig> for TargetConfig {
fn from(config: wadm::types::TargetConfig) -> Self {
TargetConfig {
name: config.name,
config: config.config.into_iter().map(|c| c.into()).collect(),
secrets: config.secrets.into_iter().map(|s| s.into()).collect(),
}
}
}
Expand Down
1 change: 1 addition & 0 deletions crates/wadm-types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ impl Trait {
/// Properties for defining traits
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema)]
#[serde(untagged)]
#[allow(clippy::large_enum_variant)]
pub enum TraitProperty {
Link(LinkProperty),
SpreadScaler(SpreadScalerProperty),
Expand Down
4 changes: 2 additions & 2 deletions crates/wadm-types/wit/deps.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[wadm]
path = "../../../wit/wadm"
sha256 = "3a7cd5d4f4bff4279330c3dfbb5dc282ee84fa03fd12b16d7a14c11feae8e7b0"
sha512 = "b80e5c44367398b40e85d418a9ce6f14db66f6c64b70eaa8029960b923e73bc023d423b884cfeb797122a29b195c2a4d67d1896a80d3d271246f0b379ddaaf2a"
sha256 = "554eedbde75c59b750d2dd0c6fe374e3d70f4c1ef4205da784691deeceeb3942"
sha512 = "056155b17c7b20455a9db9a63b7b114433c4755baccbebe566d1be88ea10b38dfeebb32090bf60057afa8e7a8a27ae51e5a5a837e68ab33d40e7a187d8853b52"
4 changes: 2 additions & 2 deletions crates/wadm-types/wit/deps/wadm/client.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasmcloud:wadm@0.1.0;
package wasmcloud:wadm@0.2.0;

/// A Wadm client which interacts with the wadm api
interface client {
Expand All @@ -11,7 +11,7 @@ interface client {

// Deploys a model to the WADM system.
// If no lattice is provided, the default lattice name 'default' is used.
deploy-model: func(model-name: string, version: option<string>, lattice: option<string>) -> result<_, string>;
deploy-model: func(model-name: string, version: option<string>, lattice: option<string>) -> result<string, string>;

// Undeploys a model from the WADM system.
undeploy-model: func(model-name: string, lattice: option<string>, non-destructive: bool) -> result<_, string>;
Expand Down
Loading