fix(ec2): persist SG rule descriptions + IAM-profile/SG-VPC/TGW-multicast/route-server/BYOIP/NAT associations (bug-hunt) (#2305)

Author: vieiralucas

crates/fakecloud-ec2/src/defaults.rs

@@ -380,6 +380,8 @@ pub(crate) fn bootstrap_default_network(state: &mut Ec2State) {
                     cidr_ipv6: None,
                     prefix_list_id: None,
                     referenced_group_id: Some(sg_id.clone()),
+                    referenced_group_name: None,
+                    referenced_user_id: None,
                     description: String::new(),
                 },
                 SecurityGroupRule {
@@ -393,6 +395,8 @@ pub(crate) fn bootstrap_default_network(state: &mut Ec2State) {
                     cidr_ipv6: None,
                     prefix_list_id: None,
                     referenced_group_id: None,
+                    referenced_group_name: None,
+                    referenced_user_id: None,
                     description: String::new(),
                 },
             ],
@@ -476,6 +480,8 @@ pub(crate) fn create_vpc_default_resources(state: &mut Ec2State, vpc_id: &str, c
                     cidr_ipv6: None,
                     prefix_list_id: None,
                     referenced_group_id: Some(sg_id.clone()),
+                    referenced_group_name: None,
+                    referenced_user_id: None,
                     description: String::new(),
                 },
                 SecurityGroupRule {
@@ -489,6 +495,8 @@ pub(crate) fn create_vpc_default_resources(state: &mut Ec2State, vpc_id: &str, c
                     cidr_ipv6: None,
                     prefix_list_id: None,
                     referenced_group_id: None,
+                    referenced_group_name: None,
+                    referenced_user_id: None,
                     description: String::new(),
                 },
             ],

crates/fakecloud-ec2/src/service/firewall_model.rs

@@ -263,6 +263,8 @@ mod tests {
             cidr_ipv6: None,
             prefix_list_id: None,
             referenced_group_id: refg.map(str::to_string),
+            referenced_group_name: None,
+            referenced_user_id: None,
             description: String::new(),
         }
     }

crates/fakecloud-ec2/src/service/rest/byoip.rs

@@ -4,63 +4,121 @@
 
 use super::*;
 
+fn byoip_cidr_xml(c: &ByoipCidr) -> String {
+    format!(
+        "{}{}{}",
+        ec2_elem("cidr", &c.cidr),
+        ec2_elem("description", &c.description),
+        ec2_elem("state", &c.state),
+    )
+}
+
+/// Update the persisted BYOIP CIDR's state (inserting it when unknown), then
+/// render it. Shared by advertise/withdraw so each op round-trips.
+fn set_byoip_state(svc: &Ec2Service, req: &AwsRequest, cidr: &str, state: &str) -> ByoipCidr {
+    let mut accounts = svc.state.write();
+    let account = accounts.get_or_create(&req.account_id);
+    let entry = account
+        .byoip_cidrs
+        .entry(cidr.to_string())
+        .or_insert_with(|| ByoipCidr {
+            cidr: cidr.to_string(),
+            description: String::new(),
+            state: state.to_string(),
+        });
+    entry.state = state.to_string();
+    entry.clone()
+}
+
 pub(crate) fn advertise_byoip_cidr(
-    _svc: &Ec2Service,
+    svc: &Ec2Service,
     req: &AwsRequest,
 ) -> Result<AwsResponse, AwsServiceError> {
-    require(&req.query_params, "Cidr")?;
+    let cidr = require(&req.query_params, "Cidr")?;
+    let c = set_byoip_state(svc, req, &cidr, "advertised");
     Ok(Ec2Service::respond(
         "AdvertiseByoipCidr",
         &req.request_id,
-        "",
+        &format!("<byoipCidr>{}</byoipCidr>", byoip_cidr_xml(&c)),
     ))
 }
 
 pub(crate) fn deprovision_byoip_cidr(
-    _svc: &Ec2Service,
+    svc: &Ec2Service,
     req: &AwsRequest,
 ) -> Result<AwsResponse, AwsServiceError> {
-    require(&req.query_params, "Cidr")?;
+    let cidr = require(&req.query_params, "Cidr")?;
+    // Deprovision removes the CIDR from the pool; report the transitional state.
+    let mut c = set_byoip_state(svc, req, &cidr, "pending-deprovision");
+    {
+        let mut accounts = svc.state.write();
+        accounts
+            .get_or_create(&req.account_id)
+            .byoip_cidrs
+            .remove(&cidr);
+    }
+    c.state = "pending-deprovision".to_string();
     Ok(Ec2Service::respond(
         "DeprovisionByoipCidr",
         &req.request_id,
-        "",
+        &format!("<byoipCidr>{}</byoipCidr>", byoip_cidr_xml(&c)),
     ))
 }
 
 pub(crate) fn describe_byoip_cidrs(
-    _svc: &Ec2Service,
+    svc: &Ec2Service,
     req: &AwsRequest,
 ) -> Result<AwsResponse, AwsServiceError> {
     require(&req.query_params, "MaxResults")?;
     validate_max_results(&req.query_params, 1, 100)?;
+    let accounts = svc.state.read();
+    let empty = Ec2State::new(&req.account_id, &req.region);
+    let state = accounts.get(&req.account_id).unwrap_or(&empty);
+    let items: Vec<String> = state.byoip_cidrs.values().map(byoip_cidr_xml).collect();
     Ok(Ec2Service::respond(
         "DescribeByoipCidrs",
         &req.request_id,
-        "",
+        &ec2_list("byoipCidrSet", &items),
     ))
 }
 
 pub(crate) fn provision_byoip_cidr(
-    _svc: &Ec2Service,
+    svc: &Ec2Service,
     req: &AwsRequest,
 ) -> Result<AwsResponse, AwsServiceError> {
-    require(&req.query_params, "Cidr")?;
+    let cidr = require(&req.query_params, "Cidr")?;
+    let c = ByoipCidr {
+        cidr: cidr.clone(),
+        description: req
+            .query_params
+            .get("Description")
+            .cloned()
+            .unwrap_or_default(),
+        state: "provisioned".to_string(),
+    };
+    {
+        let mut accounts = svc.state.write();
+        accounts
+            .get_or_create(&req.account_id)
+            .byoip_cidrs
+            .insert(cidr, c.clone());
+    }
     Ok(Ec2Service::respond(
         "ProvisionByoipCidr",
         &req.request_id,
-        "",
+        &format!("<byoipCidr>{}</byoipCidr>", byoip_cidr_xml(&c)),
     ))
 }
 
 pub(crate) fn withdraw_byoip_cidr(
-    _svc: &Ec2Service,
+    svc: &Ec2Service,
     req: &AwsRequest,
 ) -> Result<AwsResponse, AwsServiceError> {
-    require(&req.query_params, "Cidr")?;
+    let cidr = require(&req.query_params, "Cidr")?;
+    let c = set_byoip_state(svc, req, &cidr, "provisioned");
     Ok(Ec2Service::respond(
         "WithdrawByoipCidr",
         &req.request_id,
-        "",
+        &format!("<byoipCidr>{}</byoipCidr>", byoip_cidr_xml(&c)),
     ))
 }