add missing return; fix typo

Juniper · Jan 21, 2025 · e96cad6 · e96cad6
1 parent 61a2859
commit e96cad6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/apstra/blueprint/connectivity_templates/primitives/bgp_peering_generic_sytem.go b/apstra/blueprint/connectivity_templates/primitives/bgp_peering_generic_sytem.go
@@ -363,7 +363,7 @@ func (o bgpPeeringGenericSystemBatchIdPlanModifier) MarkdownDescription(ctx cont
 func (o bgpPeeringGenericSystemBatchIdPlanModifier) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) {
 	var plan, state BgpPeeringGenericSystem
 
-	// unpacking the parent object's planed value should always work
+	// unpacking the parent object's planned value should always work
 	resp.Diagnostics.Append(req.Plan.GetAttribute(ctx, req.Path.ParentPath(), &plan)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -390,6 +390,7 @@ func (o bgpPeeringGenericSystemBatchIdPlanModifier) PlanModifyString(ctx context
 	if planHasChildren == stateHasChildren {
 		// state and plan agree about whether a batch ID is required. Reuse the old value.
 		resp.PlanValue = req.StateValue
+		return
 	}
 
 	// We've either gained our first, or lost our last child primitive. Set the plan value accordingly.

diff --git a/apstra/blueprint/connectivity_templates/primitives/bgp_peering_ip_endpoint.go b/apstra/blueprint/connectivity_templates/primitives/bgp_peering_ip_endpoint.go
@@ -328,7 +328,7 @@ func (o bgpPeeringIpEndpointBatchIdPlanModifier) MarkdownDescription(ctx context
 func (o bgpPeeringIpEndpointBatchIdPlanModifier) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) {
 	var plan, state BgpPeeringIpEndpoint
 
-	// unpacking the parent object's planed value should always work
+	// unpacking the parent object's planned value should always work
 	resp.Diagnostics.Append(req.Plan.GetAttribute(ctx, req.Path.ParentPath(), &plan)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -355,6 +355,7 @@ func (o bgpPeeringIpEndpointBatchIdPlanModifier) PlanModifyString(ctx context.Co
 	if planHasChildren == stateHasChildren {
 		// state and plan agree about whether a batch ID is required. Reuse the old value.
 		resp.PlanValue = req.StateValue
+		return
 	}
 
 	// We've either gained our first, or lost our last child primitive. Set the plan value accordingly.

diff --git a/apstra/blueprint/connectivity_templates/primitives/dynamic_bgp_peering.go b/apstra/blueprint/connectivity_templates/primitives/dynamic_bgp_peering.go
@@ -339,7 +339,7 @@ func (o dynamicBgpPeeringBatchIdPlanModifier) MarkdownDescription(ctx context.Co
 func (o dynamicBgpPeeringBatchIdPlanModifier) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) {
 	var plan, state DynamicBgpPeering
 
-	// unpacking the parent object's planed value should always work
+	// unpacking the parent object's planned value should always work
 	resp.Diagnostics.Append(req.Plan.GetAttribute(ctx, req.Path.ParentPath(), &plan)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -366,6 +366,7 @@ func (o dynamicBgpPeeringBatchIdPlanModifier) PlanModifyString(ctx context.Conte
 	if planHasChildren == stateHasChildren {
 		// state and plan agree about whether a batch ID is required. Reuse the old value.
 		resp.PlanValue = req.StateValue
+		return
 	}
 
 	// We've either gained our first, or lost our last child primitive. Set the plan value accordingly.

diff --git a/apstra/blueprint/connectivity_templates/primitives/ip_link.go b/apstra/blueprint/connectivity_templates/primitives/ip_link.go
@@ -337,7 +337,7 @@ func (o ipLinkBatchIdPlanModifier) MarkdownDescription(ctx context.Context) stri
 func (o ipLinkBatchIdPlanModifier) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) {
 	var plan, state IpLink
 
-	// unpacking the parent object's planed value should always work
+	// unpacking the parent object's planned value should always work
 	resp.Diagnostics.Append(req.Plan.GetAttribute(ctx, req.Path.ParentPath(), &plan)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -370,6 +370,7 @@ func (o ipLinkBatchIdPlanModifier) PlanModifyString(ctx context.Context, req pla
 	if planHasChildren == stateHasChildren {
 		// state and plan agree about whether a batch ID is required. Reuse the old value.
 		resp.PlanValue = req.StateValue
+		return
 	}
 
 	// We've either gained our first, or lost our last child primitive. Set the plan value accordingly.

diff --git a/apstra/blueprint/connectivity_templates/primitives/virtual_network_single.go b/apstra/blueprint/connectivity_templates/primitives/virtual_network_single.go
@@ -213,7 +213,7 @@ func (o virtualNetworkSingleBatchIdPlanModifier) MarkdownDescription(ctx context
 func (o virtualNetworkSingleBatchIdPlanModifier) PlanModifyString(ctx context.Context, req planmodifier.StringRequest, resp *planmodifier.StringResponse) {
 	var plan, state VirtualNetworkSingle
 
-	// unpacking the parent object's planed value should always work
+	// unpacking the parent object's planned value should always work
 	resp.Diagnostics.Append(req.Plan.GetAttribute(ctx, req.Path.ParentPath(), &plan)...)
 	if resp.Diagnostics.HasError() {
 		return
@@ -242,6 +242,7 @@ func (o virtualNetworkSingleBatchIdPlanModifier) PlanModifyString(ctx context.Co
 	if planHasChildren == stateHasChildren {
 		// state and plan agree about whether a batch ID is required. Reuse the old value.
 		resp.PlanValue = req.StateValue
+		return
 	}
 
 	// We've either gained our first, or lost our last child primitive. Set the plan value accordingly.