Skip to content

Commit b85427b

Browse files
AlexSanchez-bitAlexSanchez-bit
authored
fix[backend](integrations): removed aws log group in aws integrations module (#2338)
* fix[backend](integrations): removed aws log group in aws integrations module * chore[](): updated go deps
1 parent 8c4278d commit b85427b

6 files changed

Lines changed: 7 additions & 32 deletions

File tree

‎backend/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.8.0
99
github.com/aws/aws-sdk-go-v2/config v1.32.29
1010
github.com/aws/aws-sdk-go-v2/credentials v1.19.28
11-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.79.0
1211
github.com/aws/aws-sdk-go-v2/service/sts v1.44.0
1312
github.com/coder/websocket v1.8.15
1413
github.com/crewjam/saml v0.5.1
@@ -30,7 +29,7 @@ require (
3029
github.com/tidwall/gjson v1.19.0
3130
github.com/utmstack/license-manager-sdk v0.1.0
3231
golang.org/x/crypto v0.54.0
33-
google.golang.org/api v0.287.1
32+
google.golang.org/api v0.288.0
3433
google.golang.org/grpc v1.82.0
3534
google.golang.org/protobuf v1.36.11
3635
gopkg.in/yaml.v3 v3.0.1
@@ -54,7 +53,6 @@ require (
5453
github.com/KyleBanks/depth v1.2.1 // indirect
5554
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5655
github.com/aws/aws-sdk-go-v2 v1.42.1 // indirect
57-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14 // indirect
5856
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.30 // indirect
5957
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30 // indirect
6058
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 // indirect

‎backend/go.sum‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
5050
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
5151
github.com/aws/aws-sdk-go-v2 v1.42.1 h1:9eOTgu1z/dVtYpNZ3/8/XbbaX0x/BqE3HUzAzs6K0ek=
5252
github.com/aws/aws-sdk-go-v2 v1.42.1/go.mod h1:5pKeft2eJj+gElQ38Jqg4ibCqh+/AK33/0X3hip7IjM=
53-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14 h1:3IZY0XAJquT3aHzbkHfPzy4ACPcEjVG0x87KOwtpqGY=
54-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14/go.mod h1:zwM6veDkhGgQFqkBy+uT28AAYpLu+uFMlPl+rCg/73E=
5553
github.com/aws/aws-sdk-go-v2/config v1.32.29 h1:BcMHHnpiWKogf+gGfpj3K1w+Sktz29XDo/cPSAPO3FU=
5654
github.com/aws/aws-sdk-go-v2/config v1.32.29/go.mod h1:+Kbhn8Es4kPUph3F/0W7avykytc+Jh2Ld9/msv9ljV4=
5755
github.com/aws/aws-sdk-go-v2/credentials v1.19.28 h1:zTXJSsNcoO91/mTXsZoYf0AK8dvNPiA58/VtyGXR+wM=
@@ -64,8 +62,6 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 h1:jn46zC9LdsVR/ZpMIJ
6462
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30/go.mod h1:1hTMsAgbdS/AtUi4bw8+gUuh1pceo+eXRLfpSuSQj3M=
6563
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.31 h1:3GUprIsfmGcC5SACIyB0e7E0BM1O1b3Erl5CePYIAeQ=
6664
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.31/go.mod h1:7PuV1yl5e2xnUbm+RqvVg5i2iBM8EyijZNoI9wsOoOc=
67-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.79.0 h1:5W/KOwsnZrdi7RD97G5Vto3XEuM70FAavWScfsli7gA=
68-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.79.0/go.mod h1:h1Iw2nkdpmAUJaa89RvX3cg/HGLgdSkCWpMNgKvBSHA=
6965
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13 h1:mbRIur/BiHK6SKPjoBIXSE/hJ6g6JGRLuxQy1jGjlN4=
7066
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13/go.mod h1:ITg9em2KbJx1s0y4aqRX5OYWG6HBZ5TVR//OdpEZ2CQ=
7167
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.30 h1:/Z5jmNrKsSD7EmDjzAPsm/3L9IuOkzaynklJZ1qX7S4=
@@ -492,8 +488,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
492488
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
493489
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
494490
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
495-
google.golang.org/api v0.287.1 h1:LiyJx32VU3cwQfLchn/513qKhc25hq0pEANYJoWNnnI=
496-
google.golang.org/api v0.287.1/go.mod h1:lM2kYRzYUCBY91P9h6VF1PYmvhxii3O5hji37qRvIcY=
491+
google.golang.org/api v0.288.0 h1:glhO/J88obKP5I269W3hB73dvBKrjU56ZfmNlNXpgTU=
492+
google.golang.org/api v0.288.0/go.mod h1:lM2kYRzYUCBY91P9h6VF1PYmvhxii3O5hji37qRvIcY=
497493
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
498494
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
499495
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

‎backend/modules/integrations/repository/schema_provider.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ var moduleSchemas = map[string]map[string]string{
1212
"aws_access_key_id": "text",
1313
"aws_secret_access_key": "password",
1414
"aws_default_region": "text",
15-
"aws_log_group_name": "text",
1615
},
1716
"AZURE": {
1817
"eventHubConnection": "password", // connection string contains SharedAccessKey

‎backend/modules/integrations/verifier/verifier_aws.go‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
awsconfig "github.com/aws/aws-sdk-go-v2/config"
1010
"github.com/aws/aws-sdk-go-v2/credentials"
11-
"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
1211
"github.com/aws/aws-sdk-go-v2/service/sts"
1312
)
1413

@@ -18,15 +17,13 @@ func verifyAWSIAMUser(c map[string]string) error {
1817
"aws_default_region",
1918
"aws_access_key_id",
2019
"aws_secret_access_key",
21-
"aws_log_group_name",
2220
); err != nil {
2321
return err
2422
}
2523

2624
regionName := c["aws_default_region"]
2725
accessKey := c["aws_access_key_id"]
2826
secretAccessKey := c["aws_secret_access_key"]
29-
logGroup := c["aws_log_group_name"]
3027

3128
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
3229
defer cancel()
@@ -59,20 +56,5 @@ func verifyAWSIAMUser(c map[string]string) error {
5956
return fmt.Errorf("AWS credentials are invalid. Please verify your Access Key and Secret Key are correct.")
6057
}
6158

62-
cwlClient := cloudwatchlogs.NewFromConfig(cfg)
63-
out, err := cwlClient.DescribeLogGroups(ctx, &cloudwatchlogs.DescribeLogGroupsInput{LogGroupNamePrefix: &logGroup})
64-
if err != nil {
65-
errMsg := strings.ToLower(err.Error())
66-
if strings.Contains(errMsg, "accessdenied") || strings.Contains(errMsg, "not authorized") {
67-
return fmt.Errorf("AWS credentials do not have permission to access CloudWatch in region '%s'. Please verify your IAM permissions.", regionName)
68-
}
69-
return fmt.Errorf("Cannot access CloudWatch Log Groups in region '%s'. Please verify the region and your IAM permissions.", regionName)
70-
}
71-
72-
for _, lg := range out.LogGroups {
73-
if lg.LogGroupName != nil && *lg.LogGroupName == logGroup {
74-
return nil
75-
}
76-
}
77-
return fmt.Errorf("The CloudWatch Log Group '%s' was not found in region '%s'. Please verify the Log Group name and region.", logGroup, regionName)
59+
return nil
7860
}

‎plugins/gcp/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/google/uuid v1.6.0
99
github.com/threatwinds/go-sdk v1.1.26
1010
golang.org/x/crypto v0.54.0
11-
google.golang.org/api v0.287.1
11+
google.golang.org/api v0.288.0
1212
gopkg.in/yaml.v3 v3.0.1
1313
)
1414

‎plugins/gcp/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
252252
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
253253
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
254254
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
255-
google.golang.org/api v0.287.1 h1:LiyJx32VU3cwQfLchn/513qKhc25hq0pEANYJoWNnnI=
256-
google.golang.org/api v0.287.1/go.mod h1:lM2kYRzYUCBY91P9h6VF1PYmvhxii3O5hji37qRvIcY=
255+
google.golang.org/api v0.288.0 h1:glhO/J88obKP5I269W3hB73dvBKrjU56ZfmNlNXpgTU=
256+
google.golang.org/api v0.288.0/go.mod h1:lM2kYRzYUCBY91P9h6VF1PYmvhxii3O5hji37qRvIcY=
257257
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
258258
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
259259
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

0 commit comments

Comments
 (0)