[ignore] Update to SDKv2. Fix no value bool in mso_tenant_policies_dhcp_relay_policy

Author: samiib

mso/provider_test.go

@@ -245,7 +245,10 @@ func CustomTestCheckTypeSetElemAttrs(resourceName, setName string, attrsToCheck
 						match = false
 						break
 					}
-				} else {
+				} else if expectedVal != "" {
+					// SDKv2 omits zero-value Optional fields (empty string, false) from
+					// TypeSet element flat state. Treat an absent key as matching only
+					// when the expected value is also the zero value ("").
 					match = false
 					break
 				}
@@ -255,7 +258,7 @@ func CustomTestCheckTypeSetElemAttrs(resourceName, setName string, attrsToCheck
 				return nil
 			}
 		}
-		return fmt.Errorf("No element in set '%s' found with the following attributes: %v", setName, attrsToCheck)
+		return fmt.Errorf("No element in set '%s' found with the following attributes: %v\nResolved to: %v\nState attributes for resource: %v", setName, attrsToCheck, resolvedAttrs, rs.Primary.Attributes)
 	}
 }
 

mso/resource_mso_tenant_policies_dhcp_relay_policy.go

@@ -62,6 +62,7 @@ func resourceMSOTenantPoliciesDHCPRelayPolicy() *schema.Resource {
 						"dhcp_server_vrf_preference": {
 							Type:     schema.TypeBool,
 							Optional: true,
+							Computed: true,
 						},
 					},
 				},

mso/resource_mso_tenant_policies_dhcp_relay_policy_test.go

@@ -18,7 +18,7 @@ func TestAccMSOTenantPoliciesDHCPRelayPolicyResource(t *testing.T) {
 			{
 				PreConfig:   func() { fmt.Println("Test: Create DHCP Relay Policy without dhcp_relay_providers") },
 				Config:      testAccMSOTenantPoliciesDHCPRelayPolicyConfigCreateErrorWithoutProviders(name),
-				ExpectError: regexp.MustCompile(`config is invalid: "dhcp_relay_providers": required field is not set`),
+				ExpectError: regexp.MustCompile(`Insufficient dhcp_relay_providers blocks`),
 			},
 			{
 				PreConfig:                 func() { fmt.Println("Test: Create DHCP Relay Policy with invalid dhcp_relay_providers") },