Merge branch 'cleanup-library-requires' into 'master'

Cleanup Build::Info class and requires after refactor

Closes #8063

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7200

Merged-by: Robert Marshall <[email protected]>
Approved-by: Clemens Beck <[email protected]>
Approved-by: Robert Marshall <[email protected]>
Reviewed-by: Balasankar 'Balu' C <[email protected]>
Reviewed-by: Robert Marshall <[email protected]>
Reviewed-by: Clemens Beck <[email protected]>
Co-authored-by: Balasankar "Balu" C <[email protected]>

Author: Robert Marshall

.rubocop.yml

@@ -87,3 +87,8 @@ Lint/RedundantSafeNavigation: # (new in 0.93)
   Enabled: true
 Style/ClassEqualityComparison: # (new in 0.93)
   Enabled: true
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+  Exclude:
+    - files/**/*

config/projects/gitlab.rb

@@ -17,7 +17,7 @@
 #
 
 require "#{Omnibus::Config.project_root}/lib/gitlab/build_iteration"
-require "#{Omnibus::Config.project_root}/lib/gitlab/build/info"
+require "#{Omnibus::Config.project_root}/lib/gitlab/build/info/package"
 require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 require "#{Omnibus::Config.project_root}/lib/gitlab/util"
 require "#{Omnibus::Config.project_root}/lib/gitlab/ohai_helper.rb"

config/software/package-scripts.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "#{Omnibus::Config.project_root}/lib/gitlab/build/info"
+require "#{Omnibus::Config.project_root}/lib/gitlab/build/info/package"
 name 'package-scripts'
 
 license 'Apache-2.0'

doc/development/examples/simple.rb

@@ -1,4 +1,4 @@
-require "#{Omnibus::Config.project_root}/lib/gitlab/build/info"
+require "#{Omnibus::Config.project_root}/lib/gitlab/build/info/package"
 require "#{Omnibus::Config.project_root}/lib/gitlab/build_iteration"
 require "#{Omnibus::Config.project_root}/lib/gitlab/ohai_helper.rb"
 require "#{Omnibus::Config.project_root}/lib/gitlab/openssl_helper"

lib/gitlab/api_client.rb

@@ -1,8 +1,8 @@
+require 'gitlab'
+
 require_relative 'build/info/ci'
 require_relative 'build/info/secrets'
 
-require 'gitlab'
-
 module Gitlab
   class APIClient
     def initialize(endpoint = Build::Info::CI.api_v4_url, token = Build::Info::Secrets.api_token)

lib/gitlab/aws_helper.rb

@@ -1,10 +1,10 @@
-require_relative 'build/info.rb'
-require_relative 'util.rb'
-
 require 'aws-sdk-ec2'
 require 'aws-sdk-marketplacecatalog'
 require 'json'
 
+require_relative 'build/info/ci'
+require_relative 'util'
+
 class AWSHelper
   def initialize(version, type)
     # version specifies the GitLab version being processed

lib/gitlab/build.rb

@@ -1,11 +1,19 @@
-require_relative "build/info.rb"
+require_relative "util"
 
 module Build
+  def self.log_level
+    if Gitlab::Util.get_env('BUILD_LOG_LEVEL') && !Gitlab::Util.get_env('BUILD_LOG_LEVEL').empty?
+      Gitlab::Util.get_env('BUILD_LOG_LEVEL')
+    else
+      'info'
+    end
+  end
+
   def self.exec(project)
     system(*cmd(project))
   end
 
   def self.cmd(project)
-    %W[bundle exec omnibus build #{project} --log-level #{Info.log_level}]
+    %W[bundle exec omnibus build #{project} --log-level #{log_level}]
   end
 end

lib/gitlab/build/check.rb

@@ -1,6 +1,6 @@
-require_relative "info.rb"
-require_relative "info/git"
-require_relative "../util.rb"
+require_relative '../util'
+require_relative 'info/git'
+require_relative 'info/package'
 
 module Build
   class Check

lib/gitlab/build/facts.rb

@@ -1,6 +1,8 @@
+require_relative 'gitlab_image'
 require_relative 'info/docker'
 require_relative 'info/git'
 require_relative 'info/package'
+require_relative 'info/qa'
 
 module Build
   class Facts

lib/gitlab/build/gitlab_image.rb

@@ -1,5 +1,5 @@
 require_relative 'image'
-require_relative 'info'
+require_relative 'info/package'
 
 module Build
   class GitlabImage