Skip to content

Commit 3dc6d87

Browse files
authored
Replace vcap.me with 127.0.0.1.nip.io (#5044)
1 parent 64f2e16 commit 3dc6d87

15 files changed

Lines changed: 66 additions & 66 deletions

config/cloud_controller.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ readiness_port:
1010
deployment_updater: -1
1111

1212
external_protocol: http
13-
external_domain: api2.vcap.me
13+
external_domain: api2.127.0.0.1.nip.io
1414
temporary_disable_deployments: false
1515
deployment_updater:
1616
update_frequency_in_seconds: 30
@@ -19,7 +19,7 @@ deployment_updater:
1919
internal_service_hostname: api.internal.cf
2020

2121
system_domain_organization: the-system_domain-org-name
22-
system_domain: vcap.me
22+
system_domain: 127.0.0.1.nip.io
2323
app_domains:
2424
- customer-app-domain1.com
2525
- name: customer-app-domain2.com

docs/v2/domains_(deprecated)/list_all_domains_(deprecated).html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ <h4>Body</h4>
373373
"updated_at": "2016-06-08T16:41:26Z"
374374
},
375375
"entity": {
376-
"name": "vcap.me",
376+
"name": "127.0.0.1.nip.io",
377377
"owning_organization_guid": "a7aff246-5f5b-4cf8-87d8-f316053e4a20",
378378
"owning_organization_url": "/v2/organizations/a7aff246-5f5b-4cf8-87d8-f316053e4a20",
379379
"spaces_url": "/v2/domains/ef91529f-7659-424c-96ac-68c55decb7bf/spaces"

docs/v2/info/get_info.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h4>Body</h4>
108108
"app_ssh_host_key_fingerprint": "47:0d:d1:c8:c3:3d:0a:36:d1:49:2f:f2:90:27:31:d0",
109109
"app_ssh_oauth_client": null,
110110
"routing_endpoint": "http://localhost:3000",
111-
"logging_endpoint": "ws://loggregator.vcap.me:80"
111+
"logging_endpoint": "ws://loggregator.127.0.0.1.nip.io:80"
112112
}</pre>
113113

114114
<h4>Headers</h4>

docs/v2/private_domains/list_all_private_domains.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ <h4>Body</h4>
253253
"updated_at": "2016-06-08T16:41:26Z"
254254
},
255255
"entity": {
256-
"name": "vcap.me",
256+
"name": "127.0.0.1.nip.io",
257257
"owning_organization_guid": "4cf3bc47-eccd-4662-9322-7833c3bdcded",
258258
"owning_organization_url": "/v2/organizations/4cf3bc47-eccd-4662-9322-7833c3bdcded",
259259
"shared_organizations_url": "/v2/private_domains/b2a35f0c-d5ad-4a59-bea7-461711d96b0d/shared_organizations"

docs/v2/private_domains/retrieve_a_particular_private_domain.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ <h4>Body</h4>
103103
"updated_at": "2016-06-08T16:41:26Z"
104104
},
105105
"entity": {
106-
"name": "vcap.me",
106+
"name": "127.0.0.1.nip.io",
107107
"owning_organization_guid": "4cf3bc47-eccd-4662-9322-7833c3bdcded",
108108
"owning_organization_url": "/v2/organizations/4cf3bc47-eccd-4662-9322-7833c3bdcded",
109109
"shared_organizations_url": "/v2/private_domains/b2a35f0c-d5ad-4a59-bea7-461711d96b0d/shared_organizations"

spec/fixtures/config/port_8181_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
local_route: 127.0.0.1
33
external_port: 8181
4-
external_domain: api2.vcap.me
4+
external_domain: api2.127.0.0.1.nip.io
55
tls_port: 8183
66
pid_filename: /tmp/cloud_controller.8181.pid
77
internal_service_hostname: cc.internal.cf

spec/request/domains_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@
717717
before do
718718
TestConfig.override(
719719
kubernetes: { host_url: nil },
720-
external_domain: 'api2.vcap.me',
720+
external_domain: 'api2.127.0.0.1.nip.io',
721721
external_protocol: 'https'
722722
)
723723
allow_any_instance_of(CloudController::DependencyLocator).to receive(:routing_api_client).and_return(routing_api_client)

spec/request/organizations_spec.rb

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ module VCAP::CloudController
5959
'name' => 'org1',
6060
'links' => {
6161
'self' => { 'href' => "#{link_prefix}/v3/organizations/#{created_org.guid}" },
62-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{created_org.guid}/domains" },
63-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{created_org.guid}/domains/default" },
64-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{created_org.quota_definition.guid}" }
62+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{created_org.guid}/domains" },
63+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{created_org.guid}/domains/default" },
64+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{created_org.quota_definition.guid}" }
6565
},
6666
'relationships' => { 'quota' => { 'data' => { 'guid' => created_org.quota_definition.guid } } },
6767
'metadata' => {
@@ -92,9 +92,9 @@ module VCAP::CloudController
9292
'name' => 'suspended-org',
9393
'links' => {
9494
'self' => { 'href' => "#{link_prefix}/v3/organizations/#{created_org.guid}" },
95-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{created_org.guid}/domains" },
96-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{created_org.guid}/domains/default" },
97-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{created_org.quota_definition.guid}" }
95+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{created_org.guid}/domains" },
96+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{created_org.guid}/domains/default" },
97+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{created_org.quota_definition.guid}" }
9898
},
9999
'metadata' => { 'labels' => {}, 'annotations' => {} },
100100
'relationships' => { 'quota' => { 'data' => { 'guid' => created_org.quota_definition.guid } } },
@@ -124,9 +124,9 @@ module VCAP::CloudController
124124
'name' => 'org1',
125125
'links' => {
126126
'self' => { 'href' => "#{link_prefix}/v3/organizations/#{created_org.guid}" },
127-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{created_org.guid}/domains" },
128-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{created_org.guid}/domains/default" },
129-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{created_org.quota_definition.guid}" }
127+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{created_org.guid}/domains" },
128+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{created_org.guid}/domains/default" },
129+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{created_org.quota_definition.guid}" }
130130
},
131131
'relationships' => { 'quota' => { 'data' => { 'guid' => created_org.quota_definition.guid } } },
132132
'metadata' => {
@@ -243,9 +243,9 @@ module VCAP::CloudController
243243
'self' => {
244244
'href' => "#{link_prefix}/v3/organizations/#{organization1.guid}"
245245
},
246-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}/domains" },
247-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}/domains/default" },
248-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{organization1.quota_definition.guid}" }
246+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}/domains" },
247+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}/domains/default" },
248+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{organization1.quota_definition.guid}" }
249249
},
250250
'metadata' => {
251251
'labels' => {},
@@ -263,9 +263,9 @@ module VCAP::CloudController
263263
'self' => {
264264
'href' => "#{link_prefix}/v3/organizations/#{organization2.guid}"
265265
},
266-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization2.guid}/domains" },
267-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization2.guid}/domains/default" },
268-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{organization2.quota_definition.guid}" }
266+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization2.guid}/domains" },
267+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization2.guid}/domains/default" },
268+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{organization2.quota_definition.guid}" }
269269
},
270270
'metadata' => {
271271
'labels' => {},
@@ -368,9 +368,9 @@ module VCAP::CloudController
368368
'self' => {
369369
'href' => "#{link_prefix}/v3/organizations/#{organization2.guid}"
370370
},
371-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization2.guid}/domains" },
372-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization2.guid}/domains/default" },
373-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{organization2.quota_definition.guid}" }
371+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization2.guid}/domains" },
372+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization2.guid}/domains/default" },
373+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{organization2.quota_definition.guid}" }
374374
},
375375
'metadata' => {
376376
'labels' => {},
@@ -388,9 +388,9 @@ module VCAP::CloudController
388388
'self' => {
389389
'href' => "#{link_prefix}/v3/organizations/#{organization3.guid}"
390390
},
391-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization3.guid}/domains" },
392-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization3.guid}/domains/default" },
393-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{organization3.quota_definition.guid}" }
391+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization3.guid}/domains" },
392+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization3.guid}/domains/default" },
393+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{organization3.quota_definition.guid}" }
394394
},
395395
'metadata' => {
396396
'labels' => {},
@@ -1172,10 +1172,10 @@ module VCAP::CloudController
11721172
'guid' => organization1.guid,
11731173
'relationships' => { 'quota' => { 'data' => { 'guid' => organization1.quota_definition.guid } } },
11741174
'links' => {
1175-
'self' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}" },
1176-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}/domains" },
1177-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}/domains/default" },
1178-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{organization1.quota_definition.guid}" }
1175+
'self' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}" },
1176+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}/domains" },
1177+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}/domains/default" },
1178+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{organization1.quota_definition.guid}" }
11791179
},
11801180
'created_at' => iso8601,
11811181
'updated_at' => iso8601,
@@ -1225,10 +1225,10 @@ module VCAP::CloudController
12251225
'guid' => organization1.guid,
12261226
'relationships' => { 'quota' => { 'data' => { 'guid' => organization1.quota_definition.guid } } },
12271227
'links' => {
1228-
'self' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}" },
1229-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}/domains" },
1230-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}/domains/default" },
1231-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{organization1.quota_definition.guid}" }
1228+
'self' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}" },
1229+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}/domains" },
1230+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}/domains/default" },
1231+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{organization1.quota_definition.guid}" }
12321232
},
12331233
'created_at' => iso8601,
12341234
'updated_at' => iso8601,
@@ -1267,10 +1267,10 @@ module VCAP::CloudController
12671267
'guid' => organization1.guid,
12681268
'relationships' => { 'quota' => { 'data' => { 'guid' => organization1.quota_definition.guid } } },
12691269
'links' => {
1270-
'self' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}" },
1271-
'domains' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}/domains" },
1272-
'default_domain' => { 'href' => "http://api2.vcap.me/v3/organizations/#{organization1.guid}/domains/default" },
1273-
'quota' => { 'href' => "http://api2.vcap.me/v3/organization_quotas/#{organization1.quota_definition.guid}" }
1270+
'self' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}" },
1271+
'domains' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}/domains" },
1272+
'default_domain' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organizations/#{organization1.guid}/domains/default" },
1273+
'quota' => { 'href' => "http://api2.127.0.0.1.nip.io/v3/organization_quotas/#{organization1.quota_definition.guid}" }
12741274
},
12751275
'created_at' => iso8601,
12761276
'updated_at' => iso8601,

spec/request/routes_spec.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,10 @@
313313
},
314314
options: {},
315315
links: {
316-
self: { href: "http://api2.vcap.me/v3/routes/#{route1_domain1.guid}" },
317-
space: { href: "http://api2.vcap.me/v3/spaces/#{space.guid}" },
316+
self: { href: "http://api2.127.0.0.1.nip.io/v3/routes/#{route1_domain1.guid}" },
317+
space: { href: "http://api2.127.0.0.1.nip.io/v3/spaces/#{space.guid}" },
318318
destinations: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/#{route1_domain1.guid}/destinations} },
319-
domain: { href: "http://api2.vcap.me/v3/domains/#{domain1.guid}" }
319+
domain: { href: "http://api2.127.0.0.1.nip.io/v3/domains/#{domain1.guid}" }
320320
}
321321
}
322322
end
@@ -425,10 +425,10 @@
425425
},
426426
options: {},
427427
links: {
428-
self: { href: 'http://api2.vcap.me/v3/routes/route-without-host' },
429-
space: { href: "http://api2.vcap.me/v3/spaces/#{space.guid}" },
428+
self: { href: 'http://api2.127.0.0.1.nip.io/v3/routes/route-without-host' },
429+
space: { href: "http://api2.127.0.0.1.nip.io/v3/spaces/#{space.guid}" },
430430
destinations: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/route-without-host/destinations} },
431-
domain: { href: "http://api2.vcap.me/v3/domains/#{domain.guid}" }
431+
domain: { href: "http://api2.127.0.0.1.nip.io/v3/domains/#{domain.guid}" }
432432
}
433433
}
434434
end
@@ -461,10 +461,10 @@
461461
},
462462
options: {},
463463
links: {
464-
self: { href: 'http://api2.vcap.me/v3/routes/route-without-host2' },
465-
space: { href: "http://api2.vcap.me/v3/spaces/#{space.guid}" },
464+
self: { href: 'http://api2.127.0.0.1.nip.io/v3/routes/route-without-host2' },
465+
space: { href: "http://api2.127.0.0.1.nip.io/v3/spaces/#{space.guid}" },
466466
destinations: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/route-without-host2/destinations} },
467-
domain: { href: "http://api2.vcap.me/v3/domains/#{domain.guid}" }
467+
domain: { href: "http://api2.127.0.0.1.nip.io/v3/domains/#{domain.guid}" }
468468
}
469469
}
470470
end
@@ -500,10 +500,10 @@
500500
},
501501
options: {},
502502
links: {
503-
self: { href: 'http://api2.vcap.me/v3/routes/route-without-path' },
504-
space: { href: "http://api2.vcap.me/v3/spaces/#{space.guid}" },
503+
self: { href: 'http://api2.127.0.0.1.nip.io/v3/routes/route-without-path' },
504+
space: { href: "http://api2.127.0.0.1.nip.io/v3/spaces/#{space.guid}" },
505505
destinations: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/route-without-path/destinations} },
506-
domain: { href: "http://api2.vcap.me/v3/domains/#{domain.guid}" }
506+
domain: { href: "http://api2.127.0.0.1.nip.io/v3/domains/#{domain.guid}" }
507507
}
508508
}
509509
end
@@ -1601,7 +1601,7 @@
16011601
before do
16021602
TestConfig.override(
16031603
kubernetes: { host_url: nil },
1604-
external_domain: 'api2.vcap.me',
1604+
external_domain: 'api2.127.0.0.1.nip.io',
16051605
external_protocol: 'https'
16061606
)
16071607
allow_any_instance_of(CloudController::DependencyLocator).to receive(:routing_api_client).and_return(routing_api_client)

spec/unit/controllers/v3/apps_controller_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@
15751575
expect(job.delayed_job_guid).to eq(enqueued_job.guid)
15761576

15771577
expect(response).to have_http_status :accepted
1578-
expect(response['Location']).to eq("http://api2.vcap.me/v3/jobs/#{job.guid}")
1578+
expect(response['Location']).to eq("http://api2.127.0.0.1.nip.io/v3/jobs/#{job.guid}")
15791579

15801580
execute_all_jobs(expected_successes: 1, expected_failures: 0)
15811581
end

0 commit comments

Comments
 (0)