Fix services defs (#96)

* Update herald manually, allowing validation to pass for others

* Update kalm definition

Co-authored-by: Anton Benkevich <[email protected]>

Author: anton-b

alsdkdefs/apis/herald/herald.v1.yaml

@@ -62,7 +62,7 @@ paths:
           description: Forbidden
         '404':
           description: Not Found
-      operationId: get-subscriptions-v1-account_id-entitlements
+      operationId: get_account_integration
       description: Get the specified account integration
       security:
         - X-AIMS-Auth-Token: []
@@ -82,9 +82,7 @@ paths:
                   integrations:
                     type: array
                     items:
-                      allOf:
-                        - $ref: '#/components/schemas/Integration-Webhook'
-                        - $ref: '#/components/schemas/Integration-Email'
+                      $ref: '#/components/schemas/Integration-Webhook' 
               examples:
                 List account Integrations for the Specified Account Response Example:
                   value:
@@ -104,7 +102,7 @@ paths:
                           by: 3B8EAFA0-1E1A-4744-AB53-0EE45EA8B102
         '403':
           description: Forbidden
-      operationId: 'get-herald-v2-:account_id-integrations'
+      operationId: get_account_integrations
       security:
         - X-AIMS-Auth-Token: []
       description: List the specified account integration
@@ -139,7 +137,7 @@ paths:
                       - name: webhook
         '403':
           description: Forbidden
-      operationId: get-herald-v2-integration_types
+      operationId: get_integration_types
       description: Get the list of available integration types
       security:
         - X-AIMS-Auth-Token: []
@@ -159,7 +157,7 @@ paths:
           description: Forbidden
         '404':
           description: Not Found
-      operationId: 'get-herald-v2-notifications-:notification_id'
+      operationId: get_notification
       security:
         - X-AIMS-Auth-Token: []
       description: Get a notification by ID
@@ -187,7 +185,7 @@ paths:
           description: Forbidden
         '404':
           description: Not Found
-      operationId: 'get-herald-v2-:account_id-notifications-:notification_id'
+      operationId: get_account_notification
       security:
         - X-AIMS-Auth-Token: []
       description: Get a notification by account id and notification id
@@ -220,7 +218,7 @@ paths:
           description: Forbidden
         '404':
           description: Not Found
-      operationId: 'get-herald-v2-notifications-type-incidents-alerts-:long_incident_id'
+      operationId: get_sent_incident_notifications
       description: Get a notification by ID
       security:
         - X-AIMS-Auth-Token: []
@@ -234,7 +232,7 @@ paths:
   '/herald/v2/{account_id}/notifications':
     post:
       summary: Send a notification
-      operationId: 'post-herald-v2-:account_id-notifications'
+      operationId: sent_notification
       responses:
         '202':
           description: Accepted
@@ -422,7 +420,7 @@ paths:
       summary: List subscribers
       tags:
         - Subscribers
-      operationId: 'get-herald-v2-:account_id-subscriptions-:subscription_id-subscribers'
+      operationId: get_account_subscription_subscribers
       security:
         - X-AIMS-Auth-Token: []
       description: List all subscribers subscribed to that subscription
@@ -472,7 +470,7 @@ paths:
                       $ref: '#/components/schemas/Notification-Type'
         '403':
           description: Forbidden
-      operationId: get-herald-v2-notification_types
+      operationId: get_notification_types
       description: Get available notification types
       security:
         - X-AIMS-Auth-Token: []
@@ -509,7 +507,7 @@ paths:
                     error: invalid_search_parameters
         '403':
           description: Forbidden
-      operationId: 'get-herald-v2-:account_id-subscriptions'
+      operationId: get_account_subscriptions
       security:
         - X-AIMS-Auth-Token: []
       description: List subscriptions for an account
@@ -556,7 +554,7 @@ paths:
           description: Forbidden
         '404':
           description: Not Found
-      operationId: 'get-herald-v2-:account_id-subscriptions-:subscription_id'
+      operationId: get_account_subscription
       description: List a subscription for an account by subscription id
       security:
         - X-AIMS-Auth-Token: []

alsdkdefs/apis/kalm/kalm.v1.yaml

@@ -64,7 +64,7 @@ paths:
                       - key: asset_type_param
                         description: Parameter description
                         type: string
-      operationId: get-kalm-v1-account_id-named_query-query_name
+      operationId: get_account_named_query
       security:
         - X-AIMS-Auth-Token: []
       description: Returns named query
@@ -99,7 +99,7 @@ paths:
                     columns:
                       account_id: bigint
                       environment_id: string
-      operationId: get-kalm-v1-account_id-table-table_name
+      operationId: get_account_named_table
       security:
         - X-AIMS-Auth-Token: []
       description: Returns table
@@ -150,7 +150,7 @@ paths:
                         - key: asset_type_param
                           description: Parameter description
                           type: string
-      operationId: get-kalm-v1-account_id-named_query
+      operationId: get_account_named_queries
       description: Returns list of named queries
       security:
         - X-AIMS-Auth-Token: []
@@ -181,7 +181,7 @@ paths:
                       columns:
                         account_id: bigint
                         environment_id: string
-      operationId: get-kalm-v1-account_id-table
+      operationId: get_account_named_tables
       description: Returns list of available tables.
       security:
         - X-AIMS-Auth-Token: []
@@ -224,7 +224,7 @@ paths:
                         - /aws/us-west-2/sg/sg-07f0b89cae6a8415d
                       - - 71B0F87C-E015-4368-9672-6A5863B7AAD9
                         - /aws/us-west-2/host/i-0008b17e2d0943ad8
-      operationId: get-kalm-v1-account_id-query-named_or_table_query
+      operationId: run_named_or_table_query
       description: 'Runs query and returns query results for named query or existing table. For named queries additional query parameters with a single value each can be passed. If the parameter is not passed then its key is considered as `NULL`'
       security:
         - X-AIMS-Auth-Token: []