gitlab-qa 7.0.3 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32809b6a435a4f885da425ee4f02b947731e5cc703c88353b0b4449521c7fd4b
-  data.tar.gz: 00e470d8140455b32fe9296ae2bde313fda2c9df4c370cd84b4e4247d72a7e01
+  metadata.gz: 94fd458767a2190eeba5094962dca4d1eb9d1ec2769c3ed6815e0750c4d95d3e
+  data.tar.gz: 38f5336f05c2bb558c7099d410ceea33cf1f0ea254b978e18c32c96f5e7fdc62
 SHA512:
-  metadata.gz: 16d8eea53beb93f9fe3265043541e308a1bc654be3151f79d78ca14346e9f56b67c3bfed86347239c33a9c0b32a3cf2f636c23b5392bb075ec1f3fa78741dc25
-  data.tar.gz: 3a483c5288e75f21418b98f9a52d991a3081fb380816d851d7e9e142b5989202243ad25fbba50ef339bcf14f927f9d392cff084ab1f8274edc9f61ca22371d5d
+  metadata.gz: 8a146c677f1b78dde5755e9d0d0445c100f4264d2e862dc98c75c8bf7265b84df9167565702c88556877c48747eb18b677a6deb4ff4489bf5e05a54c0fb0bd5c
+  data.tar.gz: e386131381bdfc7e1f7c4f9644586279af44e8996c0f4fc23a70559d821f127856e56ec37391407346982058b9377f78979f269e2d0d49b49d074845fad7c37a

data/lib/gitlab/qa/component/gitlab.rb

@@ -33,7 +33,7 @@ module Gitlab
           @volumes[GITLAB_CERTIFICATES_PATH] = SSL_PATH
           @volumes[AUTHORITY_CERTIFICATES_PATH] = TRUSTED_PATH
 
-          @omnibus_configuration ||= OmnibusConfiguration.new
+          @omnibus_configuration ||= Runtime::OmnibusConfiguration.new(Runtime::Scenario.omnibus_configuration)
 
           self.release = 'CE'
         end
@@ -206,20 +206,6 @@ module Gitlab
             @uri.scheme == 'https' ? { use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE } : {}
           end
         end
-
-        class OmnibusConfiguration
-          def initialize
-            @config = [Runtime::Scenario.attributes[:omnibus_configuration].to_s] || []
-          end
-
-          def <<(configuration)
-            @config << configuration
-          end
-
-          def to_s
-            @config.join("\n")
-          end
-        end
       end
     end
   end

data/lib/gitlab/qa/runtime/omnibus_configuration.rb

@@ -6,8 +6,18 @@ module Gitlab
   module QA
     module Runtime
       class OmnibusConfiguration
-        def initialize
+        # @param prefixed_config The configuration to be prefixed to the new configuration
+        def initialize(prefixed_config = nil)
           @config = ["# Generated by GitLab QA Omnibus Configurator at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"]
+
+          return unless prefixed_config
+
+          # remove generation statement if it exists within the prefixed configuration that was passed
+          # and insert the rest AFTER the very first generation statement
+          config_to_insert = prefixed_config.to_s
+          generation_regexp = /# Generated by GitLab QA Omnibus Configurator.*\n/
+          config_to_insert = config_to_insert.gsub(generation_regexp, '') if config_to_insert.match?(generation_regexp)
+          @config.insert(1, config_to_insert)
         end
 
         def to_s
@@ -28,7 +38,7 @@ module Gitlab
           []
         end
 
-        # Ensures no duplicate entries
+        # Ensures no duplicate entries and sanitizes configurations
         # @raise RuntimeError if competing configurations exist
         # rubocop:disable Metrics/AbcSize
         def sanitize!

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '7.0.3'.freeze
+    VERSION = '7.0.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.0.4
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control