Fix api name

Author: daniel-m-dd

.generator/src/generator/cli.py

@@ -40,7 +40,7 @@ def cli(specs, output):
     env.filters["return_type"] = openapi.return_type
     env.filters["snake_case"] = formatter.snake_case
     env.filters["attribute_path"] = formatter.attribute_path
-
+    env.filters["class_name"] = formatter.class_name
     env.globals["gem_name"] = GEM_NAME
     env.globals["module_name"] = MODULE_NAME
     env.globals["enumerate"] = enumerate

.generator/src/generator/formatter.py

@@ -342,6 +342,9 @@ def format_data_with_schema_dict(
 
     return parameters
 
+def class_name(value):
+    value = re.sub(r'[^a-zA-Z0-9]', '', value)
+    return value + "API"
 
 def attribute_path(attribute):
     return ".".join(attribute_name(a) for a in attribute.split("."))

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

@@ -5,7 +5,7 @@
 require 'cgi'
 
 module {{ module_name }}::{{ version|upper }}
-{%- set classname = name.replace(" ", "") + "API" %}
+{%- set classname = name|class_name %}
   class {{ classname }}
     attr_accessor :api_client
 

.generator/src/generator/templates/inflector.j2

@@ -18,7 +18,7 @@ module {{ module_name }}
         # APIs
         {%- for version, apis in all_apis.items() %}
         {%- for api in apis|sort %}
-        {%- set name = api.replace(" ", "") + "API" %}
+        {%- set name = api|class_name %}
         "{{ version }}.{{ api|snake_case }}_api" => "{{ name }}"{%-if not loop.last %},{% endif %}
         {%- endfor %}{%-if not loop.last %},{% endif %}
         {%- endfor %}

features/step_definitions/request.rb

@@ -123,6 +123,14 @@ def undo_operations
     @undo_operations
   end
 
+  # Takes a tag name and converts it into an API class name by removing spaces and dashes, then appending "API"
+  # For example: "Logs-Archive" -> "LogsArchiveAPI"
+  # @param name [String] The tag name to convert
+  # @return [String] The API class name
+  def build_api_name(name)
+    name.gsub(/[\s-]/, '') + "API"
+  end
+
   def build_undo_for(version, operation_id, api_instance = nil)
     operation = undo_operations
     raise "missing x-undo for #{version}" unless operation.key? version
@@ -134,13 +142,14 @@ def build_undo_for(version, operation_id, api_instance = nil)
     return if operation["type"] != "unsafe"
 
     if operation["tag"] != nil
-      undo_tag = operation["tag"].gsub(/\s/, '')
+      undo_tag = operation["tag"]
+      api_name = build_api_name(undo_tag)
       undo_api = Object.const_get("DatadogAPIClient")
       undo_configuration = from_env(undo_api::Configuration.new)
       undo_configuration.api_key = ENV["DD_TEST_CLIENT_API_KEY"]
       undo_configuration.application_key = ENV["DD_TEST_CLIENT_APP_KEY"]
       undo_api_client = undo_api::APIClient.new undo_configuration
-      api_instance = undo_api.const_get("V#{version}").const_get("#{undo_tag}API").new undo_api_client
+      api_instance = undo_api.const_get("V#{version}").const_get(api_name).new undo_api_client
     end
 
     api_instance ||= @api_instance
@@ -171,7 +180,7 @@ def build_undo_for(version, operation_id, api_instance = nil)
   end
 
   def build_given(api_version, operation)
-    api_name = operation["tag"].gsub(/\s/, '')
+    api_name = build_api_name(operation["tag"])
     operation_name = operation["operationId"].snakecase
 
     # make sure we have a fresh instance of API client and configuration
@@ -180,7 +189,7 @@ def build_given(api_version, operation)
     given_configuration.api_key = ENV["DD_TEST_CLIENT_API_KEY"]
     given_configuration.application_key = ENV["DD_TEST_CLIENT_APP_KEY"]
     given_api_client = given_api::APIClient.new given_configuration
-    given_api_instance = given_api.const_get("V#{api_version}").const_get("#{api_name}API").new given_api_client
+    given_api_instance = given_api.const_get("V#{api_version}").const_get(api_name).new given_api_client
     method = given_api_instance.method("#{operation_name}_with_http_info".to_sym)
 
     # find undo method
@@ -240,7 +249,8 @@ def model_builder(param, obj)
 end
 
 Given(/^an instance of "([^"]+)" API$/) do |api_name|
-  @api_instance = api.const_get("V#{@api_version}").const_get("#{api_name}API").new api_client
+  name = build_api_name(api_name)
+  @api_instance = api.const_get("V#{@api_version}").const_get(name).new api_client
 end
 
 Given('operation {string} enabled') do |name|