Skip to content

Commit

Permalink
feat(logger): update new logger
Browse files Browse the repository at this point in the history
  • Loading branch information
StanGirard committed Apr 9, 2023
1 parent 5cecc6e commit 45ff0ac
Show file tree
Hide file tree
Showing 18 changed files with 92 additions and 79 deletions.
8 changes: 4 additions & 4 deletions aws/acm/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package acm

import (
"context"
"fmt"

"github.com/aws/aws-sdk-go-v2/service/acm"
"github.com/aws/aws-sdk-go-v2/service/acm/types"
"github.com/padok-team/yatas-aws/logger"
)

type ACMGetObjectAPI interface {
Expand All @@ -17,7 +17,7 @@ func GetCertificates(svc ACMGetObjectAPI) []types.CertificateDetail {
input := &acm.ListCertificatesInput{}
result, err := svc.ListCertificates(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of certificates
return []types.CertificateDetail{}
}
Expand All @@ -33,7 +33,7 @@ func GetCertificates(svc ACMGetObjectAPI) []types.CertificateDetail {
input.NextToken = result.NextToken
result, err = svc.ListCertificates(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
return []types.CertificateDetail{}
}
for _, r := range result.CertificateSummaryList {
Expand All @@ -47,7 +47,7 @@ func GetCertificates(svc ACMGetObjectAPI) []types.CertificateDetail {
}
result, err := svc.DescribeCertificate(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
return []types.CertificateDetail{}
}
certificates = append(certificates, *result.Certificate)
Expand Down
6 changes: 3 additions & 3 deletions aws/cloudfront/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package cloudfront

import (
"context"
"fmt"

"github.com/aws/aws-sdk-go-v2/service/cloudfront"
"github.com/aws/aws-sdk-go-v2/service/cloudfront/types"
"github.com/padok-team/yatas-aws/logger"
)

type SummaryToConfig struct {
Expand All @@ -22,7 +22,7 @@ func GetAllCloudfront(svc CloudfrontGetObjectApi) []types.DistributionSummary {
input := &cloudfront.ListDistributionsInput{}
result, err := svc.ListDistributions(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of certificates
return []types.DistributionSummary{}
}
Expand All @@ -37,7 +37,7 @@ func GetAllDistributionConfig(svc CloudfrontGetObjectApi, ds []types.Distributio
}
result, err := svc.GetDistributionConfig(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of certificates
return []SummaryToConfig{}
}
Expand Down
4 changes: 2 additions & 2 deletions aws/cloudtrail/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package cloudtrail

import (
"context"
"fmt"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/cloudtrail"
"github.com/aws/aws-sdk-go-v2/service/cloudtrail/types"
"github.com/padok-team/yatas-aws/logger"
)

func GetCloudtrails(s aws.Config) []types.Trail {
Expand All @@ -16,7 +16,7 @@ func GetCloudtrails(s aws.Config) []types.Trail {
}
result, err := svc.DescribeTrails(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list
return []types.Trail{}
}
Expand Down
5 changes: 3 additions & 2 deletions aws/cognito/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/cognitoidentity"
"github.com/aws/aws-sdk-go-v2/service/cognitoidentity/types"
"github.com/padok-team/yatas-aws/logger"
)

func GetCognitoPools(s aws.Config) []types.IdentityPoolShortDescription {
Expand All @@ -16,7 +17,7 @@ func GetCognitoPools(s aws.Config) []types.IdentityPoolShortDescription {
}
result, err := svc.ListIdentityPools(context.TODO(), cognitoInput)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of certificates
return []types.IdentityPoolShortDescription{}
}
Expand All @@ -33,7 +34,7 @@ func GetDetailedCognitoPool(s aws.Config, pools []types.IdentityPoolShortDescrip
}
result, err := svc.DescribeIdentityPool(context.TODO(), cognitoInput)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of certificates
return []cognitoidentity.DescribeIdentityPoolOutput{}
}
Expand Down
8 changes: 4 additions & 4 deletions aws/dynamodb/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ package dynamodb

import (
"context"
"fmt"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/dynamodb"
"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
"github.com/padok-team/yatas-aws/logger"
)

func GetDynamodbs(s aws.Config) []string {
svc := dynamodb.NewFromConfig(s)
dynamodbInput := &dynamodb.ListTablesInput{}
result, err := svc.ListTables(context.TODO(), dynamodbInput)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list
return []string{}
}
Expand All @@ -30,7 +30,7 @@ func GetTables(s aws.Config, dynamodbs []string) []*dynamodb.DescribeTableOutput
}
resp, err := svc.DescribeTable(context.TODO(), params)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of certificates
return []*dynamodb.DescribeTableOutput{}
}
Expand All @@ -54,7 +54,7 @@ func GetContinuousBackups(s aws.Config, tables []string) []TableBackups {
}
resp, err := svc.DescribeContinuousBackups(context.TODO(), params)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of certificates
return []TableBackups{}
}
Expand Down
6 changes: 3 additions & 3 deletions aws/ec2/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package ec2

import (
"context"
"fmt"

"github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/padok-team/yatas-aws/logger"
)

type EC2GetObjectAPI interface {
Expand All @@ -16,7 +16,7 @@ func GetEC2s(svc EC2GetObjectAPI) []types.Instance {
input := &ec2.DescribeInstancesInput{}
result, err := svc.DescribeInstances(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list
return []types.Instance{}
}
Expand All @@ -31,7 +31,7 @@ func GetEC2s(svc EC2GetObjectAPI) []types.Instance {
input.NextToken = result.NextToken
result, err = svc.DescribeInstances(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of instances
return []types.Instance{}
}
Expand Down
6 changes: 3 additions & 3 deletions aws/ecr/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package ecr

import (
"context"
"fmt"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ecr"
"github.com/aws/aws-sdk-go-v2/service/ecr/types"
"github.com/padok-team/yatas-aws/logger"
)

func GetECRs(s aws.Config) []types.Repository {
Expand All @@ -17,7 +17,7 @@ func GetECRs(s aws.Config) []types.Repository {
}
result, err := svc.DescribeRepositories(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list
return []types.Repository{}
}
Expand All @@ -27,7 +27,7 @@ func GetECRs(s aws.Config) []types.Repository {
input.NextToken = result.NextToken
result, err = svc.DescribeRepositories(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list
return []types.Repository{}
}
Expand Down
8 changes: 4 additions & 4 deletions aws/eks/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package eks

import (
"context"
"fmt"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/eks"
"github.com/aws/aws-sdk-go-v2/service/eks/types"
"github.com/padok-team/yatas-aws/logger"
)

type EKSGetObjectAPI interface {
Expand All @@ -18,7 +18,7 @@ func GetClusters(svc EKSGetObjectAPI) []types.Cluster {
input := &eks.ListClustersInput{}
result, err := svc.ListClusters(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list
return []types.Cluster{}
}
Expand All @@ -34,7 +34,7 @@ func GetClusters(svc EKSGetObjectAPI) []types.Cluster {
input.NextToken = result.NextToken
result, err = svc.ListClusters(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of instances
return []types.Cluster{}
}
Expand All @@ -49,7 +49,7 @@ func GetClusters(svc EKSGetObjectAPI) []types.Cluster {
}
result, err := svc.DescribeCluster(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list of instances
return []types.Cluster{}
}
Expand Down
4 changes: 2 additions & 2 deletions aws/guardduty/getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ package guardduty

import (
"context"
"fmt"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/guardduty"
"github.com/padok-team/yatas-aws/logger"
)

func GetDetectors(s aws.Config) []string {
svc := guardduty.NewFromConfig(s)
input := &guardduty.ListDetectorsInput{}
result, err := svc.ListDetectors(context.TODO(), input)
if err != nil {
fmt.Println(err)
logger.Logger.Error(err.Error())
// Return an empty list
return []string{}
}
Expand Down
Loading

0 comments on commit 45ff0ac

Please sign in to comment.