Minor style improvements for Helm code

lib/gitlab/kubernetes/helm/base_command.rb

@@ -26,6 +26,10 @@ module Gitlab
           Gitlab::Kubernetes::ConfigMap.new(name, files).generate
         end
+        def file_names
+          files.keys
+        end
+
         def name
           raise "Not implemented"
         end

lib/gitlab/kubernetes/helm/install_command.rb

@@ -33,9 +33,13 @@ module Gitlab
         end
         def script_command
-          <<~HEREDOC
-          helm install#{optional_tls_flags} #{chart} --name #{name}#{optional_version_flag} --namespace #{Gitlab::Kubernetes::Helm::NAMESPACE} -f /data/helm/#{name}/config/values.yaml >/dev/null
-          HEREDOC
+          "helm install" \
+          "#{optional_tls_flags} " \
+          "#{chart} " \
+          "--name #{name}" \
+          "#{optional_version_flag} " \
+          "--namespace #{Gitlab::Kubernetes::Helm::NAMESPACE} " \
+          "-f /data/helm/#{name}/config/values.yaml >/dev/null\n"
         end
         def optional_version_flag

lib/gitlab/kubernetes/helm/pod.rb

@@ -59,7 +59,7 @@ module Gitlab
               name: 'configuration-volume',
               configMap: {
                 name: "values-content-configuration-#{command.name}",
-                items: command.files.map { |name, _| { key: name, path: name } }
+                items: command.file_names.map { |name| { key: name, path: name } }
               }
             }
           ]

spec/factories/clusters/applications/helm.rb

@@ -35,12 +35,15 @@ FactoryBot.define do
     factory :clusters_applications_ingress, class: Clusters::Applications::Ingress do
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
+
     factory :clusters_applications_prometheus, class: Clusters::Applications::Prometheus do
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
+
     factory :clusters_applications_runner, class: Clusters::Applications::Runner do
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
     end
+
     factory :clusters_applications_jupyter, class: Clusters::Applications::Jupyter do
       oauth_application factory: :oauth_application
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)

spec/features/projects/clusters/applications_spec.rb

@@ -121,6 +121,7 @@ describe 'Clusters Applications', :js do
   def wait_until_helm_created!
     retries = 0
+
     while Clusters::Cluster.last.application_helm.nil?
       raise "Timed out waiting for helm application to be created in DB" if (retries += 1) > 3