diff --git a/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.cc b/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.cc index 85c9099..b873636 100644 --- a/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.cc +++ b/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.cc @@ -15,35 +15,41 @@ #include "jsonnet_base_transaction.h" absl::Status JsonnetTransaction::Main() { - JsonnetApi api(sandbox()); // Initialize library's main structure. - SAPI_ASSIGN_OR_RETURN(JsonnetVm* jsonnet_vm, api.c_jsonnet_make()); + SAPI_ASSIGN_OR_RETURN(JsonnetVm * jsonnet_vm, api.c_jsonnet_make()); sapi::v::RemotePtr vm_pointer(jsonnet_vm); // Read input file. std::string in_file_in_sandboxee(std::string("/input/") + basename(&in_file_[0])); sapi::v::ConstCStr in_file_var(in_file_in_sandboxee.c_str()); - SAPI_ASSIGN_OR_RETURN(char* input, api.c_read_input(false, in_file_var.PtrBefore())); + SAPI_ASSIGN_OR_RETURN(char* input, + api.c_read_input(false, in_file_var.PtrBefore())); // Process jsonnet data. sapi::v::RemotePtr input_pointer(input); sapi::v::Int error; - SAPI_ASSIGN_OR_RETURN(char* output, api.c_jsonnet_evaluate_snippet(&vm_pointer, in_file_var.PtrBefore(), &input_pointer, error.PtrAfter())); - TRANSACTION_FAIL_IF_NOT(error.GetValue() == 0, "Jsonnet code evaluation failed."); + SAPI_ASSIGN_OR_RETURN(char* output, api.c_jsonnet_evaluate_snippet( + &vm_pointer, in_file_var.PtrBefore(), + &input_pointer, error.PtrAfter())); + TRANSACTION_FAIL_IF_NOT(error.GetValue() == 0, + "Jsonnet code evaluation failed."); // Write data to file. std::string out_file_in_sandboxee(std::string("/output/") + basename(&out_file_[0])); sapi::v::ConstCStr out_file_var(out_file_in_sandboxee.c_str()); sapi::v::RemotePtr output_pointer(output); - SAPI_ASSIGN_OR_RETURN(bool success, api.c_write_output_file(&output_pointer, out_file_var.PtrBefore())); + SAPI_ASSIGN_OR_RETURN( + bool success, + api.c_write_output_file(&output_pointer, out_file_var.PtrBefore())); TRANSACTION_FAIL_IF_NOT(success, "Writing to output file failed."); // Clean up. - SAPI_ASSIGN_OR_RETURN(char* result, api.c_jsonnet_realloc(&vm_pointer, &output_pointer, 0)); + SAPI_ASSIGN_OR_RETURN(char* result, + api.c_jsonnet_realloc(&vm_pointer, &output_pointer, 0)); SAPI_RETURN_IF_ERROR(api.c_jsonnet_destroy(&vm_pointer)); SAPI_RETURN_IF_ERROR(api.c_free_input(&input_pointer)); @@ -51,7 +57,6 @@ absl::Status JsonnetTransaction::Main() { return absl::OkStatus(); } - int main(int argc, char* argv[]) { google::InitGoogleLogging(argv[0]); gflags::ParseCommandLineFlags(&argc, &argv, true); @@ -74,5 +79,4 @@ int main(int argc, char* argv[]) { CHECK(result.ok()); return EXIT_SUCCESS; - } diff --git a/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.h b/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.h index 5e81adf..412ee47 100644 --- a/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.h +++ b/oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.h @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include #include - -#include "sandboxed_api/transaction.h" -#include "sandboxed_api/vars.h" -#include "sandboxed_api/util/flag.h" +#include #include "jsonnet_sapi.sapi.h" +#include "sandboxed_api/transaction.h" +#include "sandboxed_api/util/flag.h" +#include "sandboxed_api/vars.h" class JsonnetSapiTransactionSandbox : public JsonnetSandbox { public: - explicit JsonnetSapiTransactionSandbox(std::string in_file, std::string out_file) + explicit JsonnetSapiTransactionSandbox(std::string in_file, + std::string out_file) : in_file_(in_file), out_file_(out_file) {} std::unique_ptr ModifyPolicy( @@ -53,16 +53,17 @@ class JsonnetSapiTransactionSandbox : public JsonnetSandbox { class JsonnetTransaction : public sapi::Transaction { public: JsonnetTransaction(std::string in_file, std::string out_file) - : sapi::Transaction(std::make_unique(in_file, out_file)), - in_file_(in_file), out_file_(out_file) - { - sapi::Transaction::set_retry_count(0); // Try once, no retries - sapi::Transaction::SetTimeLimit(0); // Infinite time limit + : sapi::Transaction( + std::make_unique(in_file, out_file)), + in_file_(in_file), + out_file_(out_file) { + sapi::Transaction::set_retry_count(0); // Try once, no retries + sapi::Transaction::SetTimeLimit(0); // Infinite time limit } private: - absl::Status Main() override; std::string in_file_; std::string out_file_; + absl::Status Main() override; };