Page MenuHomePhabricator
Differential D11531

Reorder project.pbxproj after yarn cleaninstall
ClosedPublic
Actions

Authored by marcin on Apr 3 2024, 2:25 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 25, 11:05 AM
Unknown Object (File)
Mon, Mar 10, 10:25 PM
Unknown Object (File)
Mon, Mar 3, 7:56 PM
Unknown Object (File)
Feb 26 2025, 11:39 AM
Unknown Object (File)
Feb 26 2025, 11:39 AM
Unknown Object (File)
Feb 26 2025, 11:39 AM
Unknown Object (File)
Feb 26 2025, 11:39 AM
Unknown Object (File)
Feb 26 2025, 11:34 AM
View All Files
Subscribers
ashoat
kamil

Details

Reviewers
michal
will
tomek
bartek
Commits
rCOMM42dc0c836e3b: Reorder project.pbxproj after yarn cleaninstall
Summary

Changes in this diff are effect of running yarn cleaninstall on latest master.

Test Plan

Run yarn cleaninstall on latest master to ensure that those changes appear.

Diff Detail

Repository
rCOMM Comm
Branch
marcin/eng-7640
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

marcin created this revision.Apr 3 2024, 2:25 AM
Herald added a subscriber: ashoat. · View Herald TranscriptApr 3 2024, 2:25 AM
Harbormaster completed remote builds in B27928: Diff 38700.Apr 3 2024, 2:41 AM
marcin requested review of this revision.Apr 3 2024, 2:41 AM
michal accepted this revision.Apr 3 2024, 2:45 AM
This revision is now accepted and ready to land.Apr 3 2024, 2:45 AM
marcin updated this revision to Diff 38720.Apr 3 2024, 4:42 AM

Fix clang formaatting in SQLiteQueryExecutorBindings

Harbormaster completed remote builds in B27941: Diff 38720.Apr 3 2024, 4:58 AM
kamil added a subscriber: kamil.Apr 3 2024, 5:20 AM
kamil added inline comments.
web/cpp/SQLiteQueryExecutorBindings.cpp
196–205

If I remember correctly clang-format-all should be automatically called on commit - is it broken now?

marcin updated this revision to Diff 38727.Apr 3 2024, 6:29 AM

Rebase before landing

This revision was landed with ongoing or failed builds.Apr 3 2024, 6:31 AM
Closed by commit rCOMM42dc0c836e3b: Reorder project.pbxproj after yarn cleaninstall (authored by marcin). · Explain Why
This revision was automatically updated to reflect the committed changes.
marcin added a commit: rCOMM42dc0c836e3b: Reorder project.pbxproj after yarn cleaninstall.
Harbormaster completed remote builds in B27948: Diff 38727.Apr 3 2024, 6:45 AM

Revision Contents
Changeset List

PathSize
native/
ios/
Comm.xcodeproj/
8 lines
web/
cpp/
13 lines

Diff 38720

View Options

native/ios/Comm.xcodeproj/project.pbxproj

pub mod error; pub mod error;
pub mod identity; pub mod identity;
pub mod tunnelbroker; pub mod tunnelbroker;
// Re-export some dependencies which may need to be used by downstream crates // Re-export some dependencies which may need to be used by downstream crates
pub use tonic; pub use tonic;
use error::Error; use error::Error;
use std::path::Path;
use std::time::Duration; use std::time::Duration;
use tonic::transport::{Certificate, Channel, ClientTlsConfig}; use tonic::transport::Channel;
use tracing::info; use tracing::info;
const CERT_PATHS: &[&str] = &[
// MacOS and newer Ubuntu
"/etc/ssl/cert.pem",
// Common CA cert paths
"/etc/ssl/certs/ca-bundle.crt",
"/etc/ssl/certs/ca-certificates.crt",
];
const CONNECT_TIMEOUT_DURATION: Duration = Duration::from_secs(5); const CONNECT_TIMEOUT_DURATION: Duration = Duration::from_secs(5);
pub(crate) fn get_ca_cert_contents() -> Option<String> {
CERT_PATHS
.iter()
.map(Path::new)
.filter(|p| p.exists())
.filter_map(|f| std::fs::read_to_string(f).ok())
.next()
}
pub(crate) async fn get_grpc_service_channel( pub(crate) async fn get_grpc_service_channel(
url: &str, url: &str,
) -> Result<Channel, Error> { ) -> Result<Channel, Error> {
let ca_cert = crate::get_ca_cert_contents().expect("Unable to get CA bundle");
info!("Connecting to gRPC service at {}", url); info!("Connecting to gRPC service at {}", url);
let mut channel = Channel::from_shared(url.to_string())? let channel = Channel::from_shared(url.to_string())?
.connect_timeout(CONNECT_TIMEOUT_DURATION); .connect_timeout(CONNECT_TIMEOUT_DURATION);
// tls_config will fail if the underlying URI is only http://
if url.starts_with("https:") {
channel = channel.tls_config(
ClientTlsConfig::new().ca_certificate(Certificate::from_pem(&ca_cert)),
)?
}
Ok(channel.connect().await?) Ok(channel.connect().await?)
} }
View Options

web/cpp/SQLiteQueryExecutorBindings.cpp

pub mod error; pub mod error;
pub mod identity; pub mod identity;
pub mod tunnelbroker; pub mod tunnelbroker;
// Re-export some dependencies which may need to be used by downstream crates // Re-export some dependencies which may need to be used by downstream crates
pub use tonic; pub use tonic;
use error::Error; use error::Error;
use std::path::Path;
use std::time::Duration; use std::time::Duration;
use tonic::transport::{Certificate, Channel, ClientTlsConfig}; use tonic::transport::Channel;
use tracing::info; use tracing::info;
const CERT_PATHS: &[&str] = &[
// MacOS and newer Ubuntu
"/etc/ssl/cert.pem",
// Common CA cert paths
"/etc/ssl/certs/ca-bundle.crt",
"/etc/ssl/certs/ca-certificates.crt",
];
const CONNECT_TIMEOUT_DURATION: Duration = Duration::from_secs(5); const CONNECT_TIMEOUT_DURATION: Duration = Duration::from_secs(5);
pub(crate) fn get_ca_cert_contents() -> Option<String> {
CERT_PATHS
.iter()
.map(Path::new)
.filter(|p| p.exists())
.filter_map(|f| std::fs::read_to_string(f).ok())
.next()
}
pub(crate) async fn get_grpc_service_channel( pub(crate) async fn get_grpc_service_channel(
url: &str, url: &str,
) -> Result<Channel, Error> { ) -> Result<Channel, Error> {
let ca_cert = crate::get_ca_cert_contents().expect("Unable to get CA bundle");
info!("Connecting to gRPC service at {}", url); info!("Connecting to gRPC service at {}", url);
let mut channel = Channel::from_shared(url.to_string())? let channel = Channel::from_shared(url.to_string())?
.connect_timeout(CONNECT_TIMEOUT_DURATION); .connect_timeout(CONNECT_TIMEOUT_DURATION);
// tls_config will fail if the underlying URI is only http://
if url.starts_with("https:") {
channel = channel.tls_config(
ClientTlsConfig::new().ca_certificate(Certificate::from_pem(&ca_cert)),
)?
}
Ok(channel.connect().await?) Ok(channel.connect().await?)
} }