ec_extension: fix upload request wrapper to get filePath string

elastic · Jan 4, 2021 · e7e1343 · e7e1343
1 parent 31a44fb
commit e7e1343
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ec/ecresource/extensionresource/create.go b/ec/ecresource/extensionresource/create.go
@@ -38,7 +38,7 @@ func createResource(ctx context.Context, d *schema.ResourceData, meta interface{
 	d.SetId(*model.ID)
 
 	if _, ok := d.GetOk("file_path"); ok {
-		if err := uploadRequest(client, d); err != nil {
+		if err := uploadRequest(client, d.Get("file_path").(string)); err != nil {
 			return diag.FromErr(multierror.NewPrefixed("failed to upload file", err))
 		}
 	}

diff --git a/ec/ecresource/extensionresource/request.go b/ec/ecresource/extensionresource/request.go
@@ -96,15 +96,15 @@ func deleteRequest(client *api.API, d *schema.ResourceData) error {
 	return nil
 }
 
-func uploadRequest(client *api.API, d *schema.ResourceData) error {
-	reader, err := os.Open(d.Get("file_path").(string))
+func uploadRequest(client *api.API, filePath string) error {
+	reader, err := os.Open(filePath)
 	if err != nil {
 		return multierror.NewPrefixed("failed open file", err)
 	}
 
 	if _, err := client.V1API.Extensions.UploadExtension(
 		extensions.NewUploadExtensionParams().WithExtensionID(d.Id()).
-			WithFile(runtime.NamedReader(d.Get("file_path").(string), reader)),
+			WithFile(runtime.NamedReader(filePath, reader)),
 		client.AuthWriter); err != nil {
 		return apierror.Wrap(err)
 	}

diff --git a/ec/ecresource/extensionresource/update.go b/ec/ecresource/extensionresource/update.go
@@ -35,7 +35,7 @@ func updateResource(ctx context.Context, d *schema.ResourceData, meta interface{
 	}
 
 	if _, ok := d.GetOk("file_path"); ok && d.HasChange("file_hash") {
-		if err := uploadRequest(client, d); err != nil {
+		if err := uploadRequest(client, d.Get("file_path").(string)); err != nil {
 			return diag.FromErr(multierror.NewPrefixed("failed to upload file", err))
 		}
 	}