Address review comments

equinix · Sep 6, 2023 · 91c17ab · 91c17ab
1 parent 2ee3f62
commit 91c17ab
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/examples/fabric/v4/cloudRouterConnectivity/cloudRouter2port/main.tf b/examples/fabric/v4/cloudRouterConnectivity/cloudRouter2port/main.tf
@@ -43,6 +43,6 @@ resource "equinix_fabric_connection" "fcr2port"{
   }
 }
 
-output "fcr2port_result" {
+output "connection_result" {
   value = equinix_fabric_connection.fcr2port.id
 }
diff --git a/tests/connection_e2e_fcr2aws_test.go b/tests/connection_e2e_fcr2aws_test.go
@@ -10,12 +10,12 @@ import (
 func TestCloudRouter2AwsCreateConnection(t *testing.T) {
 	// retryable errors in terraform testing.
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
-		TerraformDir: "../examples/fabric-cloud-router/fg2aws",
+		TerraformDir: "../examples/fabric/v4/cloudRouterConnectivity/cloudRouter2aws",
 	})
 
 	defer terraform.Destroy(t, terraformOptions)
 
 	terraform.InitAndApply(t, terraformOptions)
-	output := terraform.Output(t, terraformOptions, "fg2aws_connection_result")
+	output := terraform.Output(t, terraformOptions, "connection_result")
 	assert.NotNil(t, output)
 }
diff --git a/tests/connection_e2e_fcr2gcp_test.go b/tests/connection_e2e_fcr2gcp_test.go
@@ -10,12 +10,12 @@ import (
 func TestCloudRouter2GcpCreateConnection(t *testing.T) {
 	// retryable errors in terraform testing.
 	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
-		TerraformDir: "../examples/fabric-cloud-router/fcr2gcp",
+		TerraformDir: "../examples/fabric/v4/cloudRouterConnectivity/cloudRouter2gcp",
 	})
 
 	defer terraform.Destroy(t, terraformOptions)
 
 	terraform.InitAndApply(t, terraformOptions)
-	output := terraform.Output(t, terraformOptions, "fcr2gcp_connection_result")
+	output := terraform.Output(t, terraformOptions, "connection_result")
 	assert.NotNil(t, output)
 }
diff --git a/tests/connection_e2e_fcr2port_test.go b/tests/connection_e2e_fcr2port_test.go
@@ -16,6 +16,6 @@ func TestCloudRouter2PortCreateConnection(t *testing.T) {
 	defer terraform.Destroy(t, terraformOptions)
 
 	terraform.InitAndApply(t, terraformOptions)
-	output := terraform.Output(t, terraformOptions, "fcr2port_connection_result")
+	output := terraform.Output(t, terraformOptions, "connection_result")
 	assert.NotNil(t, output)
 }
diff --git a/tests/connection_e2e_fcr_test.go b/tests/connection_e2e_fcr_test.go
@@ -9,22 +9,14 @@ import (
 
 func TestCloudRouterCreate(t *testing.T) {
 	// retryable errors in terraform testing.
-	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
-		TerraformDir: "../examples/fabric/v4/cloudRouter",
-	})
-
-	terraform.InitAndApply(t, terraformOptions)
-	output := terraform.Output(t, terraformOptions, "fcr_result")
-	assert.NotNil(t, output)
 
-	terraformOptions = terraform.WithDefaultRetryableErrors(t, &terraform.Options{
+	terraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
 		TerraformDir: "../examples/fabric/v4/cloudRouter",
 	})
 
 	defer terraform.Destroy(t, terraformOptions)
 
 	terraform.InitAndApply(t, terraformOptions)
-	output = terraform.Output(t, terraformOptions, "fcr_result")
-
+	output := terraform.Output(t, terraformOptions, "fcr_result")
 	assert.NotNil(t, output)
 }