Skip to content

Commit 7c7167f

Browse files
committed
Remove blob download endpoint
1 parent 54bf0ca commit 7c7167f

File tree

9 files changed

+3
-329
lines changed

9 files changed

+3
-329
lines changed

cmd/bb_portal/BUILD.bazel

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ go_library(
1616
"//internal/api",
1717
"//internal/api/grpc/bes",
1818
"//internal/graphql",
19-
"//pkg/cas",
2019
"//pkg/processing",
2120
"//pkg/proto/configuration/bb_portal",
2221
"@com_github_99designs_gqlgen//graphql/handler",

cmd/bb_portal/main.go

+1-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/buildbarn/bb-portal/ent/gen/ent"
1717
"github.com/buildbarn/bb-portal/ent/gen/ent/migrate"
1818
"github.com/buildbarn/bb-portal/internal/api/grpc/bes"
19-
"github.com/buildbarn/bb-portal/pkg/cas"
2019
"github.com/buildbarn/bb-portal/pkg/processing"
2120
"github.com/buildbarn/bb-portal/pkg/proto/configuration/bb_portal"
2221
"github.com/buildbarn/bb-storage/pkg/global"
@@ -36,8 +35,6 @@ var (
3635
dsDriver = flag.String("datasource-driver", "sqlite3", "Data source driver to use")
3736
dsURL = flag.String("datasource-url", "file:buildportal.db?_journal=WAL&_fk=1", "Data source URL for the DB")
3837
bepFolder = flag.String("bep-folder", "./bep-files/", "Folder to watch for new BEP files")
39-
caFile = flag.String("ca-file", "", "Custom CA certificate file")
40-
credentialsHelperCommand = flag.String("credential_helper", "", "Path to a credential helper. Compatible with Bazel's --credential_helper")
4138
blobArchiveFolder = flag.String("blob-archive-folder", "./blob-archive/",
4239
"Folder where blobs (log outputs, stdout, stderr, undeclared test outputs) referenced from failures are archived")
4340
)
@@ -83,11 +80,7 @@ func main() {
8380
runWatcher(watcher, dbClient, *bepFolder, blobArchiver)
8481

8582
router := mux.NewRouter()
86-
casManager := cas.NewConnectionManager(cas.ManagerParams{
87-
TLSCACertFile: *caFile,
88-
CredentialsHelperCommand: *credentialsHelperCommand,
89-
})
90-
newPortalService(blobArchiver, casManager, dbClient, router)
83+
newPortalService(blobArchiver, dbClient, router)
9184
bb_http.NewServersFromConfigurationAndServe(
9285
configuration.HttpServers,
9386
bb_http.NewMetricsHandler(router, "PortalUI"),

cmd/bb_portal/portal_service.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@ import (
1111
"github.com/buildbarn/bb-portal/ent/gen/ent"
1212
"github.com/buildbarn/bb-portal/internal/api"
1313
"github.com/buildbarn/bb-portal/internal/graphql"
14-
"github.com/buildbarn/bb-portal/pkg/cas"
1514
"github.com/buildbarn/bb-portal/pkg/processing"
1615
"github.com/gorilla/mux"
1716
)
1817

19-
func newPortalService(archiver processing.BlobMultiArchiver, casManager *cas.ConnectionManager, dbClient *ent.Client, router *mux.Router) {
18+
func newPortalService(archiver processing.BlobMultiArchiver, dbClient *ent.Client, router *mux.Router) {
2019
srv := handler.NewDefaultServer(graphql.NewSchema(dbClient))
2120
srv.Use(entgql.Transactioner{TxOpener: dbClient})
2221

2322
router.PathPrefix("/graphql").Handler(srv)
2423
router.Handle("/graphiql", playground.Handler("GraphQL Playground", "/graphql"))
25-
router.Handle("/api/v1/blobs/{blobID}/{name}", api.NewBlobHandler(dbClient, casManager))
2624
router.Handle("/api/v1/bep/upload", api.NewBEPUploadHandler(dbClient, archiver)).Methods("POST")
2725
router.PathPrefix("/").Handler(frontendServer())
2826
}

internal/api/BUILD.bazel

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@ load("@rules_go//go:def.bzl", "go_library")
22

33
go_library(
44
name = "api",
5-
srcs = [
6-
"bep_upload.go",
7-
"blob_handler.go",
8-
],
5+
srcs = ["bep_upload.go"],
96
importpath = "github.com/buildbarn/bb-portal/internal/api",
107
visibility = ["//:__subpackages__"],
118
deps = [
129
"//ent/gen/ent",
13-
"//ent/gen/ent/blob",
14-
"//pkg/cas",
1510
"//pkg/processing",
1611
],
1712
)

internal/api/blob_handler.go

-123
This file was deleted.

pkg/auth/BUILD.bazel

-12
This file was deleted.

pkg/auth/credentials_helper.go

-78
This file was deleted.

pkg/cas/BUILD.bazel

-13
This file was deleted.

pkg/cas/client.go

-85
This file was deleted.

0 commit comments

Comments
 (0)