Fixed Conversations

Signed-off-by: satakshigarg <satakshi@civo.com>
crossplane-contrib · Sep 12, 2022 · 622a241 · 622a241
1 parent 86b2ca6
commit 622a241
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/internal/controller/civoObjectStore/civoobjectstore.go b/internal/controller/civoObjectStore/civoobjectstore.go
@@ -209,28 +209,31 @@ func (e *external) Create(ctx context.Context, mg resource.Managed) (managed.Ext
 	}
 
 	var createObjectStoreRequest civogo.CreateObjectStoreRequest
-	specifiedObjectStore, err := FindObjectStoreViaKey(e.civoGoClient, cr.Spec.AccessKey)
-	if specifiedObjectStore != nil {
+	cred, err := FindObjectStoreCreds(e.civoGoClient, cr.Spec.AccessKey)
+	if err != nil {
 		createObjectStoreRequest = civogo.CreateObjectStoreRequest{
-			Name:        specifiedObjectStore.Name,
-			MaxSizeGB:   int64(specifiedObjectStore.MaxSize),
-			AccessKeyID: specifiedObjectStore.OwnerInfo.AccessKeyID,
+			Name:        cred.Name,
+			MaxSizeGB:   int64(cred.MaxSize),
+			AccessKeyID: cred.OwnerInfo.AccessKeyID,
 			Region:      e.civoGoClient.Region,
 		}
 	} else {
 		createObjectStoreRequest = civogo.CreateObjectStoreRequest{
-			Name:        specifiedObjectStore.Name,
-			MaxSizeGB:   int64(specifiedObjectStore.MaxSize),
-			AccessKeyID: "",
-			Region:      e.civoGoClient.Region,
+			Name:      cred.Name,
+			MaxSizeGB: int64(cred.MaxSize),
+			Region:    e.civoGoClient.Region,
 		}
 	}
-	e.civoGoClient.NewObjectStore(&createObjectStoreRequest)
 	_, err = e.civoGoClient.NewObjectStore(&createObjectStoreRequest)
+	cr.SetConditions(xpv1.Creating())
 	if err != nil {
-		return managed.ExternalCreation{}, err
+		return managed.ExternalCreation{
+			ExternalNameAssigned: true,
+		}, err
 	}
-	return managed.ExternalCreation{}, nil
+	return managed.ExternalCreation{
+		ExternalNameAssigned: true,
+	}, nil
 }
 
 func (e *external) Update(ctx context.Context, mg resource.Managed) (managed.ExternalUpdate, error) {
@@ -242,10 +245,14 @@ func (e *external) Update(ctx context.Context, mg resource.Managed) (managed.Ext
 	if err != nil {
 		return managed.ExternalUpdate{}, err
 	}
-	if civoObjectStore.MaxSize == int(cr.Status.AtProvider.MaxSize) {
-		return managed.ExternalUpdate{}, nil
+	updateObjectStoreRequest := civogo.UpdateObjectStoreRequest{
+		MaxSizeGB: int64(cr.Status.AtProvider.MaxSize),
+		Region:    e.civoGoClient.Region,
+	}
+	_, err = e.civoGoClient.UpdateObjectStore(civoObjectStore.ID, &updateObjectStoreRequest)
+	if err != nil {
+		return managed.ExternalUpdate{}, err
 	}
-	civoObjectStore.MaxSize = cr.Status.AtProvider.MaxSize
 	return managed.ExternalUpdate{}, nil
 }
 

diff --git a/internal/controller/civoObjectStore/utils.go b/internal/controller/civoObjectStore/utils.go
@@ -27,7 +27,7 @@ func FindObjectStore(c *civogo.Client, search string) (*civogo.ObjectStore, erro
 
 }
 
-func FindObjectStoreViaKey(c *civogo.Client, search string) (*civogo.ObjectStore, error) {
+func FindObjectStoreCreds(c *civogo.Client, search string) (*civogo.ObjectStore, error) {
 	objectstores, err := c.ListObjectStores()
 	if err != nil {
 		return nil, err