Merge pull request #11 from aperture-data/support_building_locally

Support building locally

Author: andreim-sv

SConstruct

@@ -53,12 +53,15 @@ comm_env.Replace(
         LIBPATH = []
              )
 
-comm_env.Replace(CXXFLAGS = comm_env['CXXFLAGS'].replace("-Weffc++", ""))
-comm_env.Replace(CXXFLAGS = re.sub("-Warray-bounds[^\s]+", "-Warray-bounds=1", comm_env['CXXFLAGS']))
-comm_env.Replace(CXXFLAGS = re.sub("-Wsuggest-attribute=const", "-Wno-suggest-attribute=const", comm_env['CXXFLAGS']))
-comm_env.Replace(CXXFLAGS = re.sub("-Wsuggest-final-types",     "-Wno-suggest-final-types",     comm_env['CXXFLAGS']))
-comm_env.Replace(CXXFLAGS = re.sub("-Wuseless-cast",            "-Wno-useless-cast",            comm_env['CXXFLAGS']))
-comm_env.Replace(CXXFLAGS = re.sub("-Wsuggest-override",        "-Wno-suggest-override",        comm_env['CXXFLAGS']))
+# This is to compile protobuf-based .cc whose code-generation we do not control.
+# The rest of the code is supposed to compiled using higher standards.
+lenient_env = comm_env.Clone()
+lenient_env.Replace(CXXFLAGS = lenient_env['CXXFLAGS'].replace("-Weffc++", ""))
+lenient_env.Replace(CXXFLAGS = re.sub("-Warray-bounds[^\s]+", "-Warray-bounds=1", lenient_env['CXXFLAGS']))
+lenient_env.Replace(CXXFLAGS = re.sub("-Wsuggest-attribute=const", "-Wno-suggest-attribute=const", lenient_env['CXXFLAGS']))
+lenient_env.Replace(CXXFLAGS = re.sub("-Wsuggest-final-types",     "-Wno-suggest-final-types",     lenient_env['CXXFLAGS']))
+lenient_env.Replace(CXXFLAGS = re.sub("-Wuseless-cast",            "-Wno-useless-cast",            lenient_env['CXXFLAGS']))
+lenient_env.Replace(CXXFLAGS = re.sub("-Wsuggest-override",        "-Wno-suggest-override",        lenient_env['CXXFLAGS']))
 
 comm_cc = [
            'src/comm/ConnClient.cc',
@@ -86,15 +89,19 @@ client_env.Replace(
 
 compileProtoFiles(client_env)
 
-client_cc = [
+protobuf_cc = [
            'src/aperturedb/queryMessage.pb.cc',
+           ]
+client_cc = [
            'src/aperturedb/TokenBasedVDMSClient.cc',
            'src/aperturedb/VDMSClient.cc',
            'src/aperturedb/VDMSClientImpl.cc'
           ]
 
 client_env.ParseConfig('pkg-config --cflags --libs protobuf')
-ulib = client_env.SharedLibrary('lib/aperturedb-client', client_cc)
+ulib = client_env.SharedLibrary('lib/aperturedb-client',
+        [client_cc, lenient_env.SharedObject(protobuf_cc)]
+        )
 
 CXXFLAGS = env['CXXFLAGS']
 

src/aperturedb/TokenBasedVDMSClient.cc

@@ -54,8 +54,8 @@ TokenBasedVDMSClient::TokenBasedVDMSClient(const VDMSClientConfig& config)
         false,
         config.metrics
 )))
+, _connection(_client->connect())
 {
-    _connection = _client->connect();
 }
 
 TokenBasedVDMSClient::~TokenBasedVDMSClient() = default;

src/aperturedb/VDMSClientImpl.cc

@@ -88,13 +88,18 @@ VDMSClientImpl::VDMSClientImpl(std::string username, std::string password, const
 : TokenBasedVDMSClient(config)
 , _username(std::move(username))
 , _password(std::move(password))
+, _api_key()
+, _auth_token()
 {
     re_authenticate();
 }
 
 VDMSClientImpl::VDMSClientImpl(std::string api_key, const VDMSClientConfig& config)
 : TokenBasedVDMSClient(config)
+, _username()
+, _password()
 , _api_key(std::move(api_key))
+, _auth_token()
 {
     re_authenticate();
 }

src/aperturedb/VDMSClientImpl.h

@@ -41,10 +41,10 @@
 namespace VDMS {
 
     struct AuthToken {
-        std::chrono::system_clock::time_point issued_at;
-        std::string refresh_token;
+        std::chrono::system_clock::time_point issued_at{};
+        std::string refresh_token{};
         int32_t refresh_token_expires_in{-1};
-        std::string session_token;
+        std::string session_token{};
         int32_t session_token_expires_in{-1};
     };
 

src/comm/ConnClient.cc

@@ -49,10 +49,10 @@ using namespace comm;
 
 ConnClient::ConnClient(const Address& server_address, ConnClientConfig config) :
     _config(std::move(config)),
-    _server(std::move(server_address))
+    _connection(),
+    _server(std::move(server_address)),
+    _ssl_ctx(create_client_context())
 {
-    _ssl_ctx = create_client_context();
-
     set_default_verify_paths(_ssl_ctx.get());
 
     if (config.verify_certificate) {

src/comm/ConnServer.cc

@@ -51,11 +51,11 @@ using namespace comm;
 
 ConnServer::ConnServer(int port, ConnServerConfig config) :
     _config(std::move(config)),
+    _listening_socket(),
     _open_ssl_initializer(OpenSSLInitializer::instance()),
-    _port(port)
+    _port(port),
+    _ssl_ctx(create_server_context())
 {
-    _ssl_ctx = create_server_context();
-
     set_default_verify_paths(_ssl_ctx.get());
 
     if (_config.auto_generate_certificate) {

src/comm/TCPConnection.cc

@@ -43,6 +43,7 @@ using namespace comm;
 
 TCPConnection::TCPConnection(ConnMetrics* metrics)
 : Connection(metrics)
+, _tcp_socket()
 {
 }
 

src/comm/TLS.h

@@ -11,8 +11,8 @@
 #include <openssl/ssl.h>
 
 struct Certificate {
-    std::string private_key;
-    std::string cert;
+    std::string private_key{};
+    std::string cert{};
 };
 
 class OpenSSLInitializer

src/comm/TLSConnection.cc

@@ -18,6 +18,7 @@ using namespace comm;
 
 TLSConnection::TLSConnection(ConnMetrics* metrics)
 : Connection(metrics)
+, _tls_socket()
 {
 }
 

tools/prometheus_ambassador/SConscript

@@ -7,11 +7,12 @@ Import('env')
 
 prom_amb_env = env.Clone()
 prom_amb_env.Replace(
-    CPPPATH = [ 'src',
+    CPPPATH = [ 'src', '../../include/util',
                 os.getenv('AD_COMM_INCLUDE',     default='../../include'),
                 os.getenv('AD_CLIENT_INCLUDE',   default='../../include'),
                 os.getenv('PROMETHEUS_CPP_CORE_INCLUDE', default=''),
                 os.getenv('PROMETHEUS_CPP_PULL_INCLUDE', default=''),
+                os.getenv('NLOHMANN_JSON_INCLUDE', default='/usr/include'),
               ],
     LIBS =    [ 'comm',
                 'aperturedb-client',