Merge pull request #1535 from terraform-providers/hotfix_tersi-1462

rashik-bhasin · web-flow · commit f4183e25869a · 2022-02-16T15:23:21.000-08:00
4.64.0 - hotfix
diff --git a/internal/service/core/core_virtual_circuit_resource.go b/internal/service/core/core_virtual_circuit_resource.go
@@ -826,7 +826,7 @@ func (s *CoreVirtualCircuitResourceCrud) mapToCrossConnectMapping(fieldKeyFormat
 
 	// Do not include default empty cross_connect_or_cross_connect_group_id in request payload unless it has changed
 	if crossConnectOrCrossConnectGroupId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "cross_connect_or_cross_connect_group_id")); ok &&
-		(crossConnectOrCrossConnectGroupId != "" && s.D.HasChange("cross_connect_or_cross_connect_group_id")) {
+		(crossConnectOrCrossConnectGroupId != "" || s.D.HasChange("cross_connect_or_cross_connect_group_id")) {
 		tmp := crossConnectOrCrossConnectGroupId.(string)
 		result.CrossConnectOrCrossConnectGroupId = &tmp
 	}
@@ -858,7 +858,7 @@ func (s *CoreVirtualCircuitResourceCrud) mapToCrossConnectMapping(fieldKeyFormat
 		}
 	}
 
-	if vlan, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "vlan")); ok && s.D.HasChange("vlan") {
+	if vlan, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "vlan")); ok || s.D.HasChange("vlan") {
 		tmp := vlan.(int)
 		// Do not include default 0 vlan in request payload unless it has changed
 		if tmp > 0 || s.D.HasChange("vlan") {

Original file line number	Diff line number	Diff line change
`@@ -826,7 +826,7 @@ func (s *CoreVirtualCircuitResourceCrud) mapToCrossConnectMapping(fieldKeyFormat`
`826`	`826`
`827`	`827`	`// Do not include default empty cross_connect_or_cross_connect_group_id in request payload unless it has changed`
`828`	`828`	`if crossConnectOrCrossConnectGroupId, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "cross_connect_or_cross_connect_group_id")); ok &&`
`829`		`- (crossConnectOrCrossConnectGroupId != "" && s.D.HasChange("cross_connect_or_cross_connect_group_id")) {`
	`829`	`+ (crossConnectOrCrossConnectGroupId != "" \|\| s.D.HasChange("cross_connect_or_cross_connect_group_id")) {`
`830`	`830`	`tmp := crossConnectOrCrossConnectGroupId.(string)`
`831`	`831`	`result.CrossConnectOrCrossConnectGroupId = &tmp`
`832`	`832`	`}`
`@@ -858,7 +858,7 @@ func (s *CoreVirtualCircuitResourceCrud) mapToCrossConnectMapping(fieldKeyFormat`
`858`	`858`	`}`
`859`	`859`	`}`
`860`	`860`
`861`		`- if vlan, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "vlan")); ok && s.D.HasChange("vlan") {`
	`861`	`+ if vlan, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "vlan")); ok \|\| s.D.HasChange("vlan") {`
`862`	`862`	`tmp := vlan.(int)`
`863`	`863`	`// Do not include default 0 vlan in request payload unless it has changed`
`864`	`864`	`if tmp > 0 \|\| s.D.HasChange("vlan") {`