Merge pull request #539 from jeremmfr/bugfix-2.1.2

Release v2.1.3
jeremmfr · Aug 30, 2023 · 9ba8ca4 · 9ba8ca4
2 parents 58bdc63 + 970870d
commit 9ba8ca4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 <!-- markdownlint-disable-file MD013 MD041 -->
 # changelog
 
+## v2.1.3 (August 30, 2023)
+
+BUG FIXES:
+
+* **resource/junos_forwardingoptions_sampling_instance**: avoid resources replacement when upgrading the provider before `v2.0.0` and without refreshing resource states (`-refresh=false`) (Fix [#536](https://github.com/jeremmfr/terraform-provider-junos/issues/536))
+
 ## v2.1.2 (August 28, 2023)
 
 BUG FIXES:

diff --git a/internal/providerfwk/upgradestate_forwardingoptions_sampling_instance.go b/internal/providerfwk/upgradestate_forwardingoptions_sampling_instance.go
@@ -3,6 +3,8 @@ package providerfwk
 import (
 	"context"
 
+	"github.com/jeremmfr/terraform-provider-junos/internal/junos"
+
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -176,6 +178,7 @@ func upgradeForwardingoptionsSamplingInstanceStateV0toV1(
 	var dataV1 forwardingoptionsSamplingInstanceData
 	dataV1.ID = dataV0.ID
 	dataV1.Name = dataV0.Name
+	dataV1.RoutingInstance = types.StringValue(junos.DefaultW)
 	dataV1.Disable = dataV0.Disable
 	if len(dataV0.FamilyInetInput) > 0 {
 		dataV1.FamilyInetInput = &dataV0.FamilyInetInput[0]