address feature name limits from crates.io (#645)

This ensures feature names are alpha-numeric, dashes, and underscores only.

Co-authored-by: Brian Caswell <bcaswell@microsoft.com>

Author: bmc-msft

services/autorust/codegen/examples/gen_mgmt.rs

@@ -1,6 +1,10 @@
 // cargo run --example gen_mgmt --release
 // https://github.com/Azure/azure-rest-api-specs/blob/master/specification/compute/resource-manager
-use autorust_codegen::{self, cargo_toml, config_parser::to_mod_name, get_mgmt_readmes, lib_rs, path, Config, PropertyName, SpecReadme};
+use autorust_codegen::{
+    self, cargo_toml,
+    config_parser::{to_mod_name, to_tag_name},
+    get_mgmt_readmes, lib_rs, path, Config, PropertyName, SpecReadme,
+};
 use std::{collections::HashSet, fs, path::PathBuf};
 
 const OUTPUT_FOLDER: &str = "../mgmt";
@@ -28,6 +32,7 @@ const SKIP_SERVICE_TAGS: &[(&str, &str)] = &[
     ("authorization", "package-2018-05-01-preview"),
     ("authorization", "package-2021-03-01-preview-only"),
     ("authorization", "package-2021-07-01-preview-only"),
+    ("authorization", "package-preview-2021-11"),
     ("azureactivedirectory", "package-preview-2020-07"),
     ("consumption", "package-2018-03"), // defines get_balances_by_billing_account twice
     ("consumption", "package-2019-11"), // ReservationRecommendationDetails_Get has a path and query param both named "scope"
@@ -285,6 +290,8 @@ const BOX_PROPERTIES: &[(&str, &str, &str)] = &[
     ("../../../azure-rest-api-specs/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/managedHsm.json", "Error" , "innererror"),
     ("../../../azure-rest-api-specs/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/managedHsm.json", "Error" , "innererror"),
     ("../../../azure-rest-api-specs/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/managedHsm.json", "Error" , "innererror"),
+    ("../../../azure-rest-api-specs/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-11-01-preview/managedHsm.json", "Error" , "innererror"),
+    ("../../../azure-rest-api-specs/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2021-10-01/managedHsm.json", "Error", "innererror"),
 ];
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
@@ -352,17 +359,17 @@ fn gen_crate(spec: &SpecReadme) -> Result<()> {
     }
 
     for config in spec.configs()? {
-        let tag = config.tag.as_str();
-        if skip_service_tags.contains(&(spec.spec(), tag)) {
+        let tag = to_tag_name(&config.tag);
+        if skip_service_tags.contains(&(spec.spec(), tag.as_ref())) {
             println!("  skipping {}", tag);
             continue;
         }
         println!("  {}", tag);
         // println!("  {}", api_version);
-        let mod_name = &to_mod_name(tag);
-        feature_mod_names.push((tag.to_string(), mod_name.clone()));
+        let mod_name = to_mod_name(&tag);
+        let mod_output_folder = path::join(&src_folder, &mod_name).map_err(|source| Error::PathError { source })?;
+        feature_mod_names.push((tag, mod_name));
         // println!("  {}", mod_name);
-        let mod_output_folder = path::join(&src_folder, mod_name).map_err(|source| Error::PathError { source })?;
         // println!("  {:?}", mod_output_folder);
         // for input_file in &config.input_files {
         //     println!("  {}", input_file);

services/autorust/codegen/examples/gen_svc.rs

@@ -1,6 +1,10 @@
 // cargo run --example gen_svc --release
 // https://github.com/Azure/azure-rest-api-specs/blob/master/specification/batch/data-plane
-use autorust_codegen::{self, cargo_toml, config_parser::to_mod_name, get_svc_readmes, lib_rs, path, Config, PropertyName, SpecReadme};
+use autorust_codegen::{
+    self, cargo_toml,
+    config_parser::{to_mod_name, to_tag_name},
+    get_svc_readmes, lib_rs, path, Config, PropertyName, SpecReadme,
+};
 use std::{collections::HashSet, fs, path::PathBuf};
 
 const OUTPUT_FOLDER: &str = "../svc";
@@ -18,11 +22,11 @@ const SKIP_SERVICES: &[&str] = &[
 const SKIP_SERVICE_TAGS: &[(&str, &str)] = &[
     ("agrifood", "package-2021-03-31-preview"), // duplicate params https://github.com/Azure/azure-sdk-for-rust/issues/501
     ("purview", "package-2021-05-01-preview"),  // need to box types
-    ("maps", "package-preview-2.0"),            // global responses https://github.com/Azure/azure-sdk-for-rust/issues/502
-    ("maps", "package-1.0-preview"),            // global responses https://github.com/Azure/azure-sdk-for-rust/issues/502
-    ("servicefabric", "6.2"),                   // invalid model TimeBasedBackupScheduleDescription
-    ("servicefabric", "6.3"),                   // invalid model TimeBasedBackupScheduleDescription
-    ("servicefabric", "6.4"),                   // invalid model TimeBasedBackupScheduleDescription
+    ("maps", "package-preview-2_0"),            // global responses https://github.com/Azure/azure-sdk-for-rust/issues/502
+    ("maps", "package-1_0-preview"),            // global responses https://github.com/Azure/azure-sdk-for-rust/issues/502
+    ("servicefabric", "6_2"),                   // invalid model TimeBasedBackupScheduleDescription
+    ("servicefabric", "6_3"),                   // invalid model TimeBasedBackupScheduleDescription
+    ("servicefabric", "6_4"),                   // invalid model TimeBasedBackupScheduleDescription
     ("storagedatalake", "package-2018-11"),     // "invalid value: string \"ErrorResponse\", expected length 3"
     ("storagedatalake", "package-2018-06-preview"),
     ("storagedatalake", "package-2019-10"),
@@ -241,16 +245,16 @@ fn gen_crate(spec: &SpecReadme) -> Result<()> {
     }
 
     for config in spec.configs()? {
-        let tag = config.tag.as_str();
-        if skip_service_tags.contains(&(spec.spec(), tag)) {
+        let tag = to_tag_name(config.tag.as_str());
+        if skip_service_tags.contains(&(spec.spec(), tag.as_ref())) {
             // println!("  skipping {}", tag);
             continue;
         }
         println!("  {}", tag);
-        let mod_name = &to_mod_name(tag);
-        feature_mod_names.push((tag.to_string(), mod_name.clone()));
+        let mod_name = to_mod_name(&tag);
+        let mod_output_folder = path::join(&src_folder, &mod_name).map_err(|source| Error::PathError { source })?;
+        feature_mod_names.push((tag, mod_name));
         // println!("  {}", mod_name);
-        let mod_output_folder = path::join(&src_folder, mod_name).map_err(|source| Error::PathError { source })?;
         // println!("  {:?}", mod_output_folder);
         // for input_file in &config.input_files {
         //     println!("  {}", input_file);

services/autorust/codegen/src/config_parser.rs

@@ -194,6 +194,16 @@ pub fn get_input_file_api_version(input_file: &str) -> Option<String> {
     }
 }
 
+/// Create a Rust tag name, based on the feature naem.
+pub fn to_tag_name(name: &str) -> String {
+    name.chars()
+        .map(|x| match x {
+            'a'..='z' | 'A'..='Z' | '0'..='9' | '-' | '_' => x,
+            _ => '_',
+        })
+        .collect()
+}
+
 /// Create a Rust module name, based on the feature naem.
 pub fn to_mod_name(feature_name: &str) -> String {
     let mut name = feature_name.to_owned();
@@ -215,6 +225,13 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_tag_name() {
+        assert_eq!("2019-06", to_tag_name("2019-06"));
+        assert_eq!("2019_06", to_tag_name("2019.06"));
+        assert_eq!("2019_06", to_tag_name("2019!06"));
+    }
+
     #[test]
     fn test_mod_name() {
         assert_eq!("v2019_06", to_mod_name("2019-06"));

services/svc/batch/Cargo.toml

@@ -24,18 +24,18 @@ tokio = { version = "1.0", features = ["macros"] }
 all-features = true
 
 [features]
-default = ["package-2022-01.15.0", "enable_reqwest"]
+default = ["package-2022-01_15_0", "enable_reqwest"]
 enable_reqwest = ["azure_core/enable_reqwest"]
 enable_reqwest_rustls = ["azure_core/enable_reqwest_rustls"]
 no-default-version = []
-"package-2022-01.15.0" = []
-"package-2021-06.14.0" = []
-"package-2020-09.12.0" = []
-"package-2020-03.11.0" = []
-"package-2019-08.10.0" = []
-"package-2019-06.9.0" = []
-"package-2018-12.8.0" = []
-"package-2018-08.7.0" = []
-"package-2018-03.6.1" = []
-"package-2017-09.6.0" = []
-"package-2017-06.5.1" = []
+"package-2022-01_15_0" = []
+"package-2021-06_14_0" = []
+"package-2020-09_12_0" = []
+"package-2020-03_11_0" = []
+"package-2019-08_10_0" = []
+"package-2019-06_9_0" = []
+"package-2018-12_8_0" = []
+"package-2018-08_7_0" = []
+"package-2018-03_6_1" = []
+"package-2017-09_6_0" = []
+"package-2017-06_5_1" = []

services/svc/batch/src/lib.rs

@@ -3,47 +3,47 @@
 #![allow(clippy::ptr_arg)]
 #![allow(clippy::large_enum_variant)]
 #![doc = "generated by AutoRust"]
-#[cfg(feature = "package-2022-01.15.0")]
+#[cfg(feature = "package-2022-01_15_0")]
 pub mod package_2022_01_15_0;
-#[cfg(all(feature = "package-2022-01.15.0", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2022-01_15_0", not(feature = "no-default-version")))]
 pub use package_2022_01_15_0::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2021-06.14.0")]
+#[cfg(feature = "package-2021-06_14_0")]
 pub mod package_2021_06_14_0;
-#[cfg(all(feature = "package-2021-06.14.0", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2021-06_14_0", not(feature = "no-default-version")))]
 pub use package_2021_06_14_0::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2020-09.12.0")]
+#[cfg(feature = "package-2020-09_12_0")]
 pub mod package_2020_09_12_0;
-#[cfg(all(feature = "package-2020-09.12.0", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2020-09_12_0", not(feature = "no-default-version")))]
 pub use package_2020_09_12_0::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2020-03.11.0")]
+#[cfg(feature = "package-2020-03_11_0")]
 pub mod package_2020_03_11_0;
-#[cfg(all(feature = "package-2020-03.11.0", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2020-03_11_0", not(feature = "no-default-version")))]
 pub use package_2020_03_11_0::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2019-08.10.0")]
+#[cfg(feature = "package-2019-08_10_0")]
 pub mod package_2019_08_10_0;
-#[cfg(all(feature = "package-2019-08.10.0", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2019-08_10_0", not(feature = "no-default-version")))]
 pub use package_2019_08_10_0::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2019-06.9.0")]
+#[cfg(feature = "package-2019-06_9_0")]
 pub mod package_2019_06_9_0;
-#[cfg(all(feature = "package-2019-06.9.0", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2019-06_9_0", not(feature = "no-default-version")))]
 pub use package_2019_06_9_0::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2018-12.8.0")]
+#[cfg(feature = "package-2018-12_8_0")]
 pub mod package_2018_12_8_0;
-#[cfg(all(feature = "package-2018-12.8.0", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2018-12_8_0", not(feature = "no-default-version")))]
 pub use package_2018_12_8_0::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2018-08.7.0")]
+#[cfg(feature = "package-2018-08_7_0")]
 pub mod package_2018_08_7_0;
-#[cfg(all(feature = "package-2018-08.7.0", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2018-08_7_0", not(feature = "no-default-version")))]
 pub use package_2018_08_7_0::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2018-03.6.1")]
+#[cfg(feature = "package-2018-03_6_1")]
 pub mod package_2018_03_6_1;
-#[cfg(all(feature = "package-2018-03.6.1", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2018-03_6_1", not(feature = "no-default-version")))]
 pub use package_2018_03_6_1::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2017-09.6.0")]
+#[cfg(feature = "package-2017-09_6_0")]
 pub mod package_2017_09_6_0;
-#[cfg(all(feature = "package-2017-09.6.0", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2017-09_6_0", not(feature = "no-default-version")))]
 pub use package_2017_09_6_0::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-2017-06.5.1")]
+#[cfg(feature = "package-2017-06_5_1")]
 pub mod package_2017_06_5_1;
-#[cfg(all(feature = "package-2017-06.5.1", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-2017-06_5_1", not(feature = "no-default-version")))]
 pub use package_2017_06_5_1::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};

services/svc/confidentialledger/Cargo.toml

@@ -24,9 +24,9 @@ tokio = { version = "1.0", features = ["macros"] }
 all-features = true
 
 [features]
-default = ["package-0.1-preview-ledger", "enable_reqwest"]
+default = ["package-0_1-preview-ledger", "enable_reqwest"]
 enable_reqwest = ["azure_core/enable_reqwest"]
 enable_reqwest_rustls = ["azure_core/enable_reqwest_rustls"]
 no-default-version = []
-"package-0.1-preview-ledger" = []
-"package-0.1-preview-identity" = []
+"package-0_1-preview-ledger" = []
+"package-0_1-preview-identity" = []

services/svc/confidentialledger/src/lib.rs

@@ -3,11 +3,11 @@
 #![allow(clippy::ptr_arg)]
 #![allow(clippy::large_enum_variant)]
 #![doc = "generated by AutoRust"]
-#[cfg(feature = "package-0.1-preview-ledger")]
+#[cfg(feature = "package-0_1-preview-ledger")]
 pub mod package_0_1_preview_ledger;
-#[cfg(all(feature = "package-0.1-preview-ledger", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-0_1-preview-ledger", not(feature = "no-default-version")))]
 pub use package_0_1_preview_ledger::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};
-#[cfg(feature = "package-0.1-preview-identity")]
+#[cfg(feature = "package-0_1-preview-identity")]
 pub mod package_0_1_preview_identity;
-#[cfg(all(feature = "package-0.1-preview-identity", not(feature = "no-default-version")))]
+#[cfg(all(feature = "package-0_1-preview-identity", not(feature = "no-default-version")))]
 pub use package_0_1_preview_identity::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};

services/svc/graphrbac/Cargo.toml

@@ -24,8 +24,8 @@ tokio = { version = "1.0", features = ["macros"] }
 all-features = true
 
 [features]
-default = ["1.6", "enable_reqwest"]
+default = ["1_6", "enable_reqwest"]
 enable_reqwest = ["azure_core/enable_reqwest"]
 enable_reqwest_rustls = ["azure_core/enable_reqwest_rustls"]
 no-default-version = []
-"1.6" = []
+"1_6" = []

services/svc/graphrbac/src/lib.rs

@@ -3,7 +3,7 @@
 #![allow(clippy::ptr_arg)]
 #![allow(clippy::large_enum_variant)]
 #![doc = "generated by AutoRust"]
-#[cfg(feature = "1.6")]
+#[cfg(feature = "1_6")]
 pub mod v1_6;
-#[cfg(all(feature = "1.6", not(feature = "no-default-version")))]
+#[cfg(all(feature = "1_6", not(feature = "no-default-version")))]
 pub use v1_6::{models, operations, operations::Client, operations::ClientBuilder, operations::Error};

services/svc/iotcentral/Cargo.toml

@@ -24,10 +24,10 @@ tokio = { version = "1.0", features = ["macros"] }
 all-features = true
 
 [features]
-default = ["package-1.0", "enable_reqwest"]
+default = ["package-1_0", "enable_reqwest"]
 enable_reqwest = ["azure_core/enable_reqwest"]
 enable_reqwest_rustls = ["azure_core/enable_reqwest_rustls"]
 no-default-version = []
-"package-1.1-preview" = []
+"package-1_1-preview" = []
 "package-2021-04-30-preview" = []
-"package-1.0" = []
+"package-1_0" = []