Skip to content

Distinguishes between IPv4 and v6 subnet overlap when creating VPC #760

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

Merged
merged 1 commit into from
Mar 15, 2022
Merged

Distinguishes between IPv4 and v6 subnet overlap when creating VPC #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 3 additions & 22 deletions nexus/src/db/datastore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ use crate::context::OpContext;
use crate::db::fixed_data::role_assignment_builtin::BUILTIN_ROLE_ASSIGNMENTS;
use crate::db::fixed_data::role_builtin::BUILTIN_ROLES;
use crate::external_api::params;
use async_bb8_diesel::{
AsyncConnection, AsyncRunQueryDsl, ConnectionError, ConnectionManager,
PoolError,
};
use async_bb8_diesel::{AsyncConnection, AsyncRunQueryDsl, ConnectionManager};
use chrono::Utc;
use diesel::pg::Pg;
use diesel::prelude::*;
Expand Down Expand Up @@ -2537,29 +2534,13 @@ impl DataStore {
subnet: VpcSubnet,
) -> Result<VpcSubnet, SubnetError> {
use db::schema::vpc_subnet::dsl;
let name = subnet.name().clone();
let values = FilterConflictingVpcSubnetRangesQuery(subnet);
let values = FilterConflictingVpcSubnetRangesQuery(subnet.clone());
diesel::insert_into(dsl::vpc_subnet)
.values(values)
.returning(VpcSubnet::as_returning())
.get_result_async(self.pool())
.await
.map_err(|err| {
if let PoolError::Connection(ConnectionError::Query(
diesel::result::Error::NotFound,
)) = err
{
SubnetError::OverlappingIpRange
} else {
SubnetError::External(public_error_from_diesel_pool(
err,
ErrorHandler::Conflict(
ResourceType::VpcSubnet,
name.to_string().as_str(),
),
))
}
})
.map_err(|e| SubnetError::from_pool(e, &subnet))
}

pub async fn vpc_delete_subnet(
Expand Down
Loading