diff --git a/go.mod b/go.mod index f738ed9509..ac3fa69ffb 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.25.4 require ( github.com/Dynatrace/libbuildpack-dynatrace v1.8.0 - github.com/cloudfoundry/libbuildpack v0.0.0-20260306121953-8ab9253c8181 + github.com/cloudfoundry/libbuildpack v0.0.0-20260415084012-70e599bbe72c github.com/cloudfoundry/switchblade v0.9.5 github.com/golang/mock v1.6.0 github.com/onsi/ginkgo/v2 v2.27.2 diff --git a/go.sum b/go.sum index dd38171914..255901d35d 100644 --- a/go.sum +++ b/go.sum @@ -1556,8 +1556,8 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= -github.com/cloudfoundry/libbuildpack v0.0.0-20260306121953-8ab9253c8181 h1:di63teVid/uT+6TAqBSXFqxNM3sAbxk6hssYppZBvbw= -github.com/cloudfoundry/libbuildpack v0.0.0-20260306121953-8ab9253c8181/go.mod h1:Qtj1XicpoDn88w2cvVCYtw1Whq+kK3bouin0xNZ9lIU= +github.com/cloudfoundry/libbuildpack v0.0.0-20260415084012-70e599bbe72c h1:BMlBv4TunN2BTh8CgVL1Hf8iiKCCIk5eD64Dg9fU4GM= +github.com/cloudfoundry/libbuildpack v0.0.0-20260415084012-70e599bbe72c/go.mod h1:Qtj1XicpoDn88w2cvVCYtw1Whq+kK3bouin0xNZ9lIU= github.com/cloudfoundry/switchblade v0.9.5 h1:GTga1Uu6kGOL+n1TRTHyZm170N5/B/ou6wU90MiKKys= github.com/cloudfoundry/switchblade v0.9.5/go.mod h1:hIEQdGAsuNnzlyQfsD5OIORt38weSBar6Wq5/JX6Omo= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/vendor/github.com/cloudfoundry/libbuildpack/installer.go b/vendor/github.com/cloudfoundry/libbuildpack/installer.go index 365b8d11b8..ebcf2d406c 100644 --- a/vendor/github.com/cloudfoundry/libbuildpack/installer.go +++ b/vendor/github.com/cloudfoundry/libbuildpack/installer.go @@ -4,7 +4,6 @@ import ( "crypto/sha256" "encoding/hex" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -47,7 +46,7 @@ func (i *Installer) InstallDependency(dep Dependency, outputDir string) error { func (i *Installer) InstallDependencyWithStrip(dep Dependency, outputDir string, stripComponents int) error { i.manifest.log.BeginStep("Installing %s %s", dep.Name, dep.Version) - tmpDir, err := ioutil.TempDir("", "downloads") + tmpDir, err := os.MkdirTemp("", "downloads") if err != nil { return err } diff --git a/vendor/github.com/cloudfoundry/libbuildpack/json.go b/vendor/github.com/cloudfoundry/libbuildpack/json.go index d6d124f829..7e747cb126 100644 --- a/vendor/github.com/cloudfoundry/libbuildpack/json.go +++ b/vendor/github.com/cloudfoundry/libbuildpack/json.go @@ -3,7 +3,7 @@ package libbuildpack import ( "bytes" "encoding/json" - "io/ioutil" + "os" ) type JSON struct { @@ -30,7 +30,7 @@ func removeBOM(b []byte) []byte { } func (j *JSON) Load(file string, obj interface{}) error { - data, err := ioutil.ReadFile(file) + data, err := os.ReadFile(file) if err != nil { return err } diff --git a/vendor/github.com/cloudfoundry/libbuildpack/manifest.go b/vendor/github.com/cloudfoundry/libbuildpack/manifest.go index 0629e05334..3381cbb063 100644 --- a/vendor/github.com/cloudfoundry/libbuildpack/manifest.go +++ b/vendor/github.com/cloudfoundry/libbuildpack/manifest.go @@ -2,7 +2,6 @@ package libbuildpack import ( "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -179,7 +178,7 @@ func (m *Manifest) Language() string { } func (m *Manifest) Version() (string, error) { - version, err := ioutil.ReadFile(filepath.Join(m.manifestRootDir, "VERSION")) + version, err := os.ReadFile(filepath.Join(m.manifestRootDir, "VERSION")) if err != nil { return "", fmt.Errorf("unable to read VERSION file %s", err) } diff --git a/vendor/github.com/cloudfoundry/libbuildpack/stager.go b/vendor/github.com/cloudfoundry/libbuildpack/stager.go index f9c63e3f72..38a9d54a80 100644 --- a/vendor/github.com/cloudfoundry/libbuildpack/stager.go +++ b/vendor/github.com/cloudfoundry/libbuildpack/stager.go @@ -3,7 +3,6 @@ package libbuildpack import ( "errors" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -95,7 +94,7 @@ func (s *Stager) WriteEnvFile(envVar, envVal string) error { } - return ioutil.WriteFile(filepath.Join(envDir, envVar), []byte(envVal), 0644) + return os.WriteFile(filepath.Join(envDir, envVar), []byte(envVal), 0644) } func (s *Stager) LinkDirectoryInDepDir(destDir, depSubDir string) error { @@ -104,7 +103,7 @@ func (s *Stager) LinkDirectoryInDepDir(destDir, depSubDir string) error { return err } - files, err := ioutil.ReadDir(destDir) + files, err := os.ReadDir(destDir) if err != nil { return err } @@ -153,7 +152,7 @@ func (s *Stager) StagingComplete() { } func (s *Stager) ClearCache() error { - files, err := ioutil.ReadDir(s.cacheDir) + files, err := os.ReadDir(s.cacheDir) if err != nil { if os.IsNotExist(err) { return nil @@ -172,7 +171,7 @@ func (s *Stager) ClearCache() error { } func (s *Stager) ClearDepDir() error { - files, err := ioutil.ReadDir(s.DepDir()) + files, err := os.ReadDir(s.DepDir()) if err != nil { return err } @@ -234,14 +233,14 @@ func (s *Stager) SetStagingEnvironment() error { } for _, dir := range depsPaths { - files, err := ioutil.ReadDir(dir) + files, err := os.ReadDir(dir) if err != nil { return err } for _, file := range files { - if file.Mode().IsRegular() { - val, err := ioutil.ReadFile(filepath.Join(dir, file.Name())) + if file.Type().IsRegular() { + val, err := os.ReadFile(filepath.Join(dir, file.Name())) if err != nil { return err } @@ -293,13 +292,13 @@ func (s *Stager) SetLaunchEnvironment() error { depsIdx := sections[len(sections)-2] - files, err := ioutil.ReadDir(dir) + files, err := os.ReadDir(dir) if err != nil { return err } for _, file := range files { - if file.Mode().IsRegular() { + if file.Type().IsRegular() { src := filepath.Join(dir, file.Name()) dest := filepath.Join(s.profileDir, depsIdx+"_"+file.Name()) @@ -322,7 +321,7 @@ func (s *Stager) BuildpackVersion() (string, error) { } func existingDepsDirs(depsDir, subDir, prefix string) ([]string, error) { - files, err := ioutil.ReadDir(depsDir) + files, err := os.ReadDir(depsDir) if err != nil { return nil, err } diff --git a/vendor/github.com/cloudfoundry/libbuildpack/util.go b/vendor/github.com/cloudfoundry/libbuildpack/util.go index 686103266c..93b442863c 100644 --- a/vendor/github.com/cloudfoundry/libbuildpack/util.go +++ b/vendor/github.com/cloudfoundry/libbuildpack/util.go @@ -9,7 +9,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "math/rand" "net/http" "net/url" @@ -22,17 +21,13 @@ import ( backoff "github.com/cenkalti/backoff/v4" ) -func init() { - rand.Seed(time.Now().UnixNano()) -} - func MoveDirectory(srcDir, destDir string) error { destExists, _ := FileExists(destDir) if !destExists { return os.Rename(srcDir, destDir) } - files, err := ioutil.ReadDir(srcDir) + files, err := os.ReadDir(srcDir) if err != nil { return err } @@ -43,7 +38,7 @@ func MoveDirectory(srcDir, destDir string) error { if exists, err := FileExists(dest); err != nil { return err } else if !exists { - if m := f.Mode(); m&os.ModeSymlink != 0 { + if m := f.Type(); m&os.ModeSymlink != 0 { if err = moveSymlinks(src, dest); err != nil { return err } @@ -69,7 +64,7 @@ func CopyDirectory(srcDir, destDir string) error { return errors.New("destination dir must exist") } - files, err := ioutil.ReadDir(srcDir) + files, err := os.ReadDir(srcDir) if err != nil { return err } @@ -78,12 +73,16 @@ func CopyDirectory(srcDir, destDir string) error { src := filepath.Join(srcDir, f.Name()) dest := filepath.Join(destDir, f.Name()) - if m := f.Mode(); m&os.ModeSymlink != 0 { + if m := f.Type(); m&os.ModeSymlink != 0 { if err = moveSymlinks(src, dest); err != nil { return err } } else if f.IsDir() { - err = os.MkdirAll(dest, f.Mode()) + fi, err := f.Info() + if err != nil { + return err + } + err = os.MkdirAll(dest, fi.Mode()) if err != nil { return err } @@ -96,7 +95,13 @@ func CopyDirectory(srcDir, destDir string) error { return err } - err = writeToFile(rc, dest, f.Mode()) + fi, err := f.Info() + if err != nil { + rc.Close() + return err + } + + err = writeToFile(rc, dest, fi.Mode()) if err != nil { rc.Close() return err @@ -500,7 +505,7 @@ func filterURI(rawURL string) (string, error) { } func CheckSha256(filePath, expectedSha256 string) error { - content, err := ioutil.ReadFile(filePath) + content, err := os.ReadFile(filePath) if err != nil { return err } diff --git a/vendor/github.com/cloudfoundry/libbuildpack/yaml.go b/vendor/github.com/cloudfoundry/libbuildpack/yaml.go index 8cbe8cb751..368ce12d08 100644 --- a/vendor/github.com/cloudfoundry/libbuildpack/yaml.go +++ b/vendor/github.com/cloudfoundry/libbuildpack/yaml.go @@ -2,7 +2,7 @@ package libbuildpack import ( "bytes" - "io/ioutil" + "os" yaml "gopkg.in/yaml.v2" ) @@ -15,7 +15,7 @@ func NewYAML() *YAML { } func (y *YAML) Load(file string, obj interface{}) error { - data, err := ioutil.ReadFile(file) + data, err := os.ReadFile(file) if err != nil { return err } diff --git a/vendor/modules.txt b/vendor/modules.txt index c3b4a041e7..02fb07a771 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -18,7 +18,7 @@ github.com/blang/semver # github.com/cenkalti/backoff/v4 v4.3.0 ## explicit; go 1.18 github.com/cenkalti/backoff/v4 -# github.com/cloudfoundry/libbuildpack v0.0.0-20260306121953-8ab9253c8181 +# github.com/cloudfoundry/libbuildpack v0.0.0-20260415084012-70e599bbe72c ## explicit; go 1.22.5 github.com/cloudfoundry/libbuildpack # github.com/cloudfoundry/switchblade v0.9.5