Fix service catalog schema change (#1232)

Co-authored-by: ci.datadog-api-spec <[email protected]>

Author: api-clients-generation-pipeline[bot]

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-11-09 16:23:06.808407",
-            "spec_repo_commit": "a896c6f6"
+            "regenerated": "2022-11-14 19:04:01.903894",
+            "spec_repo_commit": "aaa18608"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-11-09 16:23:06.820984",
-            "spec_repo_commit": "a896c6f6"
+            "regenerated": "2022-11-14 19:04:01.916873",
+            "spec_repo_commit": "aaa18608"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -9701,12 +9701,12 @@ components:
       properties:
         region:
           $ref: '#/components/schemas/ServiceDefinitionV2OpsgenieRegion'
-        service-id:
-          description: Opsgenie service id.
-          example: 123e4567-e89b-12d3-a456-426614174000
+        service-url:
+          description: Opsgenie service url.
+          example: https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000
           type: string
       required:
-      - service-id
+      - service-url
       type: object
     ServiceDefinitionV2OpsgenieRegion:
       description: Opsgenie instance region.

examples/v2/service-definition/CreateOrUpdateServiceDefinitions.py

@@ -37,7 +37,7 @@
     integrations=ServiceDefinitionV2Integrations(
         opsgenie=ServiceDefinitionV2Opsgenie(
             region=ServiceDefinitionV2OpsgenieRegion.US,
-            service_id="123e4567-e89b-12d3-a456-426614174000",
+            service_url="https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000",
         ),
         pagerduty="https://my-org.pagerduty.com/service-directory/PMyService",
     ),

examples/v2/service-definition/DeleteServiceDefinition.py

@@ -9,5 +9,5 @@
 with ApiClient(configuration) as api_client:
     api_instance = ServiceDefinitionApi(api_client)
     api_instance.delete_service_definition(
-        service_name="service-Example-Delete_a_single_service_definition_returns_OK_response",
+        service_name="service-definition-test",
     )

examples/v2/service-definition/GetServiceDefinition.py

@@ -9,7 +9,7 @@
 with ApiClient(configuration) as api_client:
     api_instance = ServiceDefinitionApi(api_client)
     response = api_instance.get_service_definition(
-        service_name="service-Example-Get_a_single_service_definition_returns_OK_response",
+        service_name="service-definition-test",
     )
 
     print(response)

src/datadog_api_client/v2/model/service_definition_v2_opsgenie.py

@@ -24,26 +24,28 @@ def openapi_types(_):
 
         return {
             "region": (ServiceDefinitionV2OpsgenieRegion,),
-            "service_id": (str,),
+            "service_url": (str,),
         }
 
     attribute_map = {
         "region": "region",
-        "service_id": "service-id",
+        "service_url": "service-url",
     }
 
-    def __init__(self_, service_id: str, region: Union[ServiceDefinitionV2OpsgenieRegion, UnsetType] = unset, **kwargs):
+    def __init__(
+        self_, service_url: str, region: Union[ServiceDefinitionV2OpsgenieRegion, UnsetType] = unset, **kwargs
+    ):
         """
         Opsgenie integration for the service.
 
         :param region: Opsgenie instance region.
         :type region: ServiceDefinitionV2OpsgenieRegion, optional
 
-        :param service_id: Opsgenie service id.
-        :type service_id: str
+        :param service_url: Opsgenie service url.
+        :type service_url: str
         """
         if region is not unset:
             kwargs["region"] = region
         super().__init__(kwargs)
 
-        self_.service_id = service_id
+        self_.service_url = service_url

tests/v2/cassettes/test_scenarios/test_create_or_update_service_definition_returns_created_response.frozen

@@ -1 +1 @@
-2022-10-11T16:11:15.904Z
+2022-11-10T21:14:44.544Z

tests/v2/cassettes/test_scenarios/test_create_or_update_service_definition_returns_created_response.yaml

@@ -1,7 +1,7 @@
 interactions:
 - request:
-    body: '{"contacts":[{"contact":"[email protected]","name":"Team Email","type":"email"}],"dd-service":"service-Test-Create_or_update_service_definition_returns_CREATED_response-1665504675","dd-team":"my-team","docs":[{"name":"Architecture","provider":"google
-      drive","url":"https://gdrive/mydoc"}],"extensions":{"myorgextension":"extensionvalue"},"integrations":{"opsgenie":{"region":"US","service-id":"123e4567-e89b-12d3-a456-426614174000"},"pagerduty":"https://my-org.pagerduty.com/service-directory/PMyService"},"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"}],"repos":[{"name":"Source
+    body: '{"contacts":[{"contact":"[email protected]","name":"Team Email","type":"email"}],"dd-service":"service-Test-Create_or_update_service_definition_returns_CREATED_response-1668114884","dd-team":"my-team","docs":[{"name":"Architecture","provider":"google
+      drive","url":"https://gdrive/mydoc"}],"extensions":{"myorgextension":"extensionvalue"},"integrations":{"opsgenie":{"region":"US","service-url":"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000"},"pagerduty":"https://my-org.pagerduty.com/service-directory/PMyService"},"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"}],"repos":[{"name":"Source
       Code","provider":"GitHub","url":"https://github.com/DataDog/schema"}],"schema-version":"v2","tags":["my:tag","service:tag"],"team":"my-team"}'
     headers:
       accept:
@@ -12,10 +12,10 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/services/definitions
   response:
     body:
-      string: '{"data":[{"attributes":{"meta":{"ingested-schema-version":"v2","ingestion-source":"api","last-modified-time":"2022-10-11T16:11:16.302119241Z","github-html-url":"","warnings":[]},"schema":{"links":[{"url":"https://my-runbook","type":"runbook","name":"Runbook"}],"contacts":[{"contact":"[email protected]","type":"email","name":"Team
-        Email"}],"docs":[{"url":"https://gdrive/mydoc","name":"Architecture","provider":"google
-        drive"}],"repos":[{"url":"https://github.com/DataDog/schema","name":"Source
-        Code","provider":"GitHub"}],"tags":["my:tag","service:tag"],"dd-team":"my-team","integrations":{"opsgenie":{"region":"US","service-id":"123e4567-e89b-12d3-a456-426614174000"},"pagerduty":"https://my-org.pagerduty.com/service-directory/PMyService"},"schema-version":"v2","team":"my-team","extensions":{},"dd-service":"service-test-create_or_update_service_definition_returns_created_response-1665504675"}},"type":"service-definition"}]}
+      string: '{"data":[{"type":"service-definition","attributes":{"meta":{"last-modified-time":"2022-11-10T21:14:45.52228008Z","github-html-url":"","ingestion-source":"api","warnings":[],"ingested-schema-version":"v2"},"schema":{"schema-version":"v2","dd-service":"service-test-create_or_update_service_definition_returns_created_response-1668114884","dd-team":"my-team","team":"my-team","contacts":[{"name":"Team
+        Email","type":"email","contact":"[email protected]"}],"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"}],"repos":[{"name":"Source
+        Code","provider":"GitHub","url":"https://github.com/DataDog/schema"}],"docs":[{"name":"Architecture","provider":"google
+        drive","url":"https://gdrive/mydoc"}],"tags":["my:tag","service:tag"],"integrations":{"pagerduty":"https://my-org.pagerduty.com/service-directory/PMyService","opsgenie":{"service-url":"https://my-org.opsgenie.com/service/123e4567-e89b-12d3-a456-426614174000","region":"US"}},"extensions":{"myorgextension":"extensionvalue"}}}}]}
 
         '
     headers:
@@ -30,7 +30,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/services/definitions/service-test-create_or_update_service_definition_returns_created_response-1665504675
+    uri: https://api.datadoghq.com/api/v2/services/definitions/service-test-create_or_update_service_definition_returns_created_response-1668114884
   response:
     body:
       string: '{"errors":["Not Found"],"error_details":[{}]}

tests/v2/cassettes/test_scenarios/test_delete_a_single_service_definition_returns_ok_response.frozen

@@ -1 +1 @@
-2022-10-10T12:48:37.381Z
+2022-11-14T18:19:52.943Z

tests/v2/cassettes/test_scenarios/test_delete_a_single_service_definition_returns_ok_response.yaml

@@ -1,58 +1,18 @@
 interactions:
-- request:
-    body: '{"dd-service":"service-Test-Delete_a_single_service_definition_returns_OK_response-1665406117","dd-team":"my-team","docs":[{"name":"Architecture","provider":"google
-      drive","url":"https://gdrive/mygivedoc"}],"extensions":{"frogextension":"extensionfrogvalue"},"integrations":{"opsgenie":{"region":"US","service-id":"123e4567-e89b-12d3-a456-426614174000"},"pagerduty":"https://my-org.pagerduty.com/service-directory/PMyService"},"links":[{"name":"Runbook","type":"runbook","url":"https://my-runbook"}],"repos":[{"name":"Source
-      Code","provider":"GitHub","url":"https://github.com/DataDog/given"}],"schema-version":"v2","tags":["this:tag","service:tag"],"team":"super-team"}'
-    headers:
-      accept:
-      - application/json
-      content-type:
-      - application/json
-    method: POST
-    uri: https://api.datadoghq.com/api/v2/services/definitions
-  response:
-    body:
-      string: '{"data":[{"attributes":{"meta":{"ingested-schema-version":"v2","ingestion-source":"api","last-modified-time":"2022-10-10T12:48:37.797458518Z","github-html-url":"","warnings":[]},"schema":{"links":[{"url":"https://my-runbook","type":"runbook","name":"Runbook"}],"contacts":[],"docs":[{"url":"https://gdrive/mygivedoc","name":"Architecture","provider":"google
-        drive"}],"repos":[{"url":"https://github.com/DataDog/given","name":"Source
-        Code","provider":"GitHub"}],"tags":["service:tag","this:tag"],"dd-team":"my-team","integrations":{"opsgenie":{"region":"US","service-id":"123e4567-e89b-12d3-a456-426614174000"},"pagerduty":"https://my-org.pagerduty.com/service-directory/PMyService"},"schema-version":"v2","team":"super-team","extensions":{},"dd-service":"service-test-delete_a_single_service_definition_returns_ok_response-1665406117"}},"type":"service-definition"}]}
-
-        '
-    headers:
-      content-type:
-      - application/json
-    status:
-      code: 200
-      message: OK
 - request:
     body: null
     headers:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/services/definitions/service-Test-Delete_a_single_service_definition_returns_OK_response-1665406117
+    uri: https://api.datadoghq.com/api/v2/services/definitions/service-definition-test
   response:
     body:
       string: ''
-    headers: {}
-    status:
-      code: 204
-      message: No Content
-- request:
-    body: null
-    headers:
-      accept:
-      - '*/*'
-    method: DELETE
-    uri: https://api.datadoghq.com/api/v2/services/definitions/service-test-delete_a_single_service_definition_returns_ok_response-1665406117
-  response:
-    body:
-      string: '{"errors":["Not Found"],"error_details":[{}]}
-
-        '
     headers:
       content-type:
-      - application/json
+      - text/html; charset=utf-8
     status:
-      code: 404
-      message: Not Found
+      code: 204
+      message: No Content
 version: 1