Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions config/v1/types_infrastructure_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1

import (
"io/ioutil"
"os"
"path"
"testing"

Expand All @@ -24,7 +24,7 @@ func TestInfrastructureStatusDefault(t *testing.T) {
filePaths := []string{infraCRDDefaultFilePath, infraCRDTestPreviewFilePath}

for _, filepath := range filePaths {
infraCRDBytes, err := ioutil.ReadFile(path.Join("zz_generated.crd-manifests", filepath))
infraCRDBytes, err := os.ReadFile(path.Join("zz_generated.crd-manifests", filepath))
if err != nil {
t.Fatalf("failed to read infrastructure CRD file %q: %v", filepath, err)
}
Expand Down
5 changes: 2 additions & 3 deletions payload-command/render/renderassets/assets.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package assets

import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -97,7 +96,7 @@ func (a Asset) WriteFile(path string) error {
perms = a.FilePermission
}
fmt.Printf("Writing asset: %s\n", f)
return ioutil.WriteFile(f, a.Data, os.FileMode(perms))
return os.WriteFile(f, a.Data, os.FileMode(perms))
}

// MustCreateAssetFromTemplate process the given template using and return an asset.
Expand Down Expand Up @@ -224,7 +223,7 @@ func LoadFilesRecursively(dir string, predicates ...FileInfoPredicate) (map[stri
}
}

bs, err := ioutil.ReadFile(path)
bs, err := os.ReadFile(path)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions tools/codegen/pkg/swaggerdocs/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package swaggerdocs

import (
"fmt"
"io/ioutil"
"os"
"path/filepath"

"github.com/openshift/api/tools/codegen/pkg/generation"
Expand Down Expand Up @@ -126,7 +126,7 @@ func (g *generator) generateGroupVersion(groupName string, version generation.AP
return fmt.Errorf("error generating swagger docs: %w", err)
}

if err := ioutil.WriteFile(outFilePath, generatedDocs, 0644); err != nil {
if err := os.WriteFile(outFilePath, generatedDocs, 0644); err != nil {
return fmt.Errorf("error writing swagger docs output: %w", err)
}

Expand Down
4 changes: 2 additions & 2 deletions tools/codegen/pkg/swaggerdocs/swaggerdocs.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"fmt"
"go/format"
"io/ioutil"
"os"
"reflect"

kruntime "k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -65,7 +65,7 @@ func verifySwaggerDocs(packageName, filePath string, docsForTypes []kruntime.Kub
}

// Verify that the existing data matches the generated data.
data, err := ioutil.ReadFile(filePath)
data, err := os.ReadFile(filePath)
if err != nil {
return fmt.Errorf("error reading existing swagger docs file: %w", err)
}
Expand Down