s/CapMount/CapExecMount/g

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>

client/llb/exec.go

@@ -200,11 +200,11 @@ func (e *ExecOp) Marshal(c *Constraints) (digest.Digest, []byte, *pb.OpMetadata,
 	}
 
 	if len(e.secrets) > 0 {
-		addCap(&e.constraints, pb.CapMountSecret)
+		addCap(&e.constraints, pb.CapExecMountSecret)
 	}
 
 	if len(e.ssh) > 0 {
-		addCap(&e.constraints, pb.CapMountSSH)
+		addCap(&e.constraints, pb.CapExecMountSSH)
 	}
 
 	pop, md := MarshalConstraints(c, &e.constraints)

frontend/gateway/grpcclient/client.go

@@ -207,7 +207,7 @@ func defaultLLBCaps() []apicaps.PBCap {
 		{ID: string(opspb.CapExecMountCacheSharing), Enabled: true},
 		{ID: string(opspb.CapExecMountSelector), Enabled: true},
 		{ID: string(opspb.CapExecMountTmpfs), Enabled: true},
-		{ID: string(opspb.CapMountSecret), Enabled: true},
+		{ID: string(opspb.CapExecMountSecret), Enabled: true},
 		{ID: string(opspb.CapConstraints), Enabled: true},
 		{ID: string(opspb.CapPlatform), Enabled: true},
 		{ID: string(opspb.CapMetaIgnoreCache), Enabled: true},

solver/pb/caps.go

@@ -39,8 +39,8 @@ const (
 	CapExecMountCacheSharing   apicaps.CapID = "exec.mount.cache.sharing"
 	CapExecMountSelector       apicaps.CapID = "exec.mount.selector"
 	CapExecMountTmpfs          apicaps.CapID = "exec.mount.tmpfs"
-	CapMountSecret             apicaps.CapID = "exec.mount.secret"
-	CapMountSSH                apicaps.CapID = "exec.mount.ssh"
+	CapExecMountSecret         apicaps.CapID = "exec.mount.secret"
+	CapExecMountSSH            apicaps.CapID = "exec.mount.ssh"
 
 	CapConstraints apicaps.CapID = "constraints"
 	CapPlatform    apicaps.CapID = "platform"
@@ -208,13 +208,13 @@ func init() {
 	})
 
 	Caps.Init(apicaps.Cap{
-		ID:      CapMountSecret,
+		ID:      CapExecMountSecret,
 		Enabled: true,
 		Status:  apicaps.CapStatusExperimental,
 	})
 
 	Caps.Init(apicaps.Cap{
-		ID:      CapMountSSH,
+		ID:      CapExecMountSSH,
 		Enabled: true,
 		Status:  apicaps.CapStatusExperimental,
 	})