Update sourcegraph/lib/batches and use AllowFiles (#641)

Author: mrnugget

cmd/src/batch_common.go

@@ -211,6 +211,7 @@ func executeBatchSpec(ctx context.Context, opts executeBatchSpecOpts) (err error
 	svc := service.New(&service.Opts{
 		AllowUnsupported: opts.flags.allowUnsupported,
 		AllowIgnored:     opts.flags.allowIgnored,
+		AllowFiles:       true,
 		Client:           opts.client,
 	})
 

cmd/src/batch_exec.go

@@ -85,6 +85,7 @@ func executeBatchSpecInWorkspaces(ctx context.Context, opts executeBatchSpecOpts
 	svc := service.New(&service.Opts{
 		AllowUnsupported: opts.flags.allowUnsupported,
 		AllowIgnored:     opts.flags.allowIgnored,
+		AllowFiles:       false,
 		Client:           opts.client,
 	})
 	if err := svc.DetermineFeatureFlags(ctx); err != nil {

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	github.com/sourcegraph/go-diff v0.6.1
 	github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf
-	github.com/sourcegraph/sourcegraph/lib v0.0.0-20211019100035-3927434f5fd9
+	github.com/sourcegraph/sourcegraph/lib v0.0.0-20211025134328-131865293af3
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	golang.org/x/net v0.0.0-20210614182718-04defd469f4e

go.sum

@@ -118,7 +118,6 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -259,8 +258,8 @@ github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0H
 github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
 github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWiiMP/vkkHiMXqFXzl1XfUNOdxKJbd6bI=
 github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf/go.mod h1:ppFaPm6kpcHnZGqQTFhUIAQRIEhdQDWP1PCv4/ON354=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20211019100035-3927434f5fd9 h1:ENVNYjfyNlKP6wcbgsj+8ZKq6L8ZKAeTxGL3P7HfiQA=
-github.com/sourcegraph/sourcegraph/lib v0.0.0-20211019100035-3927434f5fd9/go.mod h1:9vLg5fQL9Q3iktfqu96OrswbOq7yqMesMJER9DCy8vk=
+github.com/sourcegraph/sourcegraph/lib v0.0.0-20211025134328-131865293af3 h1:Ytf+X4TWH84t5RodqpIBUPS3VGzlHH9nnEaxh9/N2rI=
+github.com/sourcegraph/sourcegraph/lib v0.0.0-20211025134328-131865293af3/go.mod h1:lAHZIUiCW2kpj7f0YFFjdOq/Tv9OnnaBQNLoBcchuqQ=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o=
 github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=

internal/batches/service/service.go

@@ -25,6 +25,7 @@ import (
 type Service struct {
 	allowUnsupported bool
 	allowIgnored     bool
+	allowFiles       bool
 	client           api.Client
 	features         batches.FeatureFlags
 	imageCache       *docker.ImageCache
@@ -33,6 +34,7 @@ type Service struct {
 type Opts struct {
 	AllowUnsupported bool
 	AllowIgnored     bool
+	AllowFiles       bool
 	Client           api.Client
 }
 
@@ -44,6 +46,7 @@ func New(opts *Opts) *Service {
 	return &Service{
 		allowUnsupported: opts.AllowUnsupported,
 		allowIgnored:     opts.AllowIgnored,
+		allowFiles:       opts.AllowFiles,
 		client:           opts.Client,
 		imageCache:       docker.NewImageCache(),
 	}
@@ -275,6 +278,7 @@ func (svc *Service) ParseBatchSpec(data []byte) (*batcheslib.BatchSpec, error) {
 		AllowArrayEnvironments: svc.features.AllowArrayEnvironments,
 		AllowTransformChanges:  svc.features.AllowTransformChanges,
 		AllowConditionalExec:   svc.features.AllowConditionalExec,
+		AllowFiles:             svc.allowFiles,
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "parsing batch spec")