Merge branch 'hotfix-missing-proxy-jump'

Author: milliams

CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+### Fixed
+- Correctly parse missing proxy_jump as None.
 
 ## [0.3.4] - 2025-02-14
 ### Changed

src/main.rs

@@ -83,8 +83,7 @@ struct Platform {
     #[serde(with = "http_serde::authority")]
     hostname: axum::http::uri::Authority,
     /// The hostname of the SSH jump host.
-    #[serde(with = "http_serde::option::authority")]
-    proxy_jump: Option<axum::http::uri::Authority>,
+    proxy_jump: Option<String>,
 }
 
 #[derive(Debug)]

tests/integration/basic.hurl

@@ -84,14 +84,6 @@ HTTP 500
 [Asserts]
 jsonpath "$.message" contains "RSA keys must be at least 3072 bits long"
 
-GET {{conch}}/sign
-Authorization: Bearer {{ test1_token }}
-[QueryStringParams]
-public_key: {{ ssh_key_dsa_pub }}
-HTTP 500
-[Asserts]
-jsonpath "$.message" contains "DSA keys are not supported"
-
 GET {{conch}}/sign
 Authorization: Bearer {{ test2_token }}
 [QueryStringParams]

tests/integration/integration.sh

@@ -40,8 +40,6 @@ ssh-keygen -q -t rsa -b 2048 -N '' -f tests/integration/temp/id_rsa_2048
 SSH_KEY_RSA_2048_PUB=$(cat tests/integration/temp/id_rsa_2048.pub)
 ssh-keygen -q -t rsa -b 3072 -N '' -f tests/integration/temp/id_rsa_3072
 SSH_KEY_RSA_3072_PUB=$(cat tests/integration/temp/id_rsa_3072.pub)
-ssh-keygen -q -t dsa -N '' -f tests/integration/temp/id_dsa
-SSH_KEY_DSA_PUB=$(cat tests/integration/temp/id_dsa.pub)
 
 header "Running Hurl tests"
 hurl \
@@ -50,7 +48,6 @@ hurl \
     --variable ssh_key_ed25519_pub="${SSH_KEY_ED25519_PUB}" \
     --variable ssh_key_rsa_2048_pub="${SSH_KEY_RSA_2048_PUB}" \
     --variable ssh_key_rsa_3072_pub="${SSH_KEY_RSA_3072_PUB}" \
-    --variable ssh_key_dsa_pub="${SSH_KEY_DSA_PUB}" \
     --test \
     --report-html results \
     --error-format long \

tests/integration/run.sh

@@ -148,6 +148,10 @@ projects1=$(jq tojson << EOF
       {
         "name": "slurm.3.example",
         "username": "test"
+      },
+      {
+        "name": "slurm.5.example",
+        "username": "test"
       }
     ]
   },

tests/integration/values.yaml

@@ -13,6 +13,9 @@ config:
       alias: "3.example"
       hostname: "3.access.example.com"
       proxy_jump: "login.example.com"
+    slurm.5.example:
+      alias: "5.example"
+      hostname: "5.access.example.com"
   mappers:
     - project_infra: "v1"
   extensions: