Merge pull request #262 from hashicorp/bendbennett/handle-number-when…

…-nil

Only assign value of number to numeric if number is bool

CHANGELOG.md

@@ -1,4 +1,11 @@
-## 3.3.0 (Unreleased)
+## 3.3.1 (June 07, 2022)
+
+BUG FIXES:
+
+* resource/random_password: During schema upgrade, copy value of attribute `number` to attribute `numeric`, only if said value is a boolean (i.e. not `null`) ([262](https://github.com/hashicorp/terraform-provider-random/pull/262))
+* resource/random_string: During schema upgrade, copy value of attribute `number` to attribute `numeric`, only if said value is a boolean (i.e. not `null`) ([262](https://github.com/hashicorp/terraform-provider-random/pull/262))
+
+## 3.3.0 (June 06, 2022)
 
 ENHANCEMENTS:
 

internal/provider/string.go

@@ -329,13 +329,10 @@ func resourcePasswordStringStateUpgradeV1(_ context.Context, rawState map[string
 		return nil, errors.New("state upgrade failed, state is nil")
 	}
 
-	number, ok := rawState["number"].(bool)
-	if !ok {
-		return nil, fmt.Errorf("state upgrade failed, number is not a boolean: %T", rawState["number"])
+	if number, ok := rawState["number"].(bool); ok {
+		rawState["numeric"] = number
 	}
 
-	rawState["numeric"] = number
-
 	return rawState, nil
 }
 

internal/provider/string_test.go

@@ -21,9 +21,9 @@ func TestResourcePasswordStringStateUpgradeV1(t *testing.T) {
 			err:     errors.New("state upgrade failed, state is nil"),
 		},
 		{
-			name:    "number is not bool",
-			stateV1: map[string]interface{}{"number": 0},
-			err:     errors.New("state upgrade failed, number is not a boolean: int"),
+			name:            "number is not bool, raw state unaltered",
+			stateV1:         map[string]interface{}{"number": 0},
+			expectedStateV2: map[string]interface{}{"number": 0},
 		},
 		{
 			name:            "success",