Skip to content

Commit 0a9ef64

Browse files
authored
adjust service crate naming (#440)
1 parent 2eadbde commit 0a9ef64

File tree

278 files changed

+39
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+39
-28
lines changed

services/autorust/codegen/examples/gen_mgmt.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// cargo run --example gen_mgmt --release
22
// https://github.com/Azure/azure-rest-api-specs/blob/master/specification/compute/resource-manager
33
use autorust_codegen::{self, cargo_toml, config_parser::to_mod_name, get_mgmt_readmes, lib_rs, path, Config, PropertyName, SpecReadme};
4-
use heck::SnakeCase;
54
use std::{collections::HashSet, fs, path::PathBuf};
65

76
const OUTPUT_FOLDER: &str = "../mgmt";
@@ -324,7 +323,7 @@ fn main() -> Result<()> {
324323
}
325324

326325
fn gen_crate(spec: &SpecReadme) -> Result<()> {
327-
let service_name = &get_service_name(spec.spec());
326+
let service_name = &spec.service_name();
328327
let crate_name = &format!("azure_mgmt_{}", service_name);
329328
let output_folder = &path::join(OUTPUT_FOLDER, service_name).map_err(|source| Error::PathError { source })?;
330329

@@ -407,7 +406,3 @@ fn gen_crate(spec: &SpecReadme) -> Result<()> {
407406

408407
Ok(())
409408
}
410-
411-
fn get_service_name(spec_folder: &str) -> String {
412-
spec_folder.to_snake_case().replace("-", "_")
413-
}

services/autorust/codegen/examples/gen_svc.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// cargo run --example gen_svc --release
22
// https://github.com/Azure/azure-rest-api-specs/blob/master/specification/batch/data-plane
33
use autorust_codegen::{self, cargo_toml, config_parser::to_mod_name, get_svc_readmes, lib_rs, path, Config, PropertyName, SpecReadme};
4-
use heck::SnakeCase;
54
use std::{collections::HashSet, fs, path::PathBuf};
65

76
const OUTPUT_FOLDER: &str = "../svc";
@@ -170,7 +169,7 @@ fn gen_crate(spec: &SpecReadme) -> Result<()> {
170169
return Ok(());
171170
}
172171

173-
let service_name = &get_service_name(spec.spec());
172+
let service_name = &spec.service_name();
174173
let crate_name = &format!("azure_svc_{}", service_name);
175174
let output_folder = &path::join(OUTPUT_FOLDER, service_name).map_err(|source| Error::PathError { source })?;
176175

@@ -261,7 +260,3 @@ fn gen_crate(spec: &SpecReadme) -> Result<()> {
261260

262261
Ok(())
263262
}
264-
265-
fn get_service_name(spec_folder: &str) -> String {
266-
spec_folder.to_snake_case().replace("-", "_").replace(".", "_")
267-
}

services/autorust/codegen/src/lib.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ impl SpecReadme {
180180
pub fn spec(&self) -> &str {
181181
self.spec.as_str()
182182
}
183+
pub fn service_name(&self) -> String {
184+
get_service_name(&self.spec)
185+
}
183186
pub fn readme(&self) -> &Path {
184187
self.readme.as_path()
185188
}
@@ -226,3 +229,21 @@ pub fn get_svc_readmes() -> Result<Vec<SpecReadme>> {
226229
});
227230
Ok(readmes)
228231
}
232+
233+
fn get_service_name(spec_name: &str) -> String {
234+
spec_name.replace("azure", "").replace("_", "").replace("-", "").to_lowercase()
235+
}
236+
237+
#[cfg(test)]
238+
mod tests {
239+
use super::*;
240+
241+
#[test]
242+
fn test_service_name() {
243+
assert_eq!("activedirectory", get_service_name("azureactivedirectory"));
244+
assert_eq!("cosmosdb", get_service_name("cosmos_db"));
245+
assert_eq!("datalakestore", get_service_name("datalake_store"));
246+
assert_eq!("kusto", get_service_name("azure-kusto"));
247+
assert_eq!("enterpriseknowledgegraph", get_service_name("EnterpriseKnowledgeGraph"));
248+
}
249+
}

services/mgmt/azureactivedirectory/Cargo.toml renamed to services/mgmt/activedirectory/Cargo.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)