Commit e16fba67 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Improve how we handle persistent runner variables

parent 937e7f9e
...@@ -12,9 +12,5 @@ module Ci ...@@ -12,9 +12,5 @@ module Ci
} }
scope :unprotected, -> { where(protected: false) } scope :unprotected, -> { where(protected: false) }
def to_hash
{ key: key, value: value, public: false }
end
end end
end end
...@@ -20,12 +20,8 @@ module HasVariable ...@@ -20,12 +20,8 @@ module HasVariable
super(new_key.to_s.strip) super(new_key.to_s.strip)
end end
def to_hash
{ key: key, value: value, public: false }
end
def to_runner_variable def to_runner_variable
to_hash { key: key, value: value, public: false }
end end
end end
end end
...@@ -3,8 +3,6 @@ module Gitlab ...@@ -3,8 +3,6 @@ module Gitlab
module Variables module Variables
class Collection class Collection
class Item class Item
# TODO, public by default?
#
def initialize(**options) def initialize(**options)
@variable = { @variable = {
key: options.fetch(:key), key: options.fetch(:key),
...@@ -34,17 +32,11 @@ module Gitlab ...@@ -34,17 +32,11 @@ module Gitlab
end end
def self.fabricate(resource) def self.fabricate(resource)
# TODO, to_runner_variable by default for class < ActiveRecord::Base
#
case resource case resource
when Hash when Hash
self.new(resource) self.new(resource)
when ::Ci::Variable when ::HasVariable
self.new(resource.to_hash) self.new(resource.to_runner_variable)
when ::Ci::PipelineVariable
self.new(resource.to_hash)
when ::Ci::GroupVariable
self.new(resource.to_hash)
when self when self
resource.dup resource.dup
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment