Skip to content

Commit da03217

Browse files
stephenplusplusstephenplusplus
committed
Revert "updated FQDN's to googleapis.com with a trailing dot (googleapis#2214)"
This reverts commit 13d4ed5.
1 parent 8af56e9 commit da03217

File tree

45 files changed

+61
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+61
-64
lines changed

‎packages/bigquery/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function BigQuery(options) {
6666
}
6767

6868
var config = {
69-
baseUrl: 'https://www.googleapis.com./bigquery/v2',
69+
baseUrl: 'https://www.googleapis.com/bigquery/v2',
7070
scopes: ['https://www.googleapis.com/auth/bigquery'],
7171
packageJson: require('../package.json')
7272
};

‎packages/bigquery/src/table.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ Table.prototype.createWriteStream = function(metadata) {
648648
},
649649
request: {
650650
uri: format('{base}/{projectId}/jobs', {
651-
base: 'https://www.googleapis.com./upload/bigquery/v2/projects',
651+
base: 'https://www.googleapis.com/upload/bigquery/v2/projects',
652652
projectId: self.bigQuery.projectId
653653
})
654654
}

‎packages/bigquery/test/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ describe('BigQuery', function() {
144144

145145
var calledWith = bq.calledWith_[0];
146146

147-
var baseUrl = 'https://www.googleapis.com./bigquery/v2';
147+
var baseUrl = 'https://www.googleapis.com/bigquery/v2';
148148
assert.strictEqual(calledWith.baseUrl, baseUrl);
149149
assert.deepEqual(calledWith.scopes, [
150150
'https://www.googleapis.com/auth/bigquery'

‎packages/bigquery/test/table.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ describe('BigQuery/Table', function() {
809809

810810
it('should pass the correct request uri', function(done) {
811811
makeWritableStreamOverride = function(stream, options) {
812-
var uri = 'https://www.googleapis.com./upload/bigquery/v2/projects/' +
812+
var uri = 'https://www.googleapis.com/upload/bigquery/v2/projects/' +
813813
table.bigQuery.projectId + '/jobs';
814814
assert.equal(options.request.uri, uri);
815815
done();

‎packages/bigtable/src/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ function Bigtable(options) {
309309
return new Bigtable(options);
310310
}
311311

312-
var baseUrl = 'bigtable.googleapis.com.';
313-
var adminBaseUrl = 'bigtableadmin.googleapis.com.';
312+
var baseUrl = 'bigtable.googleapis.com';
313+
var adminBaseUrl = 'bigtableadmin.googleapis.com';
314314

315315
var customEndpoint = options.apiEndpoint ||
316316
process.env.BIGTABLE_EMULATOR_HOST;

‎packages/bigtable/test/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -136,28 +136,28 @@ describe('Bigtable', function() {
136136

137137
var calledWith = bigtable.calledWith_[0];
138138

139-
assert.strictEqual(calledWith.baseUrl, 'bigtable.googleapis.com.');
139+
assert.strictEqual(calledWith.baseUrl, 'bigtable.googleapis.com');
140140
assert.strictEqual(calledWith.service, 'bigtable');
141141
assert.strictEqual(calledWith.apiVersion, 'v2');
142142
assert.strictEqual(calledWith.customEndpoint, false);
143143

144144
assert.deepEqual(calledWith.protoServices, {
145145
Bigtable: googleProtoFiles('bigtable/v2/bigtable.proto'),
146146
BigtableTableAdmin: {
147-
baseUrl: 'bigtableadmin.googleapis.com.',
147+
baseUrl: 'bigtableadmin.googleapis.com',
148148
path: googleProtoFiles(
149149
'bigtable/admin/v2/bigtable_table_admin.proto'),
150150
service: 'bigtable.admin'
151151
},
152152
BigtableInstanceAdmin: {
153-
baseUrl: 'bigtableadmin.googleapis.com.',
153+
baseUrl: 'bigtableadmin.googleapis.com',
154154
path: googleProtoFiles(
155155
'bigtable/admin/v2/bigtable_instance_admin.proto'
156156
),
157157
service: 'bigtable.admin'
158158
},
159159
Operations: {
160-
baseUrl: 'bigtableadmin.googleapis.com.',
160+
baseUrl: 'bigtableadmin.googleapis.com',
161161
path: googleProtoFiles('longrunning/operations.proto'),
162162
service: 'longrunning',
163163
apiVersion: 'v1'

‎packages/common-grpc/test/service.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ describe('GrpcService', function() {
390390
});
391391

392392
it('should store the baseUrl properly', function() {
393-
var fakeBaseUrl = 'a.googleapis.com.';
393+
var fakeBaseUrl = 'a.googleapis.com';
394394

395395
grpcLoadOverride = function() {
396396
return MOCK_GRPC_API;
@@ -1914,7 +1914,7 @@ describe('GrpcService', function() {
19141914
});
19151915

19161916
it('should use the baseUrl override if applicable', function() {
1917-
var fakeBaseUrl = 'a.googleapis.com.';
1917+
var fakeBaseUrl = 'a.googleapis.com';
19181918
var fakeService = {};
19191919

19201920
grpcService.protos = {

‎packages/compute/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function Compute(options) {
9595
}
9696

9797
var config = {
98-
baseUrl: 'https://www.googleapis.com./compute/v1',
98+
baseUrl: 'https://www.googleapis.com/compute/v1',
9999
scopes: ['https://www.googleapis.com/auth/compute'],
100100
packageJson: require('../package.json')
101101
};

‎packages/compute/src/service.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ Service.prototype.delete = function(callback) {
263263
Service.prototype.getHealth = function(group, callback) {
264264
if (!is.string(group)) {
265265
group = format('{baseUrl}/projects/{p}/zones/{z}/instanceGroups/{n}', {
266-
baseUrl: 'https://www.googleapis.com./compute/v1',
266+
baseUrl: 'https://www.googleapis.com/compute/v1',
267267
p: this.parent.projectId,
268268
z: group.zone.name || group.zone,
269269
n: group.name

‎packages/compute/src/vm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ function VM(zone, name) {
104104
this.waiters = [];
105105

106106
this.url = format('{base}/{project}/zones/{zone}/instances/{name}', {
107-
base: 'https://www.googleapis.com./compute/v1/projects',
107+
base: 'https://www.googleapis.com/compute/v1/projects',
108108
project: zone.compute.projectId,
109109
zone: zone.name,
110110
name: this.name

‎packages/compute/src/zone.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Zone.prototype.createAutoscaler = function(name, config, callback) {
257257

258258
if (!/^https*:/.test(json.target)) {
259259
json.target = [
260-
'https://content.googleapis.com./compute/v1/projects/',
260+
'https://content.googleapis.com/compute/v1/projects/',
261261
this.compute.projectId,
262262
'/zones/',
263263
this.name,
@@ -554,7 +554,7 @@ Zone.prototype.createInstanceGroup = function(name, options, callback) {
554554
* boot: true,
555555
* initializeParams: {
556556
* sourceImage:
557-
* 'https://www.googleapis.com./compute/v1/projects' +
557+
* 'https://www.googleapis.com/compute/v1/projects' +
558558
* '/debian-cloud/global/images/debian-7-wheezy-v20150710'
559559
* }
560560
* }

‎packages/compute/test/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ describe('Compute', function() {
205205

206206
var calledWith = compute.calledWith_[0];
207207

208-
var baseUrl = 'https://www.googleapis.com./compute/v1';
208+
var baseUrl = 'https://www.googleapis.com/compute/v1';
209209
assert.strictEqual(calledWith.baseUrl, baseUrl);
210210
assert.deepEqual(calledWith.scopes, [
211211
'https://www.googleapis.com/auth/compute'

‎packages/compute/test/service.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ describe('Service', function() {
205205
service.request = function(reqOpts) {
206206
assert.deepEqual(reqOpts.json, {
207207
group: [
208-
'https://www.googleapis.com./compute/v1/projects/',
208+
'https://www.googleapis.com/compute/v1/projects/',
209209
COMPUTE.projectId,
210210
'/zones/',
211211
group.zone,
@@ -232,7 +232,7 @@ describe('Service', function() {
232232
service.request = function(reqOpts) {
233233
assert.deepEqual(reqOpts.json, {
234234
group: [
235-
'https://www.googleapis.com./compute/v1/projects/',
235+
'https://www.googleapis.com/compute/v1/projects/',
236236
COMPUTE.projectId,
237237
'/zones/',
238238
group.zone.name,

‎packages/compute/test/vm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ describe('VM', function() {
110110

111111
it('should localize the URL of the VM', function() {
112112
assert.strictEqual(vm.url, [
113-
'https://www.googleapis.com./compute/v1/projects',
113+
'https://www.googleapis.com/compute/v1/projects',
114114
COMPUTE.projectId,
115115
'zones',
116116
ZONE.name,

‎packages/compute/test/zone.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ describe('Zone', function() {
286286

287287
zone.request = function(reqOpts) {
288288
var expectedTarget = [
289-
'https://content.googleapis.com./compute/v1/projects/',
289+
'https://content.googleapis.com/compute/v1/projects/',
290290
COMPUTE.projectId,
291291
'/zones/',
292292
zone.name,

‎packages/datastore/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ function Datastore(options) {
300300
return new Datastore(options);
301301
}
302302

303-
this.defaultBaseUrl_ = 'datastore.googleapis.com.';
303+
this.defaultBaseUrl_ = 'datastore.googleapis.com';
304304
this.determineBaseUrl_(options.apiEndpoint);
305305

306306
this.namespace = options.namespace;

‎packages/datastore/src/v1/datastore_client.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -500,4 +500,4 @@ function DatastoreClientBuilder(gaxGrpc) {
500500
}
501501
module.exports = DatastoreClientBuilder;
502502
module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
503-
module.exports.ALL_SCOPES = ALL_SCOPES;
503+
module.exports.ALL_SCOPES = ALL_SCOPES;

‎packages/datastore/test/index.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,7 @@ describe('Datastore', function() {
116116
});
117117

118118
it('should set the default base URL', function() {
119-
assert.strictEqual(
120-
datastore.defaultBaseUrl_,
121-
'datastore.googleapis.com.'
122-
);
119+
assert.strictEqual(datastore.defaultBaseUrl_, 'datastore.googleapis.com');
123120
});
124121

125122
it('should set default API connection details', function(done) {

‎packages/dns/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function DNS(options) {
5353
}
5454

5555
var config = {
56-
baseUrl: 'https://www.googleapis.com./dns/v1',
56+
baseUrl: 'https://www.googleapis.com/dns/v1',
5757
scopes: [
5858
'https://www.googleapis.com/auth/ndev.clouddns.readwrite',
5959
'https://www.googleapis.com/auth/cloud-platform'

‎packages/dns/test/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('DNS', function() {
125125

126126
var calledWith = dns.calledWith_[0];
127127

128-
var baseUrl = 'https://www.googleapis.com./dns/v1';
128+
var baseUrl = 'https://www.googleapis.com/dns/v1';
129129
assert.strictEqual(calledWith.baseUrl, baseUrl);
130130
assert.deepEqual(calledWith.scopes, [
131131
'https://www.googleapis.com/auth/ndev.clouddns.readwrite',

‎packages/error-reporting/src/google-apis/auth-client.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var isString = is.string;
2727
var SCOPES = ['https://www.googleapis.com/auth/cloud-platform'];
2828

2929
/* @const {String} Base Error Reporting API */
30-
var API = 'https://clouderrorreporting.googleapis.com./v1beta1/projects';
30+
var API = 'https://clouderrorreporting.googleapis.com/v1beta1/projects';
3131

3232
/**
3333
* The RequestHandler constructor initializes several properties on the
@@ -90,7 +90,7 @@ class RequestHandler extends common.Service {
9090
var pid = config.getProjectId();
9191
super({
9292
packageJson: pkg,
93-
baseUrl: 'https://clouderrorreporting.googleapis.com./v1beta1/',
93+
baseUrl: 'https://clouderrorreporting.googleapis.com/v1beta1/',
9494
scopes: SCOPES,
9595
projectId: pid !== null ? pid : undefined,
9696
projectIdRequired: true

‎packages/error-reporting/system-test/testAuthClient.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ describe('Request/Response lifecycle mocking', function() {
135135
beforeEach(function() {
136136
env.setProjectId().setKeyFilename().setProduction();
137137
fakeService = nock(
138-
'https://clouderrorreporting.googleapis.com./v1beta1/projects/' +
138+
'https://clouderrorreporting.googleapis.com/v1beta1/projects/' +
139139
process.env.GCLOUD_PROJECT
140140
).persist().post('/events:report');
141141
logger = createLogger({logLevel: 5});
@@ -429,4 +429,4 @@ describe('error-reporting', function() {
429429
}, TIMEOUT);
430430
});
431431
});
432-
});
432+
});

‎packages/language/src/v1/language_service_client.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var configData = require('./language_service_client_config');
3131
var extend = require('extend');
3232
var gax = require('google-gax');
3333

34-
var SERVICE_ADDRESS = 'language.googleapis.com.';
34+
var SERVICE_ADDRESS = 'language.googleapis.com';
3535

3636
var DEFAULT_SERVICE_PORT = 443;
3737

@@ -369,4 +369,4 @@ function LanguageServiceClientBuilder(gaxGrpc) {
369369
}
370370
module.exports = LanguageServiceClientBuilder;
371371
module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
372-
module.exports.ALL_SCOPES = ALL_SCOPES;
372+
module.exports.ALL_SCOPES = ALL_SCOPES;

‎packages/language/src/v1beta2/language_service_client.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var configData = require('./language_service_client_config');
3131
var extend = require('extend');
3232
var gax = require('google-gax');
3333

34-
var SERVICE_ADDRESS = 'language.googleapis.com.';
34+
var SERVICE_ADDRESS = 'language.googleapis.com';
3535

3636
var DEFAULT_SERVICE_PORT = 443;
3737

@@ -426,4 +426,4 @@ function LanguageServiceClientBuilder(gaxGrpc) {
426426
}
427427
module.exports = LanguageServiceClientBuilder;
428428
module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
429-
module.exports.ALL_SCOPES = ALL_SCOPES;
429+
module.exports.ALL_SCOPES = ALL_SCOPES;

‎packages/logging/src/log.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ Log.prototype.warning = function(entry, options, callback) {
545545
* //-
546546
* // You may also pass multiple log entries to write.
547547
* //-
548-
* var secondEntry = log.entry('gce_instance', {
548+
* var secondEntry = log.entry('compute.googleapis.com', {
549549
* user: 'my_username'
550550
* });
551551
*

‎packages/logging/src/v2/config_service_v2_client.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -602,4 +602,4 @@ function ConfigServiceV2ClientBuilder(gaxGrpc) {
602602
}
603603
module.exports = ConfigServiceV2ClientBuilder;
604604
module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
605-
module.exports.ALL_SCOPES = ALL_SCOPES;
605+
module.exports.ALL_SCOPES = ALL_SCOPES;

‎packages/logging/src/v2/logging_service_v2_client.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ LoggingServiceV2Client.prototype.getProjectId = function(callback) {
229229
*
230230
* `[LOG_ID]` must be URL-encoded. For example,
231231
* `"projects/my-project-id/logs/syslog"`,
232-
* `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com.%2Factivity"`.
232+
* `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
233233
* For more information about log names, see
234234
* {@link LogEntry}.
235235
* @param {Object=} options
@@ -287,7 +287,7 @@ LoggingServiceV2Client.prototype.deleteLog = function(request, options, callback
287287
*
288288
* `[LOG_ID]` must be URL-encoded. For example,
289289
* `"projects/my-project-id/logs/syslog"` or
290-
* `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com.%2Factivity"`.
290+
* `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
291291
* For more information about log names, see
292292
* {@link LogEntry}.
293293
* @param {Object=} request.resource
@@ -835,4 +835,4 @@ function LoggingServiceV2ClientBuilder(gaxGrpc) {
835835
}
836836
module.exports = LoggingServiceV2ClientBuilder;
837837
module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
838-
module.exports.ALL_SCOPES = ALL_SCOPES;
838+
module.exports.ALL_SCOPES = ALL_SCOPES;

‎packages/logging/src/v2/metrics_service_v2_client.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -555,4 +555,4 @@ function MetricsServiceV2ClientBuilder(gaxGrpc) {
555555
}
556556
module.exports = MetricsServiceV2ClientBuilder;
557557
module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
558-
module.exports.ALL_SCOPES = ALL_SCOPES;
558+
module.exports.ALL_SCOPES = ALL_SCOPES;

‎packages/prediction/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function Prediction(options) {
6363
}
6464

6565
var config = {
66-
baseUrl: 'https://www.googleapis.com./prediction/v1.6',
66+
baseUrl: 'https://www.googleapis.com/prediction/v1.6',
6767
scopes: [
6868
'https://www.googleapis.com/auth/prediction',
6969
'https://www.googleapis.com/auth/devstorage.read_only'

‎packages/prediction/test/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('Prediction', function() {
125125

126126
var calledWith = prediction.calledWith_[0];
127127

128-
var baseUrl = 'https://www.googleapis.com./prediction/v1.6';
128+
var baseUrl = 'https://www.googleapis.com/prediction/v1.6';
129129
assert.strictEqual(calledWith.baseUrl, baseUrl);
130130
assert.deepEqual(calledWith.scopes, [
131131
'https://www.googleapis.com/auth/prediction',

‎packages/pubsub/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function PubSub(options) {
7777
return new PubSub(options);
7878
}
7979

80-
this.defaultBaseUrl_ = 'pubsub.googleapis.com.';
80+
this.defaultBaseUrl_ = 'pubsub.googleapis.com';
8181
this.determineBaseUrl_();
8282

8383
var config = {

‎packages/pubsub/test/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ describe('PubSub', function() {
179179

180180
var calledWith = pubsub.calledWith_[0];
181181

182-
var baseUrl = 'pubsub.googleapis.com.';
182+
var baseUrl = 'pubsub.googleapis.com';
183183
assert.strictEqual(calledWith.baseUrl, baseUrl);
184184
assert.strictEqual(calledWith.service, 'pubsub');
185185
assert.strictEqual(calledWith.apiVersion, 'v1');
@@ -191,7 +191,7 @@ describe('PubSub', function() {
191191
});
192192

193193
it('should set the defaultBaseUrl_', function() {
194-
assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com.');
194+
assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com');
195195
});
196196

197197
it('should use the PUBSUB_EMULATOR_HOST env var', function() {

0 commit comments

Comments
 (0)