Fix frozen string errors again, more durably this time (#2407)

issyl0 · skarimo · web-flow · commit 69fda8858f77 · 2025-05-15T12:39:25.000-04:00
- The PR #1971 fixed frozen string errors. - But when the templates regenerated, the `+` on each `url` string went away. So now we're seeing these errors again with the current gem version on Ruby 3.4. - This attempts to fix them more durably by persisting the `+` for marking the string as mutable to the template itself. ``` /workspaces/github/vendor/gems/3.4.3/ruby/3.4.0/gems/datadog_api_client-2.33.0/lib/datadog_api_client/configuration.rb:619: warning: literal string will be frozen in the future (run with --debug-frozen-string-literal for more information) ``` Co-authored-by: skarimo <40482491+skarimo@users.noreply.github.com>
diff --git a/.generator/src/generator/templates/configuration.j2 b/.generator/src/generator/templates/configuration.j2
@@ -312,7 +312,7 @@ module {{ module_name }}
     # Returns an array of Server setting
 {%- macro server_configuration(server) -%}
 {
-  url: "{{ server.url }}",
+  url: +"{{ server.url }}",
   description: "{{ server.description|default("No description provided") }}",
   variables: {
   {%- for name, variable in server.get("variables", {}).items() %}
@@ -353,7 +353,7 @@ module {{ module_name }}
         "{{ version }}.{{ operation.operationId|snake_case }}": [
         {%- endif %}
           {{ server_configuration(server)|indent(10) }}{% if not loop.last %},{% endif %}
-        {%- if loop.last %}  
+        {%- if loop.last %}
         ],
         {%- endif %}
         {%- endfor %}
diff --git a/lib/datadog_api_client/configuration.rb b/lib/datadog_api_client/configuration.rb
@@ -380,7 +380,7 @@ def auth_settings
     def server_settings
       [
         {
-          url: "https://{subdomain}.{site}",
+          url: +"https://{subdomain}.{site}",
           description: "No description provided",
           variables: {
             site: {
@@ -402,7 +402,7 @@ def server_settings
           }
         },
         {
-          url: "{protocol}://{name}",
+          url: +"{protocol}://{name}",
           description: "No description provided",
           variables: {
             name: {
@@ -416,7 +416,7 @@ def server_settings
           }
         },
         {
-          url: "https://{subdomain}.{site}",
+          url: +"https://{subdomain}.{site}",
           description: "No description provided",
           variables: {
             site: {
@@ -436,7 +436,7 @@ def operation_server_settings
       {
         "v1.get_ip_ranges": [
           {
-            url: "https://{subdomain}.{site}",
+            url: +"https://{subdomain}.{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -458,7 +458,7 @@ def operation_server_settings
             }
           },
           {
-            url: "{protocol}://{name}",
+            url: +"{protocol}://{name}",
             description: "No description provided",
             variables: {
               name: {
@@ -472,19 +472,19 @@ def operation_server_settings
             }
           },
           {
-            url: "https://{subdomain}.datadoghq.com",
+            url: +"https://{subdomain}.datadoghq.com",
             description: "No description provided",
             variables: {
               subdomain: {
                 description: "The subdomain where the API is deployed.",
                 default_value: "ip-ranges",
               }
             }
-          }  
+          }
         ],
         "v1.submit_log": [
           {
-            url: "https://{subdomain}.{site}",
+            url: +"https://{subdomain}.{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -506,7 +506,7 @@ def operation_server_settings
             }
           },
           {
-            url: "{protocol}://{name}",
+            url: +"{protocol}://{name}",
             description: "No description provided",
             variables: {
               name: {
@@ -520,7 +520,7 @@ def operation_server_settings
             }
           },
           {
-            url: "https://{subdomain}.{site}",
+            url: +"https://{subdomain}.{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -532,11 +532,11 @@ def operation_server_settings
                 default_value: "http-intake.logs",
               }
             }
-          }  
+          }
         ],
         "v2.submit_log": [
           {
-            url: "https://{subdomain}.{site}",
+            url: +"https://{subdomain}.{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -558,7 +558,7 @@ def operation_server_settings
             }
           },
           {
-            url: "{protocol}://{name}",
+            url: +"{protocol}://{name}",
             description: "No description provided",
             variables: {
               name: {
@@ -572,7 +572,7 @@ def operation_server_settings
             }
           },
           {
-            url: "https://{subdomain}.{site}",
+            url: +"https://{subdomain}.{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -584,11 +584,11 @@ def operation_server_settings
                 default_value: "http-intake.logs",
               }
             }
-          }  
+          }
         ],
         "v2.create_on_call_page": [
           {
-            url: "https://{site}",
+            url: +"https://{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -605,7 +605,7 @@ def operation_server_settings
             }
           },
           {
-            url: "{protocol}://{name}",
+            url: +"{protocol}://{name}",
             description: "No description provided",
             variables: {
               name: {
@@ -619,7 +619,7 @@ def operation_server_settings
             }
           },
           {
-            url: "https://{subdomain}.{site}",
+            url: +"https://{subdomain}.{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -631,11 +631,11 @@ def operation_server_settings
                 default_value: "api",
               }
             }
-          }  
+          }
         ],
         "v2.acknowledge_on_call_page": [
           {
-            url: "https://{site}",
+            url: +"https://{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -652,7 +652,7 @@ def operation_server_settings
             }
           },
           {
-            url: "{protocol}://{name}",
+            url: +"{protocol}://{name}",
             description: "No description provided",
             variables: {
               name: {
@@ -666,7 +666,7 @@ def operation_server_settings
             }
           },
           {
-            url: "https://{subdomain}.{site}",
+            url: +"https://{subdomain}.{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -678,11 +678,11 @@ def operation_server_settings
                 default_value: "api",
               }
             }
-          }  
+          }
         ],
         "v2.escalate_on_call_page": [
           {
-            url: "https://{site}",
+            url: +"https://{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -699,7 +699,7 @@ def operation_server_settings
             }
           },
           {
-            url: "{protocol}://{name}",
+            url: +"{protocol}://{name}",
             description: "No description provided",
             variables: {
               name: {
@@ -713,7 +713,7 @@ def operation_server_settings
             }
           },
           {
-            url: "https://{subdomain}.{site}",
+            url: +"https://{subdomain}.{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -725,11 +725,11 @@ def operation_server_settings
                 default_value: "api",
               }
             }
-          }  
+          }
         ],
         "v2.resolve_on_call_page": [
           {
-            url: "https://{site}",
+            url: +"https://{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -746,7 +746,7 @@ def operation_server_settings
             }
           },
           {
-            url: "{protocol}://{name}",
+            url: +"{protocol}://{name}",
             description: "No description provided",
             variables: {
               name: {
@@ -760,7 +760,7 @@ def operation_server_settings
             }
           },
           {
-            url: "https://{subdomain}.{site}",
+            url: +"https://{subdomain}.{site}",
             description: "No description provided",
             variables: {
               site: {
@@ -772,7 +772,7 @@ def operation_server_settings
                 default_value: "api",
               }
             }
-          }  
+          }
         ],
       }
     end

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ def auth_settings`
`380`	`380`	`def server_settings`
`381`	`381`	`[`
`382`	`382`	`{`
`383`		`- url: "https://{subdomain}.{site}",`
	`383`	`+ url: +"https://{subdomain}.{site}",`
`384`	`384`	`description: "No description provided",`
`385`	`385`	`variables: {`
`386`	`386`	`site: {`
`@@ -402,7 +402,7 @@ def server_settings`
`402`	`402`	`}`
`403`	`403`	`},`
`404`	`404`	`{`
`405`		`- url: "{protocol}://{name}",`
	`405`	`+ url: +"{protocol}://{name}",`
`406`	`406`	`description: "No description provided",`
`407`	`407`	`variables: {`
`408`	`408`	`name: {`
`@@ -416,7 +416,7 @@ def server_settings`
`416`	`416`	`}`
`417`	`417`	`},`
`418`	`418`	`{`
`419`		`- url: "https://{subdomain}.{site}",`
	`419`	`+ url: +"https://{subdomain}.{site}",`
`420`	`420`	`description: "No description provided",`
`421`	`421`	`variables: {`
`422`	`422`	`site: {`
`@@ -436,7 +436,7 @@ def operation_server_settings`
`436`	`436`	`{`
`437`	`437`	`"v1.get_ip_ranges": [`
`438`	`438`	`{`
`439`		`- url: "https://{subdomain}.{site}",`
	`439`	`+ url: +"https://{subdomain}.{site}",`
`440`	`440`	`description: "No description provided",`
`441`	`441`	`variables: {`
`442`	`442`	`site: {`
`@@ -458,7 +458,7 @@ def operation_server_settings`
`458`	`458`	`}`
`459`	`459`	`},`
`460`	`460`	`{`
`461`		`- url: "{protocol}://{name}",`
	`461`	`+ url: +"{protocol}://{name}",`
`462`	`462`	`description: "No description provided",`
`463`	`463`	`variables: {`
`464`	`464`	`name: {`
`@@ -472,19 +472,19 @@ def operation_server_settings`
`472`	`472`	`}`
`473`	`473`	`},`
`474`	`474`	`{`
`475`		`- url: "https://{subdomain}.datadoghq.com",`
	`475`	`+ url: +"https://{subdomain}.datadoghq.com",`
`476`	`476`	`description: "No description provided",`
`477`	`477`	`variables: {`
`478`	`478`	`subdomain: {`
`479`	`479`	`description: "The subdomain where the API is deployed.",`
`480`	`480`	`default_value: "ip-ranges",`
`481`	`481`	`}`
`482`	`482`	`}`
`483`		`- }`
	`483`	`+ }`
`484`	`484`	`],`
`485`	`485`	`"v1.submit_log": [`
`486`	`486`	`{`
`487`		`- url: "https://{subdomain}.{site}",`
	`487`	`+ url: +"https://{subdomain}.{site}",`
`488`	`488`	`description: "No description provided",`
`489`	`489`	`variables: {`
`490`	`490`	`site: {`
`@@ -506,7 +506,7 @@ def operation_server_settings`
`506`	`506`	`}`
`507`	`507`	`},`
`508`	`508`	`{`
`509`		`- url: "{protocol}://{name}",`
	`509`	`+ url: +"{protocol}://{name}",`
`510`	`510`	`description: "No description provided",`
`511`	`511`	`variables: {`
`512`	`512`	`name: {`
`@@ -520,7 +520,7 @@ def operation_server_settings`
`520`	`520`	`}`
`521`	`521`	`},`
`522`	`522`	`{`
`523`		`- url: "https://{subdomain}.{site}",`
	`523`	`+ url: +"https://{subdomain}.{site}",`
`524`	`524`	`description: "No description provided",`
`525`	`525`	`variables: {`
`526`	`526`	`site: {`
`@@ -532,11 +532,11 @@ def operation_server_settings`
`532`	`532`	`default_value: "http-intake.logs",`
`533`	`533`	`}`
`534`	`534`	`}`
`535`		`- }`
	`535`	`+ }`
`536`	`536`	`],`
`537`	`537`	`"v2.submit_log": [`
`538`	`538`	`{`
`539`		`- url: "https://{subdomain}.{site}",`
	`539`	`+ url: +"https://{subdomain}.{site}",`
`540`	`540`	`description: "No description provided",`
`541`	`541`	`variables: {`
`542`	`542`	`site: {`
`@@ -558,7 +558,7 @@ def operation_server_settings`
`558`	`558`	`}`
`559`	`559`	`},`
`560`	`560`	`{`
`561`		`- url: "{protocol}://{name}",`
	`561`	`+ url: +"{protocol}://{name}",`
`562`	`562`	`description: "No description provided",`
`563`	`563`	`variables: {`
`564`	`564`	`name: {`
`@@ -572,7 +572,7 @@ def operation_server_settings`
`572`	`572`	`}`
`573`	`573`	`},`
`574`	`574`	`{`
`575`		`- url: "https://{subdomain}.{site}",`
	`575`	`+ url: +"https://{subdomain}.{site}",`
`576`	`576`	`description: "No description provided",`
`577`	`577`	`variables: {`
`578`	`578`	`site: {`
`@@ -584,11 +584,11 @@ def operation_server_settings`
`584`	`584`	`default_value: "http-intake.logs",`
`585`	`585`	`}`
`586`	`586`	`}`
`587`		`- }`
	`587`	`+ }`
`588`	`588`	`],`
`589`	`589`	`"v2.create_on_call_page": [`
`590`	`590`	`{`
`591`		`- url: "https://{site}",`
	`591`	`+ url: +"https://{site}",`
`592`	`592`	`description: "No description provided",`
`593`	`593`	`variables: {`
`594`	`594`	`site: {`
`@@ -605,7 +605,7 @@ def operation_server_settings`
`605`	`605`	`}`
`606`	`606`	`},`
`607`	`607`	`{`
`608`		`- url: "{protocol}://{name}",`
	`608`	`+ url: +"{protocol}://{name}",`
`609`	`609`	`description: "No description provided",`
`610`	`610`	`variables: {`
`611`	`611`	`name: {`
`@@ -619,7 +619,7 @@ def operation_server_settings`
`619`	`619`	`}`
`620`	`620`	`},`
`621`	`621`	`{`
`622`		`- url: "https://{subdomain}.{site}",`
	`622`	`+ url: +"https://{subdomain}.{site}",`
`623`	`623`	`description: "No description provided",`
`624`	`624`	`variables: {`
`625`	`625`	`site: {`
`@@ -631,11 +631,11 @@ def operation_server_settings`
`631`	`631`	`default_value: "api",`
`632`	`632`	`}`
`633`	`633`	`}`
`634`		`- }`
	`634`	`+ }`
`635`	`635`	`],`
`636`	`636`	`"v2.acknowledge_on_call_page": [`
`637`	`637`	`{`
`638`		`- url: "https://{site}",`
	`638`	`+ url: +"https://{site}",`
`639`	`639`	`description: "No description provided",`
`640`	`640`	`variables: {`
`641`	`641`	`site: {`
`@@ -652,7 +652,7 @@ def operation_server_settings`
`652`	`652`	`}`
`653`	`653`	`},`
`654`	`654`	`{`
`655`		`- url: "{protocol}://{name}",`
	`655`	`+ url: +"{protocol}://{name}",`
`656`	`656`	`description: "No description provided",`
`657`	`657`	`variables: {`
`658`	`658`	`name: {`
`@@ -666,7 +666,7 @@ def operation_server_settings`
`666`	`666`	`}`
`667`	`667`	`},`
`668`	`668`	`{`
`669`		`- url: "https://{subdomain}.{site}",`
	`669`	`+ url: +"https://{subdomain}.{site}",`
`670`	`670`	`description: "No description provided",`
`671`	`671`	`variables: {`
`672`	`672`	`site: {`
`@@ -678,11 +678,11 @@ def operation_server_settings`
`678`	`678`	`default_value: "api",`
`679`	`679`	`}`
`680`	`680`	`}`
`681`		`- }`
	`681`	`+ }`
`682`	`682`	`],`
`683`	`683`	`"v2.escalate_on_call_page": [`
`684`	`684`	`{`
`685`		`- url: "https://{site}",`
	`685`	`+ url: +"https://{site}",`
`686`	`686`	`description: "No description provided",`
`687`	`687`	`variables: {`
`688`	`688`	`site: {`
`@@ -699,7 +699,7 @@ def operation_server_settings`
`699`	`699`	`}`
`700`	`700`	`},`
`701`	`701`	`{`
`702`		`- url: "{protocol}://{name}",`
	`702`	`+ url: +"{protocol}://{name}",`
`703`	`703`	`description: "No description provided",`
`704`	`704`	`variables: {`
`705`	`705`	`name: {`
`@@ -713,7 +713,7 @@ def operation_server_settings`
`713`	`713`	`}`
`714`	`714`	`},`
`715`	`715`	`{`
`716`		`- url: "https://{subdomain}.{site}",`
	`716`	`+ url: +"https://{subdomain}.{site}",`
`717`	`717`	`description: "No description provided",`
`718`	`718`	`variables: {`
`719`	`719`	`site: {`
`@@ -725,11 +725,11 @@ def operation_server_settings`
`725`	`725`	`default_value: "api",`
`726`	`726`	`}`
`727`	`727`	`}`
`728`		`- }`
	`728`	`+ }`
`729`	`729`	`],`
`730`	`730`	`"v2.resolve_on_call_page": [`
`731`	`731`	`{`
`732`		`- url: "https://{site}",`
	`732`	`+ url: +"https://{site}",`
`733`	`733`	`description: "No description provided",`
`734`	`734`	`variables: {`
`735`	`735`	`site: {`
`@@ -746,7 +746,7 @@ def operation_server_settings`
`746`	`746`	`}`
`747`	`747`	`},`
`748`	`748`	`{`
`749`		`- url: "{protocol}://{name}",`
	`749`	`+ url: +"{protocol}://{name}",`
`750`	`750`	`description: "No description provided",`
`751`	`751`	`variables: {`
`752`	`752`	`name: {`
`@@ -760,7 +760,7 @@ def operation_server_settings`
`760`	`760`	`}`
`761`	`761`	`},`
`762`	`762`	`{`
`763`		`- url: "https://{subdomain}.{site}",`
	`763`	`+ url: +"https://{subdomain}.{site}",`
`764`	`764`	`description: "No description provided",`
`765`	`765`	`variables: {`
`766`	`766`	`site: {`
`@@ -772,7 +772,7 @@ def operation_server_settings`
`772`	`772`	`default_value: "api",`
`773`	`773`	`}`
`774`	`774`	`}`
`775`		`- }`
	`775`	`+ }`
`776`	`776`	`],`
`777`	`777`	`}`
`778`	`778`	`end`