Merge pull request #885 from Juniper/866-remove-references-to-le420

add constraint and adjust checks
Juniper · Oct 1, 2024 · 34fc0b7 · 34fc0b7
2 parents 0cf8ec5 + be03cea
commit 34fc0b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/apstra/api_versions/versions.go b/apstra/api_versions/versions.go
@@ -13,6 +13,5 @@ const (
 	Apstra422  = "4.2.2"
 	Apstra500  = "5.0.0"
 
-	Le420       = "<=" + Apstra420
 	LtApstra500 = "<" + Apstra500
 )
diff --git a/apstra/compatibility/constraints.go b/apstra/compatibility/constraints.go
@@ -6,7 +6,8 @@ import (
 )
 
 var (
-	BpIbaDashboardOk = versionconstraints.New(apiversions.LtApstra500)
-	BpIbaProbeOk     = versionconstraints.New(apiversions.LtApstra500)
-	BpIbaWidgetOk    = versionconstraints.New(apiversions.LtApstra500)
+	BpIbaDashboardOk                   = versionconstraints.New(apiversions.LtApstra500)
+	BpIbaProbeOk                       = versionconstraints.New(apiversions.LtApstra500)
+	BpIbaWidgetOk                      = versionconstraints.New(apiversions.LtApstra500)
+	TemplateRequiresAntiAffinityPolicy = versionconstraints.New(apiversions.Apstra420)
 )
diff --git a/apstra/resource_template_collapsed.go b/apstra/resource_template_collapsed.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/Juniper/apstra-go-sdk/apstra"
-	apiversions "github.com/Juniper/terraform-provider-apstra/apstra/api_versions"
+	"github.com/Juniper/apstra-go-sdk/apstra/compatibility"
 	"github.com/Juniper/terraform-provider-apstra/apstra/design"
 	"github.com/Juniper/terraform-provider-apstra/apstra/utils"
 	"github.com/hashicorp/go-version"
@@ -57,7 +57,7 @@ func (o *resourceTemplateCollapsed) Create(ctx context.Context, req resource.Cre
 	}
 
 	// Apstra <= 4.2.0 requires an anti-affinity policy in the request
-	if version.MustConstraints(version.NewConstraint(apiversions.Le420)).Check(apiVer) {
+	if compatibility.TemplateRequestRequiresAntiAffinityPolicy.Check(apiVer) {
 		request.AntiAffinityPolicy = &apstra.AntiAffinityPolicy{
 			Algorithm: apstra.AlgorithmHeuristic,
 			Mode:      apstra.AntiAffinityModeDisabled,
@@ -136,7 +136,7 @@ func (o *resourceTemplateCollapsed) Update(ctx context.Context, req resource.Upd
 	}
 
 	// Apstra <= 4.2.0 requires an anti-affinity policy in the request
-	if version.MustConstraints(version.NewConstraint(apiversions.Le420)).Check(apiVer) {
+	if compatibility.TemplateRequestRequiresAntiAffinityPolicy.Check(apiVer) {
 		request.AntiAffinityPolicy = &apstra.AntiAffinityPolicy{
 			Algorithm: apstra.AlgorithmHeuristic,
 			Mode:      apstra.AntiAffinityModeDisabled,