Merge pull request #1004 from keptn/feature/949/start-evaluation-support

#949 Improvements for unit tests and connection handling

api/deploy/service.yaml

@@ -31,8 +31,8 @@ spec:
               value: event-broker.keptn.svc.cluster.local
             - name: DATASTORE_URI
               value: mongodb-datastore.keptn-datastore.svc.cluster.local:8080
-#            - name: CONFIGURATION_URI
-#              value: configuration-service.keptn.svc.cluster.local:8080
+            - name: CONFIGURATION_URI
+              value: configuration-service.keptn.svc.cluster.local:8080
             - name: SECRET_TOKEN
               valueFrom:
                 secretKeyRef:

api/handlers/event.go

@@ -23,6 +23,10 @@ import (
 	"github.com/keptn/keptn/api/ws"
 )
 
+func getDatastoreURL() string {
+	return "http://" + os.Getenv("DATASTORE_URI")
+}
+
 // PostEventHandlerFunc forwards an event to the event broker
 func PostEventHandlerFunc(params event.PostEventParams, principal *models.Principal) middleware.Responder {
 
@@ -73,15 +77,15 @@ func GetEventHandlerFunc(params event.GetEventParams, principal *models.Principa
 	}
 
 	if cloudEvent == nil {
-		return sendInternalErrorForGet(fmt.Errorf("no " + *params.Type + " event found"))
+		return sendInternalErrorForGet(fmt.Errorf("No " + *params.Type + " event found for Keptn context: " + *params.KeptnContext))
 	}
 
 	eventByte, err := json.Marshal(cloudEvent)
 	if err != nil {
 		return sendInternalErrorForGet(err)
 	}
 
-	apiEvent := &models.Event{}
+	apiEvent := &models.KeptnContextExtendedCE{}
 	err = json.Unmarshal(eventByte, apiEvent)
 	if err != nil {
 		return sendInternalErrorForGet(err)
@@ -102,7 +106,3 @@ func addEventContextInCE(ceData interface{}, eventContext models.EventContext) i
 	ceData.(map[string]interface{})["eventContext"] = eventContext
 	return ceData
 }
-
-func getDatastoreURL() string {
-	return "http://" + os.Getenv("DATASTORE_URI")
-}

api/handlers/service_resource.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	b64 "encoding/base64"
 	"encoding/json"
+	"os"
 
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/swag"
@@ -22,6 +23,10 @@ const (
 	serviceNotFound
 )
 
+func getConfigurationServiceURL() string {
+	return "http://" + os.Getenv("CONFIGURATION_URI")
+}
+
 // DeleteProjectProjectNameStageStageNameServiceServiceNameResourceResourceURIHandlerFunc deletes the specified resource
 /*
 func DeleteProjectProjectNameStageStageNameServiceServiceNameResourceResourceURIHandlerFunc(params service_resource.DeleteProjectProjectNameStageStageNameServiceServiceNameResourceResourceURIParams) middleware.Responder {
@@ -31,7 +36,7 @@ func DeleteProjectProjectNameStageStageNameServiceServiceNameResourceResourceURI
 
 // PostProjectProjectNameStageStageNameServiceServiceNameResourceHandlerFunc creates a new resource
 func PostProjectProjectNameStageStageNameServiceServiceNameResourceHandlerFunc(params service_resource.PostProjectProjectNameStageStageNameServiceServiceNameResourceParams, principal *models.Principal) middleware.Responder {
-	resourceHandler := configutils.NewResourceHandler(getConfigurationURL())
+	resourceHandler := configutils.NewResourceHandler(getConfigurationServiceURL())
 
 	resourcesToUpload := []*configmodels.Resource{}
 	for _, resource := range params.Resources.Resources {
@@ -58,7 +63,8 @@ func PostProjectProjectNameStageStageNameServiceServiceNameResourceHandlerFunc(p
 
 // PutProjectProjectNameStageStageNameServiceServiceNameResourceHandlerFunc updates a list of resources
 func PutProjectProjectNameStageStageNameServiceServiceNameResourceHandlerFunc(params service_resource.PutProjectProjectNameStageStageNameServiceServiceNameResourceParams, principal *models.Principal) middleware.Responder {
-	resourceHandler := configutils.NewResourceHandler(getConfigurationURL())
+	resourceHandler := configutils.NewResourceHandler(getConfigurationServiceURL())
+
 	resourcesToUpload := []*configmodels.Resource{}
 	for _, resource := range params.Resources.Resources {
 		decodedStrBytes, err := b64.StdEncoding.DecodeString(*resource.ResourceContent)
@@ -71,15 +77,13 @@ func PutProjectProjectNameStageStageNameServiceServiceNameResourceHandlerFunc(pa
 			ResourceURI:     resource.ResourceURI,
 		})
 	}
+
 	_, err := resourceHandler.CreateServiceResources(params.ProjectName, params.StageName, params.ServiceName, resourcesToUpload)
 	if err != nil {
 		errorObj := &models.Error{}
 		json.Unmarshal([]byte(err.Error()), errorObj)
 		return service_resource.NewPostProjectProjectNameStageStageNameServiceServiceNameResourceDefault(500).WithPayload(errorObj)
 	}
-	return service_resource.NewPutProjectProjectNameStageStageNameServiceServiceNameResourceCreated()
-}
 
-func getConfigurationURL() string {
-	return "configuration-service:8080"
+	return service_resource.NewPutProjectProjectNameStageStageNameServiceServiceNameResourceCreated()
 }

api/response_model.yaml

@@ -22,3 +22,10 @@ definitions:
         type: string
       fields:
         type: string
+  keptnContextExtendedCE:
+    allOf:
+      - $ref: https://raw.githubusercontent.com/cloudevents/spec/v0.2/spec.json#/definitions/event
+      - type: object
+        properties:
+          shkeptncontext:
+            type: string

api/swagger.yaml

@@ -68,7 +68,7 @@ paths:
         200:
           description: Success
           schema:
-            $ref: "https://raw.githubusercontent.com/cloudevents/spec/v0.2/spec.json#/definitions/event"
+            $ref: "response_model.yaml#/definitions/keptnContextExtendedCE"
         404:
           description: Failed. Event could not be found.
           schema: