fluent-plugin-google-cloud 0.6.21 → 0.6.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b71adc0c744f682e9f3548911ec4f550988864
-  data.tar.gz: 3c45d732c056e34e32f05f2708012f4b69205cca
+  metadata.gz: b7b8f87ce06794d667dd49b11c34e8ab72b264c1
+  data.tar.gz: 1f7348c7f87be620acadfcecb139aaf75d09d443
 SHA512:
-  metadata.gz: 9dab6cb5bcecc828bc025458f3adb04ba0690fcac1052c936a7e3beaebca7ea35de72295f694e73342c92a5cf1129be7bcc2e5040d405280bb23822c6f7521fb
-  data.tar.gz: 4ea689e785e16c15c4b30286203aaf54caa5e23aa1987a30252f75ec02278a41a3fa064170e4b5233de9f2104cdf1ae86f7012dd85c19f773c44e25034cfcf10
+  metadata.gz: be9997092b745378d74380bad938e0e65c4361dcff2e54ec406bfee5cc1f09080486a14fae6ce064bbfcf38f13439051797a30c104b1f5230687436bec9df157
+  data.tar.gz: e3ef4adb43b9e4062dd18d2e565e1ccd2bc0d63510d4a8d27a53607d42b0abe59236d20217399e5f1e1820e65cf5d7aa02bbcea7ff4d6fc1dc969ff52d9d5e98

data/fluent-plugin-google-cloud.gemspec

@@ -10,7 +10,7 @@ eos
   gem.homepage      =
     'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.6.21'
+  gem.version       = '0.6.22'
   gem.authors       = ['Ling Huang', 'Igor Peshansky']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2')

data/lib/fluent/plugin/out_google_cloud.rb

@@ -227,7 +227,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
-    PLUGIN_VERSION = '0.6.21'.freeze
+    PLUGIN_VERSION = '0.6.22'.freeze
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
@@ -2213,6 +2213,10 @@ module Fluent
           (?<resource_type>k8s_node)
           \.(?<node_name>[0-9a-z-]+)$/x =~ local_resource_id
 
+      # Clear name and location if they're explicitly set to empty.
+      @k8s_cluster_name = nil if @k8s_cluster_name == ''
+      @k8s_cluster_location = nil if @k8s_cluster_location == ''
+
       begin
         @k8s_cluster_name ||= fetch_gce_metadata(
           'instance/attributes/cluster-name')

data/test/plugin/base_test.rb

@@ -1376,6 +1376,13 @@ module BaseTest
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS_CUSTOM
       },
+      {
+        config: EMPTY_K8S_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
+      },
       {
         config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
@@ -1432,6 +1439,13 @@ module BaseTest
         log_entry: k8s_node_log_entry(log_entry(0)),
         expected_params: K8S_NODE_PARAMS_CUSTOM
       },
+      {
+        config: EMPTY_K8S_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
+      },
       {
         config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,

data/test/plugin/constants.rb

@@ -300,6 +300,12 @@ module Constants
     k8s_cluster_location #{CUSTOM_K8S_LOCATION}
   ).freeze
 
+  EMPTY_K8S_ENABLE_METADATA_AGENT_CONFIG = %(
+    enable_metadata_agent true
+    k8s_cluster_name ""
+    k8s_cluster_location ""
+  ).freeze
+
   CONFIG_EC2_PROJECT_ID = %(
     project_id #{EC2_PROJECT_ID}
   ).freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.21
+  version: 0.6.22
 platform: ruby
 authors:
 - Ling Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd