add local function atleast50 and fix build_error_count to use it

Juniper · Oct 1, 2024 · daf32dc · daf32dc
1 parent 10afc25
commit daf32dc
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 31 deletions.
diff --git a/apstra/data_source_blueprint_iba_dashboard_test.go b/apstra/data_source_blueprint_iba_dashboard_test.go
@@ -1,4 +1,4 @@
-package tfapstra
+package tfapstra_test
 
 import (
 	"context"

diff --git a/apstra/data_source_datacenter_blueprint_test.go b/apstra/data_source_datacenter_blueprint_test.go
@@ -4,7 +4,9 @@ package tfapstra_test
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/Juniper/apstra-go-sdk/apstra"
@@ -29,6 +31,19 @@ func TestDatasourceDatacenterBlueprint(t *testing.T) {
 	client := testutils.GetTestClient(t, ctx)
 	apiVersion := version.Must(version.NewVersion(client.ApiVersion()))
 
+	atleast50 := func(s string) error {
+		i, err := strconv.Atoi(s)
+		if err != nil {
+			return err
+		}
+
+		if i < 50 {
+			return errors.New("expected value >= 50, got " + s)
+		}
+
+		return nil
+	}
+
 	type testCase struct {
 		label                string
 		apiVersionConstrants version.Constraints
@@ -81,7 +96,7 @@ func TestDatasourceDatacenterBlueprint(t *testing.T) {
 				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "external_router_count", "0"),
 				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 				resource.TestCheckResourceAttrWith("data.apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "build_errors_count", "52"),
+				resource.TestCheckResourceAttrWith("data.apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -149,7 +164,7 @@ func TestDatasourceDatacenterBlueprint(t *testing.T) {
 				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "external_router_count", "0"),
 				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 				resource.TestCheckResourceAttrWith("data.apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "build_errors_count", "58"),
+				resource.TestCheckResourceAttrWith("data.apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 				resource.TestCheckResourceAttr("data.apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),

diff --git a/apstra/data_source_datacenter_configlet_test.go b/apstra/data_source_datacenter_configlet_test.go
@@ -1,4 +1,4 @@
-package tfapstra
+package tfapstra_test
 
 import (
 	"context"
@@ -11,21 +11,22 @@ import (
 
 const (
 	dataSourceDatacenterConfigletTemplateByNameHCL = `
-	data "apstra_datacenter_configlet" "test" {
-    	blueprint_id = "%s"
-		name = "%s"
-	}
-	`
+data "apstra_datacenter_configlet" "test" {
+  blueprint_id = "%s"
+  name = "%s"
+}
+`
 
 	dataSourceDatacenterConfigletTemplateByIdHCL = `
-	data "apstra_datacenter_configlet" "test" {
-  		blueprint_id = "%s"
-		id = "%s"
-	}
-	`
+data "apstra_datacenter_configlet" "test" {
+  blueprint_id = "%s"
+  id = "%s"
+}
+`
 )
 
 func TestAccDataSourceDatacenterConfiglet(t *testing.T) {
+	condition := "role in [\"spine\"]"
 	ctx := context.Background()
 
 	client := testutils.GetTestClient(t, ctx)

diff --git a/apstra/resource_datacenter_blueprint_test.go b/apstra/resource_datacenter_blueprint_test.go
@@ -144,6 +144,19 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 		)
 	}
 
+	atleast50 := func(s string) error {
+		i, err := strconv.Atoi(s)
+		if err != nil {
+			return err
+		}
+
+		if i < 50 {
+			return errors.New("expected value >= 50, got " + s)
+		}
+
+		return nil
+	}
+
 	type testCase struct {
 		apiVersionConstraints version.Constraints
 		testCase              resource.TestCase
@@ -173,7 +186,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "52"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeDisabled.String()),
@@ -356,7 +369,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "52"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -400,7 +413,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "52"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -518,7 +531,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "52"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeDisabled.String()),
@@ -702,7 +715,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "58"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -863,7 +876,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "52"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeDisabled.String()),
@@ -929,7 +942,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "53"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -973,7 +986,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "53"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -1046,7 +1059,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "53"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -1090,7 +1103,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "53"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -1156,7 +1169,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "52"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -1208,7 +1221,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "52"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeDisabled.String()),
@@ -1274,7 +1287,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "53"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -1318,7 +1331,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "53"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -1392,7 +1405,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "53"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -1436,7 +1449,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "53"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),
@@ -1502,7 +1515,7 @@ func TestResourceDatacenterBlueprint(t *testing.T) {
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "external_router_count", "0"),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "has_uncommitted_changes", "true"),
 							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "version", testCheckIntGE1),
-							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_errors_count", "53"),
+							resource.TestCheckResourceAttrWith("apstra_datacenter_blueprint.test", "build_errors_count", atleast50),
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "build_warnings_count", "0"),
 
 							resource.TestCheckResourceAttr("apstra_datacenter_blueprint.test", "anti_affinity_mode", apstra.AntiAffinityModeEnabledStrict.String()),