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

Jump to bottom

Chore: Replace deprecated io/ioutil #342

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Chore: Replace deprecated io/ioutil #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e111ec
Remove deprecated io/ioutil
maxilampert Aug 28, 2023
9b8395f
Merge branch 'hashicorp:main' into fix/deprecated_ioutil
maxilampert Sep 30, 2023
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
3 changes: 1 addition & 2 deletions builder/azure/arm/builder_acc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"context"
_ "embed"
"fmt"
"io/ioutil"
"os"
"os/exec"
"testing"
Expand Down Expand Up @@ -304,7 +303,7 @@ func TestBuilderAcc_Blob_Linux(t *testing.T) {

func TestBuilderUserData_Linux(t *testing.T) {
t.Parallel()
tmpfile, err := ioutil.TempFile("", "userdata")
tmpfile, err := os.CreateTemp("", "userdata")
if err != nil {
t.Fatalf("failed creating tempfile: %s", err)
}
Expand Down
6 changes: 3 additions & 3 deletions builder/azure/arm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"encoding/base64"
"encoding/json"
"fmt"
"io/ioutil"
"math/big"
"net"
"os"
"regexp"
"strings"
"time"
Expand Down Expand Up @@ -952,7 +952,7 @@ func setCustomDataFile(c *Config) error {
return nil
}

b, err := ioutil.ReadFile(c.CustomDataFile)
b, err := os.ReadFile(c.CustomDataFile)
if err != nil {
return err
}
Expand All @@ -975,7 +975,7 @@ func setUserDataFile(c *Config) error {
return nil
}

b, err := ioutil.ReadFile(c.UserDataFile)
b, err := os.ReadFile(c.UserDataFile)
if err != nil {
return err
}
Expand Down
5 changes: 2 additions & 3 deletions builder/azure/arm/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package arm

import (
"fmt"
"io/ioutil"
"os"
"strings"
"testing"
Expand Down Expand Up @@ -2496,7 +2495,7 @@ func TestConfigShouldRejectMalformedUserAssignedManagedIdentities(t *testing.T)
}

func TestConfigShouldRejectUserDataAndUserDataFile(t *testing.T) {
tmpfile, err := ioutil.TempFile("", "userdata")
tmpfile, err := os.CreateTemp("", "userdata")
if err != nil {
t.Fatalf("failed creating tempfile: %s", err)
}
Expand Down Expand Up @@ -2527,7 +2526,7 @@ func TestConfigShouldRejectUserDataAndUserDataFile(t *testing.T) {
}

func TestConfigShouldRejectCustomDataAndCustomDataFile(t *testing.T) {
tmpfile, err := ioutil.TempFile("", "customdata")
tmpfile, err := os.CreateTemp("", "customdata")
if err != nil {
t.Fatalf("failed creating tempfile: %s", err)
}
Expand Down
5 changes: 2 additions & 3 deletions builder/azure/arm/inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package arm

import (
"bytes"
"io/ioutil"
"log"
"net/http"

Expand All @@ -32,12 +31,12 @@ func handleBody(body io.ReadCloser, maxlen int64) (io.ReadCloser, string) {

defer body.Close()

b, err := ioutil.ReadAll(body)
b, err := io.ReadAll(body)
if err != nil {
return nil, ""
}

return ioutil.NopCloser(bytes.NewReader(b)), chop(b, maxlen)
return io.NopCloser(bytes.NewReader(b)), chop(b, maxlen)
}

// WithInspection/ByInspection functions are used to Log requests and responses from Azure
Expand Down
4 changes: 2 additions & 2 deletions builder/azure/chroot/packerui_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package chroot

import (
"io/ioutil"
"io"
"strings"

packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
Expand All @@ -15,7 +15,7 @@ func testUI() (packersdk.Ui, func() string) {
errorBuffer := &strings.Builder{}
ui := &packersdk.BasicUi{
Reader: strings.NewReader(""),
Writer: ioutil.Discard,
Writer: io.Discard,
ErrorWriter: errorBuffer,
}
return ui, errorBuffer.String
Expand Down
4 changes: 2 additions & 2 deletions builder/azure/chroot/step_attach_disk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package chroot
import (
"context"
"errors"
"io/ioutil"
"io"
"reflect"
"strings"
"testing"
Expand Down Expand Up @@ -55,7 +55,7 @@ func TestStepAttachDisk_Run(t *testing.T) {
errorBuffer := &strings.Builder{}
ui := &packersdk.BasicUi{
Reader: strings.NewReader(""),
Writer: ioutil.Discard,
Writer: io.Discard,
ErrorWriter: errorBuffer,
}

Expand Down
3 changes: 1 addition & 2 deletions builder/azure/chroot/step_mount_device_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package chroot
import (
"context"
"fmt"
"io/ioutil"
"os"
"runtime"
"testing"
Expand All @@ -23,7 +22,7 @@ func TestStepMountDevice_Run(t *testing.T) {
default:
t.Skip("Unsupported operating system")
}
mountPath, err := ioutil.TempDir("", "stepmountdevicetest")
mountPath, err := os.MkdirTemp("", "stepmountdevicetest")
if err != nil {
t.Errorf("Unable to create a temporary directory: %q", err)
}
Expand Down
4 changes: 2 additions & 2 deletions builder/azure/common/client/config_retriever.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package client

import (
"encoding/json"
"io/ioutil"
"io"
"net/http"
)

Expand All @@ -29,7 +29,7 @@ func _getSubscriptionFromIMDS() (string, error) {
}

defer resp.Body.Close()
resp_body, _ := ioutil.ReadAll(resp.Body)
resp_body, _ := io.ReadAll(resp.Body)
result := map[string]string{}
err = json.Unmarshal(resp_body, &result)
if err != nil {
Expand Down
8 changes: 3 additions & 5 deletions builder/azure/dtl/inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ package dtl

import (
"bytes"
"io/ioutil"
"io"
"log"
"net/http"

"io"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/azure"
"github.com/hashicorp/go-azure-sdk/sdk/client"
Expand All @@ -32,12 +30,12 @@ func handleBody(body io.ReadCloser, maxlen int64) (io.ReadCloser, string) {

defer body.Close()

b, err := ioutil.ReadAll(body)
b, err := io.ReadAll(body)
if err != nil {
return nil, ""
}

return ioutil.NopCloser(bytes.NewReader(b)), chop(b, maxlen)
return io.NopCloser(bytes.NewReader(b)), chop(b, maxlen)
}

func withInspection(maxlen int64) autorest.PrepareDecorator {
Expand Down