review: fix styles

Signed-off-by: Takeshi Yoneda <[email protected]>
envoyproxy · Mar 6, 2021 · 4e4ccf7 · 4e4ccf7
1 parent 78ac3f8
commit 4e4ccf7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/source/extensions/common/wasm/plugin.cc b/source/extensions/common/wasm/plugin.cc
@@ -18,12 +18,12 @@ WasmConfig::WasmConfig(const envoy::extensions::wasm::v3::PluginConfig& config)
   }
 
   if (config_.vm_config().has_environment_variables()) {
-    auto envs = config_.vm_config().environment_variables();
+    const auto& envs = config_.vm_config().environment_variables();
 
     // We reject NullVm with key_values configuration
     // since it directly accesses Envoy's env vars and we should not modify Envoy's env vars here.
     // TODO(mathetake): Once proxy_get_map_values(type::EnvironmentVariables, ..) call is supported,
-    // then remove this restriction
+    // then remove this restriction.
     if (config.vm_config().runtime() == WasmRuntimeNames::get().Null &&
         !envs.key_values().empty()) {
       throw EnvoyException("envoy.extensions.wasm.v3.VmConfig.EnvironmentVariables.key_values must "
@@ -32,13 +32,11 @@ WasmConfig::WasmConfig(const envoy::extensions::wasm::v3::PluginConfig& config)
 
     // Check key duplication.
     absl::flat_hash_set<std::string> keys;
-    for (auto& env : envs.key_values()) {
+    for (const auto& env : envs.key_values()) {
       keys.insert(env.first);
     }
-    for (auto& key : envs.host_env_keys()) {
-      if (keys.find(key) == keys.end()) {
-        keys.insert(key);
-      } else {
+    for (const auto& key : envs.host_env_keys()) {
+      if (!keys.insert(key).second) {
         throw EnvoyException(
             fmt::format("Key {} is duplicated in "
                         "envoy.extensions.wasm.v3.VmConfig.environment_variables for {}. "
@@ -48,10 +46,10 @@ WasmConfig::WasmConfig(const envoy::extensions::wasm::v3::PluginConfig& config)
     }
 
     // Construct merged key-value pairs.
-    for (auto& env : envs.key_values()) {
+    for (const auto& env : envs.key_values()) {
       envs_[env.first] = env.second;
     }
-    for (auto& key : envs.host_env_keys()) {
+    for (const auto& key : envs.host_env_keys()) {
       if (auto value = std::getenv(key.data())) {
         envs_[key] = value;
       }

diff --git a/test/extensions/common/wasm/plugin_test.cc b/test/extensions/common/wasm/plugin_test.cc
@@ -79,9 +79,10 @@ TEST(TestWasmConfig, NullVMEnv) {
         ->mutable_environment_variables()
         ->mutable_key_values())["key"] = "value";
 
-  EXPECT_THROW_WITH_MESSAGE(WasmConfig config(plugin_config), EnvoyException,
-                            "envoy.extensions.wasm.v3.VmConfig.EnvironmentVariables.key_values must "
-                            "not be set for NullVm.");
+  EXPECT_THROW_WITH_MESSAGE(
+      WasmConfig config(plugin_config), EnvoyException,
+      "envoy.extensions.wasm.v3.VmConfig.EnvironmentVariables.key_values must "
+      "not be set for NullVm.");
 }
 
 } // namespace