Refactor Lambda

- Simplify Lambda logic
- Use Rustic approach for borrowing.
- Reduce `.clone` calls.
- Update Dependabot.
- Update models.
- Lint config files.
- Run IDEA/cargo fmt formatter.

Author: shymega

.github/workflows/aws.yml

@@ -3,7 +3,7 @@ name: AWS Lambda function deploy workflow
 on:
   workflow_dispatch:
   push:
-    paths: ["src/**", "Cargo.toml"]
+    paths: [ "src/**", "Cargo.toml" ]
 
 jobs:
   build-and-deploy:

dependabot.yml

@@ -0,0 +1,34 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore(deps)"
+    groups:
+      cargo-deps:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore(ci-deps)"
+    groups:
+      gh-actions-deps:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore(deps)"
+    groups:
+      docker-deps:
+        patterns:
+          - "*"

src/main.rs

@@ -14,20 +14,21 @@
     variant_size_differences
 )]
 
-mod models;
-use crate::models::GithubHook;
+use std::env;
 
-use aws_lambda_events::http::HeaderMap;
-use aws_lambda_events::http::status::StatusCode;
 use aws_lambda_events::apigw::{ApiGatewayProxyRequest, ApiGatewayProxyResponse};
 use aws_lambda_events::encodings::Body;
+use aws_lambda_events::http::status::StatusCode;
+use aws_lambda_events::http::HeaderMap;
 use github_webhook_message_validator::validate as validate_gh;
 use hex::decode;
-use lambda_http::http::HeaderValue;
 use lambda_runtime::{run, service_fn, Error as LambdaError, LambdaEvent};
 use lazy_static::lazy_static;
 use log::{error, info};
-use std::env;
+
+use crate::models::GithubHook;
+
+mod models;
 
 lazy_static! {
     static ref WEBHOOK_SECRET: String = env::var("WEBHOOK_GH_SECRET").unwrap();
@@ -64,14 +65,15 @@ fn validate(sig: &str, msg: &str) -> Option<ApiGatewayProxyResponse> {
 
 fn process_webhook(payload: &str) -> Option<GithubHook> {
     let decoded: GithubHook = serde_json::from_str::<GithubHook>(payload).unwrap();
-    let decoded = decoded.clone();
-
-    if decoded.repository.name.contains("planet_") || decoded.repository.name.contains("abm_git_update_bot") || decoded
-        .head_commit
-        .message
-        .clone()
-        .unwrap()
-        .contains("Update submodule")
+
+    if decoded.repository.full_name.contains("planet_")
+        || decoded.repository.full_name.contains("abm_git_update_bot")
+        || decoded
+            .head_commit
+            .message
+            .as_ref()
+            .unwrap()
+            .contains("Update submodule")
     {
         return None;
     }
@@ -82,25 +84,22 @@ fn process_webhook(payload: &str) -> Option<GithubHook> {
 async fn webhook_handler(
     evt: LambdaEvent<ApiGatewayProxyRequest>,
 ) -> Result<ApiGatewayProxyResponse, LambdaError> {
-    let ctx = evt.context;
-    let empty_header_value = HeaderValue::from_str("")?;
     let sig = evt
         .payload
         .headers
         .get("X-Hub-Signature")
-        .unwrap_or(&empty_header_value);
-    info!("AWS Request ID: {}", ctx.request_id);
-
-    if let Some(result) = validate(
-        sig.to_str().unwrap_or_default(),
-        evt.payload.body.clone().unwrap_or_default().as_str(),
-    ) {
-        return Ok(result);
+        .expect("No GitHub signature found in headers.")
+        .to_str()
+        .unwrap_or_default();
+    let body = evt.payload.body.unwrap_or_default();
+
+    if let Some(resp) = validate(sig, &body) {
+        return Ok(resp);
     }
 
     info!("Webhook validated, signature confirmed OK.");
 
-    if process_webhook(&evt.payload.body.clone().unwrap_or_default()).is_none() {
+    if process_webhook(&body).is_none() {
         info!("Can't act on this event - it is suppressed.");
         return Ok(ApiGatewayProxyResponse {
             status_code: i64::from(StatusCode::OK.as_u16()),

src/models.rs

@@ -6,7 +6,7 @@ use serde::Deserialize;
 #[derive(Debug, Clone, Deserialize)]
 pub(crate) struct GithubHook {
     #[serde(rename = "ref")]
-    pub(crate) _reference: String,
+    pub(crate) reference: String,
     pub(crate) repository: Repository,
     pub(crate) pusher: Pusher,
     pub(crate) head_commit: Commit,
@@ -15,8 +15,7 @@ pub(crate) struct GithubHook {
 
 #[derive(Clone, Debug, Deserialize)]
 pub(crate) struct Repository {
-    #[serde(rename = "full_name")]
-    pub(crate) name: String,
+    pub(crate) full_name: String,
 }
 
 #[derive(Debug, Clone, Deserialize)]