refactor secdist: delete 'default-secdist-provider' from rest static_configs

mnink275 · mnink275 · commit 1686b05ecd31 · 2024-05-08T15:02:53.000+03:00
diff --git a/clickhouse/functional_tests/basic_chaos/static_config.yaml b/clickhouse/functional_tests/basic_chaos/static_config.yaml
@@ -17,8 +17,7 @@ components_manager:
             queue_timeout: 10s
             use_secure_connection: false
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/clickhouse_basic_chaos/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/clickhouse/functional_tests/metrics/static_config.yaml b/clickhouse/functional_tests/metrics/static_config.yaml
@@ -13,8 +13,7 @@ components_manager:
             use_secure_connection: false
             compression: lz4
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/clickhouse_basic_chaos/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/core/functional_tests/https/static_config.yaml b/core/functional_tests/https/static_config.yaml
@@ -65,9 +65,6 @@ components_manager:
             task_processor: main-task-processor
 
         secdist:
-            provider: default-secdist-provider
-
-        default-secdist-provider:
             config: secdist.json
             missing-ok: false
 
diff --git a/core/functional_tests/https/tests-deadline/conftest.py b/core/functional_tests/https/tests-deadline/conftest.py
@@ -14,7 +14,7 @@ def patch_config(config_yaml, config_vars) -> None:
         tls['cert'] = str(service_source_dir / 'cert.crt')
         tls['private-key'] = str(service_source_dir / 'private_key.key')
 
-        components['default-secdist-provider']['config'] = str(
+        components['secdist']['config'] = str(
             service_source_dir / 'secdist.json',
         )
 
diff --git a/core/functional_tests/metrics/static_config.yaml b/core/functional_tests/metrics/static_config.yaml
@@ -83,7 +83,6 @@ components_manager:
             limited-logging-interval: 1s
 
         secdist: {}
-        default-secdist-provider: {}
 
         server:
             listener:
diff --git a/core/functional_tests/uctl/static_config.yaml b/core/functional_tests/uctl/static_config.yaml
@@ -83,7 +83,6 @@ components_manager:
             limited-logging-interval: 1s
 
         secdist: {}
-        default-secdist-provider: {}
 
         server:
             listener:
diff --git a/core/src/components/manager_config_test.cpp b/core/src/components/manager_config_test.cpp
@@ -110,7 +110,6 @@ constexpr char kConfig[] = R"(
       blocking_task_processor: pg-task-processor
       dbalias: devicenotify
     secdist:
-    default-secdist-provider:
       config: /etc/yandex/taxi-secdist/taxi.json
     server:
       listener:
@@ -216,7 +215,7 @@ TEST(ManagerConfig, Basic) {
 
   EXPECT_EQ(mc.task_processors.size(), 5);
 
-  ASSERT_EQ(mc.components.size(), 28);
+  ASSERT_EQ(mc.components.size(), 27);
 
   EXPECT_TRUE(std::any_of(
       mc.components.begin(), mc.components.end(),
diff --git a/kafka/functional_tests/balanced_consumer_groups/static_config.yaml b/kafka/functional_tests/balanced_consumer_groups/static_config.yaml
@@ -43,8 +43,7 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/kafka_service/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/kafka/functional_tests/integrational_tests/static_config.yaml b/kafka/functional_tests/integrational_tests/static_config.yaml
@@ -66,8 +66,7 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/kafka_service/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/mysql/functional_tests/basic_chaos/static_config.yaml b/mysql/functional_tests/basic_chaos/static_config.yaml
@@ -9,8 +9,7 @@ components_manager:
             initial_pool_size: 1
             max_pool_size: 1
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/mysql_service/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/rabbitmq/functional_tests/basic_chaos/static_config.yaml b/rabbitmq/functional_tests/basic_chaos/static_config.yaml
@@ -17,8 +17,7 @@ components_manager:
             max_in_flight_requests: 5
             use_secure_connection: false
 
-        secdist: {}                                           # Component that stores configuration of hosts and passwords
-        default-secdist-provider:                             # Component that loads configuration of hosts and passwords  
+        secdist:                                              # Component that stores configuration of hosts and passwords
             config: /etc/rabbitmq_service/secure_data.json    # Values are supposed to be stored in this file
             missing-ok: true                                  # ... but if the file is missing it is still ok
             environment-secrets-key: SECDIST_CONFIG           # ... values will be loaded from this environment value
diff --git a/rabbitmq/functional_tests/metrics/static_config.yaml b/rabbitmq/functional_tests/metrics/static_config.yaml
@@ -17,8 +17,7 @@ components_manager:
             queue: sample-queue
             prefetch_count: 5
 
-        secdist: {}                                           # Component that stores configuration of hosts and passwords
-        default-secdist-provider:                             # Component that loads configuration of hosts and passwords  
+        secdist:                                              # Component that stores configuration of hosts and passwords
             config: /etc/rabbitmq_service/secure_data.json    # Values are supposed to be stored in this file
             missing-ok: true                                  # ... but if the file is missing it is still ok
             environment-secrets-key: SECDIST_CONFIG           # ... values will be loaded from this environment value
diff --git a/redis/functional_tests/basic_chaos/static_config.yaml b/redis/functional_tests/basic_chaos/static_config.yaml
@@ -48,9 +48,7 @@ components_manager:
         dns-client:
             fs-task-processor: fs-task-processor
 
-        secdist: {}
-
-        default-secdist-provider:
+        secdist:
             config: /etc/redis_service/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/redis/functional_tests/cluster_auto_topology/static_config.yaml b/redis/functional_tests/cluster_auto_topology/static_config.yaml
@@ -34,8 +34,7 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/redis_service/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/redis/functional_tests/cluster_auto_topology_pubsub/static_config.yaml b/redis/functional_tests/cluster_auto_topology_pubsub/static_config.yaml
@@ -40,8 +40,7 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/redis_service/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/redis/functional_tests/integration_tests/static_config.yaml b/redis/functional_tests/integration_tests/static_config.yaml
@@ -39,8 +39,7 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/redis_service/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/redis/functional_tests/metrics/static_config.yaml b/redis/functional_tests/metrics/static_config.yaml
@@ -71,8 +71,7 @@ components_manager:
                         enable-monitoring: true
                         forbid-requests-to-syncing-replicas: true
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/redis_service/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/redis/functional_tests/pubsub/static_config.yaml b/redis/functional_tests/pubsub/static_config.yaml
@@ -39,8 +39,7 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
 
-        secdist: {}
-        default-secdist-provider:
+        secdist:
             config: /etc/redis_service/secure_data.json
             missing-ok: true
             environment-secrets-key: SECDIST_CONFIG
diff --git a/samples/https_service/tests/conftest.py b/samples/https_service/tests/conftest.py
@@ -20,7 +20,7 @@ def patch_config(config, config_vars):
         tls['cert'] = str(SERVICE_SOURCE_DIR / 'cert.crt')
         tls['private-key'] = str(SERVICE_SOURCE_DIR / 'private_key.key')
 
-        components['default-secdist-provider']['config'] = str(
+        components['secdist']['config'] = str(
             SERVICE_SOURCE_DIR / 'secdist.json',
         )
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ def patch_config(config_yaml, config_vars) -> None:`
`14`	`14`	`tls['cert'] = str(service_source_dir / 'cert.crt')`
`15`	`15`	`tls['private-key'] = str(service_source_dir / 'private_key.key')`
`16`	`16`
`17`		`- components['default-secdist-provider']['config'] = str(`
	`17`	`+ components['secdist']['config'] = str(`
`18`	`18`	`service_source_dir / 'secdist.json',`
`19`	`19`	`)`
`20`	`20`