refactor

stephenplusplus · stephenplusplus · commit 17281fa5bf76 · 2017-08-02T13:20:34.000-04:00
diff --git a/packages/logging/src/metadata.js b/packages/logging/src/metadata.js
@@ -103,8 +103,10 @@ Metadata.getGCEDescriptor = function(projectId) {
 Metadata.getGKEDescriptor = function(projectId, callback) {
   gcpMetadata.instance('attributes/clusterName', function(err, _, clusterName) {
     if (err) {
-      return callback(err);
+      callback(err);
+      return;
     }
+
     callback(null, {
       type: 'container',
       labels: {
@@ -150,21 +152,22 @@ Metadata.prototype.getDefaultResource = function(callback) {
     self.logging.auth.getEnvironment(function(err, env) {
       if (env.IS_CONTAINER_ENGINE) {
         Metadata.getGKEDescriptor(projectId, callback);
+        return;
+      }
+
+      var defaultResource;
+
+      if (env.IS_APP_ENGINE) {
+        defaultResource = Metadata.getGAEDescriptor(projectId);
+      } else if (env.IS_CLOUD_FUNCTION) {
+        defaultResource = Metadata.getCloudFunctionDescriptor(projectId);
+      } else if (env.IS_COMPUTE_ENGINE) {
+        defaultResource = Metadata.getGCEDescriptor(projectId);
       } else {
-        var defaultResource;
-
-        if (env.IS_APP_ENGINE) {
-          defaultResource = Metadata.getGAEDescriptor(projectId);
-        } else if (env.IS_CLOUD_FUNCTION) {
-          defaultResource = Metadata.getCloudFunctionDescriptor(projectId);
-        } else if (env.IS_COMPUTE_ENGINE) {
-          defaultResource = Metadata.getGCEDescriptor(projectId);
-        } else {
-          defaultResource = Metadata.getGlobalDescriptor(projectId);
-        }
-
-        callback(null, defaultResource);
+        defaultResource = Metadata.getGlobalDescriptor(projectId);
       }
+
+      callback(null, defaultResource);
     });
   });
 };
diff --git a/packages/logging/test/metadata.js b/packages/logging/test/metadata.js
@@ -29,12 +29,9 @@ var fakeGcpMetadata = {
   }
 };
 
-var Metadata = proxyquire('../src/metadata.js', {
-  'gcp-metadata': fakeGcpMetadata
-});
-
 describe('metadata', function() {
   var MetadataCached;
+  var Metadata;
   var metadata;
 
   var PROJECT_ID = 'project-id';
@@ -43,6 +40,10 @@ describe('metadata', function() {
   var ENV_CACHED = extend({}, process.env);
 
   before(function() {
+    Metadata = proxyquire('../src/metadata.js', {
+      'gcp-metadata': fakeGcpMetadata
+    });
+
     MetadataCached = extend({}, Metadata);
   });
 
@@ -270,8 +271,7 @@ describe('metadata', function() {
 
       describe('container engine', function() {
         it('should return correct descriptor', function(done) {
-          var RETURNED_CLUSTER_NAME = 'fake-cluster-name';
-          instanceValueOverride = RETURNED_CLUSTER_NAME;
+          instanceValueOverride = 'overridden-value';
 
           metadata.logging.auth.getEnvironment = function(callback) {
             callback(null, {
@@ -285,7 +285,7 @@ describe('metadata', function() {
             assert.deepStrictEqual(defaultResource, {
               type: 'container',
               labels: {
-                cluster_name: RETURNED_CLUSTER_NAME,
+                cluster_name: instanceValueOverride,
                 project_id: RETURNED_PROJECT_ID
               }
             });
