Change ssh_key to be a model, not a single value

It seems like a good idea to add a description for an ssh key, so that
it's easier to know which key is it. I changed ssh key to be a model
with description and value.

Author: drogus

lib/travis/api/v0/worker/job/test.rb

@@ -64,8 +64,8 @@ def repository_data
             end
 
             def ssh_key
-              if ssh_key = repository.settings.ssh_key.decrypt
-                { 'source' => 'repo_settings', 'value' => ssh_key }
+              if ssh_key = repository.settings.ssh_key
+                { 'source' => 'repo_settings', 'value' => ssh_key.value.decrypt }
               elsif ssh_key = job.ssh_key
                 { 'source' => 'config', 'value' => ssh_key }
               end

lib/travis/model/repository/settings.rb

@@ -14,6 +14,13 @@ class EnvVar < Travis::Settings::Model
     validates :name, presence: true
   end
 
+  class SshKey < Travis::Settings::Model
+    attribute :description, String
+    attribute :value, Travis::Settings::EncryptedValue
+
+    validates :value, presence: true
+  end
+
   class EnvVars < Collection
     model EnvVar
   end
@@ -24,7 +31,7 @@ class EnvVars < Collection
   attribute :build_pushes, Boolean, default: true
   attribute :build_pull_requests, Boolean, default: true
   attribute :maximum_number_of_builds, Integer
-  attribute :ssh_key, Travis::Settings::EncryptedValue
+  attribute :ssh_key, SshKey
 
   def maximum_number_of_builds
     super.to_i

lib/travis/settings/model_extensions.rb

@@ -10,16 +10,7 @@ def set(instance, value)
       end
 
       def get(instance)
-        if type.primitive <= Travis::Settings::Model
-          unless instance.instance_variable_get(instance_variable_name)
-            value = Travis::Settings::Model.new
-            if instance.frozen?
-              return value
-            else
-              set(instance, value)
-            end
-          end
-        elsif type.primitive <= Travis::Settings::EncryptedValue
+        if type.primitive <= Travis::Settings::EncryptedValue
           unless instance.instance_variable_get(instance_variable_name)
             value = Travis::Settings::EncryptedValue.new(nil)
             if instance.frozen?
@@ -92,6 +83,10 @@ def model?(name)
         end
       end
 
+      def primitive(name)
+        attribute_set[name.to_sym].type.primitive
+      end
+
       def get(key)
         if attribute?(key)
           self.send(key)
@@ -107,9 +102,13 @@ def set(key, value)
       private :set
 
       def load(hash)
+        return unless hash
+
         hash.each do |key, value|
           if collection?(key) || encrypted?(key) || model?(key)
-            get(key).load(value)
+            thing = get(key)
+            thing = set(key, primitive(key).new) if !thing && value
+            thing.load(value) if thing
           elsif attribute?(key)
             set(key, value)
           end

lib/travis/testing/stubs.rb

@@ -190,7 +190,8 @@ def stub_test(attributes = {})
           finished_at: Time.now.utc,
           worker: 'ruby3.worker.travis-ci.org:travis-ruby-4',
           tags: 'tag-a,tag-b',
-          log_content: log.content
+          log_content: log.content,
+          ssh_key: nil
         )
 
         source = stub_build(:matrix => [test])

spec/travis/api/v0/worker/job/test_spec.rb

@@ -6,7 +6,9 @@
   let(:test) do
     test = stub_test
     settings = Repository::Settings.load({
-      'ssh_key' => Travis::Model::EncryptedColumn.new(use_prefix: false).dump('an ssh key'),
+      'ssh_key' => {
+        'value' => Travis::Model::EncryptedColumn.new(use_prefix: false).dump('an ssh key')
+      },
       'env_vars' => [{
         'name' => 'FOO',
         'value' => Travis::Model::EncryptedColumn.new(use_prefix: false).dump('bar')

spec/travis/enqueue/services/enqueue_jobs_spec.rb

@@ -44,8 +44,7 @@
     before :each do
       settings = OpenStruct.new(
         restricts_number_of_builds?: false,
-        env_vars: [],
-        ssh_key: Travis::Settings::EncryptedValue.new('an ssh key')
+        env_vars: []
       )
       test.repository.stubs(:settings).returns(settings)
       scope = stub('scope')