@@ -78,7 +78,7 @@ struct RegisterResponse {
7878 // body, but as a header. Header is extracted and set manually.
7979 #[ serde( skip_deserializing) ]
8080 extension_id : String ,
81- account_id : String ,
81+ account_id : Option < String > ,
8282}
8383
8484#[ derive( Deserialize ) ]
@@ -190,13 +190,11 @@ async fn main() -> Result<()> {
190190fn load_configs ( ) -> ( AwsConfig , Arc < Config > ) {
191191 // First load the configuration
192192 let aws_config = AwsConfig {
193- region : env:: var ( "AWS_DEFAULT_REGION" ) . expect ( "AWS_DEFAULT_REGION not set" ) ,
194- aws_access_key_id : env:: var ( "AWS_ACCESS_KEY_ID" ) . expect ( "AWS_ACCESS_KEY_ID not set" ) ,
195- aws_secret_access_key : env:: var ( "AWS_SECRET_ACCESS_KEY" )
196- . expect ( "AWS_SECRET_ACCESS_KEY not set" ) ,
197- aws_session_token : env:: var ( "AWS_SESSION_TOKEN" ) . expect ( "AWS_SESSION_TOKEN not set" ) ,
198- function_name : env:: var ( "AWS_LAMBDA_FUNCTION_NAME" )
199- . expect ( "AWS_LAMBDA_FUNCTION_NAME not set" ) ,
193+ region : env:: var ( "AWS_DEFAULT_REGION" ) . unwrap_or ( "us-east-1" . to_string ( ) ) ,
194+ aws_access_key_id : env:: var ( "AWS_ACCESS_KEY_ID" ) . unwrap_or_default ( ) ,
195+ aws_secret_access_key : env:: var ( "AWS_SECRET_ACCESS_KEY" ) . unwrap_or_default ( ) ,
196+ aws_session_token : env:: var ( "AWS_SESSION_TOKEN" ) . unwrap_or_default ( ) ,
197+ function_name : env:: var ( "AWS_LAMBDA_FUNCTION_NAME" ) . unwrap_or_default ( ) ,
200198 } ;
201199 let lambda_directory = env:: var ( "LAMBDA_TASK_ROOT" ) . unwrap_or_else ( |_| "/var/task" . to_string ( ) ) ;
202200 let config = match config:: get_config ( Path :: new ( & lambda_directory) ) {
@@ -256,7 +254,11 @@ async fn extension_loop_active(
256254) -> Result < ( ) > {
257255 let mut event_bus = EventBus :: run ( ) ;
258256
259- let tags_provider = setup_tag_provider ( aws_config, config, & r. account_id ) ;
257+ let tags_provider = setup_tag_provider (
258+ aws_config,
259+ config,
260+ r. account_id . as_ref ( ) . unwrap_or ( & "none" . to_string ( ) ) ,
261+ ) ;
260262 let ( logs_agent_channel, logs_flusher) = start_logs_agent (
261263 config,
262264 resolved_api_key. clone ( ) ,
0 commit comments