@@ -106,12 +106,21 @@ impl Config {
106106 crisp_website_id : env:: var ( "CRISP_WEBSITE_ID" ) . ok ( ) ,
107107 pinecone_api_key : env:: var ( "PINECONE_API_KEY" ) . ok ( ) ,
108108 pinecone_host : env:: var ( "PINECONE_HOST" ) . ok ( ) ,
109- gce_project_id : env:: var ( "GCE_PROJECT_ID" )
110- . or_else ( |_| env:: var ( "FIREBASE_PROJECT_ID" ) )
111- . or_else ( |_| env:: var ( "GCP_PROJECT_ID" ) )
112- . unwrap_or_else ( |_| "based-hardware" . to_string ( ) ) ,
113- gce_source_image : env:: var ( "GCE_SOURCE_IMAGE" )
114- . unwrap_or_else ( |_| "projects/based-hardware/global/images/family/omi-agent" . to_string ( ) ) ,
109+ gce_project_id : {
110+ let p = env:: var ( "GCE_PROJECT_ID" )
111+ . or_else ( |_| env:: var ( "FIREBASE_PROJECT_ID" ) )
112+ . or_else ( |_| env:: var ( "GCP_PROJECT_ID" ) )
113+ . unwrap_or_else ( |_| "based-hardware" . to_string ( ) ) ;
114+ p
115+ } ,
116+ gce_source_image : {
117+ let gce_proj = env:: var ( "GCE_PROJECT_ID" )
118+ . or_else ( |_| env:: var ( "FIREBASE_PROJECT_ID" ) )
119+ . or_else ( |_| env:: var ( "GCP_PROJECT_ID" ) )
120+ . unwrap_or_else ( |_| "based-hardware" . to_string ( ) ) ;
121+ env:: var ( "GCE_SOURCE_IMAGE" )
122+ . unwrap_or_else ( |_| format ! ( "projects/{}/global/images/family/omi-agent" , gce_proj) )
123+ } ,
115124 agent_gcs_bucket : env:: var ( "AGENT_GCS_BUCKET" )
116125 . unwrap_or_else ( |_| "based-hardware-agent" . to_string ( ) ) ,
117126 }
0 commit comments