From eb94450bc204b3625cc40a11416688b167fae9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Osti?= Date: Mon, 19 Jun 2023 14:01:56 -0300 Subject: [PATCH 1/4] Update test_ua.yaml Extend test cases to support aws v2 sdk for some languages --- tests/test_ua.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/test_ua.yaml b/tests/test_ua.yaml index 2b2bee8c..f5bb6e70 100644 --- a/tests/test_ua.yaml +++ b/tests/test_ua.yaml @@ -7938,6 +7938,12 @@ test_cases: major: '2' minor: '2' patch: '18' + + - user_agent_string: 'aws-sdk-ruby3/3.170 ruby/3.0 x86_64-linux-musl aws-sdk-core/3.170' + family: 'aws-sdk-ruby3' + major: '3' + minor: '170' + patch: 0 - user_agent_string: 'aws-sdk-cpp/1.0.64 Linux/4.4.0-66-generic x86_64' family: 'aws-sdk-cpp' @@ -7950,12 +7956,24 @@ test_cases: major: '1' minor: '4' patch: '12' + + - user_agent_string: 'aws-sdk-go-v2/1.18 os/linux lang/go/1.20 md/GOOS/linux md/GOARCH/amd64 api/sts/1.18' + family: 'aws-sdk-go-v2' + major: '1' + minor: '18' + patch: - user_agent_string: 'aws-sdk-nodejs/2.141.0 win32/v8.4.0' family: 'aws-sdk-nodejs' major: '2' minor: '141' patch: '0' + + - user_agent_string: 'aws-sdk-js/3.186 os/linux/5.15 lang/js md/nodejs/18.15 api/sts/3.186' + family: 'aws-sdk-js' + major: '3' + minor: '186' + patch: - user_agent_string: 'JetS3t/0.9.0 (Linux/4.4.0-1044-aws; amd64; en; JVM 1.8.0_131)' family: 'JetS3t' From 7982f19b446249db09ea0fee0219e9219c3c0fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Osti?= Date: Mon, 19 Jun 2023 14:03:21 -0300 Subject: [PATCH 2/4] Update test_ua.yaml fix test case --- tests/test_ua.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_ua.yaml b/tests/test_ua.yaml index f5bb6e70..cc1d5441 100644 --- a/tests/test_ua.yaml +++ b/tests/test_ua.yaml @@ -7943,7 +7943,7 @@ test_cases: family: 'aws-sdk-ruby3' major: '3' minor: '170' - patch: 0 + patch: - user_agent_string: 'aws-sdk-cpp/1.0.64 Linux/4.4.0-66-generic x86_64' family: 'aws-sdk-cpp' From 571208576f3f575d4055c1da961fbb03ce44cc63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Osti?= Date: Mon, 19 Jun 2023 14:05:11 -0300 Subject: [PATCH 3/4] Update regexes.yaml Add support for the following aws sdk identification: aws-sdk-go-v2 aws-sdk-js aws-sdk-ruby3 --- regexes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regexes.yaml b/regexes.yaml index a8f8e097..ee63522f 100644 --- a/regexes.yaml +++ b/regexes.yaml @@ -152,7 +152,7 @@ user_agent_parsers: # AWS S3 Clients # must come before "Bots General matcher" to catch "boto"/"boto3" before "bot" - - regex: '\b(Boto3?|JetS3t|aws-(?:cli|sdk-(?:cpp|go|java|nodejs|ruby2?|dotnet-(?:\d{1,2}|core)))|s3fs)/(\d+)\.(\d+)(?:\.(\d+)|)' + - regex: '\b(Boto3?|JetS3t|aws-(?:cli|sdk-(?:cpp|go(?:-v2)?|java|js|nodejs|ruby(?:2|3)?|dotnet-(?:\d{1,2}|core)))|s3fs)/(\d+)\.(\d+)(?:\.(\d+)|)' # SAFE FME - regex: '(FME)\/(\d+\.\d+)\.(\d+)\.(\d+)' From affa1a58521c06ecae26797c18c7242618909e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Osti?= Date: Mon, 19 Jun 2023 14:32:35 -0300 Subject: [PATCH 4/4] Update test_ua.yaml Fix test cases patch version --- tests/test_ua.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_ua.yaml b/tests/test_ua.yaml index cc1d5441..e3dc4ba1 100644 --- a/tests/test_ua.yaml +++ b/tests/test_ua.yaml @@ -7939,11 +7939,11 @@ test_cases: minor: '2' patch: '18' - - user_agent_string: 'aws-sdk-ruby3/3.170 ruby/3.0 x86_64-linux-musl aws-sdk-core/3.170' + - user_agent_string: 'aws-sdk-ruby3/3.170.0 ruby/3.0 x86_64-linux-musl aws-sdk-core/3.170' family: 'aws-sdk-ruby3' major: '3' minor: '170' - patch: + patch: '0' - user_agent_string: 'aws-sdk-cpp/1.0.64 Linux/4.4.0-66-generic x86_64' family: 'aws-sdk-cpp' @@ -7957,11 +7957,11 @@ test_cases: minor: '4' patch: '12' - - user_agent_string: 'aws-sdk-go-v2/1.18 os/linux lang/go/1.20 md/GOOS/linux md/GOARCH/amd64 api/sts/1.18' + - user_agent_string: 'aws-sdk-go-v2/1.18.0 os/linux lang/go/1.20 md/GOOS/linux md/GOARCH/amd64 api/sts/1.18' family: 'aws-sdk-go-v2' major: '1' minor: '18' - patch: + patch: '0' - user_agent_string: 'aws-sdk-nodejs/2.141.0 win32/v8.4.0' family: 'aws-sdk-nodejs' @@ -7969,11 +7969,11 @@ test_cases: minor: '141' patch: '0' - - user_agent_string: 'aws-sdk-js/3.186 os/linux/5.15 lang/js md/nodejs/18.15 api/sts/3.186' + - user_agent_string: 'aws-sdk-js/3.186.0 os/linux/5.15 lang/js md/nodejs/18.15 api/sts/3.186' family: 'aws-sdk-js' major: '3' minor: '186' - patch: + patch: '0' - user_agent_string: 'JetS3t/0.9.0 (Linux/4.4.0-1044-aws; amd64; en; JVM 1.8.0_131)' family: 'JetS3t'