Skip to content

Commit 2d1ad86

Browse files
kyessenovkyessenov
authored
reformat (istio#4381)
Signed-off-by: Kuat Yessenov <[email protected]> Signed-off-by: Kuat Yessenov <[email protected]>
1 parent eb81ed7 commit 2d1ad86

File tree

128 files changed

+3346
-4636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+3346
-4636
lines changed

‎.clang-format

+17-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1-
BasedOnStyle: Google
1+
---
2+
Language: Cpp
3+
AccessModifierOffset: -2
4+
ColumnLimit: 100
5+
DerivePointerAlignment: false
6+
PointerAlignment: Left
7+
SortIncludes: false
8+
TypenameMacros: ['STACK_OF']
9+
...
10+
11+
---
12+
Language: Proto
13+
ColumnLimit: 100
14+
SpacesInContainerLiterals: false
15+
AllowShortFunctionsOnASingleLine: false
16+
ReflowComments: false
17+
...

‎extensions/access_log_policy/config.cc

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ namespace null_plugin {
2121
namespace AccessLogPolicy {
2222
namespace Plugin {
2323
NullPluginRegistry* context_registry_{};
24-
} // namespace Plugin
24+
} // namespace Plugin
2525

2626
// Registration glue
27-
RegisterNullVmPluginFactory register_access_log_policy_filter(
28-
"envoy.wasm.access_log_policy",
29-
[]() { return std::make_unique<NullPlugin>(Plugin::context_registry_); });
27+
RegisterNullVmPluginFactory register_access_log_policy_filter("envoy.wasm.access_log_policy", []() {
28+
return std::make_unique<NullPlugin>(Plugin::context_registry_);
29+
});
3030

31-
} // namespace AccessLogPolicy
32-
} // namespace null_plugin
33-
} // namespace proxy_wasm
31+
} // namespace AccessLogPolicy
32+
} // namespace null_plugin
33+
} // namespace proxy_wasm

‎extensions/access_log_policy/plugin.cc

+22-29
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,17 @@ PROXY_WASM_NULL_PLUGIN_REGISTRY;
4646
namespace {
4747

4848
bool setFilterStateValue(bool log) {
49-
auto r = setFilterStateStringValue(::Wasm::Common::kAccessLogPolicyKey,
50-
log ? "yes" : "no");
49+
auto r = setFilterStateStringValue(::Wasm::Common::kAccessLogPolicyKey, log ? "yes" : "no");
5150
if (r != WasmResult::Ok) {
5251
logWarn(toString(r));
5352
return false;
5453
}
5554
return true;
5655
}
5756

58-
} // namespace
57+
} // namespace
5958

60-
constexpr long long kDefaultLogWindowDurationNanoseconds =
61-
43200000000000; // 12h
59+
constexpr long long kDefaultLogWindowDurationNanoseconds = 43200000000000; // 12h
6260

6361
constexpr std::string_view kSource = "source";
6462
constexpr std::string_view kAddress = "address";
@@ -68,32 +66,30 @@ constexpr std::string_view kResponse = "response";
6866
constexpr std::string_view kCode = "code";
6967
constexpr std::string_view kGrpcStatus = "grpc_status";
7068

71-
static RegisterContextFactory register_AccessLogPolicy(
72-
CONTEXT_FACTORY(PluginContext), ROOT_FACTORY(PluginRootContext));
69+
static RegisterContextFactory register_AccessLogPolicy(CONTEXT_FACTORY(PluginContext),
70+
ROOT_FACTORY(PluginRootContext));
7371

7472
bool PluginRootContext::onConfigure(size_t size) {
7573
initialized_ = configure(size);
7674
return true;
7775
}
7876

7977
bool PluginRootContext::configure(size_t configuration_size) {
80-
auto configuration_data = getBufferBytes(WasmBufferType::PluginConfiguration,
81-
0, configuration_size);
78+
auto configuration_data =
79+
getBufferBytes(WasmBufferType::PluginConfiguration, 0, configuration_size);
8280
auto configuration = configuration_data->toString();
8381
JsonParseOptions json_options;
8482
json_options.ignore_unknown_fields = true;
85-
const auto status =
86-
JsonStringToMessage(configuration, &config_, json_options);
83+
const auto status = JsonStringToMessage(configuration, &config_, json_options);
8784
if (!status.ok()) {
88-
logWarn("Cannot parse AccessLog plugin configuration JSON string " +
89-
configuration + ", " + status.message().ToString());
85+
logWarn("Cannot parse AccessLog plugin configuration JSON string " + configuration + ", " +
86+
status.message().ToString());
9087
return false;
9188
}
9289

9390
if (config_.has_log_window_duration()) {
9491
log_time_duration_nanos_ =
95-
::google::protobuf::util::TimeUtil::DurationToNanoseconds(
96-
config_.log_window_duration());
92+
::google::protobuf::util::TimeUtil::DurationToNanoseconds(config_.log_window_duration());
9793
} else {
9894
log_time_duration_nanos_ = kDefaultLogWindowDurationNanoseconds;
9995
}
@@ -105,8 +101,8 @@ bool PluginRootContext::configure(size_t configuration_size) {
105101
return true;
106102
}
107103

108-
void PluginRootContext::updateLastLogTimeNanos(
109-
const Wasm::Common::IstioDimensions& key, long long last_log_time_nanos) {
104+
void PluginRootContext::updateLastLogTimeNanos(const Wasm::Common::IstioDimensions& key,
105+
long long last_log_time_nanos) {
110106
if (int32_t(cache_.size()) > max_client_cache_size_) {
111107
auto it = cache_.begin();
112108
cache_.erase(cache_.begin(), std::next(it, max_client_cache_size_ / 4));
@@ -139,10 +135,9 @@ void PluginContext::onLog() {
139135
long long last_log_time_nanos = lastLogTimeNanos();
140136
auto cur = static_cast<long long>(getCurrentTimeNanoseconds());
141137
if ((cur - last_log_time_nanos) > logTimeDurationNanos()) {
142-
LOG_TRACE(absl::StrCat(
143-
"Setting logging to true as its outside of log windown. SourceIp: ",
144-
source_ip, " SourcePrincipal: ", source_principal,
145-
" Window: ", logTimeDurationNanos()));
138+
LOG_TRACE(
139+
absl::StrCat("Setting logging to true as its outside of log windown. SourceIp: ", source_ip,
140+
" SourcePrincipal: ", source_principal, " Window: ", logTimeDurationNanos()));
146141
if (setFilterStateValue(true)) {
147142
updateLastLogTimeNanos(cur);
148143
}
@@ -155,8 +150,7 @@ void PluginContext::onLog() {
155150
bool PluginContext::isRequestFailed() {
156151
// Check if HTTP request is a failure.
157152
int64_t http_response_code = 0;
158-
if (getValue({kResponse, kCode}, &http_response_code) &&
159-
http_response_code >= 400) {
153+
if (getValue({kResponse, kCode}, &http_response_code) && http_response_code >= 400) {
160154
return true;
161155
}
162156

@@ -166,17 +160,16 @@ bool PluginContext::isRequestFailed() {
166160
getHeaderMapValue(WasmHeaderMapType::RequestHeaders,
167161
::Wasm::Common::kContentTypeHeaderKey)
168162
->toString()) != 0 &&
169-
getValue({kResponse, kGrpcStatus}, &grpc_response_code) &&
170-
grpc_response_code != 0) {
163+
getValue({kResponse, kGrpcStatus}, &grpc_response_code) && grpc_response_code != 0) {
171164
return true;
172165
}
173166

174167
return false;
175168
}
176169

177170
#ifdef NULL_PLUGIN
178-
} // namespace Plugin
179-
} // namespace AccessLogPolicy
180-
} // namespace null_plugin
181-
} // namespace proxy_wasm
171+
} // namespace Plugin
172+
} // namespace AccessLogPolicy
173+
} // namespace null_plugin
174+
} // namespace proxy_wasm
182175
#endif

‎extensions/access_log_policy/plugin.h

+11-15
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ const size_t DefaultClientCacheMaxSize = 500;
4646
// thread. It has the same lifetime as the filter instance and acts as target
4747
// for interactions that outlives individual stream, e.g. timer, async calls.
4848
class PluginRootContext : public RootContext {
49-
public:
50-
PluginRootContext(uint32_t id, std::string_view root_id)
51-
: RootContext(id, root_id) {}
49+
public:
50+
PluginRootContext(uint32_t id, std::string_view root_id) : RootContext(id, root_id) {}
5251
~PluginRootContext() = default;
5352

5453
bool onConfigure(size_t) override;
@@ -66,7 +65,7 @@ class PluginRootContext : public RootContext {
6665
long long logTimeDurationNanos() { return log_time_duration_nanos_; };
6766
bool initialized() const { return initialized_; };
6867

69-
private:
68+
private:
7069
accesslogpolicy::config::v1alpha1::AccessLogPolicyConfig config_;
7170
// Cache storing last log time by a client.
7271
absl::flat_hash_map<Wasm::Common::IstioDimensions, long long> cache_;
@@ -78,33 +77,30 @@ class PluginRootContext : public RootContext {
7877

7978
// Per-stream context.
8079
class PluginContext : public Context {
81-
public:
80+
public:
8281
explicit PluginContext(uint32_t id, RootContext* root) : Context(id, root) {}
8382

8483
void onLog() override;
8584

86-
private:
85+
private:
8786
inline PluginRootContext* rootContext() {
8887
return dynamic_cast<PluginRootContext*>(this->root());
8988
};
9089
inline long long lastLogTimeNanos() {
9190
return rootContext()->lastLogTimeNanos(istio_dimensions_);
9291
};
9392
inline void updateLastLogTimeNanos(long long last_log_time_nanos) {
94-
rootContext()->updateLastLogTimeNanos(istio_dimensions_,
95-
last_log_time_nanos);
96-
};
97-
inline long long logTimeDurationNanos() {
98-
return rootContext()->logTimeDurationNanos();
93+
rootContext()->updateLastLogTimeNanos(istio_dimensions_, last_log_time_nanos);
9994
};
95+
inline long long logTimeDurationNanos() { return rootContext()->logTimeDurationNanos(); };
10096
bool isRequestFailed();
10197

10298
Wasm::Common::IstioDimensions istio_dimensions_;
10399
};
104100

105101
#ifdef NULL_PLUGIN
106-
} // namespace Plugin
107-
} // namespace AccessLogPolicy
108-
} // namespace null_plugin
109-
} // namespace proxy_wasm
102+
} // namespace Plugin
103+
} // namespace AccessLogPolicy
104+
} // namespace null_plugin
105+
} // namespace proxy_wasm
110106
#endif

‎extensions/attributegen/plugin.cc

+28-36
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
// WASM_PROLOG
1919
#ifndef NULL_PLUGIN
2020

21-
#else // NULL_PLUGIN
21+
#else // NULL_PLUGIN
2222

2323
#include "include/proxy-wasm/null_plugin.h"
2424

2525
namespace proxy_wasm {
2626
namespace null_plugin {
2727

28-
#endif // NULL_PLUGIN
28+
#endif // NULL_PLUGIN
2929

3030
// END WASM_PROLOG
3131

@@ -43,14 +43,13 @@ std::optional<bool> Match::evaluate() const {
4343
const std::string function = "expr_evaluate";
4444
char* out = nullptr;
4545
size_t out_size = 0;
46-
auto result = proxy_call_foreign_function(
47-
function.data(), function.size(),
48-
reinterpret_cast<const char*>(&condition_token_), sizeof(uint32_t), &out,
49-
&out_size);
46+
auto result = proxy_call_foreign_function(function.data(), function.size(),
47+
reinterpret_cast<const char*>(&condition_token_),
48+
sizeof(uint32_t), &out, &out_size);
5049

5150
if (result != WasmResult::Ok) {
52-
LOG_TRACE(absl::StrCat("Failed to evaluate expression:[", condition_token_,
53-
"] ", condition_, " result: ", toString(result)));
51+
LOG_TRACE(absl::StrCat("Failed to evaluate expression:[", condition_token_, "] ", condition_,
52+
" result: ", toString(result)));
5453
} else if (out_size != sizeof(bool)) {
5554
LOG_TRACE(absl::StrCat("Expression:[", condition_token_, "] ", condition_,
5655
" did not return a bool, size:", out_size));
@@ -93,20 +92,19 @@ std::optional<bool> AttributeGenerator::evaluate(std::string* val) const {
9392
// It is the responsibility of the control plane to send valid configuration.
9493
// AttributeGen plugin will not return `false`.
9594
bool PluginRootContext::onConfigure(size_t configuration_size) {
96-
auto configuration_data = getBufferBytes(WasmBufferType::PluginConfiguration,
97-
0, configuration_size);
95+
auto configuration_data =
96+
getBufferBytes(WasmBufferType::PluginConfiguration, 0, configuration_size);
9897
auto configuration = configuration_data->toString();
9998
// Parse configuration JSON string.
10099
JsonParseOptions json_options;
101100
json_options.ignore_unknown_fields = true;
102101
istio::attributegen::PluginConfig config;
103102
const auto status = JsonStringToMessage(configuration, &config, json_options);
104103
if (!status.ok()) {
105-
LOG_WARN(
106-
absl::StrCat("Config Error: cannot parse 'attributegen' plugin "
107-
"configuration JSON string [YAML is "
108-
"not supported]: ",
109-
configuration));
104+
LOG_WARN(absl::StrCat("Config Error: cannot parse 'attributegen' plugin "
105+
"configuration JSON string [YAML is "
106+
"not supported]: ",
107+
configuration));
110108
incrementMetric(config_errors_, 1);
111109
return true;
112110
}
@@ -118,14 +116,12 @@ bool PluginRootContext::onConfigure(size_t configuration_size) {
118116
if (!init_status) {
119117
incrementMetric(config_errors_, 1);
120118
cleanupAttributeGen();
121-
LOG_WARN(
122-
"Config Error: attributegen plugin rejected invalid configuration");
119+
LOG_WARN("Config Error: attributegen plugin rejected invalid configuration");
123120
}
124121
return true;
125122
}
126123

127-
bool PluginRootContext::initAttributeGen(
128-
const istio::attributegen::PluginConfig& config) {
124+
bool PluginRootContext::initAttributeGen(const istio::attributegen::PluginConfig& config) {
129125
for (const auto& attribute_gen_config : config.attributes()) {
130126
EvalPhase phase = OnLog;
131127
if (attribute_gen_config.phase() == istio::attributegen::ON_REQUEST) {
@@ -142,24 +138,21 @@ bool PluginRootContext::initAttributeGen(
142138
auto create_status = createExpression(matchconfig.condition(), &token);
143139

144140
if (create_status != WasmResult::Ok) {
145-
LOG_WARN(absl::StrCat("Cannot create expression: <",
146-
matchconfig.condition(), "> for ",
141+
LOG_WARN(absl::StrCat("Cannot create expression: <", matchconfig.condition(), "> for ",
147142
attribute_gen_config.output_attribute(),
148143
" result:", toString(create_status)));
149144
return false;
150145
}
151146
if (debug_) {
152-
LOG_DEBUG(absl::StrCat(
153-
"Added [", token, "] ", attribute_gen_config.output_attribute(),
154-
" if (", matchconfig.condition(), ") -> ", matchconfig.value()));
147+
LOG_DEBUG(absl::StrCat("Added [", token, "] ", attribute_gen_config.output_attribute(),
148+
" if (", matchconfig.condition(), ") -> ", matchconfig.value()));
155149
}
156150

157151
tokens_.push_back(token);
158-
matches.push_back(
159-
Match(matchconfig.condition(), token, matchconfig.value()));
152+
matches.push_back(Match(matchconfig.condition(), token, matchconfig.value()));
160153
}
161-
gen_.push_back(AttributeGenerator(
162-
phase, attribute_gen_config.output_attribute(), std::move(matches)));
154+
gen_.push_back(
155+
AttributeGenerator(phase, attribute_gen_config.output_attribute(), std::move(matches)));
163156
matches.clear();
164157
}
165158
return true;
@@ -197,8 +190,7 @@ void PluginRootContext::attributeGen(EvalPhase phase) {
197190
}
198191

199192
if (debug_) {
200-
LOG_DEBUG(absl::StrCat("Setting ", attribute_generator.outputAttribute(),
201-
" --> ", val));
193+
LOG_DEBUG(absl::StrCat("Setting ", attribute_generator.outputAttribute(), " --> ", val));
202194
}
203195
setFilterState(attribute_generator.outputAttribute(), val);
204196
}
@@ -207,15 +199,15 @@ void PluginRootContext::attributeGen(EvalPhase phase) {
207199
#ifdef NULL_PLUGIN
208200
NullPluginRegistry* context_registry_{};
209201

210-
RegisterNullVmPluginFactory register_attribute_gen_filter(
211-
"envoy.wasm.attributegen",
212-
[]() { return std::make_unique<NullPlugin>(context_registry_); });
202+
RegisterNullVmPluginFactory register_attribute_gen_filter("envoy.wasm.attributegen", []() {
203+
return std::make_unique<NullPlugin>(context_registry_);
204+
});
213205
#endif
214206

215-
} // namespace AttributeGen
207+
} // namespace AttributeGen
216208

217209
#ifdef NULL_PLUGIN
218210
// WASM_EPILOG
219-
} // namespace null_plugin
220-
} // namespace proxy_wasm
211+
} // namespace null_plugin
212+
} // namespace proxy_wasm
221213
#endif

0 commit comments

Comments
 (0)