Skip to content

Commit

Permalink
Merge pull request #119 from Opteo/v16
Browse files Browse the repository at this point in the history
Upgrade to Google Ads API v16
  • Loading branch information
avermeil authored Mar 1, 2024
2 parents 3614f37 + 08020b3 commit 9850223
Show file tree
Hide file tree
Showing 1,438 changed files with 521,320 additions and 347,340 deletions.
13 changes: 11 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,28 @@ RUN git clone https://github.com/googleapis/googleapis.git

WORKDIR /go/googleapis

# Compile protocol buffers
# Compile protocol buffers (outputs to /root/.cache/bazel/_bazel_root/406d0d5cbc9dcef756f86d53a7b98449/execroot/com_google_googleapis/bazel-out/aarch64-fastbuild/bin/google/ads/googleads/v16/googleads-nodejs.tar.gz)
RUN bazelisk build //google/ads/googleads/${GOOGLE_ADS_VERSION}:googleads-nodejs

# Get the path to the complied bazel output and set it to a file. Result is /root/.cache/bazel/_bazel_root/406d0d5cbc9dcef756f86d53a7b98449/execroot/com_google_googleapis/bazel-out/aarch64-fastbuild/bin
RUN bazelisk info bazel-bin > /tmp/bazel-bin-path

# Copy the compiled bazel output to a new location, to be used in next stage
RUN cp -r $(cat /tmp/bazel-bin-path) /tmp/bazel-bin-copy

# Build stage for extracting the compiled nodejs gapic client and performing any custom changes
FROM node:latest

# Copy the compiled bazel output from the previous stage
COPY --from=protos /tmp/bazel-bin-copy /tmp/bazel-bin-copy

ARG GOOGLE_ADS_VERSION

RUN mkdir /package

WORKDIR /package

COPY --from=protos /go/googleapis/bazel-bin/google/ads/googleads/${GOOGLE_ADS_VERSION}/googleads-nodejs.tar.gz /package
COPY --from=protos /tmp/bazel-bin-copy/google/ads/googleads/${GOOGLE_ADS_VERSION}/googleads-nodejs.tar.gz /package

RUN tar -xvzf googleads-nodejs.tar.gz -C .

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Google Ads API version
# This only needs changing for major versions e.g. v8 -> v9
GOOGLE_ADS_VERSION=v14
GOOGLE_ADS_VERSION=v16

BUNDLE=googleads-nodejs.tar.gz
PACKAGE_BUILD=/package/googleads-nodejs
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<p align="center">
<a href="https://developers.google.com/google-ads/api/docs/release-notes">
<img src="https://img.shields.io/badge/google%20ads-v14-009688.svg?style=flat-square">
<img src="https://img.shields.io/badge/google%20ads-v16-009688.svg?style=flat-square">
</a>
<a href="https://www.npmjs.com/package/google-ads-node">
<img src="https://img.shields.io/npm/v/google-ads-node.svg?style=flat-square">
Expand Down Expand Up @@ -38,10 +38,6 @@ This library (google-ads-node) is the compiled output of the experimental [Googl
npm install google-ads-node
```

## Standalone

_Documentation for this will be released soon_

## Upgrading API Versions

1. Fetch the latest changes in [Opteo/gax-nodejs](https://github.com/Opteo/gax-nodejs).
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "google-ads-node",
"version": "12.0.2",
"version": "13.0.0",
"description": "Google Ads API client library",
"main": "build/src/index.js",
"files": [
Expand All @@ -15,7 +15,7 @@
"prepare": "sh ./init.sh"
},
"dependencies": {
"google-gax": "^4.0.3"
"google-gax": "^4.3.1"
},
"devDependencies": {
"prettier": "^2.2.1",
Expand Down
4 changes: 2 additions & 2 deletions package/googleads-nodejs/.jsdoc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Google LLC
// Copyright 2024 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,7 +40,7 @@ module.exports = {
includePattern: '\\.js$'
},
templates: {
copyright: 'Copyright 2023 Google LLC',
copyright: 'Copyright 2024 Google LLC',
includeDate: false,
sourceFiles: false,
systemName: 'google-ads',
Expand Down
2 changes: 1 addition & 1 deletion package/googleads-nodejs/.mocharc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Google LLC
// Copyright 2024 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion package/googleads-nodejs/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Google LLC
// Copyright 2024 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
30 changes: 16 additions & 14 deletions package/googleads-nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"bidding seasonality adjustment service",
"bidding strategy service",
"billing setup service",
"brand suggestion service",
"campaign asset service",
"campaign asset set service",
"campaign bid modifier service",
Expand All @@ -64,6 +65,7 @@
"campaign feed service",
"campaign group service",
"campaign label service",
"campaign lifecycle goal service",
"campaign service",
"campaign shared set service",
"conversion action service",
Expand All @@ -83,6 +85,7 @@
"customer extension setting service",
"customer feed service",
"customer label service",
"customer lifecycle goal service",
"customer manager link service",
"customer negative criterion service",
"customer service",
Expand All @@ -103,6 +106,7 @@
"geo target constant service",
"google ads field service",
"google ads service",
"identity verification service",
"invoice service",
"keyword plan ad group keyword service",
"keyword plan ad group service",
Expand All @@ -112,13 +116,13 @@
"keyword plan service",
"keyword theme constant service",
"label service",
"media file service",
"merchant center link service",
"offline user data job service",
"payments account service",
"product link invitation service",
"product link service",
"reach plan service",
"recommendation service",
"recommendation subscription service",
"remarketing action service",
"shared criterion service",
"shared set service",
Expand All @@ -132,7 +136,7 @@
"scripts": {
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/ && minifyProtoJson",
"compile-protos": "compileProtos src",
"compile-protos": "compileProtos src ",
"docs": "jsdoc -c .jsdoc.js",
"fix": "gts fix",
"lint": "gts check",
Expand All @@ -141,24 +145,22 @@
"test": "c8 mocha build/test"
},
"devDependencies": {
"@types/mocha": "^10.0.1",
"@types/node": "^18.11.18",
"@types/sinon": "^10.0.16",
"@types/mocha": "^10.0.6",
"@types/node": "^20.11.20",
"@types/sinon": "^10.0.20",
"c8": "^8.0.1",
"google-gax": "^4.0.4",
"gts": "5.0.1",
"google-gax": "^4.3.1",
"gts": "5.2.0",
"jsdoc": "^4.0.2",
"jsdoc-fresh": "^3.0.0",
"jsdoc-region-tag": "^3.0.0",
"mocha": "^10.2.0",
"pack-n-play": "^1.0.0-2",
"mocha": "^10.3.0",
"pack-n-play": "^2.0.3",
"sinon": "^15.2.0",
"typescript": "5.1.6"
"typescript": "5.1.6",
"gapic-tools": "https://gitpkg.now.sh/Opteo/gax-nodejs/tools?keep-case"
},
"engines": {
"node": ">=v14"
},
"dependencies": {
"gapic-tools": "https://gitpkg.now.sh/Opteo/gax-nodejs/tools?keep-case"
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9850223

Please sign in to comment.