6
6
7
7
remoteexecution "github.com/bazelbuild/remote-apis/build/bazel/remote/execution/v2"
8
8
"github.com/buildbarn/bb-storage/pkg/auth"
9
+ auth_configuration "github.com/buildbarn/bb-storage/pkg/auth/configuration"
9
10
"github.com/buildbarn/bb-storage/pkg/blobstore"
10
11
blobstore_configuration "github.com/buildbarn/bb-storage/pkg/blobstore/configuration"
11
12
"github.com/buildbarn/bb-storage/pkg/blobstore/grpcservers"
@@ -56,7 +57,8 @@ func main() {
56
57
configuration .ContentAddressableStorage ,
57
58
blobstore_configuration .NewCASBlobAccessCreator (
58
59
grpcClientFactory ,
59
- int (configuration .MaximumMessageSizeBytes )))
60
+ int (configuration .MaximumMessageSizeBytes )),
61
+ grpcClientFactory )
60
62
if err != nil {
61
63
return util .StatusWrap (err , "Failed to create Content Addressable Storage" )
62
64
}
@@ -75,7 +77,8 @@ func main() {
75
77
blobstore_configuration .NewACBlobAccessCreator (
76
78
contentAddressableStorageInfo ,
77
79
grpcClientFactory ,
78
- int (configuration .MaximumMessageSizeBytes )))
80
+ int (configuration .MaximumMessageSizeBytes )),
81
+ grpcClientFactory )
79
82
if err != nil {
80
83
return util .StatusWrap (err , "Failed to create Action Cache" )
81
84
}
@@ -94,7 +97,8 @@ func main() {
94
97
configuration .IndirectContentAddressableStorage ,
95
98
blobstore_configuration .NewICASBlobAccessCreator (
96
99
grpcClientFactory ,
97
- int (configuration .MaximumMessageSizeBytes )))
100
+ int (configuration .MaximumMessageSizeBytes )),
101
+ grpcClientFactory )
98
102
if err != nil {
99
103
return util .StatusWrap (err , "Failed to create Indirect Content Addressable Storage" )
100
104
}
@@ -109,7 +113,8 @@ func main() {
109
113
configuration .InitialSizeClassCache ,
110
114
blobstore_configuration .NewISCCBlobAccessCreator (
111
115
grpcClientFactory ,
112
- int (configuration .MaximumMessageSizeBytes )))
116
+ int (configuration .MaximumMessageSizeBytes )),
117
+ grpcClientFactory )
113
118
if err != nil {
114
119
return util .StatusWrap (err , "Failed to create Initial Size Class Cache" )
115
120
}
@@ -124,7 +129,8 @@ func main() {
124
129
configuration .FileSystemAccessCache ,
125
130
blobstore_configuration .NewFSACBlobAccessCreator (
126
131
grpcClientFactory ,
127
- int (configuration .MaximumMessageSizeBytes )))
132
+ int (configuration .MaximumMessageSizeBytes )),
133
+ grpcClientFactory )
128
134
if err != nil {
129
135
return util .StatusWrap (err , "Failed to create File System Access Cache" )
130
136
}
@@ -148,7 +154,7 @@ func main() {
148
154
if err != nil {
149
155
return err
150
156
}
151
- executeAuthorizer , err := auth .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .GetExecuteAuthorizer ())
157
+ executeAuthorizer , err := auth_configuration .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .GetExecuteAuthorizer (), grpcClientFactory )
152
158
if err != nil {
153
159
return util .StatusWrap (err , "Failed to create execute authorizer" )
154
160
}
@@ -210,26 +216,27 @@ func main() {
210
216
}
211
217
},
212
218
siblingsGroup ,
219
+ grpcClientFactory ,
213
220
); err != nil {
214
221
return util .StatusWrap (err , "gRPC server failure" )
215
222
}
216
223
217
- lifecycleState .MarkReadyAndWait (siblingsGroup )
224
+ lifecycleState .MarkReadyAndWait (siblingsGroup , grpcClientFactory )
218
225
return nil
219
226
})
220
227
}
221
228
222
- func newNonScannableBlobAccess (dependenciesGroup program.Group , configuration * bb_storage.NonScannableBlobAccessConfiguration , creator blobstore_configuration.BlobAccessCreator ) (blobstore_configuration.BlobAccessInfo , blobstore.BlobAccess , []auth.Authorizer , auth.Authorizer , error ) {
229
+ func newNonScannableBlobAccess (dependenciesGroup program.Group , configuration * bb_storage.NonScannableBlobAccessConfiguration , creator blobstore_configuration.BlobAccessCreator , grpcClientFactory bb_grpc. ClientFactory ) (blobstore_configuration.BlobAccessInfo , blobstore.BlobAccess , []auth.Authorizer , auth.Authorizer , error ) {
223
230
info , err := blobstore_configuration .NewBlobAccessFromConfiguration (dependenciesGroup , configuration .Backend , creator )
224
231
if err != nil {
225
232
return blobstore_configuration.BlobAccessInfo {}, nil , nil , nil , err
226
233
}
227
234
228
- getAuthorizer , err := auth .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .GetAuthorizer )
235
+ getAuthorizer , err := auth_configuration .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .GetAuthorizer , grpcClientFactory )
229
236
if err != nil {
230
237
return blobstore_configuration.BlobAccessInfo {}, nil , nil , nil , util .StatusWrap (err , "Failed to create Get() authorizer" )
231
238
}
232
- putAuthorizer , err := auth .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .PutAuthorizer )
239
+ putAuthorizer , err := auth_configuration .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .PutAuthorizer , grpcClientFactory )
233
240
if err != nil {
234
241
return blobstore_configuration.BlobAccessInfo {}, nil , nil , nil , util .StatusWrap (err , "Failed to create Put() authorizer" )
235
242
}
@@ -241,21 +248,21 @@ func newNonScannableBlobAccess(dependenciesGroup program.Group, configuration *b
241
248
nil
242
249
}
243
250
244
- func newScannableBlobAccess (dependenciesGroup program.Group , configuration * bb_storage.ScannableBlobAccessConfiguration , creator blobstore_configuration.BlobAccessCreator ) (blobstore_configuration.BlobAccessInfo , blobstore.BlobAccess , []auth.Authorizer , error ) {
251
+ func newScannableBlobAccess (dependenciesGroup program.Group , configuration * bb_storage.ScannableBlobAccessConfiguration , creator blobstore_configuration.BlobAccessCreator , grpcClientFactory bb_grpc. ClientFactory ) (blobstore_configuration.BlobAccessInfo , blobstore.BlobAccess , []auth.Authorizer , error ) {
245
252
info , err := blobstore_configuration .NewBlobAccessFromConfiguration (dependenciesGroup , configuration .Backend , creator )
246
253
if err != nil {
247
254
return blobstore_configuration.BlobAccessInfo {}, nil , nil , err
248
255
}
249
256
250
- getAuthorizer , err := auth .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .GetAuthorizer )
257
+ getAuthorizer , err := auth_configuration .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .GetAuthorizer , grpcClientFactory )
251
258
if err != nil {
252
259
return blobstore_configuration.BlobAccessInfo {}, nil , nil , util .StatusWrap (err , "Failed to create Get() authorizer" )
253
260
}
254
- putAuthorizer , err := auth .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .PutAuthorizer )
261
+ putAuthorizer , err := auth_configuration .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .PutAuthorizer , grpcClientFactory )
255
262
if err != nil {
256
263
return blobstore_configuration.BlobAccessInfo {}, nil , nil , util .StatusWrap (err , "Failed to create Put() authorizer" )
257
264
}
258
- findMissingAuthorizer , err := auth .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .FindMissingAuthorizer )
265
+ findMissingAuthorizer , err := auth_configuration .DefaultAuthorizerFactory .NewAuthorizerFromConfiguration (configuration .FindMissingAuthorizer , grpcClientFactory )
259
266
if err != nil {
260
267
return blobstore_configuration.BlobAccessInfo {}, nil , nil , util .StatusWrap (err , "Failed to create FindMissing() authorizer" )
261
268
}
0 commit comments