Fix parsing of retry codes from config json. (#108)

Author: landrito

packages/packages/google-gax/lib/gax.js

@@ -482,8 +482,10 @@ function mergeRetryOptions(retry, overrides) {
  *       "interfaces": {
  *         "google.fake.v1.ServiceName": {
  *           "retry_codes": {
- *             "idempotent": ["UNAVAILABLE", "DEADLINE_EXCEEDED"],
- *             "non_idempotent": []
+ *             "retry_codes_def": {
+ *               "idempotent": ["UNAVAILABLE", "DEADLINE_EXCEEDED"],
+ *               "non_idempotent": []
+ *             }
  *           },
  *           "retry_params": {
  *             "default": {
@@ -554,7 +556,7 @@ exports.constructSettings = function constructSettings(
     var jsName = methodName[0].toLowerCase() + methodName.slice(1);
 
     var retry = constructRetry(methodConfig,
-                               serviceConfig.retry_codes,
+                               serviceConfig.retry_codes.retry_codes_def,
                                serviceConfig.retry_params,
                                retryNames);
     var bundlingConfig = methodConfig.bundling;
@@ -569,9 +571,13 @@ exports.constructSettings = function constructSettings(
           timeout = overridingMethod.timeout_millis;
         }
       }
+      var overridesRetryCodes = null;
+      if (overrides.retry_params) {
+        overridesRetryCodes = overrides.retry_codes.retry_codes_def;
+      }
       retry = mergeRetryOptions(
           retry,
-          constructRetry(overridingMethod, overrides.retry_codes,
+          constructRetry(overridingMethod, overridesRetryCodes,
                          overrides.retry_params, retryNames));
     }
 

packages/packages/google-gax/test/gax.js

@@ -48,8 +48,10 @@ var A_CONFIG = {
 
 A_CONFIG.interfaces[SERVICE_NAME] = {
   'retry_codes': {
-    'foo_retry': ['code_a', 'code_b'],
-    'bar_retry': ['code_c']
+    'retry_codes_def': {
+      'foo_retry': ['code_a', 'code_b'],
+      'bar_retry': ['code_c']
+    }
   },
   'retry_params': {
     'default': {
@@ -147,8 +149,10 @@ describe('gax construct settings', function() {
     var overrides = {'interfaces': {}};
     overrides.interfaces[SERVICE_NAME] = {
       'retry_codes': {
-        'bar_retry': [],
-        'baz_retry': ['code_a']
+        'retry_codes_def': {
+          'bar_retry': [],
+          'baz_retry': ['code_a']
+        }
       },
       'retry_params': {
         'default': {