Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/pod_logs/base_service.rb')
-rw-r--r--app/services/pod_logs/base_service.rb52
1 files changed, 3 insertions, 49 deletions
diff --git a/app/services/pod_logs/base_service.rb b/app/services/pod_logs/base_service.rb
index d94d4e92eb6..8cc8fb913a2 100644
--- a/app/services/pod_logs/base_service.rb
+++ b/app/services/pod_logs/base_service.rb
@@ -55,22 +55,10 @@ module PodLogs
return error(_('Cluster does not exist')) if cluster.nil?
return error(_('Namespace is empty')) if namespace.blank?
- success(result)
- end
-
- def check_param_lengths(_result)
- pod_name = params['pod_name'].presence
- container_name = params['container_name'].presence
+ result[:pod_name] = params['pod_name'].presence
+ result[:container_name] = params['container_name'].presence
- if pod_name&.length.to_i > K8S_NAME_MAX_LENGTH
- return error(_('pod_name cannot be larger than %{max_length}'\
- ' chars' % { max_length: K8S_NAME_MAX_LENGTH }))
- elsif container_name&.length.to_i > K8S_NAME_MAX_LENGTH
- return error(_('container_name cannot be larger than'\
- ' %{max_length} chars' % { max_length: K8S_NAME_MAX_LENGTH }))
- end
-
- success(pod_name: pod_name, container_name: container_name)
+ success(result)
end
def get_raw_pods(result)
@@ -85,40 +73,6 @@ module PodLogs
success(result)
end
- def check_pod_name(result)
- # If pod_name is not received as parameter, get the pod logs of the first
- # pod of this namespace.
- result[:pod_name] ||= result[:pods].first
-
- unless result[:pod_name]
- return error(_('No pods available'))
- end
-
- unless result[:pods].include?(result[:pod_name])
- return error(_('Pod does not exist'))
- end
-
- success(result)
- end
-
- def check_container_name(result)
- pod_details = result[:raw_pods].first { |p| p.metadata.name == result[:pod_name] }
- containers = pod_details.spec.containers.map(&:name)
-
- # select first container if not specified
- result[:container_name] ||= containers.first
-
- unless result[:container_name]
- return error(_('No containers available'))
- end
-
- unless containers.include?(result[:container_name])
- return error(_('Container does not exist'))
- end
-
- success(result)
- end
-
def pod_logs(result)
raise NotImplementedError
end