fix: Normalize authenticated endpoint (#29)

demeter-run · Apr 15, 2024 · 56cd2c3 · 56cd2c3
1 parent 91345e4
commit 56cd2c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/bootstrap/crds/main.tf b/bootstrap/crds/main.tf
@@ -34,8 +34,8 @@ resource "kubernetes_manifest" "customresourcedefinition_cardanonodeports_demete
               "type" = "string"
             },
             {
-              "jsonPath" = ".status.authenticatedEndpoint"
-              "name" = "Authenticated Endpoint"
+              "jsonPath" = ".status.authenticatedEndpointUrl"
+              "name" = "Authenticated Endpoint URL"
               "type" = "string"
             },
             {
@@ -52,12 +52,6 @@ resource "kubernetes_manifest" "customresourcedefinition_cardanonodeports_demete
                 "spec" = {
                   "properties" = {
                     "network" = {
-                      "enum" = [
-                        "mainnet",
-                        "preprod",
-                        "preview",
-                        "sanchonet",
-                      ]
                       "type" = "string"
                     }
                     "throughputTier" = {
@@ -80,13 +74,13 @@ resource "kubernetes_manifest" "customresourcedefinition_cardanonodeports_demete
                     "authToken" = {
                       "type" = "string"
                     }
-                    "authenticatedEndpoint" = {
+                    "authenticatedEndpointUrl" = {
                       "type" = "string"
                     }
                   }
                   "required" = [
                     "authToken",
-                    "authenticatedEndpoint",
+                    "authenticatedEndpointUrl",
                   ]
                   "type" = "object"
                 }

diff --git a/operator/src/controller.rs b/operator/src/controller.rs
@@ -25,7 +25,7 @@ pub static CARDANO_NODE_PORT_FINALIZER: &str = "cardanonodeports.demeter.run";
         {"name": "Network", "jsonPath": ".spec.network", "type": "string"},
         {"name": "Version", "jsonPath": ".spec.version", "type": "string"},
         {"name": "Throughput Tier", "jsonPath": ".spec.throughputTier", "type": "string"},
-        {"name": "Authenticated Endpoint", "jsonPath": ".status.authenticatedEndpoint", "type": "string"},
+        {"name": "Authenticated Endpoint URL", "jsonPath": ".status.authenticatedEndpointUrl", "type": "string"},
         {"name": "Auth Token", "jsonPath": ".status.authToken", "type": "string"}
     "#)]
 #[serde(rename_all = "camelCase")]
@@ -38,7 +38,7 @@ pub struct CardanoNodePortSpec {
 #[derive(Deserialize, Serialize, Clone, Default, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct CardanoNodePortStatus {
-    pub authenticated_endpoint: String,
+    pub authenticated_endpoint_url: String,
     pub auth_token: String,
 }
 
@@ -56,7 +56,7 @@ async fn reconcile(crd: Arc<CardanoNodePort>, ctx: Arc<Context>) -> Result<Actio
     let key = build_api_key(&crd).await?;
 
     let status = CardanoNodePortStatus {
-        authenticated_endpoint: build_hostname(&crd.spec.network, &crd.spec.version, &key),
+        authenticated_endpoint_url: build_hostname(&crd.spec.network, &crd.spec.version, &key),
         auth_token: key,
     };