Merge pull request #1490 from paketo-buildpacks/remove-install

Simplify tools installation & pipelines
paketo-buildpacks · Feb 21, 2024 · 73e9a0c · 73e9a0c
2 parents ab85b0c + b7e510f
commit 73e9a0c
Show file tree

Hide file tree

Showing 22 changed files with 103 additions and 157 deletions.
diff --git a/actions/graalvm-dependency/main.go b/actions/graalvm-dependency/main.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 the original author or authors.
+ * Copyright 2018-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"regexp"
 	"strings"
@@ -169,7 +168,7 @@ func GetVersion(uri string) string {
 			continue
 		}
 
-		b, err := ioutil.ReadAll(t)
+		b, err := io.ReadAll(t)
 		if err != nil {
 			panic(fmt.Errorf("unable to read %s\n%w", f.Name, err))
 		}

diff --git a/buildpack/rewriteLayer.go b/buildpack/rewriteLayer.go
@@ -4,7 +4,7 @@ import (
 	"archive/tar"
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"path"
 	"strings"
 
@@ -37,7 +37,7 @@ func rewriteLayer(layer v1.Layer, oldID, newID, oldVersion, newVersion string) (
 
 		// replace buildpack id and version in buildpack.toml
 		if strings.HasSuffix(path.Clean(header.Name), "buildpack.toml") {
-			buf, err := ioutil.ReadAll(tr)
+			buf, err := io.ReadAll(tr)
 			if err != nil {
 				return nil, fmt.Errorf("unable to read buildpack.toml\n%w", err)
 			}
@@ -76,7 +76,7 @@ func rewriteLayer(layer v1.Layer, oldID, newID, oldVersion, newVersion string) (
 				return nil, fmt.Errorf("unable to write header\n%w", err)
 			}
 
-			buf, err := ioutil.ReadAll(tr)
+			buf, err := io.ReadAll(tr)
 			if err != nil {
 				return nil, fmt.Errorf("unable to read contents\n%w", err)
 			}
@@ -88,7 +88,9 @@ func rewriteLayer(layer v1.Layer, oldID, newID, oldVersion, newVersion string) (
 		}
 	}
 
-	return tarball.LayerFromReader(b)
+	return tarball.LayerFromOpener(func() (io.ReadCloser, error) {
+		return io.NopCloser(b), nil
+	})
 }
 
 type BuildpackDescriptor struct {

diff --git a/cmd/statik/main.go b/cmd/statik/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"sort"
 	"time"
@@ -58,7 +58,7 @@ func main() {
 			return fmt.Errorf("unable to open file %s", path)
 		}
 
-		b, err := ioutil.ReadAll(fp)
+		b, err := io.ReadAll(fp)
 		if err != nil {
 			return fmt.Errorf("unable to read file %s", path)
 		}

diff --git a/drafts/drafts.go b/drafts/drafts.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -198,7 +197,7 @@ func (d Drafter) CreatePayload(inputs actions.Inputs, buildpackPath string) (Pay
 }
 
 func loadBuildpackTOMLFromFile(buildpackPath string) (*Buildpack, error) {
-	rawTOML, err := ioutil.ReadFile(filepath.Join(buildpackPath, "buildpack.toml"))
+	rawTOML, err := os.ReadFile(filepath.Join(buildpackPath, "buildpack.toml"))
 	if err != nil && os.IsNotExist(err) {
 		return nil, nil
 	} else if err != nil {
@@ -277,7 +276,7 @@ func asString(m map[string]interface{}, key string) string {
 }
 
 func loadPackage(buildpackPath string) (*Package, error) {
-	rawTOML, err := ioutil.ReadFile(filepath.Join(buildpackPath, "package.toml"))
+	rawTOML, err := os.ReadFile(filepath.Join(buildpackPath, "package.toml"))
 	if err != nil && os.IsNotExist(err) {
 		return nil, nil
 	} else if err != nil {
@@ -293,7 +292,7 @@ func loadPackage(buildpackPath string) (*Package, error) {
 }
 
 func loadBuilderTOML(buildpackPath string) (*Builder, error) {
-	rawTOML, err := ioutil.ReadFile(filepath.Join(buildpackPath, "builder.toml"))
+	rawTOML, err := os.ReadFile(filepath.Join(buildpackPath, "builder.toml"))
 	if err != nil && os.IsNotExist(err) {
 		return nil, nil
 	} else if err != nil {
@@ -512,7 +511,7 @@ func (r RegistryBuildpackLoader) LoadBuildpack(uri string) (Buildpack, error) {
 		return Buildpack{}, fmt.Errorf("unable to create /tmp\n%w", err)
 	}
 
-	tarFile, err := ioutil.TempFile("/tmp", "tarfiles")
+	tarFile, err := os.CreateTemp("/tmp", "tarfiles")
 	if err != nil {
 		return Buildpack{}, fmt.Errorf("unable to create tempfile\n%w", err)
 	}

diff --git a/drafts/drafts_test.go b/drafts/drafts_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package drafts_test
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -36,22 +35,10 @@ func testDrafts(t *testing.T, context spec.G, it spec.S) {
 	var (
 		Expect = NewWithT(t).Expect
 
-		dir string
-
 		bpLoader mocks.BuildpackLoader
 	)
 
 	context("draft a release", func() {
-		it.Before(func() {
-			var err error
-			dir, err = ioutil.TempDir("", "drafts")
-			Expect(err).To(Not(HaveOccurred()))
-		})
-
-		it.After(func() {
-			Expect(os.RemoveAll(dir)).To(Succeed())
-		})
-
 		context("payloads", func() {
 			it("creates a payload for a component buildpack", func() {
 				d := drafts.Drafter{Loader: &bpLoader}
@@ -246,7 +233,7 @@ func testDrafts(t *testing.T, context spec.G, it spec.S) {
 			var templateContent string
 
 			it.Before(func() {
-				tc, err := ioutil.ReadFile("../actions/draft-release/draft.template")
+				tc, err := os.ReadFile("../actions/draft-release/draft.template")
 				Expect(err).ToNot(HaveOccurred())
 				templateContent = string(tc)
 			})

diff --git a/drafts/mocks/buildpack_loader.go b/drafts/mocks/buildpack_loader.go
diff --git a/octo/actions/workflow.go b/octo/actions/workflow.go
@@ -69,7 +69,7 @@ type Step struct {
 type Strategy struct {
 	Matrix      Matrix `yaml:",omitempty"`
 	FailFast    bool   `yaml:"fail-fast,omitempty"`
-	MaxParallel int    `yaml:"max-parallel:omitempty"`
+	MaxParallel int    `yaml:"max-parallel,omitempty"`
 }
 
 type Container struct {

diff --git a/octo/builder_dependencies.go b/octo/builder_dependencies.go
@@ -94,14 +94,11 @@ func contributeBuildImage(descriptor Descriptor, image string, classifier string
 						Run:  StatikString("/install-update-build-image-dependency.sh"),
 					},
 					{
-						Name: "Install crane",
-						Run:  StatikString("/install-crane.sh"),
-						Env:  map[string]string{"CRANE_VERSION": CraneVersion},
-					},
-					{
-						Name: "Install yj",
-						Run:  StatikString("/install-yj.sh"),
-						Env:  map[string]string{"YJ_VERSION": YJVersion},
+						Uses: fmt.Sprintf("buildpacks/github-actions/setup-tools@v%s", BuildpackActionsVersion),
+						With: map[string]interface{}{
+							"crane-version": CraneVersion,
+							"yj-version":    YJVersion,
+						},
 					},
 					{
 						Uses: "actions/checkout@v4",
@@ -164,9 +161,11 @@ func contributeLifecycle(descriptor Descriptor) (Contribution, error) {
 						Run:  StatikString("/install-update-lifecycle-dependency.sh"),
 					},
 					{
-						Name: "Install yj",
-						Run:  StatikString("/install-yj.sh"),
-						Env:  map[string]string{"YJ_VERSION": YJVersion},
+						Uses: fmt.Sprintf("buildpacks/github-actions/setup-tools@v%s", BuildpackActionsVersion),
+						With: map[string]interface{}{
+							"crane-version": CraneVersion,
+							"yj-version":    YJVersion,
+						},
 					},
 					{
 						Uses: "actions/checkout@v4",

diff --git a/octo/buildpack_dependencies.go b/octo/buildpack_dependencies.go
@@ -49,9 +49,11 @@ func ContributeBuildpackDependencies(descriptor Descriptor) ([]Contribution, err
 							Run:  StatikString("/install-update-buildpack-dependency.sh"),
 						},
 						{
-							Name: "Install yj",
-							Run:  StatikString("/install-yj.sh"),
-							Env:  map[string]string{"YJ_VERSION": YJVersion},
+							Uses: fmt.Sprintf("buildpacks/github-actions/setup-tools@v%s", BuildpackActionsVersion),
+							With: map[string]interface{}{
+								"crane-version": CraneVersion,
+								"yj-version":    YJVersion,
+							},
 						},
 						{
 							Uses: "actions/checkout@v4",

diff --git a/octo/create_builder.go b/octo/create_builder.go
@@ -17,6 +17,8 @@
 package octo
 
 import (
+	"fmt"
+
 	"github.com/paketo-buildpacks/pipeline-builder/octo/actions"
 	"github.com/paketo-buildpacks/pipeline-builder/octo/actions/event"
 )
@@ -45,14 +47,17 @@ func ContributeCreateBuilder(descriptor Descriptor) (*Contribution, error) {
 						With: map[string]interface{}{"go-version": GoVersion},
 					},
 					{
-						Name: "Install crane",
-						Run:  StatikString("/install-crane.sh"),
-						Env:  map[string]string{"CRANE_VERSION": CraneVersion},
+						Uses: fmt.Sprintf("buildpacks/github-actions/setup-tools@v%s", BuildpackActionsVersion),
+						With: map[string]interface{}{
+							"crane-version": CraneVersion,
+							"yj-version":    YJVersion,
+						},
 					},
 					{
-						Name: "Install pack",
-						Run:  StatikString("/install-pack.sh"),
-						Env:  map[string]string{"PACK_VERSION": PackVersion},
+						Uses: fmt.Sprintf("buildpacks/github-actions/setup-pack@v%s", BuildpackActionsVersion),
+						With: map[string]interface{}{
+							"pack-version": PackVersion,
+						},
 					},
 					{
 						Uses: "actions/checkout@v4",

diff --git a/octo/create_package.go b/octo/create_package.go
@@ -77,14 +77,17 @@ func ContributeCreatePackage(descriptor Descriptor) (*Contribution, error) {
 						Run:  StatikString("/install-create-package.sh"),
 					},
 					{
-						Name: "Install crane",
-						Run:  StatikString("/install-crane.sh"),
-						Env:  map[string]string{"CRANE_VERSION": CraneVersion},
+						Uses: fmt.Sprintf("buildpacks/github-actions/setup-tools@v%s", BuildpackActionsVersion),
+						With: map[string]interface{}{
+							"crane-version": CraneVersion,
+							"yj-version":    YJVersion,
+						},
 					},
 					{
-						Name: "Install pack",
-						Run:  StatikString("/install-pack.sh"),
-						Env:  map[string]string{"PACK_VERSION": PackVersion},
+						Uses: fmt.Sprintf("buildpacks/github-actions/setup-pack@v%s", BuildpackActionsVersion),
+						With: map[string]interface{}{
+							"pack-version": PackVersion,
+						},
 					},
 					{
 						Name: "Enable pack Experimental",

diff --git a/octo/install-crane.sh b/octo/install-crane.sh
diff --git a/octo/install-pack.sh b/octo/install-pack.sh
diff --git a/octo/install-yj.sh b/octo/install-yj.sh
diff --git a/octo/lite_packages.go b/octo/lite_packages.go
@@ -51,9 +51,11 @@ func contributeLitePackage(descriptor Descriptor, republishImage RepublishImage)
 				RunsOn: []actions.VirtualEnvironment{actions.UbuntuLatest},
 				Steps: []actions.Step{
 					{
-						Name: "Install crane",
-						Run:  StatikString("/install-crane.sh"),
-						Env:  map[string]string{"CRANE_VERSION": CraneVersion},
+						Uses: fmt.Sprintf("buildpacks/github-actions/setup-tools@v%s", BuildpackActionsVersion),
+						With: map[string]interface{}{
+							"crane-version": CraneVersion,
+							"yj-version":    YJVersion,
+						},
 					},
 					{
 						Uses: "actions/checkout@v4",