move GKE specific logic into getGKEDescriptor

Author: ofrobots

packages/logging/src/metadata.js

@@ -97,18 +97,23 @@ Metadata.getGCEDescriptor = function(projectId) {
  * @private
  *
  * @param {string} projectId - The project ID.
- * @param {string} clusterName - GKE cluster name.
+ * @param {function} callback - The callback function.
  * @return {object}
  */
-Metadata.getGKEDescriptor = function(projectId, clusterName) {
-  return {
-    type: 'container',
-    labels: {
-      // TODO(ofrobots): it would be good to include the namespace_id as well.
-      cluster_name: clusterName,
-      project_id: projectId
+Metadata.getGKEDescriptor = function(projectId, callback) {
+  gcpMetadata.instance('attributes/clusterName', function(err, _, clusterName) {
+    if (err) {
+      return callback(err);
     }
-  };
+    callback(null, {
+      type: 'container',
+      labels: {
+        // TODO(ofrobots): it would be good to include the namespace_id as well.
+        cluster_name: clusterName,
+        project_id: projectId
+      }
+    })
+  });
 };
 
 /**
@@ -144,13 +149,7 @@ Metadata.prototype.getDefaultResource = function(callback) {
 
     self.logging.auth.getEnvironment(function(err, env) {
       if (env.IS_CONTAINER_ENGINE) {
-        gcpMetadata.instance('attributes/clusterName',
-          function (err, _, clusterName) {
-            if (err) {
-              return callback(err);
-            }
-            callback(null, Metadata.getGKEDescriptor(projectId, clusterName));
-          });
+        Metadata.getGKEDescriptor(projectId, callback);
       } else {
         var defaultResource;
 

packages/logging/test/metadata.js

@@ -265,16 +265,8 @@ describe('metadata', function() {
       describe('container engine', function() {
         it('should return correct descriptor', function(done) {
           var RETURNED_CLUSTER_NAME = 'fake-cluster-name';
-          var DESCRIPTOR = {};
-
           instanceValueOverride = RETURNED_CLUSTER_NAME;
 
-          Metadata.getGKEDescriptor = function(projectId, clusterName) {
-            assert.strictEqual(projectId, RETURNED_PROJECT_ID);
-            assert.strictEqual(clusterName, RETURNED_CLUSTER_NAME);
-            return DESCRIPTOR;
-          };
-
           metadata.logging.auth.getEnvironment = function(callback) {
             callback(null, {
               IS_COMPUTE_ENGINE: true,
@@ -284,7 +276,13 @@ describe('metadata', function() {
 
           metadata.getDefaultResource(function(err, defaultResource) {
             assert.ifError(err);
-            assert.strictEqual(defaultResource, DESCRIPTOR);
+            assert.deepStrictEqual(defaultResource, {
+              type: 'container',
+              labels: {
+                cluster_name: RETURNED_CLUSTER_NAME,
+                project_id: RETURNED_PROJECT_ID
+              }
+            });
             done();
           });
         });