Revert "Merge pull request #33 from env0/chore-handle-http-events-list"

This reverts commit 647b42e, reversing
changes made to c7ad2d1.

Author: Yossi-kerner

src/serverless-openapi-typescript.ts

@@ -223,9 +223,9 @@ export default class ServerlessOpenapiTypeScript {
         if (customTags) openApi.tags = openApi.tags.concat(customTags)
 
         Object.values(openApi.paths).forEach(path => {
-            Object.entries(path).forEach(([methodName, method]) => {
+            Object.values(path).forEach(method => {
                 const httpEvent = this.functions[method.operationId]?.events?.find(
-                    (e: ApiGatewayEvent) => (e.http as any).method === methodName
+                    (e: ApiGatewayEvent) => e.http
                 ) as ApiGatewayEvent;
                 const http: HttpEvent = httpEvent.http;
                 if (http.documentation?.tag) {
@@ -234,7 +234,7 @@ export default class ServerlessOpenapiTypeScript {
                     method.tags = [tagName];
                 }
 
-                method.operationId = kebabCase(`${this.serverless.service.custom?.documentation?.title}-${method.operationId}-${methodName}`);
+                method.operationId = kebabCase(`${this.serverless.service.custom?.documentation?.title}-${method.operationId}`);
             });
         });
     }

test/fixtures/expect-openapi-custom-tags.yml

@@ -13,7 +13,7 @@ info:
 paths:
   /create:
     post:
-      operationId: project-create-func-post
+      operationId: project-create-func
       summary: Create Function
       description: |
         Create Function1
@@ -37,7 +37,7 @@ paths:
         - FooBarTitle
   /delete:
     delete:
-      operationId: project-delete-func-delete
+      operationId: project-delete-func
       summary: Delete Function
       description: Delete
       parameters: []
@@ -49,7 +49,7 @@ paths:
         - Project
   /get:
     get:
-      operationId: project-get-func-get
+      operationId: project-get-func
       summary: Get Function
       parameters: []
       responses:

test/fixtures/expect-openapi-full.yml

@@ -109,7 +109,7 @@ info:
 paths:
   /create/{funcName}:
     post:
-      operationId: project-create-func-post
+      operationId: project-create-func
       summary: Create Function
       description: |
         Create Function1
@@ -163,7 +163,7 @@ paths:
         - Project
   /delete/{funcName}:
     delete:
-      operationId: project-delete-func-delete
+      operationId: project-delete-func
       summary: Delete Function
       description: Delete
       parameters:
@@ -181,7 +181,7 @@ paths:
         - Project
   /update:
     put:
-      operationId: project-update-func-put
+      operationId: project-update-func
       summary: Delete Function
       description: Delete
       requestBody:
@@ -202,7 +202,7 @@ paths:
         - Project
   /get/{funcName}:
     get:
-      operationId: project-get-func-get
+      operationId: project-get-func
       summary: Get Function
       parameters:
         - name: funcName

test/fixtures/expect-openapi-hyphenated-functions.yml

@@ -13,7 +13,7 @@ info:
 paths:
   /create:
     post:
-      operationId: project-create-func-post
+      operationId: project-create-func
       summary: Create Function
       description: |
         Create Function1
@@ -37,7 +37,7 @@ paths:
         - FooBarTitle
   /delete:
     delete:
-      operationId: project-delete-all-func-delete
+      operationId: project-delete-all-func
       summary: Delete Function
       description: Delete
       parameters: []
@@ -49,7 +49,7 @@ paths:
         - Project
   /get:
     get:
-      operationId: project-get-func-get
+      operationId: project-get-func
       summary: Get Function
       parameters: []
       responses:

test/fixtures/expect-openapi-query-param-type.yml

@@ -14,7 +14,7 @@ info:
 paths:
   /get:
     get:
-      operationId: func-get
+      operationId: func
       summary: Get Function
       parameters:
         - name: name