Skip to content

Commit 0219a22

Browse files
meatballhatmeatballhat
committed
Use separate vars for com/org AMQP
1 parent 2017517 commit 0219a22

File tree

18 files changed

+54
-32
lines changed

18 files changed

+54
-32
lines changed

‎aws-production-2/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23

34
include $(shell git rev-parse --show-toplevel)/aws.mk

‎aws-production-2/main.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,21 @@ module "rabbitmq_worker_config_com" {
8181

8282
admin_password = "${var.rabbitmq_password_com}"
8383
admin_username = "${var.rabbitmq_username_com}"
84-
endpoint = "https://${trimspace(file("${path.module}/config/CLOUDAMQP_URL_HOST_COM"))}"
85-
scheme = "${trimspace(file("${path.module}/config/CLOUDAMQP_URL_SCHEME_COM"))}"
84+
endpoint = "https://${trimspace(file("${path.module}/config/CLOUDAMQP_GRAY_URL_HOST_COM"))}"
85+
scheme = "${trimspace(file("${path.module}/config/CLOUDAMQP_GRAY_URL_SCHEME_COM"))}"
8686
username = "travis-worker-ec2-${var.env}-${var.index}"
87-
vhost = "${replace(trimspace("${file("${path.module}/config/CLOUDAMQP_URL_PATH_COM")}"), "/^//", "")}"
87+
vhost = "${replace(trimspace("${file("${path.module}/config/CLOUDAMQP_GRAY_URL_PATH_COM")}"), "/^//", "")}"
8888
}
8989

9090
module "rabbitmq_worker_config_org" {
9191
source = "../modules/rabbitmq_user"
9292

9393
admin_password = "${var.rabbitmq_password_org}"
9494
admin_username = "${var.rabbitmq_username_org}"
95-
endpoint = "https://${trimspace(file("${path.module}/config/CLOUDAMQP_URL_HOST_ORG"))}"
96-
scheme = "${trimspace(file("${path.module}/config/CLOUDAMQP_URL_SCHEME_ORG"))}"
95+
endpoint = "https://${trimspace(file("${path.module}/config/CLOUDAMQP_GRAY_URL_HOST_ORG"))}"
96+
scheme = "${trimspace(file("${path.module}/config/CLOUDAMQP_GRAY_URL_SCHEME_ORG"))}"
9797
username = "travis-worker-ec2-${var.env}-${var.index}"
98-
vhost = "${replace(trimspace("${file("${path.module}/config/CLOUDAMQP_URL_PATH_ORG")}"), "/^//", "")}"
98+
vhost = "${replace(trimspace("${file("${path.module}/config/CLOUDAMQP_GRAY_URL_PATH_ORG")}"), "/^//", "")}"
9999
}
100100

101101
data "template_file" "worker_config_com" {

‎aws-shared-2/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := production
34

45
include $(shell git rev-parse --show-toplevel)/aws.mk

‎bin/write-config-files

+14-9
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ def main(argv: ARGV)
6969
fwrite(
7070
'config/worker-com-local.env',
7171
<<~EOF
72-
export TRAVIS_WORKER_AMQP_URI=#{env[opts[:amqp_url_varname]]}
72+
export TRAVIS_WORKER_AMQP_URI=#{env[opts[:amqp_url_com_varname]]}
7373
export TRAVIS_WORKER_BUILD_API_URI=#{com_build_uri}
7474
export TRAVIS_WORKER_JOB_BOARD_URL=#{job_board_uri}
7575
EOF
7676
)
7777

7878
system(
79-
{ opts[:amqp_url_varname] => env[opts[:amqp_url_varname]] },
80-
"#{top}/bin/env-url-to-parts #{opts[:amqp_url_varname]} config/ com"
79+
{ opts[:amqp_url_com_varname] => env[opts[:amqp_url_com_varname]] },
80+
"#{top}/bin/env-url-to-parts #{opts[:amqp_url_com_varname]} config/ com"
8181
)
8282

8383
env = source_env('config/travis-build-org.env')
@@ -89,15 +89,15 @@ def main(argv: ARGV)
8989
fwrite(
9090
'config/worker-org-local.env',
9191
<<~EOF
92-
export TRAVIS_WORKER_AMQP_URI=#{env[opts[:amqp_url_varname]]}
92+
export TRAVIS_WORKER_AMQP_URI=#{env[opts[:amqp_url_org_varname]]}
9393
export TRAVIS_WORKER_BUILD_API_URI=#{org_build_uri}
9494
export TRAVIS_WORKER_JOB_BOARD_URL=#{job_board_uri}
9595
EOF
9696
)
9797

9898
system(
99-
{ opts[:amqp_url_varname] => env[opts[:amqp_url_varname]] },
100-
"#{top}/bin/env-url-to-parts #{opts[:amqp_url_varname]} config/ org"
99+
{ opts[:amqp_url_org_varname] => env[opts[:amqp_url_org_varname]] },
100+
"#{top}/bin/env-url-to-parts #{opts[:amqp_url_org_varname]} config/ org"
101101
)
102102

103103
fwrite('config/.written', Time.now.utc.iso8601 + "\n")
@@ -112,7 +112,8 @@ def parse_argv(argv)
112112
build_com_host: '',
113113
build_org_host: '',
114114
job_board_host: '',
115-
amqp_url_varname: '',
115+
amqp_url_com_varname: '',
116+
amqp_url_org_varname: '',
116117
write_bastion: false,
117118
write_nat: false
118119
}
@@ -142,8 +143,12 @@ def parse_argv(argv)
142143
opts[:job_board_host] = v.strip
143144
end
144145

145-
o.on('--amqp-url-varname=HOST') do |v|
146-
opts[:amqp_url_varname] = v.strip
146+
o.on('--amqp-url-com-varname=HOST') do |v|
147+
opts[:amqp_url_com_varname] = v.strip
148+
end
149+
150+
o.on('--amqp-url-org-varname=HOST') do |v|
151+
opts[:amqp_url_org_varname] = v.strip
147152
end
148153

149154
o.on('--write-bastion') do

‎build-caching-production-1/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := production
34
INFRA := build-caching
45
TOP := $(shell git rev-parse --show-toplevel)

‎build-caching-production-2/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := production
34
INFRA := build-caching
45
TOP := $(shell git rev-parse --show-toplevel)

‎build-caching-production-3/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := production
34
INFRA := build-caching
45
TOP := $(shell git rev-parse --show-toplevel)

‎build-caching-staging-1/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := staging
34
INFRA := build-caching
45
TOP := $(shell git rev-parse --show-toplevel)

‎build-production-1/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := production
34
CA_PEMS := config/docker-ca-key.pem config/docker-ca.pem
45
TOP := $(shell git rev-parse --show-toplevel)

‎gce-production-1/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23

34
include $(shell git rev-parse --show-toplevel)/gce.mk

‎gce-production-2/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23

34
include $(shell git rev-parse --show-toplevel)/gce.mk

‎gce-production-3/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23

34
include $(shell git rev-parse --show-toplevel)/gce.mk
45

‎gce-production-net-1/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := production
34

45
include $(shell git rev-parse --show-toplevel)/gce.mk

‎gce-production-net-2/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := production
34

45
include $(shell git rev-parse --show-toplevel)/gce.mk

‎gce-production-net-3/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := production
34

45
include $(shell git rev-parse --show-toplevel)/gce.mk

‎gce-staging-1/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
TRAVIS_BUILD_COM_HOST := build-staging.travis-ci.com
22
TRAVIS_BUILD_ORG_HOST := build-staging.travis-ci.org
33
JOB_BOARD_HOST := job-board-staging.travis-ci.com
4-
AMQP_URL_VARNAME := CLOUDAMQP_URL
4+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
5+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
56

67
include $(shell git rev-parse --show-toplevel)/gce.mk

‎gce-staging-net-1/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
AMQP_URL_VARNAME := CLOUDAMQP_URL
1+
AMQP_URL_COM_VARNAME := CLOUDAMQP_URL
2+
AMQP_URL_ORG_VARNAME := CLOUDAMQP_GRAY_URL
23
ENV_SHORT := staging
34
JOB_BOARD_HOST := job-board-staging.travis-ci.com
45
TRAVIS_BUILD_COM_HOST := build-staging.travis-ci.com

‎terraform-common.mk

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ TFPLAN := $(PWD)/$(ENV_NAME).tfplan
1111
TRAVIS_BUILD_COM_HOST ?= build.travis-ci.com
1212
TRAVIS_BUILD_ORG_HOST ?= build.travis-ci.org
1313
JOB_BOARD_HOST ?= job-board.travis-ci.com
14-
AMQP_URL_VARNAME ?= AMQP_URL
14+
AMQP_URL_COM_VARNAME ?= AMQP_URL
15+
AMQP_URL_ORG_VARNAME ?= AMQP_URL
1516
TOP := $(shell git rev-parse --show-toplevel)
1617
NATBZ2 := $(TOP)/assets/nat.tar.bz2
1718

@@ -157,7 +158,8 @@ config/.written:
157158
--build-com-host "$(TRAVIS_BUILD_COM_HOST)" \
158159
--build-org-host "$(TRAVIS_BUILD_ORG_HOST)" \
159160
--job-board-host "$(JOB_BOARD_HOST)" \
160-
--amqp-url-varname "$(AMQP_URL_VARNAME)" $(WRITE_CONFIG_OPTS)
161+
--amqp-url-org-varname "$(AMQP_URL_ORG_VARNAME)" $(WRITE_CONFIG_OPTS) \
162+
--amqp-url-com-varname "$(AMQP_URL_COM_VARNAME)" $(WRITE_CONFIG_OPTS)
161163

162164
config/.gce-keys-written:
163165
cp -v $$TRAVIS_KEYCHAIN_DIR/travis-keychain/gce/*.json config/

0 commit comments

Comments
 (0)