Skip to content

Commit 4eda5c1

Browse files
authored
Merge pull request #1145 from terraform-providers/release_merge_v3.89.0
Candidate for release_v3.89.0
2 parents 931b55d + 9aa098d commit 4eda5c1

File tree

1 file changed

+0
-41
lines changed

1 file changed

+0
-41
lines changed

oci/core_instance_resource.go

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,10 +1062,6 @@ func (s *CoreInstanceResourceCrud) SetData() error {
10621062
}
10631063
}
10641064

1065-
err := s.setIsPvEncryptionInTransitEnabledForDataVolume()
1066-
if err != nil {
1067-
log.Printf("[WARN] is_pv_encryption_in_transit_enabled could not be set: %q", err)
1068-
}
10691065
return nil
10701066
}
10711067

@@ -1720,40 +1716,3 @@ func (s *CoreInstanceResourceCrud) updateOptionsViaWorkRequest() error {
17201716
}
17211717
return nil
17221718
}
1723-
1724-
func (s *CoreInstanceResourceCrud) setIsPvEncryptionInTransitEnabledForDataVolume() error {
1725-
request := oci_core.ListVolumeAttachmentsRequest{}
1726-
1727-
if availabilityDomain, ok := s.D.GetOkExists("availability_domain"); ok {
1728-
tmp := availabilityDomain.(string)
1729-
request.AvailabilityDomain = &tmp
1730-
}
1731-
1732-
if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
1733-
tmp := compartmentId.(string)
1734-
request.CompartmentId = &tmp
1735-
}
1736-
1737-
if instanceId, ok := s.D.GetOkExists("instance_id"); ok {
1738-
tmp := instanceId.(string)
1739-
request.InstanceId = &tmp
1740-
}
1741-
1742-
request.RequestMetadata.RetryPolicy = getRetryPolicy(true, "core")
1743-
1744-
response, err := s.Client.ListVolumeAttachments(context.Background(), request)
1745-
if err != nil {
1746-
return err
1747-
}
1748-
1749-
if len(response.Items) != 0 {
1750-
err := s.D.Set("is_pv_encryption_in_transit_enabled", response.Items[0].GetIsPvEncryptionInTransitEnabled())
1751-
if err != nil {
1752-
return err
1753-
}
1754-
} else {
1755-
return fmt.Errorf("[ERROR] Volume attachment not found")
1756-
}
1757-
1758-
return nil
1759-
}

0 commit comments

Comments
 (0)