Add username and origin to user create message

Author: svkrieger

app/messages/user_create_message.rb

@@ -2,9 +2,27 @@
 
 module VCAP::CloudController
   class UserCreateMessage < MetadataBaseMessage
-    register_allowed_keys [:guid]
+    register_allowed_keys %i[guid origin username]
+
+
+    class UserCreateValidator < ActiveModel::Validator
+      def validate(record)
+        if record.guid
+          record.errors.add(:username, message: "cannot be provided with 'guid'") if record.username
+          record.errors.add(:origin, message: "cannot be provided with 'guid'") if record.origin
+        elsif record.username || record.origin
+          record.errors.add(:origin, message: "'username' is missing") unless record.username
+          record.errors.add(:username, message: "'origin' is missing") unless record.origin
+        else
+          record.errors.add(:guid, message: "either 'guid' or 'username' and 'origin' must be provided")
+        end
+      end
+    end
 
     validates_with NoAdditionalKeysValidator
-    validates :guid, guid: true
+    validates :guid, guid: true, allow_nil: true
+    validates :origin, string: true, allow_nil: true
+    validates :username, string: true, allow_nil: true
+    validates_with UserCreateValidator
   end
 end

spec/unit/messages/user_create_message_spec.rb

@@ -27,7 +27,35 @@ module VCAP::CloudController
 
         it 'is not valid' do
           expect(subject).not_to be_valid
-          expect(subject.errors[:guid]).to include('must be between 1 and 200 characters')
+          expect(subject.errors[:guid]).to include("either 'guid' or 'username' and 'origin' must be provided")
+        end
+      end
+
+      context 'when guid and username is provided' do
+        let(:params) do
+          {
+            username: 'meow',
+            guid: 'some-user-guid'
+          }
+        end
+
+        it 'is not valid' do
+          expect(subject).not_to be_valid
+          expect(subject.errors[:username]).to include("cannot be provided with 'guid'")
+        end
+      end
+
+      context 'when guid and origin is provided' do
+        let(:params) do
+          {
+            origin: 'meow',
+            guid: 'some-user-guid'
+          }
+        end
+
+        it 'is not valid' do
+          expect(subject).not_to be_valid
+          expect(subject.errors[:origin]).to include("cannot be provided with 'guid'")
         end
       end
 
@@ -45,7 +73,7 @@ module VCAP::CloudController
         end
       end
 
-      context 'guid' do
+      describe 'guid' do
         context 'when not a string' do
           let(:params) do
             { guid: 5 }
@@ -75,6 +103,54 @@ module VCAP::CloudController
           end
         end
       end
+
+      describe 'username' do
+        context 'when not a string' do
+          let(:params) do
+            { username: 5 }
+          end
+
+          it 'is not valid' do
+            expect(subject).not_to be_valid
+            expect(subject.errors[:username]).to include('must be a string')
+          end
+        end
+
+        context 'when origin is missing' do
+          let(:params) do
+            { username: 5 }
+          end
+
+          it 'is not valid' do
+            expect(subject).not_to be_valid
+            expect(subject.errors[:username]).to include("'origin' is missing")
+          end
+        end
+      end
+
+      describe 'origin' do
+        context 'when not a string' do
+          let(:params) do
+            { origin: 5 }
+          end
+
+          it 'is not valid' do
+            expect(subject).not_to be_valid
+            expect(subject.errors[:origin]).to include('must be a string')
+          end
+        end
+
+        context 'when username is missing' do
+          let(:params) do
+            { origin: 5 }
+          end
+
+          it 'is not valid' do
+            expect(subject).not_to be_valid
+            expect(subject.errors[:origin]).to include("'username' is missing")
+          end
+        end
+      end
     end
   end
 end