change elementOptions to only take into consideration deployed, delet… (#14)

Co-authored-by: Pauline ESPALIEU <paulineespalieu@mbppaulespalieu.home>

Author: Pauline Espalieu

attachment.go

@@ -12,23 +12,26 @@ import (
 	"github.com/intercloud/autonomi-sdk/models"
 )
 
-func checkAttachmentAdministrativeState(ctx context.Context, c *Client, workspaceID, attachmentID string, state models.AdministrativeState) (*models.Attachment, bool) {
+func checkAttachmentFinishedTask(ctx context.Context, c *Client, workspaceID, attachmentID string, waiterOptionState models.AdministrativeState) (*models.Attachment, bool) {
 	attachment, err := c.GetAttachment(ctx, workspaceID, attachmentID)
 	if err != nil {
 		// if wanted state is deleted and the attachment is in this state, api has returned 404
-		if state == models.AdministrativeStateDeleted && strings.Contains(err.Error(), "status: 404") {
-			return nil, true
+		if waiterOptionState == models.AdministrativeStateDeleted {
+			if strings.Contains(err.Error(), "status: 404") {
+				return nil, true
+			}
 		}
 		log.Printf("an error occurs when getting attachment, err: %s" + err.Error())
 		return nil, false
 	}
 
-	return attachment, attachment.State == state
+	return attachment, waiterOptionState == attachment.State
 }
 
-// CreateAttachment creates asynchronously an attachment. The attachment returned will depend of the administrative state passed in options.
-// If none is passed models.AdministrativeStateDeployed will be set by default.
-// The valid administrative states options for a attachment creation are [models.AdministrativeStateCreationPending, models.AdministrativeStateCreationProceed, models.AdministrativeStateCreationError, models.AdministrativeStateDeployed]
+// CreateAttachment creates asynchronously an attachment. The attachment returned will depend of the passed option.
+// If none is passed the attachment will be returned once created in database with administrative state creation_pending.
+// If the option WithWaitUntilElementDeployed() is passed, the attachment will be returned when its state reach deployed or creation_error.
+// If the option WithWaitUntilElementUndeployed() is passed, it will not be considered hence the attachment returned will be in state creation_pending
 func (c *Client) CreateAttachment(ctx context.Context, payload models.CreateAttachment, workspaceID string, options ...OptionElement) (*models.Attachment, error) {
 	body := new(bytes.Buffer)
 	err := json.NewEncoder(body).Encode(&payload)
@@ -45,14 +48,6 @@ func (c *Client) CreateAttachment(ctx context.Context, payload models.CreateAtta
 		o(attachmentOptions)
 	}
 
-	if attachmentOptions.administrativeState == "" {
-		attachmentOptions.administrativeState = models.AdministrativeStateDeployed
-	}
-
-	if _, ok := validCreationAdministrativeStates[attachmentOptions.administrativeState]; !ok {
-		return nil, ErrCreationAdministrativeState
-	}
-
 	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/accounts/%s/workspaces/%s/attachments", c.hostURL, c.accountID, workspaceID), body)
 	if err != nil {
 		return nil, err
@@ -69,9 +64,13 @@ func (c *Client) CreateAttachment(ctx context.Context, payload models.CreateAtta
 		return nil, err
 	}
 
-	attachmentPolled, success := WaitForAdministrativeState(ctx, c, workspaceID, attachment.Data.ID.String(), attachmentOptions.administrativeState, checkAttachmentAdministrativeState)
-	if !success {
-		return nil, fmt.Errorf("Attachment did not reach '%s' state in time.", attachmentOptions.administrativeState)
+	var attachmentPolled = &attachment.Data
+	if attachmentOptions.waitUntilElementDeployed {
+		var success bool
+		attachmentPolled, success = WaitUntilFinishedTask(ctx, c, workspaceID, attachment.Data.ID.String(), models.AdministrativeStateDeployed, checkAttachmentFinishedTask)
+		if !success {
+			return nil, fmt.Errorf("Attachment did not reach '%s' state in time.", models.AdministrativeStateDeployed)
+		}
 	}
 
 	return attachmentPolled, nil
@@ -97,23 +96,16 @@ func (c *Client) GetAttachment(ctx context.Context, workspaceID, attachmentID st
 	return &attachment.Data, err
 }
 
-// DeleteAttachment deletes asynchronously a cloud attachment. The attachment returned will depend of the administrative state passed in options.
-// If none is passed models.AdministrativeStateDeleted will be set by default.
-// The valid administrative states options for a attachment creation are [ models.AdministrativeStateDeletePending, models.AdministrativeStateDeleteProceed, models.AdministrativeStateDeleteError, models.AdministrativeStateDeleted]
+// DeleteAttachment deletes asynchronously an attachment. The attachment returned will depend of the option passed.
+// If none is passed the attachment will be returned once the request accepted, its state will be delete_pending
+// If the option WithWaitUntilElementUndeployed() is passed, the attachment won't be returned as it would have been deleted. However, if an error is triggered, an object could be returned with a delete_error state.
+// If the option WithWaitUntilElementDeployed() is passed, it will not be considered hence the attachment returned will be in state delete_pending
 func (c *Client) DeleteAttachment(ctx context.Context, workspaceID, attachmentID string, options ...OptionElement) (*models.Attachment, error) {
 	attachmentOptions := &elementOptions{}
 	for _, o := range options {
 		o(attachmentOptions)
 	}
 
-	if attachmentOptions.administrativeState == "" {
-		attachmentOptions.administrativeState = models.AdministrativeStateDeleted
-	}
-
-	if _, ok := validDeletionAdministrativeStates[attachmentOptions.administrativeState]; !ok {
-		return nil, ErrDeletionAdministrativeState
-	}
-
 	req, err := http.NewRequest(http.MethodDelete, fmt.Sprintf("%s/accounts/%s/workspaces/%s/attachments/%s", c.hostURL, c.accountID, workspaceID, attachmentID), nil)
 	if err != nil {
 		return nil, err
@@ -130,9 +122,13 @@ func (c *Client) DeleteAttachment(ctx context.Context, workspaceID, attachmentID
 		return nil, err
 	}
 
-	attachmentPolled, success := WaitForAdministrativeState(ctx, c, workspaceID, attachment.Data.ID.String(), attachmentOptions.administrativeState, checkAttachmentAdministrativeState)
-	if !success {
-		return nil, fmt.Errorf("Attachment did not reach '%s' state in time.", attachmentOptions.administrativeState)
+	var attachmentPolled = &attachment.Data
+	if attachmentOptions.waitUntilElementUndeployed {
+		var success bool
+		attachmentPolled, success = WaitUntilFinishedTask(ctx, c, workspaceID, attachment.Data.ID.String(), models.AdministrativeStateDeleted, checkAttachmentFinishedTask)
+		if !success {
+			return nil, fmt.Errorf("Attachment did not reach '%s' state in time.", models.AdministrativeStateDeleted)
+		}
 	}
 
 	// If the attachment was deleted and we were waiting for the "deleted" state,