This repository has been archived by the owner on Dec 21, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 245
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: fix graceful shutdown in sdk (#6234)
* fixed graceful shutdown handling Signed-off-by: warber <bernd.warmuth@dynatrace.com> * added exmaple Signed-off-by: warber <bernd.warmuth@dynatrace.com> * updated used go-sdk versions in remediation service and webhook service Signed-off-by: warber <bernd.warmuth@dynatrace.com>
- Loading branch information
Showing
11 changed files
with
168 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "github.com/keptn/go-utils/pkg/lib/v0_2_0" | ||
| "github.com/keptn/keptn/go-sdk/pkg/sdk" | ||
| "html/template" | ||
| ) | ||
|
|
||
| type GreetingsHandler struct { | ||
| } | ||
|
|
||
| type GreetingTriggeredData struct { | ||
| v0_2_0.EventData | ||
| Text string `json:"text"` | ||
| } | ||
|
|
||
| type GreetingFinishedData struct { | ||
| v0_2_0.EventData | ||
| GreetMessage string `json:"greetMessage"` | ||
| } | ||
|
|
||
| func NewGreetingsHandler() *GreetingsHandler { | ||
| return &GreetingsHandler{} | ||
| } | ||
|
|
||
| func (g *GreetingsHandler) Execute(k sdk.IKeptn, event sdk.KeptnEvent) (interface{}, *sdk.Error) { | ||
| greetingsTriggeredData := &GreetingTriggeredData{} | ||
| if err := v0_2_0.Decode(event.Data, greetingsTriggeredData); err != nil { | ||
| return nil, &sdk.Error{Err: err, StatusType: v0_2_0.StatusErrored, ResultType: v0_2_0.ResultFailed, Message: "Could not decode input event data"} | ||
| } | ||
| name := struct{ Name string }{"Keptn"} | ||
|
|
||
| tmpl, err := template.New("").Parse(greetingsTriggeredData.Text) | ||
| if err != nil { | ||
| return nil, &sdk.Error{Err: err, StatusType: v0_2_0.StatusErrored, ResultType: v0_2_0.ResultFailed, Message: "Could not parse greeting message"} | ||
| } | ||
|
|
||
| var greetMessage bytes.Buffer | ||
| if err = tmpl.Execute(&greetMessage, name); err != nil { | ||
| return nil, &sdk.Error{Err: err, StatusType: v0_2_0.StatusErrored, ResultType: v0_2_0.ResultFailed, Message: "Could not parse process greeting message"} | ||
| } | ||
| finishedEventData := GreetingFinishedData{ | ||
| EventData: greetingsTriggeredData.EventData, | ||
| GreetMessage: greetMessage.String(), | ||
| } | ||
| return finishedEventData, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| cloudevents "github.com/cloudevents/sdk-go/v2" | ||
| "github.com/keptn/go-utils/pkg/api/models" | ||
| keptnv2 "github.com/keptn/go-utils/pkg/lib/v0_2_0" | ||
| "github.com/keptn/keptn/go-sdk/pkg/sdk" | ||
| "github.com/stretchr/testify/require" | ||
| "io/ioutil" | ||
| "log" | ||
| "testing" | ||
| ) | ||
|
|
||
| func Test_Handler(t *testing.T) { | ||
| fakeKeptn := sdk.NewFakeKeptn("test-greeting-svc") | ||
| fakeKeptn.AddTaskHandler(greetingsTriggeredEventType, NewGreetingsHandler()) | ||
| fakeKeptn.Start() | ||
| fakeKeptn.NewEvent(newNewGreetingTriggeredEvent("test-assets/events/greeting.triggered-0.json")) | ||
|
|
||
| require.Equal(t, 2, len(fakeKeptn.GetEventSender().SentEvents)) | ||
| require.Equal(t, keptnv2.GetStartedEventType("greeting"), fakeKeptn.GetEventSender().SentEvents[0].Type()) | ||
| require.Equal(t, keptnv2.GetFinishedEventType("greeting"), fakeKeptn.GetEventSender().SentEvents[1].Type()) | ||
|
|
||
| finishedEvent, _ := keptnv2.ToKeptnEvent(fakeKeptn.GetEventSender().SentEvents[1]) | ||
| greetingFinishedData := GreetingFinishedData{} | ||
| finishedEvent.DataAs(&greetingFinishedData) | ||
| require.Equal(t, "Hi, my name is Keptn", greetingFinishedData.GreetMessage) | ||
| } | ||
|
|
||
| func newNewGreetingTriggeredEvent(filename string) cloudevents.Event { | ||
| content, err := ioutil.ReadFile(filename) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| event := models.KeptnContextExtendedCE{} | ||
| err = json.Unmarshal(content, &event) | ||
| _ = err | ||
| return keptnv2.ToCloudEvent(event) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "github.com/keptn/keptn/go-sdk/pkg/sdk" | ||
| "log" | ||
| ) | ||
|
|
||
| const greetingsTriggeredEventType = "sh.keptn.event.greeting.triggered" | ||
| const serviceName = "greetings-service" | ||
|
|
||
| func main() { | ||
| log.Fatal(sdk.NewKeptn( | ||
| serviceName, | ||
| sdk.WithTaskHandler( | ||
| greetingsTriggeredEventType, | ||
| NewGreetingsHandler()), | ||
| ).Start()) | ||
| } |
15 changes: 15 additions & 0 deletions
15
go-sdk/example/test-assets/events/greeting.triggered-0.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "type": "sh.keptn.event.greeting.triggered", | ||
| "specversion": "1.0", | ||
| "source": "test", | ||
| "id": "f2b878d3-03c0-4e8f-bc3f-454bc1b3d79d", | ||
| "time": "2019-06-07T07:02:15.64489Z", | ||
| "contenttype": "application/json", | ||
| "shkeptncontext": "08735340-6f9e-4b32-97ff-3b6c292bc50f", | ||
| "data": { | ||
| "project": "my-project", | ||
| "service": "my-service", | ||
| "stage": "ms-stage", | ||
| "text": "Hi, my name is {{ .Name }}" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters