@@ -56,26 +56,6 @@ struct Args {
5656 /// Logging verbosity [OFF, ERROR, WARN, INFO, DEBUG, TRACE]
5757 #[ arg( global = true , short, long, default_value_t = LevelFilter :: Debug ) ]
5858 pub verbosity : LevelFilter ,
59-
60- #[ command( subcommand) ]
61- trigger : Option < Command > ,
62- }
63-
64- #[ derive( Debug , Subcommand ) ]
65- enum Command {
66- Trigger {
67- #[ arg( ) ]
68- url : Url ,
69-
70- #[ arg( ) ]
71- hash : Option < String > ,
72- } ,
73- Run {
74- url : Url ,
75- app_id : String ,
76- track : String ,
77- document_version : Version ,
78- } ,
7959}
8060
8161fn main ( ) {
@@ -95,33 +75,28 @@ fn main() {
9575 . init ( ) ;
9676 }
9777
98- match args . trigger {
99- Some ( Command :: Trigger { url , hash } ) => {
100- debug ! ( "Triggering update with URL: {url} and hash: {hash:?}" ) ;
101- //trigger(&url, hash).await.unwrap();
102- }
103- Some ( Command :: Run {
104- url ,
105- app_id ,
106- track ,
107- document_version ,
108- } ) => {
109- debug ! ( "Running update check for URL: {url}, App ID: {app_id}, Track: {track}, Document Version: {document_version} " ) ;
78+ let r = query_and_fetch_yaml_document (
79+ & Url :: parse ( "https://nebraska-poc-ep-cda8e2czfnhahxfk.b01.azurefd.net/v1/update" ) . unwrap ( ) ,
80+ "b0ec8f0d-1c13-4bf4-9efd-ea54464a7098" ,
81+ "west-us" ,
82+ & Version :: new ( 0 , 0 , 0 ) ,
83+ IdSource :: MachineIdHashed ,
84+ )
85+ . expect ( "Failed to query Omaha server" ) ;
86+
87+ match r . result {
88+ QueryResult :: NoUpdate => {
89+ debug ! ( "No update available " ) ;
11090 }
111- None => {
112- debug ! ( "No command provided. Exiting." ) ;
113-
114- let r = query_and_fetch_yaml_document (
115- & Url :: parse ( "https://nebraska-poc-ep-cda8e2czfnhahxfk.b01.azurefd.net/v1/update" )
116- . unwrap ( ) ,
117- "b0ec8f0d-1c13-4bf4-9efd-ea54464a7098" ,
118- "west-us" ,
119- & Version :: new ( 3 , 1 , 0 ) ,
120- IdSource :: MachineIdHashed ,
121- )
122- . expect ( "Failed to query Omaha server" ) ;
123-
124- debug ! ( "Query result: {r:?}" ) ;
91+ QueryResult :: NewDocument { url, version } => {
92+ debug ! ( "Updating to version {version}" ) ;
93+ let rt = tokio:: runtime:: Builder :: new_current_thread ( )
94+ . enable_all ( )
95+ . build ( )
96+ . expect ( "Failed to create tokio runtime" ) ;
97+
98+ rt. block_on ( trigger ( & url, None ) )
99+ . expect ( "Failed to run update" ) ;
125100 }
126101 }
127102}
0 commit comments