Skip to content

Commit 71459b7

Browse files
trend-gary-tsaitrend-gary-tsai
authored
Merge pull request #17 from trendmicro/update_to_latest_version_v1.5.1
update to latest version: v1.5.1
2 parents 9d5ae3c + 6aee15d commit 71459b7

File tree

10 files changed

+32
-22
lines changed

10 files changed

+32
-22
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGELOG
22

3+
## 1.5.1 - 2025-03-03
4+
5+
* Support new region me-central-1
6+
* Fix CVE-2023-45288
7+
38
## 1.5.0 - 2024-12-16
49
* Add `ScanReader` for scanning a well-implemented `AmaasClientReader`
510
* Add example code `scan-s3obj` for scanning an S3 object which is an example of using `ScanReader`

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Creates a new instance of the client object, and provisions essential settings,
211211
| Parameter | Description |
212212
| --------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
213213
| key (string) | A valid API key must be provided if the environment variable `TM_AM_AUTH_KEY` is not set. |
214-
| region (string) | The region you obtained your api key. Value provided must be one of the Vision One regions: `us-east-1`, `eu-central-1`, `ap-southeast-1`, `ap-southeast-2`, `ap-northeast-1`, `ap-south-1` |
214+
| region (string) | The region you obtained your api key. Value provided must be one of the Vision One regions: `us-east-1`, `eu-central-1`, `ap-southeast-1`, `ap-southeast-2`, `ap-northeast-1`, `ap-south-1`, `me-central-1` |
215215

216216
**_Return values_**
217217

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.0
1+
1.5.1

‎examples/scan-s3obj/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ require (
2121
github.com/aws/smithy-go v1.22.1 // indirect
2222
github.com/golang/protobuf v1.5.4 // indirect
2323
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
24-
golang.org/x/net v0.22.0 // indirect
25-
golang.org/x/sys v0.18.0 // indirect
26-
golang.org/x/text v0.14.0 // indirect
24+
golang.org/x/net v0.33.0 // indirect
25+
golang.org/x/sys v0.28.0 // indirect
26+
golang.org/x/text v0.21.0 // indirect
2727
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
2828
google.golang.org/grpc v1.62.1 // indirect
2929
google.golang.org/protobuf v1.33.0 // indirect

‎examples/scan-s3obj/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
5050
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
5151
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
5252
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
53-
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
54-
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
55-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
56-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
57-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
58-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
53+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
54+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
55+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
56+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
57+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
58+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
5959
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 h1:8EeVk1VKMD+GD/neyEHGmz7pFblqPjHoi+PGQIlLx2s=
6060
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
6161
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/golang-jwt/jwt v3.2.2+incompatible
77
github.com/stretchr/testify v1.8.1
88
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
9-
golang.org/x/net v0.22.0
9+
golang.org/x/net v0.33.0
1010
google.golang.org/grpc v1.62.1
1111
google.golang.org/protobuf v1.33.0
1212
)
@@ -15,8 +15,8 @@ require (
1515
github.com/davecgh/go-spew v1.1.1 // indirect
1616
github.com/golang/protobuf v1.5.4 // indirect
1717
github.com/pmezard/go-difflib v1.0.0 // indirect
18-
golang.org/x/sys v0.18.0 // indirect
19-
golang.org/x/text v0.14.0 // indirect
18+
golang.org/x/sys v0.28.0 // indirect
19+
golang.org/x/text v0.21.0 // indirect
2020
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
2121
gopkg.in/yaml.v3 v3.0.1 // indirect
2222
)

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
1717
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
1818
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
1919
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
20-
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
21-
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
22-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
23-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
24-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
25-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
20+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
21+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
22+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
23+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
24+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
25+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
2626
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 h1:8EeVk1VKMD+GD/neyEHGmz7pFblqPjHoi+PGQIlLx2s=
2727
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
2828
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=

‎grpc.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,7 @@ func getServiceFQDN(targetRegion string) (string, error) {
807807
C1_GB_REGION: "antimalware.gb-1.cloudone.trendmicro.com",
808808
C1_CA_REGION: "antimalware.ca-1.cloudone.trendmicro.com",
809809
C1_TREND_REGION: "antimalware.trend-us-1.cloudone.trendmicro.com",
810+
C1_AE_REGION: "antimalware.ae-1.cloudone.trendmicro.com",
810811
}
811812

812813
fqdn, exists := mapping[region]

‎grpc_client_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ func TestGetServiceFQDNMappingVisionOne(t *testing.T) {
143143
// "gb-1": "",
144144
// "ca-1": "",
145145
// "trend-us-1": "",
146+
"ae-1": "me-central-1",
146147
}
147148

148149
for c1, v1 := range inputs {

‎regions.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const (
99
AWS_DE_REGION = "eu-central-1"
1010
AWS_CA_REGION = "ca-central-1"
1111
AWS_GB_REGION = "eu-west-2"
12+
AWS_AE_REGION = "me-central-1"
1213
C1_JP_REGION = "jp-1"
1314
C1_SG_REGION = "sg-1"
1415
C1_AU_REGION = "au-1"
@@ -18,11 +19,12 @@ const (
1819
C1_CA_REGION = "ca-1"
1920
C1_GB_REGION = "gb-1"
2021
C1_TREND_REGION = "trend-us-1"
22+
C1_AE_REGION = "ae-1"
2123
)
2224

2325
var C1Regions []string = []string{C1_AU_REGION, C1_CA_REGION, C1_DE_REGION, C1_GB_REGION, C1_IN_REGION, C1_JP_REGION, C1_SG_REGION, C1_US_REGION, C1_TREND_REGION}
24-
var V1Regions []string = []string{AWS_AU_REGION, AWS_CA_REGION, AWS_DE_REGION, AWS_GB_REGION, AWS_IN_REGION, AWS_JP_REGION, AWS_SG_REGION, AWS_US_REGION}
25-
var SupportedV1Regions []string = []string{AWS_AU_REGION, AWS_DE_REGION, AWS_IN_REGION, AWS_JP_REGION, AWS_SG_REGION, AWS_US_REGION}
26+
var V1Regions []string = []string{AWS_AU_REGION, AWS_CA_REGION, AWS_DE_REGION, AWS_GB_REGION, AWS_IN_REGION, AWS_JP_REGION, AWS_SG_REGION, AWS_US_REGION, AWS_AE_REGION}
27+
var SupportedV1Regions []string = []string{AWS_AU_REGION, AWS_DE_REGION, AWS_IN_REGION, AWS_JP_REGION, AWS_SG_REGION, AWS_US_REGION, AWS_AE_REGION}
2628
var SupportedC1Regions []string = []string{C1_AU_REGION, C1_CA_REGION, C1_DE_REGION, C1_GB_REGION, C1_IN_REGION, C1_JP_REGION, C1_SG_REGION, C1_US_REGION}
2729
var AllRegions []string = append(C1Regions, V1Regions...)
2830
var AllValidRegions []string = append(SupportedC1Regions, SupportedV1Regions...)
@@ -34,4 +36,5 @@ var V1ToC1RegionMapping = map[string]string{
3436
AWS_JP_REGION: C1_JP_REGION,
3537
AWS_SG_REGION: C1_SG_REGION,
3638
AWS_US_REGION: C1_US_REGION,
39+
AWS_AE_REGION: C1_AE_REGION,
3740
}

0 commit comments

Comments
 (0)