Merge branch 'philipcunningham-make-dast-site-validation-state-nullable' into 'master'

Return NONE when DastSiteValidation does not exist

See merge request gitlab-org/gitlab!48751

doc/api/graphql/reference/gitlab_schema.graphql

@@ -5342,6 +5342,11 @@ enum DastSiteProfileValidationStatusEnum {
   """
   INPROGRESS_VALIDATION
 
+  """
+  No site validation exists
+  """
+  NONE
+
   """
   Site validation process finished successfully
   """

doc/api/graphql/reference/gitlab_schema.json

@@ -14715,6 +14715,12 @@
           "inputFields": null,
           "interfaces": null,
           "enumValues": [
+            {
+              "name": "NONE",
+              "description": "No site validation exists",
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "PENDING_VALIDATION",
               "description": "Site validation process has not started",

doc/api/graphql/reference/index.md

@@ -4056,6 +4056,7 @@ Status of a container repository.
 | ----- | ----------- |
 | `FAILED_VALIDATION` | Site validation process finished but failed |
 | `INPROGRESS_VALIDATION` | Site validation process is in progress |
+| `NONE` | No site validation exists |
 | `PASSED_VALIDATION` | Site validation process finished successfully |
 | `PENDING_VALIDATION` | Site validation process has not started |
 

ee/app/graphql/types/dast_site_profile_validation_status_enum.rb

@@ -2,6 +2,7 @@
 
 module Types
   class DastSiteProfileValidationStatusEnum < BaseEnum
+    value 'NONE', value: DastSiteValidation::NONE_STATE, description: 'No site validation exists'
     value 'PENDING_VALIDATION', value: 'pending', description: 'Site validation process has not started'
     value 'INPROGRESS_VALIDATION', value: 'inprogress', description: 'Site validation process is in progress'
     value 'PASSED_VALIDATION', value: 'passed', description: 'Site validation process finished successfully'

ee/app/models/dast_site_profile.rb

@@ -15,7 +15,7 @@ class DastSiteProfile < ApplicationRecord
   delegate :dast_site_validation, to: :dast_site, allow_nil: true
 
   def status
-    return DastSiteValidation::INITIAL_STATE unless dast_site_validation
+    return DastSiteValidation::NONE_STATE unless dast_site_validation
 
     dast_site_validation.state
   end

ee/app/models/dast_site_validation.rb

@@ -27,6 +27,7 @@ class DastSiteValidation < ApplicationRecord
     "#{url_base}/#{url_path}"
   end
 
+  NONE_STATE = 'none'
   INITIAL_STATE = 'pending'
 
   state_machine :state, initial: INITIAL_STATE.to_sym do

ee/changelogs/unreleased/philipcunningham-make-dast-site-validation-state-nullable.yml

+---
+title: Return NONE for GraphQL DastSiteValidation type status when there is no DAST site validation
+merge_request: 48751
+author:
+type: changed

ee/spec/models/dast_site_profile_spec.rb

@@ -74,12 +74,12 @@ RSpec.describe DastSiteProfile, type: :model do
 
   describe '#status' do
     context 'when dast_site_validation association does not exist' do
-      it 'is pending' do
+      it 'is none' do
         subject.dast_site.update!(dast_site_validation_id: nil)
 
         aggregate_failures do
           expect(subject.dast_site_validation).to be_nil
-          expect(subject.status).to eq('pending')
+          expect(subject.status).to eq('none')
         end
       end
     end

ee/spec/requests/api/graphql/project/dast_site_profile_spec.rb

@@ -93,10 +93,10 @@ RSpec.describe 'Query.project(fullPath).dastSiteProfile' do
     end
 
     context 'when there is no associated dast_site_validation' do
-      it 'returns a pending validation status' do
+      it 'returns a none validation status' do
         dast_site_profile.dast_site_validation.destroy!
 
-        expect(dast_site_profile_response['validationStatus']).to eq('PENDING_VALIDATION')
+        expect(dast_site_profile_response['validationStatus']).to eq('NONE')
       end
     end
   end