Fix state backward compatibility for object storage resources

        * Update composite Id for Objects and PARs in Read if older state is encountered

Author: parrneet

CHANGELOG.md

@@ -3,6 +3,9 @@
 ### Added
 - Support for `compartment_id` filter in `email_senders` and `email_suppressions` data sources
 
+### Fixed
+- Backward compatibility for compositeId in Object Storage - Objects and PARs
+
 ## 3.21.0 (April 03, 2019)
 
 ### Added

examples/object_storage/object.tf

@@ -1,7 +1,7 @@
 // Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 
 /* This example demonstrates object store object management. It uses Terraforms built-in `file` function to upload a file.
- * 
+ *
  * WARNING: This should only be used with small files. The file helper does stringification so large files
  * may cause terraform to slow, become unresponsive or exceed allowed memory usage.
  */

oci/object_storage_object_resource.go

@@ -401,6 +401,20 @@ func (s *ObjectStorageObjectResourceCrud) createCopyObject() error {
 
 func readObjectStorageObject(d *schema.ResourceData, m interface{}) error {
 	sync := &ObjectStorageObjectResourceCrud{}
+	// For backward compatibility with CompositeId change
+	log.Printf("[DEBUG] readObjectStorageObject() Resource Id in state: %s", d.Id())
+	_, _, _, err := parseObjectCompositeId(d.Id())
+
+	if err != nil {
+		bucket, bOk := d.GetOkExists("bucket")
+		namespace, nOk := d.GetOkExists("namespace")
+		object, oOk := d.GetOkExists("object")
+
+		if bOk && nOk && oOk {
+			compositeId := getObjectCompositeId(bucket.(string), namespace.(string), object.(string))
+			d.SetId(compositeId)
+		}
+	}
 	sync.D = d
 	sync.Client = m.(*OracleClients).objectStorageClient
 
@@ -716,48 +730,53 @@ func (s *ObjectStorageObjectResourceCrud) Update() error {
 	}
 	request := oci_object_storage.RenameObjectRequest{}
 
-	bucketName, namespaceName, objectName, err := parseObjectCompositeId(s.D.Id())
-	if err == nil {
-		request.NamespaceName = &namespaceName
-		request.BucketName = &bucketName
-		request.SourceName = &objectName
-	} else {
-		log.Printf("[WARN] Update() unable to parse current ID: %s", s.D.Id())
-		return err
+	if bucket, ok := s.D.GetOkExists("bucket"); ok {
+		tmp := bucket.(string)
+		request.BucketName = &tmp
 	}
-
-	if object, ok := s.D.GetOkExists("object"); ok {
-		tmp := object.(string)
-		request.NewName = &tmp
+	if namespace, ok := s.D.GetOkExists("namespace"); ok {
+		tmp := namespace.(string)
+		request.NamespaceName = &tmp
 	}
+	oldRaw, newRaw := s.D.GetChange("object")
+	sourceName := oldRaw.(string)
+	request.SourceName = &sourceName
+
+	newName := newRaw.(string)
+	request.NewName = &newName
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "object_storage")
-	_, err = s.Client.RenameObject(context.Background(), request)
+	_, err := s.Client.RenameObject(context.Background(), request)
 	if err != nil {
 		return err
 	}
 
-	updatedId := getObjectCompositeId(bucketName, namespaceName, *request.NewName)
+	updatedId := getObjectCompositeId(*request.BucketName, *request.NamespaceName, *request.NewName)
 	s.D.SetId(updatedId)
 	return s.Get()
 }
 
 func (s *ObjectStorageObjectResourceCrud) Delete() error {
 	request := oci_object_storage.DeleteObjectRequest{}
 
-	bucketName, namespaceName, objectName, err := parseObjectCompositeId(s.D.Id())
-	if err == nil {
-		request.NamespaceName = &namespaceName
-		request.BucketName = &bucketName
-		request.ObjectName = &objectName
-	} else {
-		log.Printf("[WARN] Delete() unable to parse current ID: %s", s.D.Id())
-		return err
+	if bucket, ok := s.D.GetOkExists("bucket"); ok {
+		tmp := bucket.(string)
+		request.BucketName = &tmp
+	}
+
+	if namespace, ok := s.D.GetOkExists("namespace"); ok {
+		tmp := namespace.(string)
+		request.NamespaceName = &tmp
+	}
+
+	if object, ok := s.D.GetOkExists("object"); ok {
+		tmp := object.(string)
+		request.ObjectName = &tmp
 	}
 
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "object_storage")
 
-	_, err = s.Client.DeleteObject(context.Background(), request)
+	_, err := s.Client.DeleteObject(context.Background(), request)
 	return err
 }
 

oci/object_storage_preauthenticated_request_resource.go

@@ -96,6 +96,20 @@ func createObjectStoragePreauthenticatedRequest(d *schema.ResourceData, m interf
 
 func readObjectStoragePreauthenticatedRequest(d *schema.ResourceData, m interface{}) error {
 	sync := &ObjectStoragePreauthenticatedRequestResourceCrud{}
+	// For backward compatibility with CompositeId change
+
+	log.Printf("[DEBUG] readObjectStoragePreauthenticatedRequest() Resource Id in state: %s", d.Id())
+	_, _, _, err := parsePreauthenticatedRequestCompositeId(d.Id())
+
+	if err != nil {
+		bucket, bOk := d.GetOkExists("bucket")
+		namespace, nOk := d.GetOkExists("namespace")
+
+		if bOk && nOk {
+			compositeId := getPreauthenticatedRequestCompositeId(bucket.(string), namespace.(string), d.Id())
+			d.SetId(compositeId)
+		}
+	}
 	sync.D = d
 	sync.Client = m.(*OracleClients).objectStorageClient
 
@@ -172,16 +186,6 @@ func (s *ObjectStoragePreauthenticatedRequestResourceCrud) Create() error {
 func (s *ObjectStoragePreauthenticatedRequestResourceCrud) Get() error {
 	request := oci_object_storage.GetPreauthenticatedRequestRequest{}
 
-	if bucket, ok := s.D.GetOkExists("bucket"); ok {
-		tmp := bucket.(string)
-		request.BucketName = &tmp
-	}
-
-	if namespace, ok := s.D.GetOkExists("namespace"); ok {
-		tmp := namespace.(string)
-		request.NamespaceName = &tmp
-	}
-
 	bucket, namespace, parId, err := parsePreauthenticatedRequestCompositeId(s.D.Id())
 	if err == nil {
 		request.BucketName = &bucket
@@ -216,16 +220,20 @@ func (s *ObjectStoragePreauthenticatedRequestResourceCrud) Get() error {
 func (s *ObjectStoragePreauthenticatedRequestResourceCrud) Delete() error {
 	request := oci_object_storage.DeletePreauthenticatedRequestRequest{}
 
-	bucket, namespace, parId, parseErr := parsePreauthenticatedRequestCompositeId(s.D.Id())
-	if parseErr == nil {
-		request.BucketName = &bucket
-		request.NamespaceName = &namespace
-		request.ParId = &parId
-	} else {
-		log.Printf("[WARN] Delete() unable to parse current ID: %s", s.D.Id())
-		return parseErr
+	if bucket, ok := s.D.GetOkExists("bucket"); ok {
+		tmp := bucket.(string)
+		request.BucketName = &tmp
 	}
 
+	if namespace, ok := s.D.GetOkExists("namespace"); ok {
+		tmp := namespace.(string)
+		request.NamespaceName = &tmp
+	}
+
+	if parId, ok := s.D.GetOkExists("par_id"); ok {
+		tmp := parId.(string)
+		request.ParId = &tmp
+	}
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "object_storage")
 
 	_, err := s.Client.DeletePreauthenticatedRequest(context.Background(), request)