add primary keyid attribute to gpg keys

4 files changed, 28 insertions, 6 deletions

diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 79952eda2ff..1dbcf09d4a0 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -220,8 +220,8 @@ describe 'Commits' do
       Dir.mktmpdir do |dir|
         FileUtils.cd dir do
           `git clone --quiet #{remote_path} .`
-          `git commit --quiet -S#{GpgHelpers::User1.key_id} --allow-empty -m "signed commit, verified key/email"`
-          `git commit --quiet -S#{GpgHelpers::User2.key_id} --allow-empty -m "signed commit, unverified key/email"`
+          `git commit --quiet -S#{GpgHelpers::User1.primary_keyid} --allow-empty -m "signed commit, verified key/email"`
+          `git commit --quiet -S#{GpgHelpers::User2.primary_keyid} --allow-empty -m "signed commit, unverified key/email"`
           `git push --quiet`
         end
       end
diff --git a/spec/lib/gitlab/gpg_spec.rb b/spec/lib/gitlab/gpg_spec.rb
index bdcf9ee0e65..55f34e0cf99 100644
--- a/spec/lib/gitlab/gpg_spec.rb
+++ b/spec/lib/gitlab/gpg_spec.rb
@@ -15,6 +15,20 @@ describe Gitlab::Gpg do
     end
   end
 
+  describe '.primary_keyids_from_key' do
+    it 'returns the keyid' do
+      expect(
+        described_class.primary_keyids_from_key(GpgHelpers::User1.public_key)
+      ).to eq [GpgHelpers::User1.primary_keyid]
+    end
+
+    it 'returns an empty array when the key is invalid' do
+      expect(
+        described_class.primary_keyids_from_key('bogus')
+      ).to eq []
+    end
+  end
+
   describe '.emails_from_key' do
     it 'returns the emails' do
       expect(
diff --git a/spec/models/gpg_key_spec.rb b/spec/models/gpg_key_spec.rb
index 6ee436b6a6d..ac446fca819 100644
--- a/spec/models/gpg_key_spec.rb
+++ b/spec/models/gpg_key_spec.rb
@@ -21,6 +21,14 @@ describe GpgKey do
         expect(gpg_key.fingerprint).to eq GpgHelpers::User1.fingerprint
       end
     end
+
+    describe 'extract_primary_keyid' do
+      it 'extracts the primary keyid from the gpg key' do
+        gpg_key = described_class.new(key: GpgHelpers::User1.public_key)
+        gpg_key.valid?
+        expect(gpg_key.primary_keyid).to eq GpgHelpers::User1.primary_keyid
+      end
+    end
   end
 
   describe '#key=' do
diff --git a/spec/support/gpg_helpers.rb b/spec/support/gpg_helpers.rb
index 52c478e1976..f9128a629f2 100644
--- a/spec/support/gpg_helpers.rb
+++ b/spec/support/gpg_helpers.rb
@@ -90,8 +90,8 @@ module GpgHelpers
       KEY
     end
 
-    def key_id
-      '00AC8B1D'
+    def primary_keyid
+      fingerprint[-16..-1]
     end
 
     def fingerprint
@@ -179,8 +179,8 @@ module GpgHelpers
       KEY
     end
 
-    def key_id
-      '911EFD65'
+    def primary_keyid
+      fingerprint[-16..-1]
     end
 
     def fingerprint