review: Validate region for Kinesis or Firehose if no endpoint override

Smjert · Nov 22, 2023 · bdeeca4 · bdeeca4
1 parent 83b2f11
commit bdeeca4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/osquery/utils/aws/aws_util.cpp b/osquery/utils/aws/aws_util.cpp
@@ -38,9 +38,9 @@
 #include <osquery/logger/data_logger.h>
 #include <osquery/logger/logger.h>
 #include <osquery/utils/aws/aws_util.h>
+#include <osquery/utils/expected/expected.h>
 #include <osquery/utils/json/json.h>
 #include <osquery/utils/system/time.h>
-#include <osquery/utils/expected/expected.h>
 
 namespace pt = boost::property_tree;
 

diff --git a/plugins/logger/aws_firehose.cpp b/plugins/logger/aws_firehose.cpp
@@ -43,7 +43,8 @@ FLAG(string,
 Status FirehoseLoggerPlugin::setUp() {
   initAwsSdk();
 
-  auto aws_region_res = AWSRegion::make(FLAGS_aws_firehose_region);
+  auto aws_region_res = AWSRegion::make(FLAGS_aws_firehose_region,
+                                        FLAGS_aws_firehose_endpoint.empty());
 
   if (aws_region_res.isError()) {
     return Status::failure(aws_region_res.getError().getMessage());

diff --git a/plugins/logger/aws_kinesis.cpp b/plugins/logger/aws_kinesis.cpp
@@ -60,7 +60,8 @@ FLAG(string,
 Status KinesisLoggerPlugin::setUp() {
   initAwsSdk();
 
-  auto aws_region_res = AWSRegion::make(FLAGS_aws_kinesis_region);
+  auto aws_region_res = AWSRegion::make(FLAGS_aws_kinesis_region,
+                                        FLAGS_aws_kinesis_endpoint.empty());
 
   if (aws_region_res.isError()) {
     return Status::failure(aws_region_res.getError().getMessage());