opencloudtool 0.6.0__tar.gz → 0.7.0__tar.gz

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/Cargo.lock

@@ -82,6 +82,48 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "askama"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f75363874b771be265f4ffe307ca705ef6f3baa19011c149da8674a87f1b75c4"
+dependencies = [
+ "askama_derive",
+ "itoa",
+ "percent-encoding",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "askama_derive"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "129397200fe83088e8a68407a8e2b1f826cf0086b21ccdb866a722c8bcd3a94f"
+dependencies = [
+ "askama_parser",
+ "basic-toml",
+ "memchr",
+ "proc-macro2",
+ "quote",
+ "rustc-hash 2.1.1",
+ "serde",
+ "serde_derive",
+ "syn",
+]
+
+[[package]]
+name = "askama_parser"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6ab5630b3d5eaf232620167977f95eb51f3432fc76852328774afbd242d4358"
+dependencies = [
+ "memchr",
+ "serde",
+ "serde_derive",
+ "winnow",
+]
+
 [[package]]
 name = "assert-json-diff"
 version = "2.0.2"
@@ -651,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871"
+checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425"
 dependencies = [
  "axum-core",
  "bytes",
@@ -735,6 +777,15 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
 
+[[package]]
+name = "basic-toml"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba62675e8242a4c4e806d12f11d136e626e6c8361d6b829310732241652a178a"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.69.5"
@@ -752,7 +803,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "shlex",
  "syn",
  "which",
@@ -879,9 +930,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.51"
+version = "4.5.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
+checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -889,9 +940,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.51"
+version = "4.5.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
+checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2078,9 +2129,9 @@ dependencies = [
 
 [[package]]
 name = "mockall"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2"
+checksum = "f58d964098a5f9c6b63d0798e5372fd04708193510a7af313c22e9f29b7b620b"
 dependencies = [
  "cfg-if",
  "downcast",
@@ -2092,9 +2143,9 @@ dependencies = [
 
 [[package]]
 name = "mockall_derive"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898"
+checksum = "ca41ce716dda6a9be188b385aa78ee5260fc25cd3802cb2a8afdc6afbe6b6dbf"
 dependencies = [
  "cfg-if",
  "proc-macro2",
@@ -2194,7 +2245,7 @@ dependencies = [
 
 [[package]]
 name = "oct-cli"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "assert_cmd",
  "clap",
@@ -2206,7 +2257,7 @@ dependencies = [
 
 [[package]]
 name = "oct-cloud"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "aws-config",
  "aws-sdk-ec2",
@@ -2226,7 +2277,7 @@ dependencies = [
 
 [[package]]
 name = "oct-ctl"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "axum",
  "log",
@@ -2242,7 +2293,7 @@ dependencies = [
 
 [[package]]
 name = "oct-ctl-sdk"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "log",
  "mockito",
@@ -2254,7 +2305,7 @@ dependencies = [
 
 [[package]]
 name = "oct-orchestrator"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "async-trait",
  "log",
@@ -2270,9 +2321,25 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "oct-platform"
+version = "0.7.0"
+dependencies = [
+ "askama",
+ "axum",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "tokio",
+ "toml",
+ "tower-http",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "oct-py"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "env_logger",
  "log",
@@ -2852,6 +2919,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
@@ -3586,9 +3659,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.6"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456"
 dependencies = [
  "bitflags",
  "bytes",
@@ -4213,6 +4286,9 @@ name = "winnow"
 version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "wit-bindgen-rt"

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.6.0"
+version = "0.7.0"
 authors = ["opencloudtool Contributors"]
 categories = ["command-line-utilities"]
 documentation = "https://opencloudtool.com/docs"
@@ -25,11 +25,12 @@ members = ["crates/*"]
 resolver = "3"
 
 [workspace.dependencies]
-oct-cloud = { package = "oct-cloud", path = "crates/oct-cloud", version = "0.6.0" }
-oct-orchestrator = { package = "oct-orchestrator", path = "crates/oct-orchestrator", version = "0.6.0" }
-oct-ctl-sdk = { package = "oct-ctl-sdk", path = "crates/oct-ctl-sdk", version = "0.6.0" }
+oct-cloud = { package = "oct-cloud", path = "crates/oct-cloud", version = "0.7.0" }
+oct-orchestrator = { package = "oct-orchestrator", path = "crates/oct-orchestrator", version = "0.7.0" }
+oct-ctl-sdk = { package = "oct-ctl-sdk", path = "crates/oct-ctl-sdk", version = "0.7.0" }
 
 assert_cmd = "2.1.1"
+askama = "0.14.0"
 async-trait = "0.1.89"
 aws-config = "1.8.3"
 aws-sdk-ec2 = "1.154.0"
@@ -37,9 +38,9 @@ aws-sdk-ecr = "1.87.0"
 aws-sdk-iam = "1.83.0"
 aws-sdk-route53 = "1.88.0"
 aws-sdk-s3 = "1.100.0"
-axum = "0.8.6"
+axum = "0.8.7"
 base64 = "0.22.1"
-clap = { version = "4.5.51", features = ["derive"] }
+clap = { version = "4.5.53", features = ["derive"] }
 petgraph = "0.8.3"
 predicates = "3.1.3"
 serde = "1.0.228"
@@ -48,7 +49,7 @@ serde_json = "1.0.145"
 tempfile = "3.23.0"
 tera = { git = "https://github.com/minev-dev/tera.git", rev = "1e36d2f8ba66833ce9ad2b46044e21f8240b5299", version = "1.20.0" } # Contains custom logic to render variables ignoring unknown variables
 tokio = { version = "1.48.0", features = ["full"] }
-mockall = "0.13.1"
+mockall = "0.14.0"
 mockito = "1.7.0"
 pyo3 = { version = "0.27.1", features = ["extension-module"] }
 uuid = { version = "1.18.1", features = ["v4"] }
@@ -57,7 +58,7 @@ env_logger = "0.11.6"
 toml = "0.9.8"
 reqwest = { version = "0.12.24", features = ["json"] }
 tower = "0.5.2"
-tower-http = { version = "0.6.4", features = ["trace"] }
+tower-http = { version = "0.6.7", features = ["trace"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3" }
 grcov = "0.8.20"

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opencloudtool
-Version: 0.6.0
+Version: 0.7.0
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/crates/oct-cloud/README.md

@@ -230,3 +230,7 @@ Total: $92 per month
 - 1 EC2 [t4g.medium](https://aws.amazon.com/ec2/pricing/on-demand/) instance ($0.0336 per hour): $25.5 per month
 
 Total: $25.5 per month
+
+## Repo stats
+
+![Alt](https://repobeats.axiom.co/api/embed/7127395110cea0828bf52367026a5768d9c016e8.svg "Repobeats analytics image")

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/crates/oct-cloud/src/aws/types.rs

@@ -74,28 +74,81 @@ pub struct InstanceInfo {
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum InstanceType {
-    T2Micro,
+    T3Nano,
+    T3Micro,
+    T3Small,
     T3Medium,
+    T3Large,
+    T3Xlarge,
+    T32xlarge,
 }
 
 impl InstanceType {
     pub fn as_str(&self) -> &str {
         match self {
-            InstanceType::T2Micro => "t2.micro",
+            InstanceType::T3Nano => "t3.nano",
+            InstanceType::T3Micro => "t3.micro",
+            InstanceType::T3Small => "t3.small",
             InstanceType::T3Medium => "t3.medium",
+            InstanceType::T3Large => "t3.large",
+            InstanceType::T3Xlarge => "t3.xlarge",
+            InstanceType::T32xlarge => "t3.2xlarge",
         }
     }
 
+    /// Tries to get the smallest possible instance type for to fit requested resources
+    // NOTE: The instances list must be sorted by size from smallest to largest
+    pub fn from_resources(cpus: u32, memory: u64) -> Option<Self> {
+        let instances = [
+            Self::T3Nano,
+            Self::T3Micro,
+            Self::T3Small,
+            Self::T3Medium,
+            Self::T3Large,
+            Self::T3Xlarge,
+            Self::T32xlarge,
+        ];
+
+        for instance in instances {
+            let info = instance.get_info();
+            if cpus <= info.cpus && memory <= info.memory {
+                return Some(instance);
+            }
+        }
+
+        None
+    }
+
     pub fn get_info(&self) -> InstanceInfo {
         match self {
-            InstanceType::T2Micro => InstanceInfo {
-                cpus: 1000,
+            Self::T3Nano => InstanceInfo {
+                cpus: 2000,
+                memory: 512,
+            },
+            Self::T3Micro => InstanceInfo {
+                cpus: 2000,
                 memory: 1024,
             },
-            InstanceType::T3Medium => InstanceInfo {
+            Self::T3Small => InstanceInfo {
+                cpus: 2000,
+                memory: 2048,
+            },
+            Self::T3Medium => InstanceInfo {
                 cpus: 2000,
                 memory: 4096,
             },
+            Self::T3Large => InstanceInfo {
+                cpus: 2000,
+                memory: 8192,
+            },
+            Self::T3Xlarge => InstanceInfo {
+                cpus: 4000,
+                memory: 16384,
+            },
+            Self::T32xlarge => InstanceInfo {
+                cpus: 8000,
+                memory: 32768,
+            },
         }
     }
 }
@@ -108,8 +161,13 @@ impl From<&str> for InstanceType {
     /// Panics if the string is not a valid instance type.
     fn from(value: &str) -> Self {
         match value {
-            "t2.micro" => InstanceType::T2Micro,
-            "t3.medium" => InstanceType::T3Medium,
+            "t3.nano" => Self::T3Nano,
+            "t3.micro" => Self::T3Micro,
+            "t3.small" => Self::T3Small,
+            "t3.medium" => Self::T3Medium,
+            "t3.large" => Self::T3Large,
+            "t3.xlarge" => Self::T3Xlarge,
+            "t3.2xlarge" => Self::T32xlarge,
             _ => panic!("Invalid instance type: {value}"),
         }
     }
@@ -186,32 +244,32 @@ mod tests {
 
     #[test]
     fn test_instance_type_as_str() {
-        assert_eq!(InstanceType::T2Micro.as_str(), "t2.micro");
-        assert_eq!(InstanceType::T3Medium.as_str(), "t3.medium");
+        assert_eq!(InstanceType::T3Nano.as_str(), "t3.nano");
+        assert_eq!(InstanceType::T32xlarge.as_str(), "t3.2xlarge");
     }
 
     #[test]
     fn test_instance_type_get_info() {
         assert_eq!(
-            InstanceType::T2Micro.get_info(),
+            InstanceType::T3Nano.get_info(),
             InstanceInfo {
-                cpus: 1000,
-                memory: 1024
+                cpus: 2000,
+                memory: 512
             }
         );
         assert_eq!(
-            InstanceType::T3Medium.get_info(),
+            InstanceType::T32xlarge.get_info(),
             InstanceInfo {
-                cpus: 2000,
-                memory: 4096
+                cpus: 8000,
+                memory: 32768
             }
         );
     }
 
     #[test]
     fn test_instance_type_from_str() {
-        assert_eq!(InstanceType::from("t2.micro"), InstanceType::T2Micro);
-        assert_eq!(InstanceType::from("t3.medium"), InstanceType::T3Medium);
+        assert_eq!(InstanceType::from("t3.nano"), InstanceType::T3Nano);
+        assert_eq!(InstanceType::from("t3.2xlarge"), InstanceType::T32xlarge);
     }
 
     #[test]
@@ -219,4 +277,75 @@ mod tests {
     fn test_instance_type_from_str_invalid() {
         let _ = InstanceType::from("invalid");
     }
+
+    #[test]
+    fn test_from_resources_fits_t3_nano_small_request() {
+        assert_eq!(
+            InstanceType::from_resources(500, 512),
+            Some(InstanceType::T3Nano)
+        );
+    }
+
+    #[test]
+    fn test_from_resources_fits_t3_nano_exact_request() {
+        assert_eq!(
+            InstanceType::from_resources(2000, 512),
+            Some(InstanceType::T3Nano)
+        );
+    }
+
+    #[test]
+    fn test_from_resources_fits_t3_micro_mem_overflow() {
+        assert_eq!(
+            InstanceType::from_resources(2000, 513),
+            Some(InstanceType::T3Micro)
+        );
+    }
+
+    #[test]
+    fn test_from_resources_fits_t3_medium_cpu_overflow() {
+        assert_eq!(
+            InstanceType::from_resources(2001, 8192),
+            Some(InstanceType::T3Xlarge)
+        );
+    }
+
+    #[test]
+    fn test_from_resources_fits_t3_xlarge_exact() {
+        assert_eq!(
+            InstanceType::from_resources(4000, 16384),
+            Some(InstanceType::T3Xlarge)
+        );
+    }
+
+    #[test]
+    fn test_from_resources_fits_t3_2xlarge_mem_overflow() {
+        assert_eq!(
+            InstanceType::from_resources(4000, 16385),
+            Some(InstanceType::T32xlarge)
+        );
+    }
+
+    #[test]
+    fn test_from_resources_fits_t3_2xlarge_exact_request() {
+        assert_eq!(
+            InstanceType::from_resources(8000, 32768),
+            Some(InstanceType::T32xlarge)
+        );
+    }
+
+    #[test]
+    fn test_from_resources_no_fit_cpu_overflow() {
+        assert_eq!(InstanceType::from_resources(8001, 32768), None);
+    }
+
+    #[test]
+    fn test_from_resources_no_fit_mem_overflow() {
+        assert_eq!(InstanceType::from_resources(8000, 32769), None);
+    }
+
+    #[test]
+    fn test_from_resources_no_fit_large_request() {
+        assert_eq!(InstanceType::from_resources(u32::MAX, u64::MAX), None);
+    }
 }

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/crates/oct-cloud/src/infra/graph.rs

@@ -66,7 +66,6 @@ impl GraphManager {
     }
 
     pub fn get_spec_graph(
-        number_of_instances: u32,
         instance_type: &types::InstanceType,
         domain_name: Option<String>,
     ) -> Graph<SpecNode, String> {
@@ -167,16 +166,11 @@ impl GraphManager {
         );
 
         // TODO: Add instance profile with instance role
-        let mut instances = Vec::new();
-        for _ in 0..number_of_instances {
-            let instance_node = deps.add_node(SpecNode::Resource(ResourceSpecType::Vm(VmSpec {
-                instance_type: instance_type.clone(),
-                ami: String::from("ami-04dd23e62ed049936"),
-                user_data: user_data.clone(),
-            })));
-
-            instances.push(instance_node);
-        }
+        let vm = deps.add_node(SpecNode::Resource(ResourceSpecType::Vm(VmSpec {
+            instance_type: instance_type.clone(),
+            ami: String::from("ami-04dd23e62ed049936"),
+            user_data,
+        })));
 
         // Order of the edges matters in this implementation
         // Nodes within the same parent are traversed from
@@ -192,13 +186,12 @@ impl GraphManager {
             (igw_1, route_table_1, String::new()),                // 7
             (route_table_1, subnet_1, String::new()),             // 8
             (instance_role_1, instance_profile_1, String::new()), // 9
+            // VM
+            (subnet_1, vm, String::new()),
+            (instance_profile_1, vm, String::new()),
+            (security_group_1, vm, String::new()),
+            (ecr_1, vm, String::new()),
         ];
-        for instance in &instances {
-            edges.push((subnet_1, *instance, String::new()));
-            edges.push((instance_profile_1, *instance, String::new()));
-            edges.push((security_group_1, *instance, String::new()));
-            edges.push((ecr_1, *instance, String::new()));
-        }
 
         if let Some(domain_name) = domain_name {
             let hosted_zone = deps.add_node(SpecNode::Resource(ResourceSpecType::HostedZone(
@@ -211,17 +204,15 @@ impl GraphManager {
             // Insert at the first place to deploy it after all other root's children
             edges.insert(0, (root, hosted_zone, String::new()));
 
-            for instance in instances {
-                let dns_record = deps.add_node(SpecNode::Resource(ResourceSpecType::DnsRecord(
-                    DnsRecordSpec {
-                        record_type: types::RecordType::A,
-                        ttl: Some(3600),
-                    },
-                )));
+            let dns_record = deps.add_node(SpecNode::Resource(ResourceSpecType::DnsRecord(
+                DnsRecordSpec {
+                    record_type: types::RecordType::A,
+                    ttl: Some(3600),
+                },
+            )));
 
-                edges.push((instance, dns_record, String::new()));
-                edges.push((hosted_zone, dns_record, String::new()));
-            }
+            edges.push((vm, dns_record, String::new()));
+            edges.push((hosted_zone, dns_record, String::new()));
         }
 
         deps.extend_with_edges(&edges);
@@ -236,14 +227,14 @@ impl GraphManager {
     pub async fn deploy(
         &self,
         graph: &Graph<SpecNode, String>,
-    ) -> Result<(Graph<Node, String>, Vec<Vm>, Option<Ecr>), Box<dyn std::error::Error>> {
+    ) -> Result<(Graph<Node, String>, Option<Vm>, Option<Ecr>), Box<dyn std::error::Error>> {
         let mut resource_graph = Graph::<Node, String>::new();
         let mut edges = vec![];
 
         let mut parents: HashMap<NodeIndex, Vec<NodeIndex>> = HashMap::new();
 
         let mut ecr: Option<Ecr> = None;
-        let mut vms: Vec<Vm> = Vec::new();
+        let mut vm: Option<Vm> = None;
 
         let result = kahn_traverse(graph)?;
 
@@ -381,7 +372,7 @@ impl GraphManager {
 
                         match output_vm {
                             Ok(output_vm) => {
-                                vms.push(output_vm.clone());
+                                vm = Some(output_vm.clone());
 
                                 Ok(Node::Resource(ResourceType::Vm(output_vm)))
                             }
@@ -419,7 +410,7 @@ impl GraphManager {
 
         log::info!("Created graph {}", Dot::new(&resource_graph));
 
-        Ok((resource_graph, vms, ecr))
+        Ok((resource_graph, vm, ecr))
     }
 
     /// Destroys resource graph
@@ -608,121 +599,43 @@ mod tests {
     #[test]
     fn test_get_spec_graph_with_one_instance_no_domain() {
         // Arrange
-        let number_of_instances = 1;
-        let instance_type = InstanceType::T2Micro;
-        let domain_name = None;
-
-        // Act
-        let graph = GraphManager::get_spec_graph(number_of_instances, &instance_type, domain_name);
-
-        // Assert
-        let number_of_nodes = 9 + number_of_instances;
-        let number_of_edges = 10 + 4 * number_of_instances;
-        assert_eq!(graph.node_count(), number_of_nodes as usize);
-        assert_eq!(graph.edge_count(), number_of_edges as usize);
-
-        let vm_nodes_count = graph
-            .raw_nodes()
-            .iter()
-            .filter(|node| matches!(&node.weight, SpecNode::Resource(ResourceSpecType::Vm(_))))
-            .count();
-        assert_eq!(vm_nodes_count, number_of_instances as usize);
-    }
-
-    #[test]
-    fn test_get_spec_graph_with_multiple_instances_no_domain() {
-        // Arrange
-        let number_of_instances = 3;
-        let instance_type = InstanceType::T2Micro;
+        let instance_type = InstanceType::T3Micro;
         let domain_name = None;
 
         // Act
-        let graph = GraphManager::get_spec_graph(number_of_instances, &instance_type, domain_name);
+        let graph = GraphManager::get_spec_graph(&instance_type, domain_name);
 
         // Assert
-        let number_of_nodes = 9 + number_of_instances;
-        let number_of_edges = 10 + 4 * number_of_instances;
-        assert_eq!(graph.node_count(), number_of_nodes as usize);
-        assert_eq!(graph.edge_count(), number_of_edges as usize);
+        assert_eq!(graph.node_count(), 10);
+        assert_eq!(graph.edge_count(), 10 + 4);
 
         let vm_nodes_count = graph
             .raw_nodes()
             .iter()
             .filter(|node| matches!(&node.weight, SpecNode::Resource(ResourceSpecType::Vm(_))))
             .count();
-        assert_eq!(vm_nodes_count, number_of_instances as usize);
+        assert_eq!(vm_nodes_count, 1);
     }
 
     #[test]
     fn test_get_spec_graph_with_one_instance_and_domain() {
         // Arrange
-        let number_of_instances = 1;
-        let instance_type = InstanceType::T2Micro;
-        let domain_name = Some(String::from("example.com"));
-
-        // Act
-        let graph = GraphManager::get_spec_graph(number_of_instances, &instance_type, domain_name);
-
-        // Assert
-        let number_of_nodes = 10 + 2 * number_of_instances;
-        let number_of_edges = 11 + 6 * number_of_instances;
-        assert_eq!(graph.node_count(), number_of_nodes as usize);
-        assert_eq!(graph.edge_count(), number_of_edges as usize);
-
-        let vm_nodes_count = graph
-            .raw_nodes()
-            .iter()
-            .filter(|node| matches!(&node.weight, SpecNode::Resource(ResourceSpecType::Vm(_))))
-            .count();
-        assert_eq!(vm_nodes_count, number_of_instances as usize);
-
-        let hosted_zone_nodes_count = graph
-            .raw_nodes()
-            .iter()
-            .filter(|node| {
-                matches!(
-                    &node.weight,
-                    SpecNode::Resource(ResourceSpecType::HostedZone(_))
-                )
-            })
-            .count();
-        assert_eq!(hosted_zone_nodes_count, 1);
-
-        let dns_record_nodes_count = graph
-            .raw_nodes()
-            .iter()
-            .filter(|node| {
-                matches!(
-                    &node.weight,
-                    SpecNode::Resource(ResourceSpecType::DnsRecord(_))
-                )
-            })
-            .count();
-        assert_eq!(dns_record_nodes_count, number_of_instances as usize);
-    }
-
-    #[test]
-    fn test_get_spec_graph_with_multiple_instances_and_domain() {
-        // Arrange
-        let number_of_instances = 3;
-        let instance_type = InstanceType::T2Micro;
+        let instance_type = InstanceType::T3Micro;
         let domain_name = Some(String::from("example.com"));
 
         // Act
-        let graph = GraphManager::get_spec_graph(number_of_instances, &instance_type, domain_name);
+        let graph = GraphManager::get_spec_graph(&instance_type, domain_name);
 
         // Assert
-        let number_of_nodes = 10 + 2 * number_of_instances;
-        let number_of_edges = 11 + 6 * number_of_instances;
-        assert_eq!(graph.node_count(), number_of_nodes as usize);
-        assert_eq!(graph.edge_count(), number_of_edges as usize);
+        assert_eq!(graph.node_count(), 10 + 2);
+        assert_eq!(graph.edge_count(), 11 + 6);
 
         let vm_nodes_count = graph
             .raw_nodes()
             .iter()
             .filter(|node| matches!(&node.weight, SpecNode::Resource(ResourceSpecType::Vm(_))))
             .count();
-        assert_eq!(vm_nodes_count, number_of_instances as usize);
+        assert_eq!(vm_nodes_count, 1);
 
         let hosted_zone_nodes_count = graph
             .raw_nodes()
@@ -746,18 +659,16 @@ mod tests {
                 )
             })
             .count();
-        assert_eq!(dns_record_nodes_count, number_of_instances as usize);
+        assert_eq!(dns_record_nodes_count, 1);
     }
 
     #[tokio::test]
     async fn test_deploy_with_one_instance_no_domain() {
         // Arrange
-        let number_of_instances = 1;
-        let instance_type = InstanceType::T2Micro;
+        let instance_type = InstanceType::T3Micro;
         let domain_name = None;
 
-        let spec_graph =
-            GraphManager::get_spec_graph(number_of_instances, &instance_type, domain_name);
+        let spec_graph = GraphManager::get_spec_graph(&instance_type, domain_name);
 
         let mut ec2_client_mock = client::Ec2::default();
         let mut iam_client_mock = client::IAM::default();
@@ -909,7 +820,7 @@ mod tests {
         );
 
         // Act
-        let (resource_graph, vms, ecr) = graph_manager
+        let (resource_graph, vm, ecr) = graph_manager
             .deploy(&spec_graph)
             .await
             .expect("Failed to deploy");
@@ -919,12 +830,12 @@ mod tests {
         assert_eq!(resource_graph.edge_count(), 14);
 
         assert_eq!(
-            vms,
-            vec![Vm {
+            vm,
+            Some(Vm {
                 id: String::from("vm-id-1"),
                 public_ip: String::from("1.2.3.4"),
                 ami: String::from("ami-04dd23e62ed049936"),
-                instance_type: InstanceType::T2Micro,
+                instance_type: InstanceType::T3Micro,
                 user_data: String::from(
                     r#"#!/bin/bash
         set -e
@@ -942,7 +853,7 @@ mod tests {
         
 aws ecr get-login-password --region us-west-2 | podman login --username AWS --password-stdin ecr-uri-1"#
                 )
-            }]
+            })
         );
 
         assert_eq!(
@@ -973,7 +884,7 @@ aws ecr get-login-password --region us-west-2 | podman login --username AWS --pa
         );
 
         // Act
-        let (resource_graph, vms, ecr) = graph_manager
+        let (resource_graph, vm, ecr) = graph_manager
             .deploy(&spec_graph)
             .await
             .expect("Failed to deploy");
@@ -981,7 +892,7 @@ aws ecr get-login-password --region us-west-2 | podman login --username AWS --pa
         // Assert
         assert_eq!(resource_graph.node_count(), 0);
         assert_eq!(resource_graph.edge_count(), 0);
-        assert!(vms.is_empty());
+        assert!(vm.is_none());
         assert!(ecr.is_none());
     }
 
@@ -1036,7 +947,7 @@ aws ecr get-login-password --region us-west-2 | podman login --username AWS --pa
         );
 
         // Act
-        let (resource_graph, vms, ecr) = graph_manager
+        let (resource_graph, vm, ecr) = graph_manager
             .deploy(&spec_graph)
             .await
             .expect("Failed to deploy");
@@ -1045,7 +956,7 @@ aws ecr get-login-password --region us-west-2 | podman login --username AWS --pa
         // 1 root + VPC
         assert_eq!(resource_graph.node_count(), 2);
         assert_eq!(resource_graph.edge_count(), 1);
-        assert!(vms.is_empty());
+        assert!(vm.is_none());
         assert!(ecr.is_none());
 
         let vpc_node_exists = resource_graph
@@ -1339,7 +1250,7 @@ aws ecr get-login-password --region us-west-2 | podman login --username AWS --pa
             id: "vm-id-1".to_string(),
             public_ip: "1.2.3.4".to_string(),
             ami: "ami-04dd23e62ed049936".to_string(),
-            instance_type: InstanceType::T2Micro,
+            instance_type: InstanceType::T3Micro,
             user_data: String::new(), // Not used in destroy
         })));
 

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/crates/oct-cloud/src/infra/resource.rs

@@ -2107,7 +2107,7 @@ mod tests {
         let vm = Vm {
             id: String::from("vm-id"),
             public_ip: String::from("1.2.3.4"),
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::new(),
         };
@@ -2148,7 +2148,7 @@ mod tests {
         let vm = Vm {
             id: String::from("vm-id"),
             public_ip: String::from("1.2.3.4"),
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::new(),
         };
@@ -2222,7 +2222,7 @@ mod tests {
         let vm = Vm {
             id: String::from("vm-id"),
             public_ip: String::from("1.2.3.4"),
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::new(),
         };
@@ -2719,7 +2719,7 @@ mod tests {
         };
 
         let vm_spec = VmSpec {
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::from("user-data"),
         };
@@ -2761,7 +2761,7 @@ mod tests {
             Vm {
                 id: String::from("vm-id"),
                 public_ip: String::from("1.2.3.4"),
-                instance_type: types::InstanceType::T2Micro,
+                instance_type: types::InstanceType::T3Micro,
                 ami: String::from("ami-123"),
                 user_data: String::from(
                     "user-data\naws ecr get-login-password --region us-west-2 | podman login --username AWS --password-stdin dkr.ecr.region.amazonaws.com",
@@ -2778,7 +2778,7 @@ mod tests {
             client: &ec2_client_mock,
         };
         let vm_spec = VmSpec {
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::from("user-data"),
         };
@@ -2820,7 +2820,7 @@ mod tests {
             client: &ec2_client_mock,
         };
         let vm_spec = VmSpec {
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::from("user-data"),
         };
@@ -2863,7 +2863,7 @@ mod tests {
             client: &ec2_client_mock,
         };
         let vm_spec = VmSpec {
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::from("user-data"),
         };
@@ -2908,7 +2908,7 @@ mod tests {
             client: &ec2_client_mock,
         };
         let vm_spec = VmSpec {
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::from("user-data"),
         };
@@ -2956,7 +2956,7 @@ mod tests {
         };
 
         let vm_spec = VmSpec {
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::from("user-data"),
         };
@@ -3019,7 +3019,7 @@ mod tests {
         let vm = Vm {
             id: String::from("vm-id"),
             public_ip: String::from("1.2.3.4"),
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::from("user-data"),
         };
@@ -3047,7 +3047,7 @@ mod tests {
         let vm = Vm {
             id: String::from("vm-id"),
             public_ip: String::from("1.2.3.4"),
-            instance_type: types::InstanceType::T2Micro,
+            instance_type: types::InstanceType::T3Micro,
             ami: String::from("ami-123"),
             user_data: String::from("user-data"),
         };

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/crates/oct-ctl-sdk/Cargo.toml

@@ -16,7 +16,7 @@ rust-version = { workspace = true }
 [dependencies]
 log = { workspace = true }
 reqwest = { workspace = true }
-serde = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tokio = { workspace = true }
 

{opencloudtool-0.6.0/crates/oct-orchestrator → opencloudtool-0.7.0/crates/oct-ctl-sdk}/README.md

@@ -230,3 +230,7 @@ Total: $92 per month
 - 1 EC2 [t4g.medium](https://aws.amazon.com/ec2/pricing/on-demand/) instance ($0.0336 per hour): $25.5 per month
 
 Total: $25.5 per month
+
+## Repo stats
+
+![Alt](https://repobeats.axiom.co/api/embed/7127395110cea0828bf52367026a5768d9c016e8.svg "Repobeats analytics image")

{opencloudtool-0.6.0/crates/oct-ctl-sdk → opencloudtool-0.7.0/crates/oct-orchestrator}/README.md

@@ -230,3 +230,7 @@ Total: $92 per month
 - 1 EC2 [t4g.medium](https://aws.amazon.com/ec2/pricing/on-demand/) instance ($0.0336 per hour): $25.5 per month
 
 Total: $25.5 per month
+
+## Repo stats
+
+![Alt](https://repobeats.axiom.co/api/embed/7127395110cea0828bf52367026a5768d9c016e8.svg "Repobeats analytics image")

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/crates/oct-orchestrator/src/lib.rs

@@ -16,8 +16,6 @@ mod user_state;
 pub struct OrchestratorWithGraph;
 
 impl OrchestratorWithGraph {
-    const INSTANCE_TYPE: InstanceType = InstanceType::T2Micro;
-
     pub async fn deploy(&self) -> Result<(), Box<dyn std::error::Error>> {
         let mut config = config::Config::new(None)?;
 
@@ -33,34 +31,26 @@ impl OrchestratorWithGraph {
             backend::get_state_backend::<user_state::UserState>(&config.project.user_state_backend);
         let (mut user_state, _loaded) = user_state_backend.load().await?;
 
-        let number_of_instances =
-            get_number_of_needed_instances(&services_graph, &Self::INSTANCE_TYPE)?;
+        let instance_type = get_instance_type(&services_graph)?;
 
-        log::info!("Instances to be created: {number_of_instances}");
+        log::info!("Instance to be created: {instance_type:?}");
 
         let spec_graph = infra::graph::GraphManager::get_spec_graph(
-            number_of_instances,
-            &Self::INSTANCE_TYPE,
+            &instance_type,
             config.project.domain.clone(),
         );
 
         let infra_graph_manager = infra::graph::GraphManager::new().await;
-        let (resource_graph, vms, ecr) = infra_graph_manager.deploy(&spec_graph).await?;
+        let (resource_graph, vm, ecr) = infra_graph_manager.deploy(&spec_graph).await?;
 
         let state = infra::state::State::from_graph(&resource_graph);
         let () = infra_state_backend.save(&state).await?;
 
-        for vm in &vms {
-            // Add missing instances to state
-            // TODO: Handle removing instances
-            if user_state.instances.contains_key(&vm.public_ip) {
-                continue;
-            }
-
+        if let Some(vm) = vm {
             let instance_info = vm.instance_type.get_info();
 
             user_state.instances.insert(
-                vm.public_ip.clone(),
+                vm.public_ip,
                 user_state::Instance {
                     cpus: instance_info.cpus,
                     memory: instance_info.memory,
@@ -141,13 +131,10 @@ impl OrchestratorWithGraph {
     }
 }
 
-/// Calculates the number of instances needed to run the services
-/// For now we expect that an individual service required resources will not exceed
-/// a single EC2 instance capacity
-fn get_number_of_needed_instances(
+/// Tries to find an instance type which can fit all user-requested services
+fn get_instance_type(
     services_graph: &Graph<config::Node, String>,
-    instance_type: &InstanceType,
-) -> Result<u32, Box<dyn std::error::Error>> {
+) -> Result<InstanceType, Box<dyn std::error::Error>> {
     let sorted_graph = infra::graph::kahn_traverse(services_graph)?;
 
     let total_services_cpus = sorted_graph
@@ -174,15 +161,12 @@ fn get_number_of_needed_instances(
         .map(|service| service.memory)
         .sum::<u64>();
 
-    let instance_info = instance_type.get_info();
+    let instance_type = InstanceType::from_resources(total_services_cpus, total_services_memory);
 
-    let needed_instances_count_by_cpus = total_services_cpus.div_ceil(instance_info.cpus);
-    let needed_instances_count_by_memory = total_services_memory.div_ceil(instance_info.memory);
-
-    Ok(std::cmp::max(
-        needed_instances_count_by_cpus,
-        u32::try_from(needed_instances_count_by_memory).unwrap_or_default(),
-    ))
+    match instance_type {
+        Some(instance_type) => Ok(instance_type),
+        None => Err("Failed to get instance type to fit all services".into()),
+    }
 }
 
 /// Deploys user services

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/crates/oct-py/uv.lock

@@ -28,7 +28,7 @@ wheels = [
 
 [[package]]
 name = "opencloudtool"
-version = "0.6.0"
+version = "0.7.0"
 source = { editable = "." }
 
 [package.dev-dependencies]

{opencloudtool-0.6.0 → opencloudtool-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "opencloudtool"
-version = "0.6.0"
+version = "0.7.0"
 readme = "README.md"
 requires-python = ">=3.8"
 dependencies = []