Skip to content

Set google options config #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2018
Merged

Set google options config #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions provider/googleProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const os = require('os');
const _ = require('lodash');
const google = require('googleapis').google;

const packageJson = require('../package.json');

const constants = {
providerName: 'google',
};
Expand All @@ -21,7 +23,18 @@ class GoogleProvider {
this.provider = this; // only load plugin in a Google service context
this.serverless.setProvider(constants.providerName, this);

const serverlessVersion = this.serverless.version;
const pluginVersion = packageJson.version;
const googleApisVersion = packageJson.dependencies.googleapis;

google.options({
headers: {
'User-Agent': `Serverless/${serverlessVersion} Serverless-Google-Provider/${pluginVersion} Googleapis/${googleApisVersion}`,
},
});

this.sdk = {
google,
deploymentmanager: google.deploymentmanager('v2'),
storage: google.storage('v1'),
logging: google.logging('v2'),
Expand Down
8 changes: 8 additions & 0 deletions provider/googleProvider.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ describe('GoogleProvider', () => {

beforeEach(() => {
serverless = new Serverless();
serverless.version = '1.0.0';
serverless.service = {
provider: {
project: 'example-project',
Expand Down Expand Up @@ -58,6 +59,8 @@ describe('GoogleProvider', () => {
});

it('should set the used SDKs', () => {
expect(googleProvider.sdk.google).toBeDefined();

expect(googleProvider.sdk.deploymentmanager)
.toBeDefined();

Expand All @@ -70,6 +73,11 @@ describe('GoogleProvider', () => {
expect(googleProvider.sdk.cloudfunctions)
.toBeDefined();
});

it('should set the google options', () => {
expect(google._options.headers['User-Agent']) // eslint-disable-line no-underscore-dangle
.toMatch(/Serverless\/.+ Serverless-Google-Provider\/.+ Googleapis\/.+/);
});
});

describe('#request()', () => {
Expand Down