@@ -2389,6 +2389,11 @@ pub async fn sandbox_get(
23892389 println ! ( " {} {}" , "Id:" . dimmed( ) , id) ;
23902390 println ! ( " {} {}" , "Name:" . dimmed( ) , name) ;
23912391 println ! ( " {} {}" , "Phase:" . dimmed( ) , phase_name( sandbox. phase) ) ;
2392+ println ! (
2393+ " {} {}" ,
2394+ "Resource version:" . dimmed( ) ,
2395+ sandbox. metadata. as_ref( ) . map_or( 0 , |m| m. resource_version)
2396+ ) ;
23922397
23932398 // Display labels if present
23942399 if let Some ( metadata) = & sandbox. metadata
@@ -3152,14 +3157,38 @@ pub async fn sandbox_provider_attach(
31523157 tls : & TlsOptions ,
31533158) -> Result < ( ) > {
31543159 let mut client = grpc_client ( server, tls) . await ?;
3155- let response = client
3160+
3161+ // Fetch current sandbox to get resource_version for CAS
3162+ let sandbox = client
3163+ . get_sandbox ( GetSandboxRequest {
3164+ name : name. to_string ( ) ,
3165+ } )
3166+ . await
3167+ . into_diagnostic ( ) ?
3168+ . into_inner ( )
3169+ . sandbox
3170+ . ok_or_else ( || miette:: miette!( "sandbox not found" ) ) ?;
3171+
3172+ let resource_version = sandbox. metadata . as_ref ( ) . map_or ( 0 , |m| m. resource_version ) ;
3173+
3174+ let response = match client
31563175 . attach_sandbox_provider ( AttachSandboxProviderRequest {
31573176 sandbox_name : name. to_string ( ) ,
31583177 provider_name : provider. to_string ( ) ,
3178+ expected_resource_version : resource_version,
31593179 } )
31603180 . await
3161- . into_diagnostic ( ) ?
3162- . into_inner ( ) ;
3181+ {
3182+ Ok ( response) => response. into_inner ( ) ,
3183+ Err ( status) if status. code ( ) == Code :: Aborted => {
3184+ return Err ( miette:: miette!(
3185+ "Failed to attach provider: sandbox was modified by another operation.\n \
3186+ Please retry the command."
3187+ )
3188+ . with_source_code ( status. message ( ) . to_string ( ) ) ) ;
3189+ }
3190+ Err ( e) => return Err ( e) . into_diagnostic ( ) ,
3191+ } ;
31633192
31643193 if response. attached {
31653194 println ! (
@@ -3181,14 +3210,38 @@ pub async fn sandbox_provider_detach(
31813210 tls : & TlsOptions ,
31823211) -> Result < ( ) > {
31833212 let mut client = grpc_client ( server, tls) . await ?;
3184- let response = client
3213+
3214+ // Fetch current sandbox to get resource_version for CAS
3215+ let sandbox = client
3216+ . get_sandbox ( GetSandboxRequest {
3217+ name : name. to_string ( ) ,
3218+ } )
3219+ . await
3220+ . into_diagnostic ( ) ?
3221+ . into_inner ( )
3222+ . sandbox
3223+ . ok_or_else ( || miette:: miette!( "sandbox not found" ) ) ?;
3224+
3225+ let resource_version = sandbox. metadata . as_ref ( ) . map_or ( 0 , |m| m. resource_version ) ;
3226+
3227+ let response = match client
31853228 . detach_sandbox_provider ( DetachSandboxProviderRequest {
31863229 sandbox_name : name. to_string ( ) ,
31873230 provider_name : provider. to_string ( ) ,
3231+ expected_resource_version : resource_version,
31883232 } )
31893233 . await
3190- . into_diagnostic ( ) ?
3191- . into_inner ( ) ;
3234+ {
3235+ Ok ( response) => response. into_inner ( ) ,
3236+ Err ( status) if status. code ( ) == Code :: Aborted => {
3237+ return Err ( miette:: miette!(
3238+ "Failed to detach provider: sandbox was modified by another operation.\n \
3239+ Please retry the command."
3240+ )
3241+ . with_source_code ( status. message ( ) . to_string ( ) ) ) ;
3242+ }
3243+ Err ( e) => return Err ( e) . into_diagnostic ( ) ,
3244+ } ;
31923245
31933246 if response. detached {
31943247 println ! (
@@ -3523,6 +3576,7 @@ async fn auto_create_provider(
35233576 name : exact_name. to_string ( ) ,
35243577 created_at_ms : 0 ,
35253578 labels : HashMap :: new ( ) ,
3579+ resource_version : 0 ,
35263580 } ) ,
35273581 r#type : provider_type. to_string ( ) ,
35283582 credentials : discovered. credentials . clone ( ) ,
@@ -3563,6 +3617,7 @@ async fn auto_create_provider(
35633617 name : name. clone ( ) ,
35643618 created_at_ms : 0 ,
35653619 labels : HashMap :: new ( ) ,
3620+ resource_version : 0 ,
35663621 } ) ,
35673622 r#type : provider_type. to_string ( ) ,
35683623 credentials : discovered. credentials . clone ( ) ,
@@ -3975,6 +4030,7 @@ pub async fn provider_create(
39754030 name : name. to_string ( ) ,
39764031 created_at_ms : 0 ,
39774032 labels : HashMap :: new ( ) ,
4033+ resource_version : 0 ,
39784034 } ) ,
39794035 r#type : provider_type. clone ( ) ,
39804036 credentials : credential_map,
@@ -4019,6 +4075,11 @@ pub async fn provider_get(server: &str, name: &str, tls: &TlsOptions) -> Result<
40194075 println ! ( " {} {}" , "Id:" . dimmed( ) , provider. object_id( ) ) ;
40204076 println ! ( " {} {}" , "Name:" . dimmed( ) , provider. object_name( ) ) ;
40214077 println ! ( " {} {}" , "Type:" . dimmed( ) , provider. r#type) ;
4078+ println ! (
4079+ " {} {}" ,
4080+ "Resource version:" . dimmed( ) ,
4081+ provider. metadata. as_ref( ) . map_or( 0 , |m| m. resource_version)
4082+ ) ;
40224083 println ! (
40234084 " {} {}" ,
40244085 "Credential keys:" . dimmed( ) ,
@@ -4475,6 +4536,7 @@ pub async fn provider_update(
44754536 name : name. to_string ( ) ,
44764537 created_at_ms : 0 ,
44774538 labels : HashMap :: new ( ) ,
4539+ resource_version : 0 ,
44784540 } ) ,
44794541 r#type : String :: new ( ) ,
44804542 credentials : credential_map,
@@ -5029,6 +5091,7 @@ pub async fn sandbox_policy_set_global(
50295091 delete_setting : false ,
50305092 global : true ,
50315093 merge_operations : vec ! [ ] ,
5094+ expected_resource_version : 0 ,
50325095 } )
50335096 . await
50345097 . into_diagnostic ( ) ?
@@ -5227,6 +5290,7 @@ pub async fn gateway_setting_set(
52275290 delete_setting : false ,
52285291 global : true ,
52295292 merge_operations : vec ! [ ] ,
5293+ expected_resource_version : 0 ,
52305294 } )
52315295 . await
52325296 . into_diagnostic ( ) ?
@@ -5261,6 +5325,7 @@ pub async fn sandbox_setting_set(
52615325 delete_setting : false ,
52625326 global : false ,
52635327 merge_operations : vec ! [ ] ,
5328+ expected_resource_version : 0 ,
52645329 } )
52655330 . await
52665331 . into_diagnostic ( ) ?
@@ -5295,6 +5360,7 @@ pub async fn gateway_setting_delete(
52955360 delete_setting : true ,
52965361 global : true ,
52975362 merge_operations : vec ! [ ] ,
5363+ expected_resource_version : 0 ,
52985364 } )
52995365 . await
53005366 . into_diagnostic ( ) ?
@@ -5329,6 +5395,7 @@ pub async fn sandbox_setting_delete(
53295395 delete_setting : true ,
53305396 global : false ,
53315397 merge_operations : vec ! [ ] ,
5398+ expected_resource_version : 0 ,
53325399 } )
53335400 . await
53345401 . into_diagnostic ( ) ?
@@ -5387,6 +5454,7 @@ pub async fn sandbox_policy_set(
53875454 delete_setting : false ,
53885455 global : false ,
53895456 merge_operations : vec ! [ ] ,
5457+ expected_resource_version : 0 ,
53905458 } )
53915459 . await
53925460 . into_diagnostic ( ) ?;
@@ -5561,6 +5629,7 @@ pub async fn sandbox_policy_update(
55615629 delete_setting : false ,
55625630 global : false ,
55635631 merge_operations : plan. merge_operations ,
5632+ expected_resource_version : 0 ,
55645633 } )
55655634 . await
55665635 . into_diagnostic ( ) ?
0 commit comments