Skip to content
Snippets Groups Projects
Commit 038fb5f1 authored by Stan Hu's avatar Stan Hu
Browse files

Merge branch '216912-revert-jira-proxy-columns' into 'master' 

Ignore Jira proxy settings columns

See merge request !57260
parents 646dea63 cb83efb3
No related branches found
No related tags found
1 merge request!57260Ignore Jira proxy settings columns
Pipeline #277780877 passed with warnings
Stage: sync
Stage: prepare
Stage: build-images
Stage: fixtures
Stage: test
Stage: post-test
Stage: review-prepare
Stage: review
Stage: qa
Stage: post-qa
Stage: pages
Stage: deploy
Hide whitespace changes
Inline Side-by-side
app/models/project_services/jira_service.rb
+ 1
− 1
View file @ 038fb5f1
......@@ -32,7 +32,7 @@ class JiraService < IssueTrackerService
# TODO: we can probably just delegate as part of
# https://gitlab.com/gitlab-org/gitlab/issues/29404
data_field :username, :password, :url, :api_url, :jira_issue_transition_id, :project_key, :issues_enabled,
:vulnerabilities_enabled, :vulnerabilities_issuetype, :proxy_address, :proxy_port, :proxy_username, :proxy_password
:vulnerabilities_enabled, :vulnerabilities_issuetype
before_update :reset_password
after_commit :update_deployment_type, on: [:create, :update], if: :update_deployment_type?
......
app/models/project_services/jira_tracker_data.rb
+ 12
− 9
View file @ 038fb5f1
......@@ -2,20 +2,23 @@
class JiraTrackerData < ApplicationRecord
include Services::DataFields
include IgnorableColumns
ignore_columns %i[
encrypted_proxy_address
encrypted_proxy_address_iv
encrypted_proxy_port
encrypted_proxy_port_iv
encrypted_proxy_username
encrypted_proxy_username_iv
encrypted_proxy_password
encrypted_proxy_password_iv
], remove_with: '14.0', remove_after: '2021-05-22'
attr_encrypted :url, encryption_options
attr_encrypted :api_url, encryption_options
attr_encrypted :username, encryption_options
attr_encrypted :password, encryption_options
attr_encrypted :proxy_address, encryption_options
attr_encrypted :proxy_port, encryption_options
attr_encrypted :proxy_username, encryption_options
attr_encrypted :proxy_password, encryption_options
validates :proxy_address, length: { maximum: 2048 }
validates :proxy_port, length: { maximum: 5 }
validates :proxy_username, length: { maximum: 255 }
validates :proxy_password, length: { maximum: 255 }
enum deployment_type: { unknown: 0, server: 1, cloud: 2 }, _prefix: :deployment
end
spec/models/project_services/jira_tracker_data_spec.rb
+ 1
− 12
View file @ 038fb5f1
......@@ -11,20 +11,9 @@
it { is_expected.to define_enum_for(:deployment_type).with_values([:unknown, :server, :cloud]).with_prefix(:deployment) }
end
describe 'proxy settings' do
it { is_expected.to validate_length_of(:proxy_address).is_at_most(2048) }
it { is_expected.to validate_length_of(:proxy_port).is_at_most(5) }
it { is_expected.to validate_length_of(:proxy_username).is_at_most(255) }
it { is_expected.to validate_length_of(:proxy_password).is_at_most(255) }
end
describe 'encrypted attributes' do
subject { described_class.encrypted_attributes.keys }
it {
is_expected.to contain_exactly(
:api_url, :password, :proxy_address, :proxy_password, :proxy_port, :proxy_username, :url, :username
)
}
it { is_expected.to contain_exactly(:api_url, :password, :url, :username) }
end
end
spec/services/bulk_create_integration_service_spec.rb
+ 1
− 1
View file @ 038fb5f1
......@@ -30,7 +30,7 @@
described_class.new(integration, batch, association).execute
expect(created_integration.reload.data_fields.attributes.except(*excluded_attributes))
.to eq(integration.data_fields.attributes.except(*excluded_attributes))
.to eq(integration.reload.data_fields.attributes.except(*excluded_attributes))
end
end
end
......
spec/services/bulk_update_integration_service_spec.rb
+ 2
− 2
View file @ 038fb5f1
......@@ -68,8 +68,8 @@
it 'updates the data fields from the integration', :aggregate_failures do
described_class.new(subgroup_integration, batch).execute
expect(integration.data_fields.attributes.except(*excluded_attributes))
.to eq(subgroup_integration.data_fields.attributes.except(*excluded_attributes))
expect(integration.reload.data_fields.attributes.except(*excluded_attributes))
.to eq(subgroup_integration.reload.data_fields.attributes.except(*excluded_attributes))
expect(integration.data_fields.attributes.except(*excluded_attributes))
.not_to eq(excluded_integration.data_fields.attributes.except(*excluded_attributes))
......
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