diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb index 467799a14fb8fc9787f00e111abcb69cca1fafad..297d29550e36232d3cb6571e55d1bb746407fc81 100644 --- a/qa/qa/page/project/settings/deploy_keys.rb +++ b/qa/qa/page/project/settings/deploy_keys.rb @@ -23,7 +23,7 @@ class DeployKeys < Page::Base view 'app/assets/javascripts/deploy_keys/components/key.vue' do element :key_container element :key_title_content - element :key_md5_fingerprint_content + element :key_sha256_fingerprint_content end def add_key @@ -38,17 +38,17 @@ def fill_key_value(key) fill_element(:deploy_key_field, key) end - def find_md5_fingerprint(title) + def find_sha256_fingerprint(title) within_project_deploy_keys do find_element(:key_container, text: title) - .find(element_selector_css(:key_md5_fingerprint_content)).text.delete_prefix('MD5:') + .find(element_selector_css(:key_sha256_fingerprint_content)).text end end - def has_key?(title, md5_fingerprint) + def has_key?(title, sha256_fingerprint) within_project_deploy_keys do find_element(:key_container, text: title) - .has_css?(element_selector_css(:key_md5_fingerprint_content), text: "MD5:#{md5_fingerprint}") + .has_css?(element_selector_css(:key_sha256_fingerprint_content), text: sha256_fingerprint) end end diff --git a/qa/qa/resource/deploy_key.rb b/qa/qa/resource/deploy_key.rb index c06671be77dbaf56f338f47468e2c518dc0514af..b194f97ef1b1dbc17019bebadec5d80fb217980b 100644 --- a/qa/qa/resource/deploy_key.rb +++ b/qa/qa/resource/deploy_key.rb @@ -7,10 +7,10 @@ class DeployKey < Base attribute :id - attribute :md5_fingerprint do + attribute :sha256_fingerprint do Page::Project::Settings::Repository.perform do |setting| setting.expand_deploy_keys do |key| - key.find_md5_fingerprint(title) + key.find_sha256_fingerprint(title) end end end diff --git a/qa/qa/resource/ssh_key.rb b/qa/qa/resource/ssh_key.rb index 154d79aaf8828b6e5fcc52ee3f9a8b0ed635f2b7..dd475d7fa66c89563cc5ea250f97aa51becbf3a6 100644 --- a/qa/qa/resource/ssh_key.rb +++ b/qa/qa/resource/ssh_key.rb @@ -39,7 +39,7 @@ def title=(title) end def api_delete - QA::Runtime::Logger.debug("Deleting SSH key with title '#{title}' and fingerprint '#{md5_fingerprint}'") + QA::Runtime::Logger.debug("Deleting SSH key with title '#{title}' and fingerprint '#{sha256_fingerprint}'") super end diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb index 1661fec03be405be032b3902b7d71f2d38ff5aca..8b7b827de91c7bf03828a34f4698163bad53e1a9 100644 --- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/add_deploy_key_spec.rb @@ -2,7 +2,7 @@ module QA RSpec.describe 'Release' do - describe 'Deploy key creation', :skip_fips_env do + describe 'Deploy key creation' do it 'user adds a deploy key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348023' do Flow::Login.sign_in @@ -15,11 +15,11 @@ module QA resource.key = deploy_key_value end - expect(deploy_key.md5_fingerprint).to eq key.md5_fingerprint + expect(deploy_key.sha256_fingerprint).to eq key.sha256_fingerprint Page::Project::Settings::Repository.perform do |setting| setting.expand_deploy_keys do |keys| - expect(keys).to have_key(deploy_key_title, key.md5_fingerprint) + expect(keys).to have_key(deploy_key_title, key.sha256_fingerprint) end end end diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb index ff8dc686991d1c78495161b218c4f1b360014606..c86f75e0b1627f57662db8d29ebbf252f71d6b2f 100644 --- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb @@ -4,7 +4,7 @@ module QA RSpec.describe 'Release', :runner do - describe 'Git clone using a deploy key', :skip_fips_env do + describe 'Git clone using a deploy key' do let(:runner_name) { "qa-runner-#{SecureRandom.hex(4)}" } let(:repository_location) { project.repository_ssh_location } diff --git a/qa/qa/specs/features/ee/browser_ui/1_manage/project/project_audit_logs_spec.rb b/qa/qa/specs/features/ee/browser_ui/1_manage/project/project_audit_logs_spec.rb index aca83e777e500c76772e37e26cfbf84edbde595c..cb78f3997e9e738c7b1b1f45768cac95a1c7d630 100644 --- a/qa/qa/specs/features/ee/browser_ui/1_manage/project/project_audit_logs_spec.rb +++ b/qa/qa/specs/features/ee/browser_ui/1_manage/project/project_audit_logs_spec.rb @@ -53,7 +53,7 @@ module QA it_behaves_like 'audit event', ["Added user access as Guest"] end - context "Add deploy key", :skip_fips_env, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347907' do + context "Add deploy key", testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347907' do before do key = Runtime::Key::RSA.new deploy_key_title = 'deploy key title'