Commit 0f64ebdd authored by Nugine's avatar Nugine
Browse files

feat(model): split smithy model

parent 60807eef

Cargo.lock

+11 −0
Original line number Diff line number Diff line
@@ -2124,6 +2124,7 @@ dependencies = [ 
 "nugine-rust-utils",

 "numeric_cast",

 "regex",

 "s3s-model",

 "serde",

 "serde_json",

 "serde_urlencoded",
@@ -2179,6 +2180,16 @@ dependencies = [ 
 "uuid",

]



[[package]]

name = "s3s-model"

version = "0.11.0-dev"

dependencies = [

 "anyhow",

 "numeric_cast",

 "serde",

 "serde_json",

]



[[package]]

name = "s3s-policy"

version = "0.11.0-dev"

codegen/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ regex = "1.11.0" 
serde = { version = "1.0.210", features = ["derive"] }

serde_json = { version = "1.0.128", features = ["preserve_order"] }

serde_urlencoded = "0.7.1"

s3s-model = { version = "0.11.0-dev", path = "../crates/s3s-model" }

codegen/src/v1/dto.rs

+1 −0
Original line number Diff line number Diff line 
use super::o;

use super::ops::{is_op_input, Operations, SKIPPED_OPS};

use super::rust::codegen_doc;

use super::smithy::SmithyTraitsExt;

use super::{rust, smithy};



use crate::declare_codegen;

codegen/src/v1/minio.rs

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ pub fn patch(model: &mut smithy::Model) { 
        return;

    }



    let patches = smithy::Model::load_json("model/minio-patches.json");

    let patches = smithy::Model::load_json("model/minio-patches.json").unwrap();



    for (shape_name, patch) in patches.shapes {

        match model.shapes.get_mut(&shape_name) {

codegen/src/v1/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ use codegen_writer::Codegen; 


pub fn run() {

    let model = {

        let mut s3_model = smithy::Model::load_json("model/s3.json");

        let mut sts_model = smithy::Model::load_json("model/sts.json");

        let mut s3_model = smithy::Model::load_json("model/s3.json").unwrap();

        let mut sts_model = smithy::Model::load_json("model/sts.json").unwrap();

        sts::reduce(&mut sts_model);

        s3_model.shapes.append(&mut sts_model.shapes);

        minio::patch(&mut s3_model);