Skip to content

Commit c37c72d

Browse files
akhil-sumologicakhil-sumologic
authored
Merge pull request #187 from SumoLogic/sumo_242119
Updated google.golang.org/grpc
2 parents 2cf5541 + addb8b3 commit c37c72d

File tree

7 files changed

+285
-293
lines changed

7 files changed

+285
-293
lines changed

‎.github/workflows/cf-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
framework: cloudformation
3131
output_format: cli
3232
output_bc_ids: false
33-
skip_check: CKV_AWS_26,CKV_AWS_116,CKV_AWS_117,CKV_AWS_115,CKV_AWS_108,CKV_AWS_173,CKV_AWS_18,CKV_AWS_21,CKV_AWS_109,CKV_AWS_67,CKV_AWS_36,CKV_AWS_35,CKV_AWS_111,CKV_AWS_54,CKV_AWS_56,CKV_AWS_55,CKV_AWS_53
33+
skip_check: CKV_AWS_18,CKV_AWS_21,CKV_AWS_26,CKV_AWS_35,CKV_AWS_36,CKV_AWS_53,CKV_AWS_54,CKV_AWS_55,CKV_AWS_56,CKV_AWS_67,CKV_AWS_108,CKV_AWS_109,CKV_AWS_111,CKV_AWS_115,CKV_AWS_116,CKV_AWS_117,CKV_AWS_173
3434

3535
CFSecurityChecksCFNNAG:
3636
name: "Security Checks (cfn-nag)"

‎.github/workflows/tf-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ jobs:
4444
output_format: cli
4545
output_bc_ids: false
4646
download_external_modules: true
47-
skip_check: CKV_AWS_26,CKV_AWS_35,CKV_AWS_67,CKV_AWS_36,CKV_AWS_252,CKV_AWS_158,CKV_AWS_338,CKV_AWS_117,CKV_AWS_115,CKV_AWS_173,CKV_AWS_50,CKV_AWS_241,CKV_AWS_240,CKV2_AWS_6,CKV2_AWS_62,CKV_AWS_144,CKV_AWS_18,CKV_AWS_21,CKV_AWS_145,CKV_TF_1,CKV_AWS_27,CKV_AWS_124,CKV2_AWS_10,CKV_AWS_272,CKV2_AWS_61
47+
skip_check: CKV_AWS_18,CKV_AWS_21,CKV_AWS_26,CKV_AWS_27,CKV_AWS_35,CKV_AWS_36,CKV_AWS_50,CKV_AWS_67,CKV_AWS_115,CKV_AWS_117,CKV_AWS_124,CKV_AWS_144,CKV_AWS_145,CKV_AWS_158,CKV_AWS_173,CKV_AWS_240,CKV_AWS_241,CKV_AWS_252,CKV_AWS_272,CKV_AWS_338,CKV2_AWS_6,CKV2_AWS_10,CKV2_AWS_61,CKV2_AWS_62,CKV_TF_1,CKV_TF_2

‎aws-observability-terraform/examples/appmodule/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.42.0, < 4.0.0"
7+
version = ">= 5.16.2, < 6.0.0"
88
}
99
sumologic = {
1010
version = ">= 2.28.3, < 3.0.0"

‎aws-observability-terraform/examples/sourcemodule/overrideSources/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.42.0, < 4.0.0"
7+
version = ">= 5.16.2, < 6.0.0"
88
}
99
sumologic = {
1010
version = ">= 2.28.3, < 3.0.0"

‎aws-observability-terraform/examples/sourcemodule/testSource/versions.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.42.0, < 4.0.0"
7+
version = ">= 5.16.2, < 6.0.0"
88
}
99
sumologic = {
1010
version = ">= 2.28.3, < 3.0.0"

‎aws-observability-terraform/go.mod‎

Lines changed: 85 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,113 @@
11
module github.com/SumoLogic/sumologic-solution-templates/aws-observability-terraform
22

3-
go 1.18
3+
go 1.22.0
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.122
7-
github.com/gruntwork-io/terratest v0.40.7
8-
github.com/stretchr/testify v1.8.1
6+
github.com/aws/aws-sdk-go v1.53.17
7+
github.com/gruntwork-io/terratest v0.46.15
8+
github.com/stretchr/testify v1.9.0
99
)
1010

1111
require (
12-
cloud.google.com/go v0.110.0 // indirect
13-
cloud.google.com/go/compute v1.19.1 // indirect
14-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
15-
cloud.google.com/go/iam v0.13.0 // indirect
16-
cloud.google.com/go/storage v1.28.1 // indirect
12+
cloud.google.com/go v0.114.0 // indirect
13+
cloud.google.com/go/auth v0.5.1 // indirect
14+
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
15+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
16+
cloud.google.com/go/iam v1.1.8 // indirect
17+
cloud.google.com/go/storage v1.41.0 // indirect
18+
filippo.io/edwards25519 v1.1.0 // indirect
1719
github.com/agext/levenshtein v1.2.3 // indirect
18-
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
20+
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
1921
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
20-
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
21-
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
22+
github.com/boombuler/barcode v1.0.1 // indirect
23+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
2224
github.com/davecgh/go-spew v1.1.1 // indirect
23-
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
24-
github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
25-
github.com/go-logr/logr v0.2.0 // indirect
26-
github.com/go-sql-driver/mysql v1.4.1 // indirect
25+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
26+
github.com/felixge/httpsnoop v1.0.4 // indirect
27+
github.com/go-errors/errors v1.5.1 // indirect
28+
github.com/go-logr/logr v1.4.2 // indirect
29+
github.com/go-logr/stdr v1.2.2 // indirect
30+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
31+
github.com/go-openapi/jsonreference v0.21.0 // indirect
32+
github.com/go-openapi/swag v0.23.0 // indirect
33+
github.com/go-sql-driver/mysql v1.8.1 // indirect
2734
github.com/gogo/protobuf v1.3.2 // indirect
2835
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
29-
github.com/golang/protobuf v1.5.3 // indirect
30-
github.com/google/go-cmp v0.5.9 // indirect
31-
github.com/google/gofuzz v1.1.0 // indirect
32-
github.com/google/uuid v1.3.0 // indirect
33-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
34-
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
35-
github.com/googleapis/gnostic v0.4.1 // indirect
36-
github.com/gruntwork-io/go-commons v0.8.0 // indirect
37-
github.com/hashicorp/errwrap v1.0.0 // indirect
36+
github.com/golang/protobuf v1.5.4 // indirect
37+
github.com/google/gnostic-models v0.6.8 // indirect
38+
github.com/google/gofuzz v1.2.0 // indirect
39+
github.com/google/s2a-go v0.1.7 // indirect
40+
github.com/google/uuid v1.6.0 // indirect
41+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
42+
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
43+
github.com/gorilla/websocket v1.5.1 // indirect
44+
github.com/gruntwork-io/go-commons v0.17.1 // indirect
45+
github.com/hashicorp/errwrap v1.1.0 // indirect
3846
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
3947
github.com/hashicorp/go-getter v1.7.4 // indirect
40-
github.com/hashicorp/go-multierror v1.1.0 // indirect
48+
github.com/hashicorp/go-multierror v1.1.1 // indirect
4149
github.com/hashicorp/go-safetemp v1.0.0 // indirect
42-
github.com/hashicorp/go-version v1.6.0 // indirect
43-
github.com/hashicorp/hcl/v2 v2.9.1 // indirect
44-
github.com/hashicorp/terraform-json v0.13.0 // indirect
45-
github.com/imdario/mergo v0.3.11 // indirect
46-
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
50+
github.com/hashicorp/go-version v1.7.0 // indirect
51+
github.com/hashicorp/hcl/v2 v2.20.1 // indirect
52+
github.com/hashicorp/terraform-json v0.22.1 // indirect
53+
github.com/imdario/mergo v0.3.16 // indirect
54+
github.com/jinzhu/copier v0.4.0 // indirect
4755
github.com/jmespath/go-jmespath v0.4.0 // indirect
48-
github.com/json-iterator/go v1.1.11 // indirect
49-
github.com/klauspost/compress v1.15.11 // indirect
50-
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
56+
github.com/josharian/intern v1.0.0 // indirect
57+
github.com/json-iterator/go v1.1.12 // indirect
58+
github.com/klauspost/compress v1.17.8 // indirect
59+
github.com/mailru/easyjson v0.7.7 // indirect
60+
github.com/mattn/go-zglob v0.0.4 // indirect
5161
github.com/mitchellh/go-homedir v1.1.0 // indirect
5262
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
5363
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
64+
github.com/moby/spdystream v0.2.0 // indirect
5465
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
55-
github.com/modern-go/reflect2 v1.0.1 // indirect
66+
github.com/modern-go/reflect2 v1.0.2 // indirect
67+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
68+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
5669
github.com/pmezard/go-difflib v1.0.0 // indirect
57-
github.com/pquerna/otp v1.2.0 // indirect
70+
github.com/pquerna/otp v1.4.0 // indirect
5871
github.com/russross/blackfriday/v2 v2.1.0 // indirect
5972
github.com/spf13/pflag v1.0.5 // indirect
60-
github.com/tmccombs/hcl2json v0.3.3 // indirect
61-
github.com/ulikunitz/xz v0.5.10 // indirect
62-
github.com/urfave/cli v1.22.2 // indirect
63-
github.com/zclconf/go-cty v1.9.1 // indirect
73+
github.com/tmccombs/hcl2json v0.6.3 // indirect
74+
github.com/ulikunitz/xz v0.5.12 // indirect
75+
github.com/urfave/cli/v2 v2.27.2 // indirect
76+
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
77+
github.com/zclconf/go-cty v1.14.4 // indirect
6478
go.opencensus.io v0.24.0 // indirect
65-
golang.org/x/crypto v0.21.0 // indirect
66-
golang.org/x/net v0.23.0 // indirect
67-
golang.org/x/oauth2 v0.4.0 // indirect
68-
golang.org/x/sys v0.18.0 // indirect
69-
golang.org/x/term v0.18.0 // indirect
70-
golang.org/x/text v0.14.0 // indirect
71-
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
72-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
73-
google.golang.org/api v0.114.0 // indirect
74-
google.golang.org/appengine v1.6.7 // indirect
75-
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
76-
google.golang.org/grpc v1.53.0 // indirect
77-
google.golang.org/protobuf v1.33.0 // indirect
79+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
80+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
81+
go.opentelemetry.io/otel v1.27.0 // indirect
82+
go.opentelemetry.io/otel/metric v1.27.0 // indirect
83+
go.opentelemetry.io/otel/trace v1.27.0 // indirect
84+
golang.org/x/crypto v0.24.0 // indirect
85+
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
86+
golang.org/x/mod v0.18.0 // indirect
87+
golang.org/x/net v0.26.0 // indirect
88+
golang.org/x/oauth2 v0.21.0 // indirect
89+
golang.org/x/sync v0.7.0 // indirect
90+
golang.org/x/sys v0.21.0 // indirect
91+
golang.org/x/term v0.21.0 // indirect
92+
golang.org/x/text v0.16.0 // indirect
93+
golang.org/x/time v0.5.0 // indirect
94+
golang.org/x/tools v0.22.0 // indirect
95+
google.golang.org/api v0.183.0 // indirect
96+
google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 // indirect
97+
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
99+
google.golang.org/grpc v1.64.0 // indirect
100+
google.golang.org/protobuf v1.34.1 // indirect
78101
gopkg.in/inf.v0 v0.9.1 // indirect
79102
gopkg.in/yaml.v2 v2.4.0 // indirect
80103
gopkg.in/yaml.v3 v3.0.1 // indirect
81-
k8s.io/api v0.20.6 // indirect
82-
k8s.io/apimachinery v0.20.6 // indirect
83-
k8s.io/client-go v0.20.6 // indirect
84-
k8s.io/klog/v2 v2.4.0 // indirect
85-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
86-
sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // indirect
87-
sigs.k8s.io/yaml v1.2.0 // indirect
104+
k8s.io/api v0.30.1 // indirect
105+
k8s.io/apimachinery v0.30.1 // indirect
106+
k8s.io/client-go v0.30.1 // indirect
107+
k8s.io/klog/v2 v2.120.1 // indirect
108+
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
109+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
110+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
111+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
112+
sigs.k8s.io/yaml v1.4.0 // indirect
88113
)

0 commit comments

Comments
 (0)