Move GCP bucket related information to GCloudHelper

This information is used only in GCloudHelper and no where else. So, it
makes sense for it to stay in that class.

Signed-off-by: Balasankar "Balu" C <[email protected]>

Author: balasankarc

lib/gitlab/build/info.rb

@@ -9,18 +9,6 @@
 module Build
   class Info
     class << self
-      def gcp_release_bucket
-        # All tagged builds are pushed to the release bucket
-        # whereas regular branch builds use a separate one
-        gcp_pkgs_release_bucket = Gitlab::Util.get_env('GITLAB_COM_PKGS_RELEASE_BUCKET') || 'gitlab-com-pkgs-release'
-        gcp_pkgs_builds_bucket = Gitlab::Util.get_env('GITLAB_COM_PKGS_BUILDS_BUCKET') || 'gitlab-com-pkgs-builds'
-        Check.on_tag? ? gcp_pkgs_release_bucket : gcp_pkgs_builds_bucket
-      end
-
-      def gcp_release_bucket_sa_file
-        Gitlab::Util.get_env('GITLAB_COM_PKGS_SA_FILE')
-      end
-
       def 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')

lib/gitlab/gcloud_helper.rb

@@ -1,5 +1,7 @@
 require 'google/cloud/storage'
-require_relative './build/info.rb'
+
+require_relative 'build/check'
+require_relative 'util'
 
 class GCloudHelper
   class << self
@@ -30,11 +32,15 @@ def upload_packages_and_print_urls(dir)
     private
 
     def sa_file
-      Build::Info.gcp_release_bucket_sa_file
+      Gitlab::Util.get_env('GITLAB_COM_PKGS_SA_FILE')
     end
 
     def pkgs_bucket
-      Build::Info.gcp_release_bucket
+      # All tagged builds are pushed to the release bucket
+      # whereas regular branch builds use a separate one
+      gcp_pkgs_release_bucket = Gitlab::Util.get_env('GITLAB_COM_PKGS_RELEASE_BUCKET') || 'gitlab-com-pkgs-release'
+      gcp_pkgs_builds_bucket = Gitlab::Util.get_env('GITLAB_COM_PKGS_BUILDS_BUCKET') || 'gitlab-com-pkgs-builds'
+      Build::Check.on_tag? ? gcp_pkgs_release_bucket : gcp_pkgs_builds_bucket
     end
   end
 end