aws_odb_cloud_vm_cluster: check only that values are null for validation

johnsonaj · johnsonaj · commit 36deb3e6ea89 · 2025-11-21T10:41:52.000-06:00
diff --git a/internal/service/odb/cloud_vm_cluster.go b/internal/service/odb/cloud_vm_cluster.go
@@ -880,17 +880,17 @@ type cloudVMCDbIormConfigResourceModel struct {
 }
 
 func (r cloudVmClusterResourceModel) isNetworkIdAndExadataInfraIdPresent() bool {
-	return !r.OdbNetworkId.IsNull() && !r.OdbNetworkId.IsUnknown() && !r.CloudExadataInfrastructureId.IsNull() && !r.CloudExadataInfrastructureId.IsUnknown()
+	return !r.OdbNetworkId.IsNull() && !r.CloudExadataInfrastructureId.IsNull()
 }
 
 func (r cloudVmClusterResourceModel) isNetworkARNAndExadataInfraARNPresent() bool {
-	return !r.OdbNetworkArn.IsNull() && !r.OdbNetworkArn.IsUnknown() && !r.CloudExadataInfrastructureArn.IsNull() && !r.CloudExadataInfrastructureArn.IsUnknown()
+	return !r.OdbNetworkArn.IsNull() && !r.CloudExadataInfrastructureArn.IsNull()
 }
 
 func (r cloudVmClusterResourceModel) isNetworkARNAndIdPresent() bool {
-	return (!r.OdbNetworkId.IsNull() && !r.OdbNetworkId.IsUnknown()) && (!r.OdbNetworkArn.IsNull() && !r.OdbNetworkArn.IsUnknown())
+	return !r.OdbNetworkId.IsNull() && !r.OdbNetworkArn.IsNull()
 }
 
 func (r cloudVmClusterResourceModel) isExadataInfraARNAndIdPresent() bool {
-	return (!r.CloudExadataInfrastructureId.IsNull() && !r.CloudExadataInfrastructureId.IsUnknown()) && (!r.CloudExadataInfrastructureArn.IsNull() && !r.CloudExadataInfrastructureArn.IsUnknown())
+	return !r.CloudExadataInfrastructureId.IsNull() && !r.CloudExadataInfrastructureArn.IsNull()
 }

Original file line number	Diff line number	Diff line change
`@@ -880,17 +880,17 @@ type cloudVMCDbIormConfigResourceModel struct {`
`880`	`880`	`}`
`881`	`881`
`882`	`882`	`func (r cloudVmClusterResourceModel) isNetworkIdAndExadataInfraIdPresent() bool {`
`883`		`- return !r.OdbNetworkId.IsNull() && !r.OdbNetworkId.IsUnknown() && !r.CloudExadataInfrastructureId.IsNull() && !r.CloudExadataInfrastructureId.IsUnknown()`
	`883`	`+ return !r.OdbNetworkId.IsNull() && !r.CloudExadataInfrastructureId.IsNull()`
`884`	`884`	`}`
`885`	`885`
`886`	`886`	`func (r cloudVmClusterResourceModel) isNetworkARNAndExadataInfraARNPresent() bool {`
`887`		`- return !r.OdbNetworkArn.IsNull() && !r.OdbNetworkArn.IsUnknown() && !r.CloudExadataInfrastructureArn.IsNull() && !r.CloudExadataInfrastructureArn.IsUnknown()`
	`887`	`+ return !r.OdbNetworkArn.IsNull() && !r.CloudExadataInfrastructureArn.IsNull()`
`888`	`888`	`}`
`889`	`889`
`890`	`890`	`func (r cloudVmClusterResourceModel) isNetworkARNAndIdPresent() bool {`
`891`		`- return (!r.OdbNetworkId.IsNull() && !r.OdbNetworkId.IsUnknown()) && (!r.OdbNetworkArn.IsNull() && !r.OdbNetworkArn.IsUnknown())`
	`891`	`+ return !r.OdbNetworkId.IsNull() && !r.OdbNetworkArn.IsNull()`
`892`	`892`	`}`
`893`	`893`
`894`	`894`	`func (r cloudVmClusterResourceModel) isExadataInfraARNAndIdPresent() bool {`
`895`		`- return (!r.CloudExadataInfrastructureId.IsNull() && !r.CloudExadataInfrastructureId.IsUnknown()) && (!r.CloudExadataInfrastructureArn.IsNull() && !r.CloudExadataInfrastructureArn.IsUnknown())`
	`895`	`+ return !r.CloudExadataInfrastructureId.IsNull() && !r.CloudExadataInfrastructureArn.IsNull()`
`896`	`896`	`}`