change a little how feature flags are returned (ydb-platform#8434)

adameat · Oct 1, 2024 · b81f58b · b81f58b
1 parent 1886a00
commit b81f58b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/ydb/core/viewer/json_handlers_viewer.cpp b/ydb/core/viewer/json_handlers_viewer.cpp
@@ -267,7 +267,7 @@ void InitViewerCheckAccessJsonHandler(TJsonHandlers& jsonHandlers) {
 }
 
 void InitViewerFeatureFlagsJsonHandler(TJsonHandlers& handlers) {
-    handlers.AddHandler("/viewer/feature_flags", new TJsonHandler<TJsonFeatureFlags>(TJsonFeatureFlags::GetSwagger()));
+    handlers.AddHandler("/viewer/feature_flags", new TJsonHandler<TJsonFeatureFlags>(TJsonFeatureFlags::GetSwagger()), 2);
 }
 
 void InitViewerJsonHandlers(TJsonHandlers& jsonHandlers) {

diff --git a/ydb/core/viewer/protos/viewer.proto b/ydb/core/viewer/protos/viewer.proto
@@ -748,8 +748,8 @@ message TPDiskInfo {
 message TFeatureFlagsConfig {
     message TFeatureFlag {
         string Name = 1;
-        bool Enabled = 2;
-        bool IsDefault = 3;
+        bool Current = 2;
+        bool Default = 3;
     }
 
     message TDatabase {

diff --git a/ydb/core/viewer/viewer_feature_flags.h b/ydb/core/viewer/viewer_feature_flags.h
@@ -46,7 +46,7 @@ class TJsonFeatureFlags : public TViewerPipeClient {
         auto* domain = domains->GetDomain();
         DomainPath = "/" + domain->Name;
 
-        Direct |= Event->Get()->Request.GetUri().StartsWith("/node/"); // we're already forwarding
+        Direct |= !TBase::Event->Get()->Request.GetHeader("X-Forwarded-From-Node").empty(); // we're already forwarding
         Direct |= (FilterDatabase == AppData()->TenantName); // we're already on the right node
         if (FilterDatabase && !Direct) {
             RequestStateStorageEndpointsLookup(FilterDatabase); // to find some dynamic node and redirect there
@@ -100,8 +100,12 @@ class TJsonFeatureFlags : public TViewerPipeClient {
             if (field->cpp_type() == google::protobuf::FieldDescriptor::CPPTYPE_BOOL) {
                 auto& feat = features[field->name()];
                 feat.SetName(field->name());
-                feat.SetEnabled(reflection->GetBool(featureFlags, field));
-                feat.SetIsDefault(field->default_value_bool());
+                if (reflection->HasField(featureFlags, field)) {
+                    feat.SetCurrent(reflection->GetBool(featureFlags, field));
+                }
+                if (field->has_default_value()) {
+                    feat.SetDefault(field->default_value_bool());
+                }
             }
         }
         return features;
@@ -121,7 +125,7 @@ class TJsonFeatureFlags : public TViewerPipeClient {
 
         // prepare response
         NKikimrViewer::TFeatureFlagsConfig Result;
-        Result.SetVersion(1);
+        Result.SetVersion(Viewer->GetCapabilityVersion("/viewer/feature_flags"));
         for (const auto& [database, features] : FeatureFlagsByDatabase) {
             auto databaseProto = Result.AddDatabases();
             databaseProto->SetName(database);