Skip to content

Switch string comparisons to be case-insensitive. #2

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Switch string comparisons to be case-insensitive. #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c64e879
Switch string comparisons to be case-insenstive.
Peternator7 Sep 28, 2020
df26ad4
Remove extra &
Peternator7 Sep 28, 2020
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
12 changes: 6 additions & 6 deletions src/resource.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ pub async fn get_vm_sku(
.await?
.value
.into_iter()
.filter(|sku| sku.resource_type == "virtualMachines")
.filter(|sku| sku.locations.len() > 0 && sku.locations[0] == location)
.filter(|sku| sku.name == name)
.filter(|sku| sku.resource_type.eq_ignore_ascii_case("virtualMachines"))
.filter(|sku| sku.locations.len() > 0 && sku.locations[0].eq_ignore_ascii_case(location))
.filter(|sku| sku.name.eq_ignore_ascii_case(name))
.map(|sku| VirtualMachine::try_from(sku))
.collect::<Result<Vec<VirtualMachine>>>()?;

Expand All @@ -92,8 +92,8 @@ pub async fn list_disk_skus(
.await?
.value
.into_iter()
.filter(|sku| sku.resource_type == "disks")
.filter(|sku| sku.locations.len() > 0 && sku.locations[0] == location)
.filter(|sku| sku.resource_type.eq_ignore_ascii_case("disks"))
.filter(|sku| sku.locations.len() > 0 && sku.locations[0].eq_ignore_ascii_case(location))
.filter(|res| res.tier != Some("Ultra".to_string())) // Need to support ultra, it has different range-based structure
.map(|sku| Disk::try_from(sku))
.collect::<Result<Vec<Disk>>>()
Expand All @@ -102,7 +102,7 @@ pub async fn list_disk_skus(
pub fn get_disk_sku(skus: &Vec<Disk>, size: &u64, storage_account_type: &str) -> Result<Disk> {
let mut filtered = skus
.iter()
.filter(|sku| &sku.storage_account_type == storage_account_type)
.filter(|sku| sku.storage_account_type.eq_ignore_ascii_case(storage_account_type))
.filter(|sku| size > &sku.min_size_gb && size <= &sku.max_size_gb)
.cloned()
.collect::<Vec<Disk>>();
Expand Down