Merge branch 'hotfix/config-init-and-cli-flags'

* hotfix/config-init-and-cli-flags:
  prepend slash to commits_url
  fix check_gh payload and secrets initialization
  don't try to load state from file on startup if doesn't exist
  print config after initialization

Author: yasunariw

lib/action.ml

@@ -198,8 +198,8 @@ module Action (Github_api : Api.Github) (Slack_api : Api.Slack) = struct
       let repo = Github.repo_of_notification notification in
       match%lwt Github_api.get_config ~ctx ~repo with
       | Ok config ->
-        Context.print_config ctx;
         ctx.config <- Some config;
+        Context.print_config ctx;
         Lwt.return @@ Ok ()
       | Error e -> action_error e
     in

lib/api_remote.ml

@@ -5,7 +5,7 @@ open Common
 
 module Github : Api.Github = struct
   let commits_url ~(repo : Github_t.repository) ~sha =
-    String.substr_replace_first ~pattern:"{/sha}" ~with_:sha repo.commits_url
+    String.substr_replace_first ~pattern:"{/sha}" ~with_:("/" ^ sha) repo.commits_url
 
   let contents_url ~(repo : Github_t.repository) ~path =
     String.substr_replace_first ~pattern:"{+path}" ~with_:path repo.contents_url

lib/context.ml

@@ -74,13 +74,15 @@ let refresh_state ctx =
   match ctx.state_filepath with
   | None -> Ok ctx
   | Some path ->
-    log#info "loading saved state from file %s" path;
-    ( match get_local_file path with
-    | Error e -> fmt_error "error while getting local file: %s\nfailed to get state from file %s" e path
-    | Ok file ->
-      let state = State_j.state_of_string file in
-      Ok { ctx with state }
-    )
+    if Caml.Sys.file_exists path then begin
+      log#info "loading saved state from file %s" path;
+      match get_local_file path with
+      | Error e -> fmt_error "error while getting local file: %s\nfailed to get state from file %s" e path
+      | Ok file ->
+        let state = State_j.state_of_string file in
+        Ok { ctx with state }
+    end
+    else Ok ctx
 
 let print_config ctx =
   let cfg = get_config_exn ctx in

src/notabot.ml

@@ -21,7 +21,7 @@ let http_server_action addr port config secrets state =
 (** In check mode, instead of actually sending the message to slack, we
     simply print it in the console *)
 let check_gh_action file json config secrets state =
-  match Github.event_of_filename file with
+  match Github.event_of_filename (Caml.Filename.basename file) with
   | None ->
     log#error "aborting because payload %s is not named properly, named should be KIND.NAME_OF_PAYLOAD.json" file
   | Some kind ->
@@ -30,14 +30,18 @@ let check_gh_action file json config secrets state =
   | Ok body ->
     let headers = [ "x-github-event", kind ] in
     let ctx = Context.make ~config_filename:config ~secrets_filepath:secrets ?state_filepath:state () in
-    Lwt_main.run
-      ( if json then
-        let module Action = Action.Action (Api_remote.Github) (Api_local.Slack_json) in
-        Action.process_github_notification ctx headers body
-      else
-        let module Action = Action.Action (Api_remote.Github) (Api_local.Slack_simple) in
-        Action.process_github_notification ctx headers body
-      )
+    ( match Context.refresh_secrets ctx with
+    | Error e -> log#error "%s" e
+    | Ok ctx ->
+      Lwt_main.run
+        ( if json then
+          let module Action = Action.Action (Api_remote.Github) (Api_local.Slack_json) in
+          Action.process_github_notification ctx headers body
+        else
+          let module Action = Action.Action (Api_remote.Github) (Api_local.Slack_simple) in
+          Action.process_github_notification ctx headers body
+        )
+    )
 
 let check_slack_action url file =
   let data = Stdio.In_channel.read_all file in
@@ -73,7 +77,7 @@ let secrets =
 
 let state =
   let doc = "state file" in
-  Arg.(value & opt (some file) None & info [ "state" ] ~docv:"STATE" ~doc)
+  Arg.(value & opt (some string) None & info [ "state" ] ~docv:"STATE" ~doc)
 
 let gh_payload =
   let doc = "JSON file containing a github webhook payload" in