Merge branch...

Merge branch 'switch-back-to-id-instead-of-global-id-in-dast-scanner-profile-mutations-270084' into 'master'

Deprecate globalId for id in DastScannerProfile

See merge request gitlab-org/gitlab!47559

doc/api/graphql/reference/gitlab_schema.graphql

@@ -4483,14 +4483,14 @@ type DastScannerProfile {
   editPath: String
 
   """
-  ID of the DAST scanner profile
+  ID of the DAST scanner profile. Deprecated in 13.6: Use `id`
   """
-  globalId: DastScannerProfileID!
+  globalId: DastScannerProfileID! @deprecated(reason: "Use `id`. Deprecated in 13.6")
 
   """
-  ID of the DAST scanner profile. Deprecated in 13.4: Use `global_id`
+  ID of the DAST scanner profile
   """
-  id: ID! @deprecated(reason: "Use `global_id`. Deprecated in 13.4")
+  id: DastScannerProfileID!
 
   """
   Name of the DAST scanner profile
@@ -4607,14 +4607,14 @@ type DastScannerProfileCreatePayload {
   errors: [String!]!
 
   """
-  ID of the scanner profile.
+  ID of the scanner profile.. Deprecated in 13.6: Use `id`
   """
-  globalId: DastScannerProfileID
+  globalId: DastScannerProfileID @deprecated(reason: "Use `id`. Deprecated in 13.6")
 
   """
-  ID of the scanner profile.. Deprecated in 13.4: Use `global_id`
+  ID of the scanner profile.
   """
-  id: ID @deprecated(reason: "Use `global_id`. Deprecated in 13.4")
+  id: DastScannerProfileID
 }
 
 """

doc/api/graphql/reference/gitlab_schema.json

@@ -12232,7 +12232,7 @@
             },
             {
               "name": "globalId",
-              "description": "ID of the DAST scanner profile",
+              "description": "ID of the DAST scanner profile. Deprecated in 13.6: Use `id`",
               "args": [
 
               ],
@@ -12245,12 +12245,12 @@
                   "ofType": null
                 }
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "Use `id`. Deprecated in 13.6"
             },
             {
               "name": "id",
-              "description": "ID of the DAST scanner profile. Deprecated in 13.4: Use `global_id`",
+              "description": "ID of the DAST scanner profile",
               "args": [
 
               ],
@@ -12259,12 +12259,12 @@
                 "name": null,
                 "ofType": {
                   "kind": "SCALAR",
-                  "name": "ID",
+                  "name": "DastScannerProfileID",
                   "ofType": null
                 }
               },
-              "isDeprecated": true,
-              "deprecationReason": "Use `global_id`. Deprecated in 13.4"
+              "isDeprecated": false,
+              "deprecationReason": null
             },
             {
               "name": "profileName",
@@ -12579,7 +12579,7 @@
             },
             {
               "name": "globalId",
-              "description": "ID of the scanner profile.",
+              "description": "ID of the scanner profile.. Deprecated in 13.6: Use `id`",
               "args": [
 
               ],
@@ -12588,22 +12588,22 @@
                 "name": "DastScannerProfileID",
                 "ofType": null
               },
-              "isDeprecated": false,
-              "deprecationReason": null
+              "isDeprecated": true,
+              "deprecationReason": "Use `id`. Deprecated in 13.6"
             },
             {
               "name": "id",
-              "description": "ID of the scanner profile.. Deprecated in 13.4: Use `global_id`",
+              "description": "ID of the scanner profile.",
               "args": [
 
               ],
               "type": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "DastScannerProfileID",
                 "ofType": null
               },
-              "isDeprecated": true,
-              "deprecationReason": "Use `global_id`. Deprecated in 13.4"
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,

doc/api/graphql/reference/index.md

@@ -737,8 +737,8 @@ Represents a DAST scanner profile.
 | Field | Type | Description |
 | ----- | ---- | ----------- |
 | `editPath` | String | Relative web path to the edit page of a scanner profile |
-| `globalId` | DastScannerProfileID! | ID of the DAST scanner profile |
-| `id` **{warning-solid}** | ID! | **Deprecated:** Use `global_id`. Deprecated in 13.4 |
+| `globalId` **{warning-solid}** | DastScannerProfileID! | **Deprecated:** Use `id`. Deprecated in 13.6 |
+| `id` | DastScannerProfileID! | ID of the DAST scanner profile |
 | `profileName` | String | Name of the DAST scanner profile |
 | `scanType` | DastScanTypeEnum | Indicates the type of DAST scan that will run. Either a Passive Scan or an Active Scan. |
 | `showDebugMessages` | Boolean! | Indicates if debug messages should be included in DAST console output. True to include the debug messages. |
@@ -754,8 +754,8 @@ Autogenerated return type of DastScannerProfileCreate.
 | ----- | ---- | ----------- |
 | `clientMutationId` | String | A unique identifier for the client performing the mutation. |
 | `errors` | String! => Array | Errors encountered during execution of the mutation. |
-| `globalId` | DastScannerProfileID | ID of the scanner profile. |
-| `id` **{warning-solid}** | ID | **Deprecated:** Use `global_id`. Deprecated in 13.4 |
+| `globalId` **{warning-solid}** | DastScannerProfileID | **Deprecated:** Use `id`. Deprecated in 13.6 |
+| `id` | DastScannerProfileID | ID of the scanner profile. |
 
 ### DastScannerProfileDeletePayload
 

ee/app/graphql/mutations/dast_scanner_profiles/create.rb

@@ -7,14 +7,14 @@ module Mutations
 
       graphql_name 'DastScannerProfileCreate'
 
-      field :id, GraphQL::ID_TYPE,
+      field :id, ::Types::GlobalIDType[::DastScannerProfile],
             null: true,
-            description: 'ID of the scanner profile.',
-            deprecated: { reason: 'Use `global_id`', milestone: '13.4' }
+            description: 'ID of the scanner profile.'
 
       field :global_id, ::Types::GlobalIDType[::DastScannerProfile],
             null: true,
-            description: 'ID of the scanner profile.'
+            description: 'ID of the scanner profile.',
+            deprecated: { reason: 'Use `id`', milestone: '13.6' }
 
       argument :full_path, GraphQL::ID_TYPE,
                required: true,

ee/app/graphql/types/dast_scanner_profile_type.rb

@@ -7,12 +7,12 @@ module Types
 
     authorize :create_on_demand_dast_scan
 
-    field :id, GraphQL::ID_TYPE, null: false,
-          description: 'ID of the DAST scanner profile',
-          deprecated: { reason: 'Use `global_id`', milestone: '13.4' }
+    field :id, ::Types::GlobalIDType[::DastScannerProfile], null: false,
+          description: 'ID of the DAST scanner profile'
 
     field :global_id, ::Types::GlobalIDType[::DastScannerProfile], null: false,
           description: 'ID of the DAST scanner profile',
+          deprecated: { reason: 'Use `id`', milestone: '13.6' },
           method: :id
 
     field :profile_name, GraphQL::STRING_TYPE, null: true,

ee/changelogs/unreleased/switch-back-to-id-instead-of-global-id-in-dast-scanner-profile-mutatio.yml

+---
+title: Deprecate globalId and undeprecate id for DastScannerProfile
+merge_request: 47559
+author:
+type: deprecated