Commit 68c6e410 authored by Matija Čupić's avatar Matija Čupić

Use secret_key and secret_value in Pipeline Schedule variables

parent 30d685b5
...@@ -92,7 +92,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController ...@@ -92,7 +92,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
def schedule_params def schedule_params
params.require(:schedule) params.require(:schedule)
.permit(:description, :cron, :cron_timezone, :ref, :active, .permit(:description, :cron, :cron_timezone, :ref, :active,
variables_attributes: [:id, :key, :value, :_destroy] ) variables_attributes: [:id, :secret_key, :secret_value, :_destroy] )
end end
def authorize_play_pipeline_schedule! def authorize_play_pipeline_schedule!
......
...@@ -5,6 +5,9 @@ module Ci ...@@ -5,6 +5,9 @@ module Ci
belongs_to :pipeline_schedule belongs_to :pipeline_schedule
alias_attribute :secret_key, :key
alias_attribute :secret_value, :value
validates :key, uniqueness: { scope: :pipeline_schedule_id } validates :key, uniqueness: { scope: :pipeline_schedule_id }
end end
end end
...@@ -80,7 +80,7 @@ describe Projects::PipelineSchedulesController do ...@@ -80,7 +80,7 @@ describe Projects::PipelineSchedulesController do
context 'when variables_attributes has one variable' do context 'when variables_attributes has one variable' do
let(:schedule) do let(:schedule) do
basic_param.merge({ basic_param.merge({
variables_attributes: [{ key: 'AAA', value: 'AAA123' }] variables_attributes: [{ secret_key: 'AAA', secret_value: 'AAA123' }]
}) })
end end
...@@ -101,7 +101,8 @@ describe Projects::PipelineSchedulesController do ...@@ -101,7 +101,8 @@ describe Projects::PipelineSchedulesController do
context 'when variables_attributes has two variables and duplicated' do context 'when variables_attributes has two variables and duplicated' do
let(:schedule) do let(:schedule) do
basic_param.merge({ basic_param.merge({
variables_attributes: [{ key: 'AAA', value: 'AAA123' }, { key: 'AAA', value: 'BBB123' }] variables_attributes: [{ secret_key: 'AAA', secret_value: 'AAA123' },
{ secret_key: 'AAA', secret_value: 'BBB123' }]
}) })
end end
...@@ -152,7 +153,7 @@ describe Projects::PipelineSchedulesController do ...@@ -152,7 +153,7 @@ describe Projects::PipelineSchedulesController do
context 'when params include one variable' do context 'when params include one variable' do
let(:schedule) do let(:schedule) do
basic_param.merge({ basic_param.merge({
variables_attributes: [{ key: 'AAA', value: 'AAA123' }] variables_attributes: [{ secret_key: 'AAA', secret_value: 'AAA123' }]
}) })
end end
...@@ -169,7 +170,8 @@ describe Projects::PipelineSchedulesController do ...@@ -169,7 +170,8 @@ describe Projects::PipelineSchedulesController do
context 'when params include two duplicated variables' do context 'when params include two duplicated variables' do
let(:schedule) do let(:schedule) do
basic_param.merge({ basic_param.merge({
variables_attributes: [{ key: 'AAA', value: 'AAA123' }, { key: 'AAA', value: 'BBB123' }] variables_attributes: [{ secret_key: 'AAA', secret_value: 'AAA123' },
{ secret_key: 'AAA', secret_value: 'BBB123' }]
}) })
end end
...@@ -194,7 +196,7 @@ describe Projects::PipelineSchedulesController do ...@@ -194,7 +196,7 @@ describe Projects::PipelineSchedulesController do
context 'when adds a new variable' do context 'when adds a new variable' do
let(:schedule) do let(:schedule) do
basic_param.merge({ basic_param.merge({
variables_attributes: [{ key: 'AAA', value: 'AAA123' }] variables_attributes: [{ secret_key: 'AAA', secret_value: 'AAA123' }]
}) })
end end
...@@ -209,7 +211,7 @@ describe Projects::PipelineSchedulesController do ...@@ -209,7 +211,7 @@ describe Projects::PipelineSchedulesController do
context 'when adds a new duplicated variable' do context 'when adds a new duplicated variable' do
let(:schedule) do let(:schedule) do
basic_param.merge({ basic_param.merge({
variables_attributes: [{ key: 'CCC', value: 'AAA123' }] variables_attributes: [{ secret_key: 'CCC', secret_value: 'AAA123' }]
}) })
end end
...@@ -224,7 +226,7 @@ describe Projects::PipelineSchedulesController do ...@@ -224,7 +226,7 @@ describe Projects::PipelineSchedulesController do
context 'when updates a variable' do context 'when updates a variable' do
let(:schedule) do let(:schedule) do
basic_param.merge({ basic_param.merge({
variables_attributes: [{ id: pipeline_schedule_variable.id, value: 'new_value' }] variables_attributes: [{ id: pipeline_schedule_variable.id, secret_value: 'new_value' }]
}) })
end end
...@@ -252,7 +254,7 @@ describe Projects::PipelineSchedulesController do ...@@ -252,7 +254,7 @@ describe Projects::PipelineSchedulesController do
let(:schedule) do let(:schedule) do
basic_param.merge({ basic_param.merge({
variables_attributes: [{ id: pipeline_schedule_variable.id, _destroy: true }, variables_attributes: [{ id: pipeline_schedule_variable.id, _destroy: true },
{ key: 'CCC', value: 'CCC123' }] { secret_key: 'CCC', secret_value: 'CCC123' }]
}) })
end end
......
...@@ -159,10 +159,10 @@ feature 'Pipeline Schedules', :js do ...@@ -159,10 +159,10 @@ feature 'Pipeline Schedules', :js do
visit_pipelines_schedules visit_pipelines_schedules
click_link 'New schedule' click_link 'New schedule'
fill_in_schedule_form fill_in_schedule_form
all('[name="schedule[variables_attributes][][key]"]')[0].set('AAA') all('[name="schedule[variables_attributes][][secret_key]"]')[0].set('AAA')
all('[name="schedule[variables_attributes][][value]"]')[0].set('AAA123') all('[name="schedule[variables_attributes][][secret_value]"]')[0].set('AAA123')
all('[name="schedule[variables_attributes][][key]"]')[1].set('BBB') all('[name="schedule[variables_attributes][][secret_key]"]')[1].set('BBB')
all('[name="schedule[variables_attributes][][value]"]')[1].set('BBB123') all('[name="schedule[variables_attributes][][secret_value]"]')[1].set('BBB123')
save_pipeline_schedule save_pipeline_schedule
end end
......
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