Skip to content

Commit bb34b79

Browse files
nr-ahemsathnr-ahemsath
committed
Unique resource names across regions to avoid security group collisions
1 parent 0d2834c commit bb34b79

4 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎test/definitions-eu/apm/dotNet/linux/ubuntu24-apache-aspnetcore.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88

99
"resources": [{
10-
"id": "ubuntu24",
10+
"id": "ubuntu24-eu",
1111
"provider": "aws",
1212
"type": "ec2",
1313
"size": "t3.micro",
@@ -17,21 +17,21 @@
1717

1818
"services": [{
1919
"id": "aspnetcore",
20-
"destinations": ["ubuntu24"],
20+
"destinations": ["ubuntu24-eu"],
2121
"source_repository": "https://github.com/newrelic/open-install-library.git",
2222
"deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu24/roles",
2323
"port": 9999
2424
},
2525
{
2626
"id": "apache1",
27-
"destinations": ["ubuntu24"],
27+
"destinations": ["ubuntu24-eu"],
2828
"source_repository": "https://github.com/newrelic/open-install-library.git",
2929
"deploy_script_path": "test/deploy/linux/apache/install/debian/roles",
3030
"port": 80
3131
},
3232
{
3333
"id": "dotnet1",
34-
"destinations": ["ubuntu24"],
34+
"destinations": ["ubuntu24-eu"],
3535
"source_repository": "https://github.com/newrelic/open-install-library.git",
3636
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
3737
"port": 8080,
@@ -43,7 +43,7 @@
4343
},
4444
{
4545
"id": "dotnet2",
46-
"destinations": ["ubuntu24"],
46+
"destinations": ["ubuntu24-eu"],
4747
"source_repository": "https://github.com/newrelic/open-install-library.git",
4848
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
4949
"port": 8081,
@@ -57,7 +57,7 @@
5757
"resources": [
5858
{
5959
"id": "cli1",
60-
"resource_ids": ["ubuntu24"],
60+
"resource_ids": ["ubuntu24-eu"],
6161
"provider": "newrelic",
6262
"source_repository": "https://github.com/newrelic/open-install-library.git",
6363
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",

‎test/definitions-jp/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717

1818
"services": [{
1919
"id": "aspnetcore",
20-
"destinations": ["ubuntu20"],
20+
"destinations": ["ubuntu20-jp"],
2121
"source_repository": "https://github.com/newrelic/open-install-library.git",
2222
"deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu20/roles",
2323
"port": 9999
2424
},
2525
{
2626
"id": "apache1",
27-
"destinations": ["ubuntu20"],
27+
"destinations": ["ubuntu20-jp"],
2828
"source_repository": "https://github.com/newrelic/open-install-library.git",
2929
"deploy_script_path": "test/deploy/linux/apache/install/debian/roles",
3030
"port": 80
3131
},
3232
{
3333
"id": "dotnet1",
34-
"destinations": ["ubuntu20"],
34+
"destinations": ["ubuntu20-jp"],
3535
"source_repository": "https://github.com/newrelic/open-install-library.git",
3636
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
3737
"port": 8080,
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"id": "dotnet2",
44-
"destinations": ["ubuntu20"],
44+
"destinations": ["ubuntu20-jp"],
4545
"source_repository": "https://github.com/newrelic/open-install-library.git",
4646
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
4747
"port": 8081
@@ -51,7 +51,7 @@
5151
"resources": [
5252
{
5353
"id": "cli1",
54-
"resource_ids": ["ubuntu20"],
54+
"resource_ids": ["ubuntu20-jp"],
5555
"provider": "newrelic",
5656
"source_repository": "https://github.com/newrelic/open-install-library.git",
5757
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",

‎test/definitions-jp/apm/dotNet/linux/ubuntu24-apache-aspnetcore.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88

99
"resources": [{
10-
"id": "ubuntu24",
10+
"id": "ubuntu24-jp",
1111
"provider": "aws",
1212
"type": "ec2",
1313
"size": "t3.micro",
@@ -17,21 +17,21 @@
1717

1818
"services": [{
1919
"id": "aspnetcore",
20-
"destinations": ["ubuntu24"],
20+
"destinations": ["ubuntu24-jp"],
2121
"source_repository": "https://github.com/newrelic/open-install-library.git",
2222
"deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu24/roles",
2323
"port": 9999
2424
},
2525
{
2626
"id": "apache1",
27-
"destinations": ["ubuntu24"],
27+
"destinations": ["ubuntu24-jp"],
2828
"source_repository": "https://github.com/newrelic/open-install-library.git",
2929
"deploy_script_path": "test/deploy/linux/apache/install/debian/roles",
3030
"port": 80
3131
},
3232
{
3333
"id": "dotnet1",
34-
"destinations": ["ubuntu24"],
34+
"destinations": ["ubuntu24-jp"],
3535
"source_repository": "https://github.com/newrelic/open-install-library.git",
3636
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
3737
"port": 8080,
@@ -43,7 +43,7 @@
4343
},
4444
{
4545
"id": "dotnet2",
46-
"destinations": ["ubuntu24"],
46+
"destinations": ["ubuntu24-jp"],
4747
"source_repository": "https://github.com/newrelic/open-install-library.git",
4848
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
4949
"port": 8081,
@@ -57,7 +57,7 @@
5757
"resources": [
5858
{
5959
"id": "cli1",
60-
"resource_ids": ["ubuntu24"],
60+
"resource_ids": ["ubuntu24-jp"],
6161
"provider": "newrelic",
6262
"source_repository": "https://github.com/newrelic/open-install-library.git",
6363
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",

‎test/definitions/apm/dotNet/linux/ubuntu24-apache-aspnetcore.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88

99
"resources": [{
10-
"id": "ubuntu24",
10+
"id": "ubuntu24-us",
1111
"provider": "aws",
1212
"type": "ec2",
1313
"size": "t3.micro",
@@ -17,21 +17,21 @@
1717

1818
"services": [{
1919
"id": "aspnetcore",
20-
"destinations": ["ubuntu24"],
20+
"destinations": ["ubuntu24-us"],
2121
"source_repository": "https://github.com/newrelic/open-install-library.git",
2222
"deploy_script_path": "test/deploy/linux/dotNet/install/ubuntu24/roles",
2323
"port": 9999
2424
},
2525
{
2626
"id": "apache1",
27-
"destinations": ["ubuntu24"],
27+
"destinations": ["ubuntu24-us"],
2828
"source_repository": "https://github.com/newrelic/open-install-library.git",
2929
"deploy_script_path": "test/deploy/linux/apache/install/debian/roles",
3030
"port": 80
3131
},
3232
{
3333
"id": "dotnet1",
34-
"destinations": ["ubuntu24"],
34+
"destinations": ["ubuntu24-us"],
3535
"source_repository": "https://github.com/newrelic/open-install-library.git",
3636
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
3737
"port": 8080,
@@ -43,7 +43,7 @@
4343
},
4444
{
4545
"id": "dotnet2",
46-
"destinations": ["ubuntu24"],
46+
"destinations": ["ubuntu24-us"],
4747
"source_repository": "https://github.com/newrelic/open-install-library.git",
4848
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/debian/roles",
4949
"port": 8081,
@@ -57,7 +57,7 @@
5757
"resources": [
5858
{
5959
"id": "cli1",
60-
"resource_ids": ["ubuntu24"],
60+
"resource_ids": ["ubuntu24-us"],
6161
"provider": "newrelic",
6262
"source_repository": "https://github.com/newrelic/open-install-library.git",
6363
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",

0 commit comments

Comments
 (0)