Skip to content

Commit ac117c3

Browse files
joe-kimmel-vmwjoe-kimmel-vmw
authored
Merge branch 'main' into 1221-report-toml-for-the-peoples
Signed-off-by: Joe Kimmel <86852107+joe-kimmel-vmw@users.noreply.github.com>
2 parents b3d0512 + d1024e9 commit ac117c3

113 files changed

Lines changed: 972 additions & 537 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- name: Set up go
7575
uses: actions/setup-go@v3
7676
with:
77-
go-version: "1.18"
77+
go-version: "1.19"
7878
- name: Set up go env for Unix
7979
if: runner.os != 'Windows'
8080
run: |
@@ -122,7 +122,8 @@ jobs:
122122
- name: Test
123123
env:
124124
TEST_COVERAGE: 1
125-
run: make test
125+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
126+
run: make test
126127
- name: Upload Coverage
127128
uses: codecov/codecov-action@v3
128129
with:
@@ -177,7 +178,7 @@ jobs:
177178
- name: Set up go
178179
uses: actions/setup-go@v3
179180
with:
180-
go-version: "1.18"
181+
go-version: "1.19"
181182
- name: Build
182183
run: |
183184
[[ $GITHUB_REF =~ ^refs\/heads\/release/(.*)$ ]] && version=${BASH_REMATCH[1]} || version=0.0.0

‎.github/workflows/compatibility.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Set up go
4747
uses: actions/setup-go@v3
4848
with:
49-
go-version: "1.18"
49+
go-version: "1.19"
5050
- name: Set up go env
5151
run: |
5252
echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV

‎DEVELOPMENT.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,15 @@ To run unit and integration tests:
5555
```shell
5656
make unit
5757
```
58+
Test output will be streamed to your terminal and also saved to the file
59+
out/unit
5860

5961
To run acceptance tests:
6062
```shell
6163
make acceptance
6264
```
65+
Test output will be streamed to your terminal and also saved to the file
66+
out/acceptance
6367

6468
Alternately, to run all tests:
6569
```shell

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ install:
6565
cp ./out/$(PACK_BIN) ${DESTDIR}${BINDIR}/
6666

6767
mod-tidy:
68-
$(GOCMD) mod tidy -compat=1.18
69-
cd tools && $(GOCMD) mod tidy -compat=1.18
68+
$(GOCMD) mod tidy -compat=1.19
69+
cd tools && $(GOCMD) mod tidy -compat=1.19
7070

7171
tidy: mod-tidy format
7272

@@ -105,16 +105,16 @@ unit: GOTESTFLAGS:=$(GOTESTFLAGS) --tags=example
105105
endif
106106
unit: out
107107
@echo "> Running unit/integration tests..."
108-
$(GOCMD) test $(GOTESTFLAGS) -timeout=$(UNIT_TIMEOUT) ./...
108+
$(GOCMD) test $(GOTESTFLAGS) -timeout=$(UNIT_TIMEOUT) ./... | tee out/unit
109109

110110
acceptance: out
111111
@echo "> Running acceptance tests..."
112-
$(GOCMD) test $(GOTESTFLAGS) -timeout=$(ACCEPTANCE_TIMEOUT) -tags=acceptance ./acceptance
112+
$(GOCMD) test $(GOTESTFLAGS) -timeout=$(ACCEPTANCE_TIMEOUT) -tags=acceptance ./acceptance | tee out/acceptance
113113

114114
acceptance-all: export ACCEPTANCE_SUITE_CONFIG:=$(shell $(CAT) .$/acceptance$/testconfig$/all.json)
115115
acceptance-all:
116116
@echo "> Running acceptance tests..."
117-
$(GOCMD) test $(GOTESTFLAGS) -timeout=$(ACCEPTANCE_TIMEOUT) -tags=acceptance ./acceptance
117+
$(GOCMD) test $(GOTESTFLAGS) -timeout=$(ACCEPTANCE_TIMEOUT) -tags=acceptance ./acceptance | tee out/acceptance
118118

119119
clean:
120120
@echo "> Cleaning workspace..."

‎acceptance/acceptance_test.go‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"encoding/hex"
1111
"encoding/json"
1212
"fmt"
13-
"io/ioutil"
1413
"math/rand"
1514
"os"
1615
"path/filepath"
@@ -177,7 +176,7 @@ func testWithoutSpecificBuilderRequirement(
177176

178177
it.Before(func() {
179178
var err error
180-
tmpDir, err = ioutil.TempDir("", "buildpack-package-tests")
179+
tmpDir, err = os.MkdirTemp("", "buildpack-package-tests")
181180
assert.Nil(err)
182181

183182
buildpackManager = buildpacks.NewBuildModuleManager(t, assert)
@@ -188,9 +187,9 @@ func testWithoutSpecificBuilderRequirement(
188187
assert.Nil(os.RemoveAll(tmpDir))
189188
})
190189

191-
generateAggregatePackageToml := func(buildpackURI, nestedPackageName, os string) string {
190+
generateAggregatePackageToml := func(buildpackURI, nestedPackageName, operatingSystem string) string {
192191
t.Helper()
193-
packageTomlFile, err := ioutil.TempFile(tmpDir, "package_aggregate-*.toml")
192+
packageTomlFile, err := os.CreateTemp(tmpDir, "package_aggregate-*.toml")
194193
assert.Nil(err)
195194

196195
pack.FixtureManager().TemplateFixtureToFile(
@@ -199,7 +198,7 @@ func testWithoutSpecificBuilderRequirement(
199198
map[string]interface{}{
200199
"BuildpackURI": buildpackURI,
201200
"PackageName": nestedPackageName,
202-
"OS": os,
201+
"OS": operatingSystem,
203202
},
204203
)
205204

@@ -402,7 +401,7 @@ func testWithoutSpecificBuilderRequirement(
402401

403402
it.Before(func() {
404403
var err error
405-
tmpDir, err = ioutil.TempDir("", "buildpack-inspect-tests")
404+
tmpDir, err = os.MkdirTemp("", "buildpack-inspect-tests")
406405
assert.Nil(err)
407406
})
408407

@@ -1159,7 +1158,7 @@ func testAcceptance(
11591158
h.SkipIf(t, imageManager.HostOS() == "windows", "temporarily disabled on WCOW due to CI flakiness")
11601159

11611160
var err error
1162-
tmpDir, err = ioutil.TempDir("", "archive-buildpacks-")
1161+
tmpDir, err = os.MkdirTemp("", "archive-buildpacks-")
11631162
assert.Nil(err)
11641163

11651164
buildpackManager.PrepareBuildModules(tmpDir, buildpacks.BpInternetCapable)
@@ -1229,12 +1228,12 @@ func testAcceptance(
12291228
}
12301229

12311230
var err error
1232-
tmpDir, err = ioutil.TempDir("", "volume-buildpack-tests-")
1231+
tmpDir, err = os.MkdirTemp("", "volume-buildpack-tests-")
12331232
assert.Nil(err)
12341233

12351234
buildpackManager.PrepareBuildModules(tmpDir, buildpacks.BpReadVolume, buildpacks.BpReadWriteVolume)
12361235

1237-
tmpVolumeSrc, err = ioutil.TempDir("", "volume-mount-source")
1236+
tmpVolumeSrc, err = os.MkdirTemp("", "volume-mount-source")
12381237
assert.Nil(err)
12391238
assert.Succeeds(os.Chmod(tmpVolumeSrc, 0777)) // Override umask
12401239

@@ -1243,7 +1242,7 @@ func testAcceptance(
12431242
tmpVolumeSrc, err = filepath.EvalSymlinks(tmpVolumeSrc)
12441243
assert.Nil(err)
12451244

1246-
err = ioutil.WriteFile(filepath.Join(tmpVolumeSrc, "some-file"), []byte("some-content\n"), 0777)
1245+
err = os.WriteFile(filepath.Join(tmpVolumeSrc, "some-file"), []byte("some-content\n"), 0777)
12471246
assert.Nil(err)
12481247
})
12491248

@@ -1354,7 +1353,7 @@ func testAcceptance(
13541353

13551354
it.Before(func() {
13561355
var err error
1357-
tmpDir, err = ioutil.TempDir("", "archive-buildpack-tests-")
1356+
tmpDir, err = os.MkdirTemp("", "archive-buildpack-tests-")
13581357
assert.Nil(err)
13591358
})
13601359

@@ -1385,7 +1384,7 @@ func testAcceptance(
13851384

13861385
it.Before(func() {
13871386
var err error
1388-
tmpDir, err = ioutil.TempDir("", "folder-buildpack-tests-")
1387+
tmpDir, err = os.MkdirTemp("", "folder-buildpack-tests-")
13891388
assert.Nil(err)
13901389
})
13911390

@@ -1465,7 +1464,7 @@ func testAcceptance(
14651464

14661465
it.Before(func() {
14671466
var err error
1468-
tmpDir, err = ioutil.TempDir("", "package-file")
1467+
tmpDir, err = os.MkdirTemp("", "package-file")
14691468
assert.Nil(err)
14701469
})
14711470

@@ -1542,7 +1541,7 @@ func testAcceptance(
15421541
var envPath string
15431542

15441543
it.Before(func() {
1545-
envfile, err := ioutil.TempFile("", "envfile")
1544+
envfile, err := os.CreateTemp("", "envfile")
15461545
assert.Nil(err)
15471546
defer envfile.Close()
15481547

@@ -1910,7 +1909,7 @@ func testAcceptance(
19101909
it.Before(func() {
19111910
h.SkipIf(t, !pack.SupportsFeature(invoke.Cache), "")
19121911
cacheBindName := fmt.Sprintf("%s-bind", repoName)
1913-
bindCacheDir, err := ioutil.TempDir("", cacheBindName)
1912+
bindCacheDir, err := os.MkdirTemp("", cacheBindName)
19141913
assert.Nil(err)
19151914
cacheFlags = fmt.Sprintf("type=build;format=bind;source=%s", bindCacheDir)
19161915
})
@@ -1957,10 +1956,10 @@ func testAcceptance(
19571956
h.SkipIf(t, runtime.GOOS == "windows", "buildpack directories not supported on windows")
19581957

19591958
var err error
1960-
tempAppDir, err = ioutil.TempDir("", "descriptor-app")
1959+
tempAppDir, err = os.MkdirTemp("", "descriptor-app")
19611960
assert.Nil(err)
19621961

1963-
tempWorkingDir, err = ioutil.TempDir("", "descriptor-app")
1962+
tempWorkingDir, err = os.MkdirTemp("", "descriptor-app")
19641963
assert.Nil(err)
19651964

19661965
origWorkingDir, err = os.Getwd()
@@ -1979,14 +1978,14 @@ func testAcceptance(
19791978

19801979
err = os.Mkdir(filepath.Join(tempAppDir, "media"), 0755)
19811980
assert.Nil(err)
1982-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "media", "mountain.jpg"), []byte("fake image bytes"), 0755)
1981+
err = os.WriteFile(filepath.Join(tempAppDir, "media", "mountain.jpg"), []byte("fake image bytes"), 0755)
19831982
assert.Nil(err)
1984-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "media", "person.png"), []byte("fake image bytes"), 0755)
1983+
err = os.WriteFile(filepath.Join(tempAppDir, "media", "person.png"), []byte("fake image bytes"), 0755)
19851984
assert.Nil(err)
19861985

1987-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "cookie.jar"), []byte("chocolate chip"), 0755)
1986+
err = os.WriteFile(filepath.Join(tempAppDir, "cookie.jar"), []byte("chocolate chip"), 0755)
19881987
assert.Nil(err)
1989-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "test.sh"), []byte("echo test"), 0755)
1988+
err = os.WriteFile(filepath.Join(tempAppDir, "test.sh"), []byte("echo test"), 0755)
19901989
assert.Nil(err)
19911990

19921991
projectToml := `
@@ -2001,7 +2000,7 @@ exclude = [ "*.sh", "media/person.png", "descriptor-buildpack" ]
20012000
uri = "descriptor-buildpack"
20022001
`
20032002
excludeDescriptorPath := filepath.Join(tempAppDir, "project.toml")
2004-
err = ioutil.WriteFile(excludeDescriptorPath, []byte(projectToml), 0755)
2003+
err = os.WriteFile(excludeDescriptorPath, []byte(projectToml), 0755)
20052004
assert.Nil(err)
20062005

20072006
// set working dir to be outside of the app we are building
@@ -2033,7 +2032,7 @@ uri = "descriptor-buildpack"
20332032
buildpackTgz = h.CreateTGZ(t, filepath.Join(bpDir, "descriptor-buildpack"), "./", 0755)
20342033

20352034
var err error
2036-
tempAppDir, err = ioutil.TempDir("", "descriptor-app")
2035+
tempAppDir, err = os.MkdirTemp("", "descriptor-app")
20372036
assert.Nil(err)
20382037

20392038
// Create test directories and files:
@@ -2053,32 +2052,32 @@ uri = "descriptor-buildpack"
20532052

20542053
err = os.Mkdir(filepath.Join(tempAppDir, "secrets"), 0755)
20552054
assert.Nil(err)
2056-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "secrets", "api_keys.json"), []byte("{}"), 0755)
2055+
err = os.WriteFile(filepath.Join(tempAppDir, "secrets", "api_keys.json"), []byte("{}"), 0755)
20572056
assert.Nil(err)
2058-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "secrets", "user_token"), []byte("token"), 0755)
2057+
err = os.WriteFile(filepath.Join(tempAppDir, "secrets", "user_token"), []byte("token"), 0755)
20592058
assert.Nil(err)
20602059

20612060
err = os.Mkdir(filepath.Join(tempAppDir, "nested"), 0755)
20622061
assert.Nil(err)
2063-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "nested", "nested-cookie.jar"), []byte("chocolate chip"), 0755)
2062+
err = os.WriteFile(filepath.Join(tempAppDir, "nested", "nested-cookie.jar"), []byte("chocolate chip"), 0755)
20642063
assert.Nil(err)
20652064

2066-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "other-cookie.jar"), []byte("chocolate chip"), 0755)
2065+
err = os.WriteFile(filepath.Join(tempAppDir, "other-cookie.jar"), []byte("chocolate chip"), 0755)
20672066
assert.Nil(err)
20682067

2069-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "nested-cookie.jar"), []byte("chocolate chip"), 0755)
2068+
err = os.WriteFile(filepath.Join(tempAppDir, "nested-cookie.jar"), []byte("chocolate chip"), 0755)
20702069
assert.Nil(err)
20712070

20722071
err = os.Mkdir(filepath.Join(tempAppDir, "media"), 0755)
20732072
assert.Nil(err)
2074-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "media", "mountain.jpg"), []byte("fake image bytes"), 0755)
2073+
err = os.WriteFile(filepath.Join(tempAppDir, "media", "mountain.jpg"), []byte("fake image bytes"), 0755)
20752074
assert.Nil(err)
2076-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "media", "person.png"), []byte("fake image bytes"), 0755)
2075+
err = os.WriteFile(filepath.Join(tempAppDir, "media", "person.png"), []byte("fake image bytes"), 0755)
20772076
assert.Nil(err)
20782077

2079-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "cookie.jar"), []byte("chocolate chip"), 0755)
2078+
err = os.WriteFile(filepath.Join(tempAppDir, "cookie.jar"), []byte("chocolate chip"), 0755)
20802079
assert.Nil(err)
2081-
err = ioutil.WriteFile(filepath.Join(tempAppDir, "test.sh"), []byte("echo test"), 0755)
2080+
err = os.WriteFile(filepath.Join(tempAppDir, "test.sh"), []byte("echo test"), 0755)
20822081
assert.Nil(err)
20832082
})
20842083

@@ -2096,7 +2095,7 @@ type = "MIT"
20962095
exclude = [ "*.sh", "secrets/", "media/metadata", "/other-cookie.jar" ,"/nested-cookie.jar"]
20972096
`
20982097
excludeDescriptorPath := filepath.Join(tempAppDir, "exclude.toml")
2099-
err := ioutil.WriteFile(excludeDescriptorPath, []byte(projectToml), 0755)
2098+
err := os.WriteFile(excludeDescriptorPath, []byte(projectToml), 0755)
21002099
assert.Nil(err)
21012100

21022101
output := pack.RunSuccessfully(
@@ -2127,7 +2126,7 @@ type = "MIT"
21272126
include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
21282127
`
21292128
includeDescriptorPath := filepath.Join(tempAppDir, "include.toml")
2130-
err := ioutil.WriteFile(includeDescriptorPath, []byte(projectToml), 0755)
2129+
err := os.WriteFile(includeDescriptorPath, []byte(projectToml), 0755)
21312130
assert.Nil(err)
21322131

21332132
output := pack.RunSuccessfully(
@@ -2694,7 +2693,7 @@ func createComplexBuilder(t *testing.T,
26942693
t.Log("creating complex builder image...")
26952694

26962695
// CREATE TEMP WORKING DIR
2697-
tmpDir, err := ioutil.TempDir("", "create-complex-test-builder")
2696+
tmpDir, err := os.MkdirTemp("", "create-complex-test-builder")
26982697
if err != nil {
26992698
return "", err
27002699
}
@@ -2726,7 +2725,7 @@ func createComplexBuilder(t *testing.T,
27262725

27272726
fixtureManager := pack.FixtureManager()
27282727

2729-
nestedLevelOneConfigFile, err := ioutil.TempFile(tmpDir, "nested-level-1-package.toml")
2728+
nestedLevelOneConfigFile, err := os.CreateTemp(tmpDir, "nested-level-1-package.toml")
27302729
assert.Nil(err)
27312730
fixtureManager.TemplateFixtureToFile(
27322731
"nested-level-1-buildpack_package.toml",
@@ -2736,7 +2735,7 @@ func createComplexBuilder(t *testing.T,
27362735
err = nestedLevelOneConfigFile.Close()
27372736
assert.Nil(err)
27382737

2739-
nestedLevelTwoConfigFile, err := ioutil.TempFile(tmpDir, "nested-level-2-package.toml")
2738+
nestedLevelTwoConfigFile, err := os.CreateTemp(tmpDir, "nested-level-2-package.toml")
27402739
assert.Nil(err)
27412740
fixtureManager.TemplateFixtureToFile(
27422741
"nested-level-2-buildpack_package.toml",
@@ -2803,7 +2802,7 @@ func createComplexBuilder(t *testing.T,
28032802
}
28042803

28052804
// RENDER builder.toml
2806-
builderConfigFile, err := ioutil.TempFile(tmpDir, "nested_builder.toml")
2805+
builderConfigFile, err := os.CreateTemp(tmpDir, "nested_builder.toml")
28072806
if err != nil {
28082807
return "", err
28092808
}
@@ -2842,7 +2841,7 @@ func createBuilder(
28422841
t.Log("creating builder image...")
28432842

28442843
// CREATE TEMP WORKING DIR
2845-
tmpDir, err := ioutil.TempDir("", "create-test-builder")
2844+
tmpDir, err := os.MkdirTemp("", "create-test-builder")
28462845
assert.Nil(err)
28472846
defer os.RemoveAll(tmpDir)
28482847

@@ -2894,7 +2893,7 @@ func createBuilder(
28942893
// RENDER builder.toml
28952894
configFileName := "builder.toml"
28962895

2897-
builderConfigFile, err := ioutil.TempFile(tmpDir, "builder.toml")
2896+
builderConfigFile, err := os.CreateTemp(tmpDir, "builder.toml")
28982897
assert.Nil(err)
28992898

29002899
pack.FixtureManager().TemplateFixtureToFile(
@@ -2933,7 +2932,7 @@ func createBuilderWithExtensions(
29332932
t.Log("creating builder image with extensions...")
29342933

29352934
// CREATE TEMP WORKING DIR
2936-
tmpDir, err := ioutil.TempDir("", "create-test-builder-extensions")
2935+
tmpDir, err := os.MkdirTemp("", "create-test-builder-extensions")
29372936
assert.Nil(err)
29382937
defer os.RemoveAll(tmpDir)
29392938

@@ -2971,7 +2970,7 @@ func createBuilderWithExtensions(
29712970
// RENDER builder.toml
29722971
configFileName := "builder_extensions.toml"
29732972

2974-
builderConfigFile, err := ioutil.TempFile(tmpDir, "builder.toml")
2973+
builderConfigFile, err := os.CreateTemp(tmpDir, "builder.toml")
29752974
assert.Nil(err)
29762975

29772976
pack.FixtureManager().TemplateFixtureToFile(
@@ -3012,7 +3011,7 @@ func generatePackageTomlWithOS(
30123011
) string {
30133012
t.Helper()
30143013

3015-
packageTomlFile, err := ioutil.TempFile(tmpDir, "package-*.toml")
3014+
packageTomlFile, err := os.CreateTemp(tmpDir, "package-*.toml")
30163015
assert.Nil(err)
30173016

30183017
pack.FixtureManager().TemplateFixtureToFile(

0 commit comments

Comments
 (0)