Merge branch 'split-info-deploy' into 'master'

Split Deploy related information to own class

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

Merged-by: Robert Marshall <[email protected]>
Approved-by: Andrew Patterson <[email protected]>
Approved-by: Robert Marshall <[email protected]>
Co-authored-by: Balasankar 'Balu' C <[email protected]>

Author: Robert Marshall

lib/gitlab/build/info.rb

@@ -8,11 +8,6 @@
 
 module Build
   class Info
-    DEPLOYER_OS_MAPPING = {
-      'PATCH_DEPLOY_ENVIRONMENT' => 'ubuntu-bionic',
-      'RELEASE_DEPLOY_ENVIRONMENT' => 'ubuntu-focal',
-    }.freeze
-
     class << self
       def gcp_release_bucket
         # All tagged builds are pushed to the release bucket
@@ -33,28 +28,6 @@ def log_level
           'info'
         end
       end
-
-      def deploy_env_key
-        if Build::Check.is_rc_tag?
-          'PATCH_DEPLOY_ENVIRONMENT'
-        elsif Build::Check.is_latest_stable_tag?
-          'RELEASE_DEPLOY_ENVIRONMENT'
-        end
-      end
-
-      def deploy_env
-        key = deploy_env_key
-
-        return nil if key.nil?
-
-        env = Gitlab::Util.get_env(key)
-
-        abort "Unable to determine which environment to deploy to, #{key} is empty" unless env
-
-        puts "Ready to send trigger for environment(s): #{env}"
-
-        env
-      end
     end
   end
 end

lib/gitlab/build/info/deploy.rb

@@ -0,0 +1,34 @@
+module Build
+  class Info
+    class Deploy
+      OS_MAPPING = {
+        'PATCH_DEPLOY_ENVIRONMENT' => 'ubuntu-bionic',
+        'RELEASE_DEPLOY_ENVIRONMENT' => 'ubuntu-focal',
+      }.freeze
+
+      class << self
+        def environment_key
+          if Build::Check.is_rc_tag?
+            'PATCH_DEPLOY_ENVIRONMENT'
+          elsif Build::Check.is_latest_stable_tag?
+            'RELEASE_DEPLOY_ENVIRONMENT'
+          end
+        end
+
+        def environment
+          key = environment_key
+
+          return nil if key.nil?
+
+          env = Gitlab::Util.get_env(key)
+
+          abort "Unable to determine which environment to deploy too, #{key} is empty" unless env
+
+          puts "Ready to send trigger for environment(s): #{env}"
+
+          env
+        end
+      end
+    end
+  end
+end

lib/gitlab/tasks/gitlab_com.rake

@@ -1,7 +1,9 @@
+require_relative '../build/check'
+require_relative '../util'
+require_relative '../build/info/deploy'
+require_relative '../build/info/package'
+require_relative '../deployer_helper'
 require_relative '../ohai_helper'
-require_relative '../deployer_helper.rb'
-require_relative "../util.rb"
-require_relative "../build/check"
 
 namespace :gitlab_com do
   desc 'Tasks related to gitlab.com.'
@@ -18,7 +20,7 @@ namespace :gitlab_com do
       next
     end
 
-    deploy_env = Build::Info.deploy_env
+    deploy_env = Build::Info::Deploy.environment
 
     if deploy_env.nil?
       puts 'Unable to determine which environment to deploy to, exiting...'
@@ -36,7 +38,7 @@ namespace :gitlab_com do
     trigger_ref = Gitlab::Util.get_env('DEPLOYER_TRIGGER_REF') || :master
 
     current_os = OhaiHelper.fetch_os_with_codename[0..1].join("-")
-    os_for_deployment = Build::Info::DEPLOYER_OS_MAPPING[Build::Info.deploy_env_key]
+    os_for_deployment = Build::Info::Deploy::OS_MAPPING[Build::Info::Deploy.environment_key]
     if current_os != os_for_deployment
       puts "Deployment to #{deploy_env} not to be triggered from this build (#{current_os})."
       next

spec/lib/gitlab/build/info/deploy_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'gitlab/build/info/deploy'
+
+RSpec.describe Build::Info::Deploy do
+  before do
+    stub_default_package_version
+    stub_env_var('GITLAB_ALTERNATIVE_REPO', nil)
+    stub_env_var('ALTERNATIVE_PRIVATE_TOKEN', nil)
+  end
+
+  describe '.environment' do
+    before do
+      allow(ENV).to receive(:[]).with('PATCH_DEPLOY_ENVIRONMENT').and_return('patch')
+      allow(ENV).to receive(:[]).with('RELEASE_DEPLOY_ENVIRONMENT').and_return('r')
+    end
+
+    context 'on RC tag' do
+      before do
+        allow(Build::Check).to receive(:is_auto_deploy_tag?).and_return(false)
+        allow(Build::Check).to receive(:is_rc_tag?).and_return(true)
+      end
+      it 'returns the patch-deploy environment' do
+        expect(described_class.environment).to eq('patch')
+      end
+    end
+
+    context 'on latest tag' do
+      before do
+        allow(Build::Check).to receive(:is_auto_deploy_tag?).and_return(false)
+        allow(Build::Check).to receive(:is_rc_tag?).and_return(false)
+        allow(Build::Check).to receive(:is_latest_stable_tag?).and_return(true)
+      end
+      it 'returns the release-deploy environment' do
+        expect(described_class.environment).to eq('r')
+      end
+    end
+
+    context 'when unable to determine the desired env' do
+      before do
+        allow(Build::Check).to receive(:is_auto_deploy_tag?).and_return(false)
+        allow(Build::Check).to receive(:is_rc_tag?).and_return(false)
+        allow(Build::Check).to receive(:is_latest_stable_tag?).and_return(false)
+      end
+      it 'it returns nil' do
+        expect(described_class.environment).to eq(nil)
+      end
+    end
+  end
+end

spec/lib/gitlab/build/info_spec.rb

@@ -9,45 +9,6 @@
     stub_env_var('ALTERNATIVE_PRIVATE_TOKEN', nil)
   end
 
-  describe '.deploy_env' do
-    before do
-      allow(ENV).to receive(:[]).with('PATCH_DEPLOY_ENVIRONMENT').and_return('patch')
-      allow(ENV).to receive(:[]).with('RELEASE_DEPLOY_ENVIRONMENT').and_return('r')
-    end
-
-    context 'on RC tag' do
-      before do
-        allow(Build::Check).to receive(:is_auto_deploy_tag?).and_return(false)
-        allow(Build::Check).to receive(:is_rc_tag?).and_return(true)
-      end
-      it 'returns the auto-deploy environment' do
-        expect(described_class.deploy_env).to eq('patch')
-      end
-    end
-
-    context 'on latest tag' do
-      before do
-        allow(Build::Check).to receive(:is_auto_deploy_tag?).and_return(false)
-        allow(Build::Check).to receive(:is_rc_tag?).and_return(false)
-        allow(Build::Check).to receive(:is_latest_stable_tag?).and_return(true)
-      end
-      it 'returns the auto-deploy environment' do
-        expect(described_class.deploy_env).to eq('r')
-      end
-    end
-
-    context 'when unable to determine the desired env' do
-      before do
-        allow(Build::Check).to receive(:is_auto_deploy_tag?).and_return(false)
-        allow(Build::Check).to receive(:is_rc_tag?).and_return(false)
-        allow(Build::Check).to receive(:is_latest_stable_tag?).and_return(false)
-      end
-      it 'it returns nil' do
-        expect(described_class.deploy_env).to eq(nil)
-      end
-    end
-  end
-
   describe '.gcp_release_bucket' do
     it 'returns the release bucket when on a tag' do
       allow(Build::Check).to receive(:on_tag?).and_return(true)