From 57d5184a6050936e25bbfb8e8edea0624f940158 Mon Sep 17 00:00:00 2001 From: Brandon Palm Date: Mon, 24 Nov 2025 11:02:07 -0600 Subject: [PATCH] Migrate away from deprecated ioutil --- config/v1/types_infrastructure_test.go | 4 ++-- payload-command/render/renderassets/assets.go | 5 ++--- tools/codegen/pkg/swaggerdocs/generator.go | 4 ++-- tools/codegen/pkg/swaggerdocs/swaggerdocs.go | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/config/v1/types_infrastructure_test.go b/config/v1/types_infrastructure_test.go index b220e185898..117f8e1d9d8 100644 --- a/config/v1/types_infrastructure_test.go +++ b/config/v1/types_infrastructure_test.go @@ -1,7 +1,7 @@ package v1 import ( - "io/ioutil" + "os" "path" "testing" @@ -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) } diff --git a/payload-command/render/renderassets/assets.go b/payload-command/render/renderassets/assets.go index df448eda511..058ee79cb41 100644 --- a/payload-command/render/renderassets/assets.go +++ b/payload-command/render/renderassets/assets.go @@ -2,7 +2,6 @@ package assets import ( "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -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. @@ -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 } diff --git a/tools/codegen/pkg/swaggerdocs/generator.go b/tools/codegen/pkg/swaggerdocs/generator.go index 9829eff607f..4176f741d75 100644 --- a/tools/codegen/pkg/swaggerdocs/generator.go +++ b/tools/codegen/pkg/swaggerdocs/generator.go @@ -2,7 +2,7 @@ package swaggerdocs import ( "fmt" - "io/ioutil" + "os" "path/filepath" "github.com/openshift/api/tools/codegen/pkg/generation" @@ -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) } diff --git a/tools/codegen/pkg/swaggerdocs/swaggerdocs.go b/tools/codegen/pkg/swaggerdocs/swaggerdocs.go index 0e7a4a0968f..8474f4286f5 100644 --- a/tools/codegen/pkg/swaggerdocs/swaggerdocs.go +++ b/tools/codegen/pkg/swaggerdocs/swaggerdocs.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "go/format" - "io/ioutil" + "os" "reflect" kruntime "k8s.io/apimachinery/pkg/runtime" @@ -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) }