Skip to content
This repository was archived by the owner on May 24, 2024. It is now read-only.

Commit b005843

Browse files
log container arn (#48)
Signed-off-by: Ayman <[email protected]> Co-authored-by: Ayman <[email protected]>
1 parent bd05462 commit b005843

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

cmd/git/git.go

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/json"
66
"flag"
77
"fmt"
8+
"github.com/LF-Engineering/insights-datasource-shared/aws"
89
"io"
910
"math"
1011
"net/url"
@@ -618,9 +619,15 @@ func (j *DSGit) AddLogger(ctx *shared.Ctx) {
618619
}
619620

620621
// WriteLog - writes to log
621-
func (j *DSGit) WriteLog(ctx *shared.Ctx, timestamp time.Time, status, message string) {
622-
_ = j.Logger.Write(&logger.Log{
622+
func (j *DSGit) WriteLog(ctx *shared.Ctx, timestamp time.Time, status, message string) error {
623+
arn, err := aws.GetContainerARN()
624+
if err != nil {
625+
j.log.WithFields(logrus.Fields{"operation": "WriteLog"}).Errorf("getContainerMetadata Error : %+v", err)
626+
return err
627+
}
628+
err = j.Logger.Write(&logger.Log{
623629
Connector: GitDataSource,
630+
TaskARN: arn,
624631
Configuration: []map[string]string{
625632
{
626633
"REPO_URL": j.URL,
@@ -630,6 +637,7 @@ func (j *DSGit) WriteLog(ctx *shared.Ctx, timestamp time.Time, status, message s
630637
CreatedAt: timestamp,
631638
Message: message,
632639
})
640+
return err
633641
}
634642

635643
// AddFlags - add git specific flags
@@ -2647,14 +2655,21 @@ func main() {
26472655
shared.SetLogLoggerError(false)
26482656
shared.AddLogger(&git.Logger, GitDataSource, logger.Internal, []map[string]string{{"REPO_URL": git.URL, "ProjectSlug": ctx.Project}})
26492657
git.AddCacheProvider()
2650-
git.WriteLog(&ctx, timestamp, logger.InProgress, "")
2658+
err = git.WriteLog(&ctx, timestamp, logger.InProgress, "")
2659+
if err != nil {
2660+
git.log.WithFields(logrus.Fields{"operation": "main"}).Errorf("WriteLog Error : %+v", err)
2661+
return
2662+
}
26512663
err = git.Sync(&ctx)
26522664
if err != nil {
26532665
git.log.WithFields(logrus.Fields{"operation": "main"}).Errorf("Error: %+v", err)
2654-
git.WriteLog(&ctx, timestamp, logger.Failed, err.Error())
2666+
er := git.WriteLog(&ctx, timestamp, logger.Failed, err.Error())
2667+
if er != nil {
2668+
err = er
2669+
}
26552670
return
26562671
}
2657-
git.WriteLog(&ctx, timestamp, logger.Done, "")
2672+
err = git.WriteLog(&ctx, timestamp, logger.Done, "")
26582673
}
26592674

26602675
// createStructuredLogger...

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/LF-Engineering/insights-datasource-git
33
go 1.15
44

55
require (
6-
github.com/LF-Engineering/insights-datasource-shared v1.5.5
6+
github.com/LF-Engineering/insights-datasource-shared v1.5.12
77
github.com/LF-Engineering/lfx-event-schema v0.1.20-0.20220511083836-c30a2d7cf561
88
github.com/aws/aws-lambda-go v1.27.1
99
github.com/aws/aws-sdk-go v1.42.25

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
2-
github.com/LF-Engineering/insights-datasource-shared v1.5.5 h1:jlSldY2MTR4gy82uQTed1M738gWrZuJj+EhAcYBrm3M=
3-
github.com/LF-Engineering/insights-datasource-shared v1.5.5/go.mod h1:ZQCRAJNyizhBemQDSjqm14G2MPkOJbRzCPfjwFhYKy4=
2+
github.com/LF-Engineering/insights-datasource-shared v1.5.12 h1:26zqp9OO15HS1KENSaHoXpizAtcSmHVAJvQ/yryGsxY=
3+
github.com/LF-Engineering/insights-datasource-shared v1.5.12/go.mod h1:ZQCRAJNyizhBemQDSjqm14G2MPkOJbRzCPfjwFhYKy4=
44
github.com/LF-Engineering/lfx-event-schema v0.1.14/go.mod h1:CfFIZ4mwzo88umf5+KxDQEzqlVkPG7Vx8eLK2oDfWIs=
55
github.com/LF-Engineering/lfx-event-schema v0.1.20-0.20220511083836-c30a2d7cf561 h1:6UCZsa14yxMNPcUN2S8Pgnb7WwOfs+N3UugFuW1tJAg=
66
github.com/LF-Engineering/lfx-event-schema v0.1.20-0.20220511083836-c30a2d7cf561/go.mod h1:CfFIZ4mwzo88umf5+KxDQEzqlVkPG7Vx8eLK2oDfWIs=

0 commit comments

Comments
 (0)