api key auth: fix broken test and use const for config (#37609)

Commit Message: api key auth: fix broken test and use const for config Additional Description: Risk Level: Testing: Docs Changes: Release Notes: Platform Specific Features: [Optional Runtime guard:] [Optional Fixes #Issue] [Optional Fixes commit #PR or SHA] [Optional Deprecated:] [Optional [API Considerations](https://github.com/envoyproxy/envoy/blob/main/api/review_checklist.md):] Signed-off-by: wangbaiping(wbpcode) <[email protected]>
envoyproxy · Dec 10, 2024 · 7cda6a2 · 7cda6a2
1 parent 5e9d287
commit 7cda6a2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/source/extensions/filters/http/api_key_auth/api_key_auth.cc b/source/extensions/filters/http/api_key_auth/api_key_auth.cc
@@ -14,9 +14,9 @@ namespace Extensions {
 namespace HttpFilters {
 namespace ApiKeyAuth {
 
-RouteConfig::RouteConfig(const ApiKeyAuthPerRouteProto& proto) : override_config_(proto) {
-  allowed_clients_.insert(proto.allowed_clients().begin(), proto.allowed_clients().end());
-}
+RouteConfig::RouteConfig(const ApiKeyAuthPerRouteProto& proto)
+    : override_config_(proto),
+      allowed_clients_(proto.allowed_clients().begin(), proto.allowed_clients().end()) {}
 
 KeySources::Source::Source(absl::string_view header, absl::string_view query,
                            absl::string_view cookie) {

diff --git a/source/extensions/filters/http/api_key_auth/api_key_auth.h b/source/extensions/filters/http/api_key_auth/api_key_auth.h
@@ -138,8 +138,8 @@ class RouteConfig : public Router::RouteSpecificFilterConfig {
   }
 
 private:
-  ApiKeyAuthConfig override_config_;
-  absl::flat_hash_set<std::string> allowed_clients_;
+  const ApiKeyAuthConfig override_config_;
+  const absl::flat_hash_set<std::string> allowed_clients_;
 };
 
 struct AuthResult {
@@ -173,7 +173,7 @@ class FilterConfig {
     return ApiKeyAuthStats{ALL_API_KEY_AUTH_STATS(POOL_COUNTER_PREFIX(scope, prefix))};
   }
 
-  ApiKeyAuthConfig default_config_;
+  const ApiKeyAuthConfig default_config_;
   ApiKeyAuthStats stats_;
 };
 

diff --git a/source/extensions/filters/http/api_key_auth/config.cc b/source/extensions/filters/http/api_key_auth/config.cc
@@ -19,7 +19,7 @@ Http::FilterFactoryCb ApiKeyAuthFilterFactory::createFilterFactoryFromProtoTyped
   };
 }
 
-Router::RouteSpecificFilterConfigConstSharedPtr
+absl::StatusOr<Router::RouteSpecificFilterConfigConstSharedPtr>
 ApiKeyAuthFilterFactory::createRouteSpecificFilterConfigTyped(
     const ApiKeyAuthPerRouteProto& proto_config, Server::Configuration::ServerFactoryContext&,
     ProtobufMessage::ValidationVisitor&) {

diff --git a/source/extensions/filters/http/api_key_auth/config.h b/source/extensions/filters/http/api_key_auth/config.h
@@ -20,7 +20,7 @@ class ApiKeyAuthFilterFactory
   Http::FilterFactoryCb
   createFilterFactoryFromProtoTyped(const ApiKeyAuthProto& config, const std::string& stats_prefix,
                                     Server::Configuration::FactoryContext& context) override;
-  Router::RouteSpecificFilterConfigConstSharedPtr
+  absl::StatusOr<Router::RouteSpecificFilterConfigConstSharedPtr>
   createRouteSpecificFilterConfigTyped(const ApiKeyAuthPerRouteProto& proto_config,
                                        Server::Configuration::ServerFactoryContext&,
                                        ProtobufMessage::ValidationVisitor&) override;

diff --git a/test/extensions/filters/http/api_key_auth/config_test.cc b/test/extensions/filters/http/api_key_auth/config_test.cc
@@ -93,8 +93,10 @@ TEST(ApiKeyAuthFilterFactoryTest, NormalFactory) {
   status_or.value()(filter_callback);
 
   const auto route_config =
-      factory.createRouteSpecificFilterConfig(scope_proto_config, context.server_factory_context_,
-                                              ProtobufMessage::getNullValidationVisitor());
+      factory
+          .createRouteSpecificFilterConfig(scope_proto_config, context.server_factory_context_,
+                                           ProtobufMessage::getNullValidationVisitor())
+          .value();
   EXPECT_TRUE(route_config != nullptr);
 }