diff options
Diffstat (limited to 'app/models/instance_configuration.rb')
-rw-r--r-- | app/models/instance_configuration.rb | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/app/models/instance_configuration.rb b/app/models/instance_configuration.rb index 11289887e00..aa4d8d1737d 100644 --- a/app/models/instance_configuration.rb +++ b/app/models/instance_configuration.rb @@ -1,20 +1,20 @@ # frozen_string_literal: true -require 'resolv' +require "resolv" class InstanceConfiguration - SSH_ALGORITHMS = %w(DSA ECDSA ED25519 RSA).freeze - SSH_ALGORITHMS_PATH = '/etc/ssh/'.freeze - CACHE_KEY = 'instance_configuration'.freeze + SSH_ALGORITHMS = %w[DSA ECDSA ED25519 RSA].freeze + SSH_ALGORITHMS_PATH = "/etc/ssh/" + CACHE_KEY = "instance_configuration" EXPIRATION_TIME = 24.hours def settings - @configuration ||= Rails.cache.fetch(CACHE_KEY, expires_in: EXPIRATION_TIME) do - { ssh_algorithms_hashes: ssh_algorithms_hashes, - host: host, - gitlab_pages: gitlab_pages, - gitlab_ci: gitlab_ci }.deep_symbolize_keys - end + @configuration ||= Rails.cache.fetch(CACHE_KEY, expires_in: EXPIRATION_TIME) { + {ssh_algorithms_hashes: ssh_algorithms_hashes, + host: host, + gitlab_pages: gitlab_pages, + gitlab_ci: gitlab_ci,}.deep_symbolize_keys + } end private @@ -38,9 +38,9 @@ class InstanceConfiguration def gitlab_ci Settings.gitlab_ci - .to_h - .merge(artifacts_max_size: { value: Settings.artifacts.max_size&.megabytes, - default: 100.megabytes }) + .to_h + .merge(artifacts_max_size: {value: Settings.artifacts.max_size&.megabytes, + default: 100.megabytes,}) end def ssh_algorithm_file(algorithm) @@ -51,9 +51,9 @@ class InstanceConfiguration content = ssh_algorithm_file_content(algorithm) return unless content.present? - { name: algorithm, - md5: ssh_algorithm_md5(content), - sha256: ssh_algorithm_sha256(content) } + {name: algorithm, + md5: ssh_algorithm_md5(content), + sha256: ssh_algorithm_sha256(content),} end def ssh_algorithm_file_content(algorithm) @@ -68,6 +68,6 @@ class InstanceConfiguration end def ssh_algorithm_sha256(ssh_file_content) - Gitlab::SSHPublicKey.new(ssh_file_content).fingerprint('SHA256') + Gitlab::SSHPublicKey.new(ssh_file_content).fingerprint("SHA256") end end |