Merge branch 'add-normalized-target-url-to-dast-site-validtion' into 'master'

Expose normalizedTargetUrl on DastSiteValidation

See merge request gitlab-org/gitlab!49541

doc/api/graphql/reference/gitlab_schema.graphql

@@ -5442,6 +5442,11 @@ type DastSiteValidation {
   """
   id: DastSiteValidationID!
 
+  """
+  Normalized URL of the target to be validated
+  """
+  normalizedTargetUrl: String
+
   """
   Status of the site validation
   """

doc/api/graphql/reference/gitlab_schema.json

@@ -14977,6 +14977,20 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "normalizedTargetUrl",
+              "description": "Normalized URL of the target to be validated",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "status",
               "description": "Status of the site validation",

doc/api/graphql/reference/index.md

@@ -939,6 +939,7 @@ Represents a DAST Site Validation.
 | Field | Type | Description |
 | ----- | ---- | ----------- |
 | `id` | DastSiteValidationID! | Global ID of the site validation |
+| `normalizedTargetUrl` | String | Normalized URL of the target to be validated |
 | `status` | DastSiteProfileValidationStatusEnum! | Status of the site validation |
 
 ### DastSiteValidationCreatePayload

ee/app/graphql/types/dast_site_validation_type.rb

@@ -13,5 +13,12 @@ module Types
     field :status, Types::DastSiteProfileValidationStatusEnum, null: false,
           description: 'Status of the site validation',
           method: :state
+
+    field :normalized_target_url, GraphQL::STRING_TYPE, null: true,
+          description: 'Normalized URL of the target to be validated'
+
+    def normalized_target_url
+      object.url_base
+    end
   end
 end

ee/spec/graphql/types/dast_site_validation_type_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe GitlabSchema.types['DastSiteValidation'] do
   let_it_be(:dast_site_validation) { create(:dast_site_validation) }
   let_it_be(:project) { dast_site_validation.dast_site_token.project }
   let_it_be(:user) { create(:user) }
-  let_it_be(:fields) { %i[id status] }
+  let_it_be(:fields) { %i[id status normalizedTargetUrl] }
 
   let(:response) do
     GitlabSchema.execute(
@@ -42,6 +42,7 @@ RSpec.describe GitlabSchema.types['DastSiteValidation'] do
             dastSiteValidation(targetUrl: $targetUrl) {
               id
               status
+              normalizedTargetUrl
             }
           }
         }