Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mononoke/s3blob: remove it from OSS #62

Closed
wants to merge 1 commit into from
Closed

mononoke/s3blob: remove it from OSS #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions build/fbcode_builder/getdeps/buildopts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,10 @@ def compute_env_for_install_dirs(self, install_dirs, env=None, manifest=None):
env["RUSTC"] = rustc_path
env["RUSTDOC"] = rustdoc_path

if self.is_windows():
libcrypto = os.path.join(d, "lib/libcrypto.lib")
else:
libcrypto = os.path.join(d, "lib/libcrypto.so")
openssl_include = os.path.join(d, "include/openssl")
if os.path.isfile(libcrypto) and os.path.isdir(openssl_include):
if os.path.isdir(openssl_include) and any(
os.path.isfile(os.path.join(d, "lib", libcrypto))
for libcrypto in ("libcrypto.lib", "libcrypto.so", "libcrypto.a")):
# This must be the openssl library, let Rust know about it
env["OPENSSL_DIR"] = d

Expand Down
1 change: 0 additions & 1 deletion eden/mononoke/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ members = [
"blobstore/prefixblob",
"blobstore/readonlyblob",
"blobstore/redactedblobstore",
"blobstore/s3blob",
"blobstore/samplingblob",
"blobstore/sqlblob",
"blobstore/throttledblob",
Expand Down
1 change: 0 additions & 1 deletion eden/mononoke/blobstore/factory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ multiplexedblob = { path = "../multiplexedblob" }
packblob = { path = "../packblob" }
prefixblob = { path = "../prefixblob" }
readonlyblob = { path = "../readonlyblob" }
s3blob = { path = "../s3blob" }
sql_construct = { path = "../../common/sql_construct" }
sql_ext = { path = "../../common/rust/sql_ext" }
sqlblob = { path = "../sqlblob" }
Expand Down
19 changes: 14 additions & 5 deletions eden/mononoke/blobstore/factory/src/blobstore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ use metaconfig_types::{
use multiplexedblob::{LoggingScrubHandler, MultiplexedBlobstore, ScrubBlobstore, ScrubHandler};
use packblob::{PackBlob, PackOptions};
use readonlyblob::ReadOnlyBlobstore;
use s3blob::S3Blob;
use scuba::ScubaSampleBuilder;
use slog::Logger;
use sql_construct::SqlConstructFromDatabaseConfig;
Expand Down Expand Up @@ -290,10 +289,20 @@ pub fn make_blobstore<'a>(
keychain_group,
region_name,
endpoint,
} => S3Blob::new(fb, bucket, keychain_group, region_name, endpoint)
.await
.context(ErrorKind::StateOpen)
.map(|store| Arc::new(store) as Arc<dyn Blobstore>)?,
} => {
#[cfg(fbcode_build)]
{
::s3blob::S3Blob::new(fb, bucket, keychain_group, region_name, endpoint)
.await
.context(ErrorKind::StateOpen)
.map(|store| Arc::new(store) as Arc<dyn Blobstore>)?
}
#[cfg(not(fbcode_build))]
{
let _ = (bucket, keychain_group, region_name, endpoint);
unimplemented!("This is implemented only for fbcode_build")
}
}
};

let store = if readonly_storage.0 {
Expand Down
25 changes: 0 additions & 25 deletions eden/mononoke/blobstore/s3blob/Cargo.toml
View file
Open in desktop

This file was deleted.

286 changes: 0 additions & 286 deletions eden/mononoke/blobstore/s3blob/src/lib.rs
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions eden/scm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ getdepsbuild:
mkdir -p ../../common/rust
ln -sfn $(GETDEPS_INSTALL_DIR)/rust-shed/source/shed ../../common/rust/shed
GETDEPS_BUILD=1 \
INCLUDE_DIRS="$(OPENSSL_DIR)/include:/usr/local/include:/opt/local/include:/opt/homebrew/include/" \
LIBRARY_DIRS="$(OPENSSL_DIR)/lib:/usr/local/lib:/opt/local/lib:/opt/homebrew/lib/" \
THRIFT="$(GETDEPS_INSTALL_DIR)/fbthrift/bin/thrift1" \
$(PYTHON) setup.py $(PURE) build $(COMPILERFLAG)

Expand Down