Merge branch '299105-fix-scripts' into 'master'

Fix Style/FrozenStringLiteralComment violations in scripts

See merge request gitlab-org/gitlab!53269

.rubocop_manual_todo.yml

@@ -2494,29 +2494,5 @@ Style/FrozenStringLiteralComment:
     - 'app/views/projects/tags/_tag.atom.builder'
     - 'app/views/projects/tags/index.atom.builder'
     - 'app/views/users/show.atom.builder'
-    - 'bin/secpick'
     - 'danger/changes_size/Dangerfile'
     - 'danger/metadata/Dangerfile'
-    - 'scripts/flaky_examples/detect-new-flaky-examples'
-    - 'scripts/flaky_examples/prune-old-flaky-examples'
-    - 'scripts/gather-test-memory-data'
-    - 'scripts/generate-gems-memory-metrics-static'
-    - 'scripts/generate-gems-size-metrics-static'
-    - 'scripts/generate-memory-metrics-on-boot'
-    - 'scripts/generate-test-mapping'
-    - 'scripts/gitaly-test-build'
-    - 'scripts/gitaly-test-spawn'
-    - 'scripts/gitaly_test.rb'
-    - 'scripts/insert-rspec-profiling-data'
-    - 'scripts/lint-rugged'
-    - 'scripts/merge-html-reports'
-    - 'scripts/merge-reports'
-    - 'scripts/merge-simplecov'
-    - 'scripts/no-ee-check'
-    - 'scripts/pack-test-mapping'
-    - 'scripts/static-analysis'
-    - 'scripts/sync-reports'
-    - 'scripts/unpack-test-mapping'
-    - 'scripts/update-feature-categories'
-    - 'scripts/used-feature-flags'
-    - 'scripts/verify-tff-mapping'

bin/secpick

 #!/usr/bin/env ruby
 
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 require 'active_support/core_ext/object/to_query'
 require 'optparse'
@@ -9,12 +9,12 @@ require 'rainbow/refinement'
 using Rainbow
 
 module Secpick
-  BRANCH_PREFIX = 'security'.freeze
-  STABLE_SUFFIX = 'stable'.freeze
+  BRANCH_PREFIX = 'security'
+  STABLE_SUFFIX = 'stable'
 
-  DEFAULT_REMOTE = 'security'.freeze
+  DEFAULT_REMOTE = 'security'
 
-  SECURITY_MR_URL = 'https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/new'.freeze
+  SECURITY_MR_URL = 'https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/new'
 
   class SecurityFix
     def initialize
@@ -27,12 +27,12 @@ module Secpick
 
     def source_branch
       branch = "#{@options[:branch]}-#{@options[:version]}"
-      branch.prepend("#{BRANCH_PREFIX}-") unless branch.start_with?("#{BRANCH_PREFIX}-")
-      branch.freeze
+      branch = "#{BRANCH_PREFIX}-#{branch}" unless branch.start_with?("#{BRANCH_PREFIX}-")
+      branch
     end
 
     def stable_branch
-      "#{@options[:version]}-#{STABLE_SUFFIX}-ee".freeze
+      "#{@options[:version]}-#{STABLE_SUFFIX}-ee"
     end
 
     def git_commands

scripts/flaky_examples/detect-new-flaky-examples

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'json'
 

scripts/flaky_examples/prune-old-flaky-examples

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # lib/rspec_flaky/flaky_examples_collection.rb is requiring
 # `active_support/hash_with_indifferent_access`, and we install the `activesupport`

scripts/gather-test-memory-data

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'csv'
 

scripts/generate-gems-memory-metrics-static

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 abort "usage: #{__FILE__} <memory_bundle_objects_file_name>" unless ARGV.length == 1
 memory_bundle_objects_file_name = ARGV.first

scripts/generate-gems-size-metrics-static

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 abort "usage: #{__FILE__} <memory_bundle_mem_file_name>" unless ARGV.length == 1
 memory_bundle_mem_file_name = ARGV.first

scripts/generate-memory-metrics-on-boot

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 abort "usage: #{__FILE__} <memory_bundle_mem_file_name>" unless ARGV.length == 1
 memory_bundle_mem_file_name = ARGV.first

scripts/generate-test-mapping

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'json'
 require_relative '../tooling/lib/tooling/test_map_generator'

scripts/gitaly-test-build

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'fileutils'
 

scripts/gitaly-test-spawn

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # This script is used both in CI and in local development 'rspec' runs.
 

scripts/gitaly_test.rb

+# frozen_string_literal: true
+
 # This file contains environment settings for gitaly when it's running
 # as part of the gitlab-ce/ee test suite.
 #
@@ -52,7 +54,7 @@ module GitalyTest
 
     if ENV['CI']
       bundle_path = File.expand_path('../vendor/gitaly-ruby', __dir__)
-      env_hash['BUNDLE_FLAGS'] << " --path=#{bundle_path}"
+      env_hash['BUNDLE_FLAGS'] += " --path=#{bundle_path}"
     end
 
     env_hash

scripts/insert-rspec-profiling-data

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'csv'
 require 'rspec_profiling'

scripts/lint-rugged

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 ALLOWED = [
   # https://gitlab.com/gitlab-org/gitaly/issues/760

scripts/merge-html-reports

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'nokogiri'
 

scripts/merge-reports

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'json'
 

scripts/merge-simplecov

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative '../spec/simplecov_env'
 SimpleCovEnv.configure_profile

scripts/no-ee-check

 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 ee_path = File.join(File.expand_path(__dir__), '../ee')
 
 if Dir.exist?(ee_path)

scripts/pack-test-mapping

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'json'
 require_relative '../tooling/lib/tooling/test_map_packer'

scripts/static-analysis

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # We don't have auto-loading here
 require_relative '../lib/gitlab'

scripts/sync-reports

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rubygems'
 require 'fog/aws'

scripts/unpack-test-mapping

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'json'
 require_relative '../tooling/lib/tooling/test_map_packer'

scripts/update-feature-categories

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'uri'
 require 'net/http'

scripts/used-feature-flags

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'set'
 

scripts/verify-tff-mapping

 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'set'