base_test.rb in fluent-plugin-google-cloud-0.6.19

- old
+ new

@@ -1308,77 +1308,84 @@
   def test_k8s_monitored_resource_fallback
     [
       # k8s_container.
       # When enable_metadata_agent is false.
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: false,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: false,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       # When enable_metadata_agent is true.
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: false,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: false,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS_FROM_LOCAL
       },
       {
-        enable_metadata_agent: true,
+        config: CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG,
+        setup_metadata_agent_stub: false,
+        setup_k8s_stub: false,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: K8S_CONTAINER_PARAMS_CUSTOM
+      },
+      {
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS
       },
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS
       },
       # When local_resource_id is not present or does not match k8s regexes.
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(
           log_entry(0)).reject { |k, _| k == LOCAL_RESOURCE_ID_KEY },
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(
           log_entry(0),
           local_resource_id: RANDOM_LOCAL_RESOURCE_ID),
@@ -1386,25 +1393,32 @@
         # not added.
         expected_params: COMPUTE_PARAMS
       },
       # Specific cases for k8s_node.
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_node_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: true,
-        setup_metadata_agent_stub: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
+        setup_metadata_agent_stub: false,
         setup_k8s_stub: true,
         log_entry: k8s_node_log_entry(log_entry(0)),
-        expected_params: K8S_NODE_PARAMS
+        expected_params: K8S_NODE_PARAMS_FROM_LOCAL
       },
       {
-        enable_metadata_agent: true,
+        config: CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG,
+        setup_metadata_agent_stub: false,
+        setup_k8s_stub: false,
+        log_entry: k8s_node_log_entry(log_entry(0)),
+        expected_params: K8S_NODE_PARAMS_CUSTOM
+      },
+      {
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_node_log_entry(log_entry(0)),
         expected_params: K8S_NODE_PARAMS
       }
@@ -1420,15 +1434,10 @@
           setup_k8s_metadata_stubs
         else
           setup_no_k8s_metadata_stubs
         end
         setup_logging_stubs do
-          config = if test_params[:enable_metadata_agent]
-                     ENABLE_METADATA_AGENT_CONFIG
-                   else
-                     APPLICATION_DEFAULT_CONFIG
-                   end
-          d = create_driver(config)
+          d = create_driver(test_params[:config])
           d.emit(test_params[:log_entry])
           d.run
         end
         verify_log_entries(1, test_params[:expected_params],
                            'jsonPayload') do |entry|