Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decode Base64 script before saving state #336

Merged
merged 2 commits into from
Sep 2, 2024
Merged

Decode Base64 script before saving state #336

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
710c28f
Decode Base64 script before saving state
uzaxirr Aug 29, 2024
7493df4
refactor
uzaxirr Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion civo/instances/resource_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package instances

import (
"context"
"encoding/base64"
"errors"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
"log"
Expand Down Expand Up @@ -361,6 +362,16 @@ func resourceInstanceRead(_ context.Context, d *schema.ResourceData, m interface
d.Set("initial_password", "")
}

if resp.Script == "" {
d.Set("script", "")
}

decodedScript, err := base64.StdEncoding.DecodeString(resp.Script)
if err != nil {
return diag.Errorf("[ERR] failed to decode base64 script: %s", err)
}

d.Set("script", string(decodedScript))
d.Set("hostname", resp.Hostname)
d.Set("reverse_dns", resp.ReverseDNS)
d.Set("size", resp.Size)
Expand All @@ -377,7 +388,6 @@ func resourceInstanceRead(_ context.Context, d *schema.ResourceData, m interface
d.Set("network_id", resp.NetworkID)
d.Set("firewall_id", resp.FirewallID)
d.Set("status", resp.Status)
d.Set("script", resp.Script)
d.Set("created_at", resp.CreatedAt.UTC().String())
d.Set("notes", resp.Notes)
d.Set("disk_image", diskImg.ID)
Expand Down
Loading