Allow hyphen

Author: daniel-m-dd

.generator/src/generator/templates/api.j2

@@ -20,7 +20,7 @@ use flate2::{write::{GzEncoder, ZlibEncoder}, Compression};
 {%- endif %}
 {%- endfor %}
 
-{%- set structName = name.replace(" ", "")+"API" %}
+{%- set structName = name.replace(" ", "").replace("-", "")+"API" %}
 {% for path, method, operation in operations|sort(attribute="2.operationId", case_sensitive=true) %}
 {%- set httpMethod = method.upper() %}
 {%- set returnType, _ = operation|return_type(version) %}

.generator/src/generator/templates/function_mappings.j2

@@ -15,7 +15,7 @@ pub struct ApiInstances {
 {%- for version, apis in all_apis.items() %}
 {%- for name, operations in apis.items() %}
 {%- set fieldName = "api_"+name %}
-{%- set structName = name.replace(" ", "")+"API" %}
+{%- set structName = name.replace(" ", "").replace("-", "")+"API" %}
     pub {{version}}_{{fieldName | snake_case}}: Option<datadog{{ version.upper() }}::{{fieldName | snake_case}}::{{structName}}>,
 {%- endfor %}
 {%- endfor %}
@@ -25,7 +25,7 @@ pub fn initialize_api_instance(world: &mut DatadogWorld, api: String) {
     match api.as_str() {
     {%- for name, versions in get_apis_and_versions(all_apis) %}
     {%- set fieldName = "api_"+name|snake_case %}
-    {%- set structName = name.replace(" ", "")+"API" %}
+    {%- set structName = name.replace(" ", "").replace("-", "")+"API" %}
         "{{name.replace(" ", "")}}" => {
         {%- for version in versions %}
             world.api_instances.{{version}}_{{fieldName}} = Some(datadog{{ version.upper() }}::{{fieldName}}::{{structName}}::with_client_and_config(

tests/scenarios/fixtures.rs

@@ -298,7 +298,8 @@ fn valid_appkey(world: &mut DatadogWorld) {
 
 #[given(expr = "an instance of {string} API")]
 fn instance_of_api(world: &mut DatadogWorld, api: String) {
-    initialize_api_instance(world, api.clone());
+    let api_name = api.clone().replace("-", "");
+    initialize_api_instance(world, api_name);
     world.api_name = Some(api);
 }
 
@@ -358,7 +359,7 @@ pub fn given_resource_in_system(
                 .as_str()
                 .expect("failed to parse given tag as str")
                 .to_string();
-            api_name.retain(|c| !c.is_whitespace());
+            api_name.retain(|c| !c.is_whitespace() && c != '-');
 
             api_name
         } else {
@@ -867,8 +868,8 @@ fn build_undo(
                     .unwrap()
                     .to_string()
             };
-            api_name.retain(|c| !c.is_whitespace());
-
+            api_name.retain(|c| !c.is_whitespace() && c != '-');
+            
             if undo.get("operationId").is_none() {
                 return Ok(None);
             }