Fix 409 conflict issuen in DNS resources

Author: Harshita Bajpai

oci/dns_record_resource.go

@@ -198,6 +198,11 @@ func (s *DnsRecordResourceCrud) Create() error {
 	}
 
 	s.Res = item
+
+	if waitErr := waitForCreatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
 	return nil
 }
 
@@ -287,6 +292,12 @@ func (s *DnsRecordResourceCrud) Update() error {
 	}
 
 	s.Res = item
+
+	// This update does not support work-request
+	if waitErr := waitForUpdatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
 	return nil
 }
 

oci/dns_rrset_resource.go

@@ -227,6 +227,10 @@ func (s *DnsRrsetResourceCrud) Create() error {
 	rrSet.Items = response.Items
 	s.Res = &rrSet
 
+	if waitErr := waitForCreatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
 	return nil
 }
 
@@ -349,6 +353,12 @@ func (s *DnsRrsetResourceCrud) Update() error {
 	rrSet := oci_dns.RrSet{}
 	rrSet.Items = response.Items
 	s.Res = &rrSet
+
+	// This update does not support work-request
+	if waitErr := waitForUpdatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
 	return nil
 }
 

oci/dns_steering_policy_resource.go

@@ -410,6 +410,11 @@ func (s *DnsSteeringPolicyResourceCrud) Create() error {
 	}
 
 	s.Res = &response.SteeringPolicy
+
+	if waitErr := waitForCreatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
 	return nil
 }
 
@@ -484,6 +489,12 @@ func (s *DnsSteeringPolicyResourceCrud) Update() error {
 	}
 
 	s.Res = &response.SteeringPolicy
+
+	// This update does not support work-request
+	if waitErr := waitForUpdatedState(s.D, s); waitErr != nil {
+		return waitErr
+	}
+
 	return nil
 }