Merge branch 'main' into issue_2181

acceptance/assertions/output.go

@@ -209,7 +209,7 @@ func (o OutputAssertionManager) IncludesTrustedBuildersHeading() {
  o.assert.Contains(o.output, "Trusted Builders:")
 }
 
-const googleBuilder = "gcr.io/buildpacks/builder:v1"
+const googleBuilder = "gcr.io/buildpacks/builder:google-22"
 
 func (o OutputAssertionManager) IncludesGoogleBuilder() {
  o.testObject.Helper()

go.mod

@@ -15,7 +15,7 @@ require (
  github.com/go-git/go-git/v5 v5.12.0
  github.com/golang/mock v1.6.0
  github.com/google/go-cmp v0.6.0
- github.com/google/go-containerregistry v0.19.1
+ github.com/google/go-containerregistry v0.19.2
  github.com/google/go-github/v30 v30.1.0
  github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95
  github.com/heroku/color v0.0.6
@@ -28,14 +28,14 @@ require (
  github.com/rivo/tview v0.0.0-20220307222120-9994674d60a8
  github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
  github.com/sclevine/spec v1.4.0
- github.com/spf13/cobra v1.8.0
- golang.org/x/crypto v0.23.0
- golang.org/x/mod v0.17.0
- golang.org/x/oauth2 v0.20.0
+ github.com/spf13/cobra v1.8.1
+ golang.org/x/crypto v0.25.0
+ golang.org/x/mod v0.19.0
+ golang.org/x/oauth2 v0.21.0
  golang.org/x/sync v0.7.0
- golang.org/x/sys v0.20.0
- golang.org/x/term v0.20.0
- golang.org/x/text v0.15.0
+ golang.org/x/sys v0.22.0
+ golang.org/x/term v0.22.0
+ golang.org/x/text v0.16.0
  gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -113,7 +113,7 @@ github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G
 github.com/containerd/stargz-snapshotter/estargz v0.15.1/go.mod h1:gr2RNwukQ/S9Nv33Lt6UC7xEx58C+LHRdoqbEKjz1Kk=
 github.com/containerd/typeurl/v2 v2.1.1 h1:3Q4Pt7i8nYwy2KmQWIw2+1hTvwTE/6w9FqcttATPO/4=
 github.com/containerd/typeurl/v2 v2.1.1/go.mod h1:IDp2JFvbwZ31H8dQbEIY7sDl2L3o3HZj1hsSQlywkQ0=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
@@ -199,8 +199,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-containerregistry v0.19.1 h1:yMQ62Al6/V0Z7CqIrrS1iYoA5/oQCm88DeNujc7C1KY=
-github.com/google/go-containerregistry v0.19.1/go.mod h1:YCMFNQeeXeLF+dnhhWkqDItx/JSkH01j1Kis4PsjzFI=
+github.com/google/go-containerregistry v0.19.2 h1:TannFKE1QSajsP6hPWb5oJNgKe1IKjHukIKDUmvsV6w=
+github.com/google/go-containerregistry v0.19.2/go.mod h1:YCMFNQeeXeLF+dnhhWkqDItx/JSkH01j1Kis4PsjzFI=
 github.com/google/go-github/v30 v30.1.0 h1:VLDx+UolQICEOKu2m4uAoMti1SxuEBAl7RSEG16L+Oo=
 github.com/google/go-github/v30 v30.1.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQFEufcolZ95JfU8=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
@@ -359,8 +359,8 @@ github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3
 github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
 github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs=
-github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
-github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
+github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -426,15 +426,15 @@ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
+golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
+golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -453,8 +453,8 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
 golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
-golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
+golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -493,8 +493,8 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -503,8 +503,8 @@ golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
+golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -514,8 +514,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -525,8 +525,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
-golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/builder/builder.go

@@ -85,6 +85,7 @@ type Builder struct {
  order dist.Order
  orderExtensions dist.Order
  validateMixins bool
+ saveProhibited bool
 }
 
 type orderTOML struct {
@@ -102,9 +103,10 @@ type moduleWithDiffID struct {
 type BuilderOption func(*options) error
 
 type options struct {
- toFlatten buildpack.FlattenModuleInfos
- labels map[string]string
- runImage string
+ toFlatten buildpack.FlattenModuleInfos
+ labels map[string]string
+ runImage string
+ saveProhibited bool
 }
 
 func WithRunImage(name string) BuilderOption {
@@ -114,6 +116,13 @@ func WithRunImage(name string) BuilderOption {
  }
 }
 
+func WithoutSave() BuilderOption {
+ return func(o *options) error {
+ o.saveProhibited = true
+ return nil
+ }
+}
+
 // FromImage constructs a builder from a builder image
 func FromImage(img imgutil.Image) (*Builder, error) {
  return constructBuilder(img, "", true)
@@ -149,8 +158,7 @@ func constructBuilder(img imgutil.Image, newName string, errOnMissingLabel bool,
  }
 
  if opts.runImage != "" {
- // Do we need to look for available mirrors? for now the mirrors are gone if you override the run-image
- // create an issue if you want to preserve the mirrors
+ // FIXME: for now the mirrors are gone if you override the run-image (open an issue if preserving the mirrors is desired)
  metadata.RunImages = []RunImageMetadata{{Image: opts.runImage}}
  metadata.Stack.RunImage = RunImageMetadata{Image: opts.runImage}
  }
@@ -173,6 +181,7 @@ func constructBuilder(img imgutil.Image, newName string, errOnMissingLabel bool,
  validateMixins: true,
  additionalBuildpacks: buildpack.NewManagedCollectionV2(opts.toFlatten),
  additionalExtensions: buildpack.NewManagedCollectionV2(opts.toFlatten),
+ saveProhibited: opts.saveProhibited,
  }
 
  if err := addImgLabelsToBuildr(bldr); err != nil {
@@ -435,6 +444,10 @@ func (b *Builder) SetValidateMixins(to bool) {
 
 // Save saves the builder
 func (b *Builder) Save(logger logging.Logger, creatorMetadata CreatorMetadata) error {
+ if b.saveProhibited {
+ return fmt.Errorf("failed to save builder %s as saving is not allowed", b.Name())
+ }
+
  logger.Debugf("Creating builder with the following buildpacks:")
  for _, bpInfo := range b.metadata.Buildpacks {
  logger.Debugf("-> %s", style.Symbol(bpInfo.FullName()))

internal/builder/known_builder.go

@@ -11,8 +11,8 @@ type KnownBuilder struct {
 var KnownBuilders = []KnownBuilder{
  {
  Vendor: "Google",
- Image: "gcr.io/buildpacks/builder:v1",
- DefaultDescription: "GCP Builder for all runtimes",
+ Image: "gcr.io/buildpacks/builder:google-22",
+ DefaultDescription: "Ubuntu 22.04 base image with buildpacks for .NET, Dart, Go, Java, Node.js, PHP, Python, and Ruby",
  Suggested: true,
  Trusted: true,
  },
@@ -66,3 +66,12 @@ var KnownBuilders = []KnownBuilder{
  Trusted: true,
  },
 }
+
+var IsKnownTrustedBuilder = func(b string) bool {
+ for _, knownBuilder := range KnownBuilders {
+ if b == knownBuilder.Image && knownBuilder.Trusted {
+ return true
+ }
+ }
+ return false
+}

internal/commands/build_test.go

@@ -114,7 +114,7 @@ func testBuildCommand(t *testing.T, when spec.G, it spec.S) {
  })
  })
 
- when("the builder is suggested", func() {
+ when("the builder is known to be trusted and suggested", func() {
  it("sets the trust builder option", func() {
  mockClient.EXPECT().
  Build(gomock.Any(), EqBuildOptionsWithTrustedBuilder(true)).
@@ -126,6 +126,32 @@ func testBuildCommand(t *testing.T, when spec.G, it spec.S) {
  h.AssertContains(t, outBuf.String(), "Builder 'heroku/builder:24' is trusted")
  })
  })
+
+ when("the builder is known to be trusted but not suggested", func() {
+ it("sets the trust builder option", func() {
+ mockClient.EXPECT().
+ Build(gomock.Any(), EqBuildOptionsWithTrustedBuilder(true)).
+ Return(nil)
+
+ logger.WantVerbose(true)
+ command.SetArgs([]string{"image", "--builder", "heroku/builder:22"})
+ h.AssertNil(t, command.Execute())
+ h.AssertContains(t, outBuf.String(), "Builder 'heroku/builder:22' is trusted")
+ })
+ })
+
+ when("the builder is not trusted", func() {
+ it("warns the user that the builder is untrusted", func() {
+ mockClient.EXPECT().
+ Build(gomock.Any(), EqBuildOptionsWithTrustedBuilder(false)).
+ Return(nil)
+
+ logger.WantVerbose(true)
+ command.SetArgs([]string{"image", "--builder", "org/builder:unknown"})
+ h.AssertNil(t, command.Execute())
+ h.AssertContains(t, outBuf.String(), "Builder 'org/builder:unknown' is untrusted")
+ })
+ })
  })
 
  when("--buildpack-registry flag is specified but experimental isn't set in the config", func() {
@@ -1036,7 +1062,7 @@ func EqBuildOptionsWithTrustedBuilder(trustBuilder bool) gomock.Matcher {
  return buildOptionsMatcher{
  description: fmt.Sprintf("Trust Builder=%t", trustBuilder),
  equals: func(o client.BuildOptions) bool {
- return o.TrustBuilder(o.Builder)
+ return o.TrustBuilder(o.Builder) == trustBuilder
  },
  }
 }

internal/commands/commands.go

@@ -7,6 +7,8 @@ import (
  "os/signal"
  "syscall"
 
+ "github.com/buildpacks/pack/internal/builder"
+
  "github.com/google/go-containerregistry/pkg/v1/types"
  "github.com/pkg/errors"
  "github.com/spf13/cobra"
@@ -105,14 +107,14 @@ func getMirrors(config config.Config) map[string][]string {
  return mirrors
 }
 
-func isTrustedBuilder(cfg config.Config, builder string) bool {
+func isTrustedBuilder(cfg config.Config, builderName string) bool {
  for _, trustedBuilder := range cfg.TrustedBuilders {
- if builder == trustedBuilder.Name {
+ if builderName == trustedBuilder.Name {
  return true
  }
  }
 
- return isSuggestedBuilder(builder)
+ return builder.IsKnownTrustedBuilder(builderName)
 }
 
 func deprecationWarning(logger logging.Logger, oldCmd, replacementCmd string) {

internal/commands/config_trusted_builder.go

@@ -80,9 +80,9 @@ func removeTrustedBuilder(args []string, logger logging.Logger, cfg config.Confi
 
  // Builder is not in the trusted builder list
  if len(existingTrustedBuilders) == len(cfg.TrustedBuilders) {
- if isSuggestedBuilder(builder) {
- // Attempted to untrust a suggested builder
- return errors.Errorf("Builder %s is a suggested builder, and is trusted by default. Currently pack doesn't support making these builders untrusted", style.Symbol(builder))
+ if bldr.IsKnownTrustedBuilder(builder) {
+ // Attempted to untrust a known trusted builder
+ return errors.Errorf("Builder %s is a known trusted builder. Currently pack doesn't support making these builders untrusted", style.Symbol(builder))
  }
 
  logger.Infof("Builder %s wasn't trusted", style.Symbol(builder))

internal/commands/config_trusted_builder_test.go

@@ -56,7 +56,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
  h.AssertNil(t, command.Execute())
  h.AssertContainsAllInOrder(t,
  outBuf,
- "gcr.io/buildpacks/builder:v1",
+ "gcr.io/buildpacks/builder:google-22",
  "heroku/builder:20",
  "heroku/builder:22",
  "heroku/builder:24",
@@ -71,7 +71,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
  h.AssertNil(t, command.Execute())
  h.AssertContainsAllInOrder(t,
  outBuf,
- "gcr.io/buildpacks/builder:v1",
+ "gcr.io/buildpacks/builder:google-22",
  "heroku/builder:20",
  "heroku/builder:22",
  "heroku/builder:24",
@@ -93,7 +93,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
  h.AssertNotContains(t, outBuf.String(), builderName)
  h.AssertContainsAllInOrder(t,
  outBuf,
- "gcr.io/buildpacks/builder:v1",
+ "gcr.io/buildpacks/builder:google-22",
  "heroku/builder:20",
  "heroku/builder:22",
  "heroku/builder:24",
@@ -110,7 +110,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 
  h.AssertContainsAllInOrder(t,
  outBuf,
- "gcr.io/buildpacks/builder:v1",
+ "gcr.io/buildpacks/builder:google-22",
  builderName,
  "heroku/builder:20",
  "heroku/builder:22",
@@ -275,7 +275,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
  command.SetArgs(append(args, builder))
 
  err := command.Execute()
- h.AssertError(t, err, fmt.Sprintf("Builder %s is a suggested builder, and is trusted by default", style.Symbol(builder)))
+ h.AssertError(t, err, fmt.Sprintf("Builder %s is a known trusted builder. Currently pack doesn't support making these builders untrusted", style.Symbol(builder)))
  })
  })
  })

internal/commands/list_trusted_builders_test.go

@@ -64,7 +64,7 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
  h.AssertNotContains(t, outBuf.String(), builderName)
  h.AssertContainsAllInOrder(t,
  outBuf,
- "gcr.io/buildpacks/builder:v1",
+ "gcr.io/buildpacks/builder:google-22",
  "heroku/builder:20",
  "heroku/builder:22",
  "heroku/builder:24",
@@ -86,7 +86,7 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
 
  h.AssertContainsAllInOrder(t,
  outBuf,
- "gcr.io/buildpacks/builder:v1",
+ "gcr.io/buildpacks/builder:google-22",
  builderName,
  "heroku/builder:20",
  "heroku/builder:22",