@google-cloud/nodejs-common 1.6.0 → 1.6.9-alpha

package/bin/google_ads.sh

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Google Ads API version
-GOOGLE_ADS_API_VERSION=10
+GOOGLE_ADS_API_VERSION=13
 
 #######################################
 # Verify whether the current OAuth token, CID and developer token can work.

package/bin/install_functions.sh

@@ -16,6 +16,7 @@
 
 # Cloud Functions Runtime Environment.
 CF_RUNTIME="${CF_RUNTIME:=nodejs14}"
+CF_MEMORY="${CF_MEMORY:=2048MB}"
 
 # Counter for steps.
 STEP=0
@@ -1551,7 +1552,7 @@ set_cloud_functions_default_settings() {
   local -n default_cf_flag=$1
   default_cf_flag+=(--region="${REGION}")
   default_cf_flag+=(--no-allow-unauthenticated)
-  default_cf_flag+=(--timeout=540 --memory=2048MB --runtime="${CF_RUNTIME}")
+  default_cf_flag+=(--timeout=540 --memory="${CF_MEMORY}" --runtime="${CF_RUNTIME}")
   default_cf_flag+=(--set-env-vars=GCP_PROJECT="${GCP_PROJECT}")
   default_cf_flag+=(--set-env-vars=PROJECT_NAMESPACE="${PROJECT_NAMESPACE}")
   default_cf_flag+=(--set-env-vars=DEBUG="${DEBUG}")
@@ -2002,11 +2003,11 @@ quit_if_failed() {
 #   Array of string.
 #######################################
 join_string_array() {
-  local separator=$1;
+  local separator=\\$1;
   shift
   local first=$1;
   shift
-  printf %s "$first" "${@/#/$separator}"
+  printf %s "$first" "${@/#/$separator}" | sed -e "s/\\$separator/$separator/g"
 }
 
 # Import other bash files.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google-cloud/nodejs-common",
-  "version": "1.6.0",
+  "version": "1.6.9-alpha",
   "description": "A NodeJs common library for solutions based on Cloud Functions",
   "author": "Google Inc.",
   "license": "Apache-2.0",
@@ -16,21 +16,21 @@
   },
   "homepage": "https://github.com/GoogleCloudPlatform/cloud-for-marketing/blob/master/marketing-analytics/activation/common-libs/nodejs-common/README.md",
   "dependencies": {
-    "@google-cloud/aiplatform": "^2.5.0",
-    "@google-cloud/automl": "^3.1.2",
-    "@google-cloud/bigquery": "^6.1.0",
-    "@google-cloud/datastore": "^7.1.0",
-    "@google-cloud/firestore": "^6.4.2",
+    "@google-cloud/aiplatform": "^2.13.0",
+    "@google-cloud/automl": "^3.1.3",
+    "@google-cloud/bigquery": "^6.2.0",
+    "@google-cloud/datastore": "^7.5.1",
+    "@google-cloud/firestore": "^6.5.0",
     "@google-cloud/logging-winston": "^5.3.0",
-    "@google-cloud/pubsub": "^3.3.0",
-    "@google-cloud/storage": "^6.9.2",
-    "@google-cloud/scheduler": "^3.2.0",
-    "@google-cloud/secret-manager": "^4.2.0",
-    "gaxios": "^5.0.2",
-    "google-ads-api": "^12.0.1",
-    "google-ads-node": "^10.0.0",
-    "google-auth-library": "^8.7.0",
-    "googleapis": "^110.0.0",
+    "@google-cloud/pubsub": "^3.6.0",
+    "@google-cloud/storage": "^6.10.1",
+    "@google-cloud/scheduler": "^3.3.1",
+    "@google-cloud/secret-manager": "^4.2.2",
+    "gaxios": "^5.1.0",
+    "google-ads-api": "^13.0.1",
+    "google-ads-node": "^11.0.0",
+    "google-auth-library": "^8.8.0",
+    "googleapis": "^118.0.0",
     "winston": "^3.8.2",
     "lodash": "^4.17.21"
   },

package/src/apis/google_ads.js

@@ -438,7 +438,7 @@ class GoogleAds {
       } catch (error) {
         this.logger.error(
           `Error in ${functionName} batch: ${batchId}`, error);
-        this.updateBatchResultWithError_(batchResult, error, lines, 0);
+        this.updateBatchResultWithError(batchResult, error, lines, 0);
         return batchResult;
       }
     }
@@ -493,9 +493,8 @@ class GoogleAds {
    * @param {number} fieldPathIndex The index of 'FieldPathElement' in the array
    *     'field_path_elements'. This is used to get the original line related to
    *     this GoogleAdsError.
-   * @private
    */
-  updateBatchResultWithError_(batchResult, error, lines, fieldPathIndex) {
+  updateBatchResultWithError(batchResult, error, lines, fieldPathIndex) {
     batchResult.result = false;
     if (error.errors) { //GoogleAdsFailure
       this.extraFailedLines_(batchResult, [error], lines, fieldPathIndex);
@@ -773,7 +772,7 @@ class GoogleAds {
       } catch (error) {
         this.logger.error(
             `Error in Customer Match upload batch[${batchId}]`, error);
-        this.updateBatchResultWithError_(batchResult, error, lines, 2);
+        this.updateBatchResultWithError(batchResult, error, lines, 2);
         return batchResult;
       }
     }
@@ -1061,7 +1060,7 @@ class GoogleAds {
       } catch (error) {
         this.logger.error(
           `Error in OfflineUserDataJob add operations batch[${batchId}]`, error);
-        this.updateBatchResultWithError_(batchResult, error, lines, 2);
+        this.updateBatchResultWithError(batchResult, error, lines, 2);
         return batchResult;
       }
     }