Additional validation and tests for v3/stacks API

Signed-off-by: Rashed Kamal <[email protected]>

Author: rashedkvm

app/messages/stack_create_message.rb

@@ -7,7 +7,11 @@ class StackCreateMessage < MetadataBaseMessage
 
     validates :name, presence: true, length: { maximum: 250 }
     validates :description, length: { maximum: 250 }
-    validates :state, inclusion: { in: StackStates::VALID_STATES, message: "must be one of #{StackStates::VALID_STATES.join(', ')}" }, allow_nil: true
+    validates :state, inclusion: { in: StackStates::VALID_STATES, message: "must be one of #{StackStates::VALID_STATES.join(', ')}" }, allow_nil: false, if: :state_requested?
+
+    def state_requested?
+      requested?(:state)
+    end
 
     def state
       return @state if defined?(@state)

app/messages/stack_update_message.rb

@@ -6,6 +6,10 @@ class StackUpdateMessage < MetadataBaseMessage
     register_allowed_keys [:state]
 
     validates_with NoAdditionalKeysValidator
-    validates :state, inclusion: { in: StackStates::VALID_STATES, message: "must be one of #{StackStates::VALID_STATES.join(', ')}" }, allow_nil: true
+    validates :state, inclusion: { in: StackStates::VALID_STATES, message: "must be one of #{StackStates::VALID_STATES.join(', ')}" }, allow_nil: false, if: :state_requested?
+
+    def state_requested?
+      requested?(:state)
+    end
   end
 end

spec/request/stacks_state_spec.rb

@@ -55,6 +55,20 @@
       end
     end
 
+    context 'when creating stack with null state' do
+      it 'returns validation error' do
+        request_body = {
+          name: 'stack-null-state',
+          state: nil
+        }.to_json
+
+        post '/v3/stacks', request_body, headers
+
+        expect(last_response.status).to eq(422)
+        expect(parsed_response['errors'].first['detail']).to include('must be one of ACTIVE, RESTRICTED, DEPRECATED, DISABLED')
+      end
+    end
+
     context 'as non-admin user' do
       let(:non_admin_user) { make_user }
       let(:non_admin_headers) { headers_for(non_admin_user) }

spec/unit/messages/stack_create_message_spec.rb

@@ -112,6 +112,15 @@
           expect(subject.errors[:state]).to include('must be one of ACTIVE, RESTRICTED, DEPRECATED, DISABLED')
         end
       end
+
+      context 'when it is explicitly null' do
+        let(:params) { valid_params.merge({ state: nil }) }
+
+        it 'returns an error' do
+          expect(subject).not_to be_valid
+          expect(subject.errors[:state]).to include('must be one of ACTIVE, RESTRICTED, DEPRECATED, DISABLED')
+        end
+      end
     end
   end
 end

spec/unit/messages/stack_update_message_spec.rb

@@ -52,6 +52,15 @@
           expect(subject).to be_valid
         end
       end
+
+      context 'when it is explicitly null' do
+        let(:params) { valid_params.merge({ state: nil }) }
+
+        it 'returns an error' do
+          expect(subject).not_to be_valid
+          expect(subject.errors[:state]).to include('must be one of ACTIVE, RESTRICTED, DEPRECATED, DISABLED')
+        end
+      end
     end
   end
 end