feat(config): update to account for credentials

flipt-io · Jan 30, 2025 · 809b878 · 809b878
1 parent 8b9280b
commit 809b878
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 96 deletions.
diff --git a/config/flipt.schema.cue b/config/flipt.schema.cue
@@ -19,6 +19,7 @@ import "list"
 	diagnostics?:    #diagnostics
 	environments?:   #environments
 	storage?:        #storage
+	credentials?:    #credentials
 	log?:            #log
 	meta?:           #meta
 	server?:         #server
@@ -195,26 +196,7 @@ import "list"
 		ca_cert_path?:      string
 		ca_cert_bytes?:     string
 		insecure_skip_tls?: bool | *false
-		authentication?: ({
-			basic: {
-				username: string
-				password: string
-			}
-		} | {
-			token: access_token: string
-		} | {
-			ssh: {
-				user?:            string | *"git"
-				password:         string
-				private_key_path: string
-			}
-		} | {
-			ssh: {
-				user?:             string | *"git"
-				password:          string
-				private_key_bytes: string
-			}
-		})
+		credentials?:       string
 		publishers?: {
 			object?: {
 				type: "s3" | "azblob" | "googlecloud" | *""
@@ -239,6 +221,30 @@ import "list"
 		}
 	}
 
+	#credentials: [string]: {
+		type: "basic"
+		basic: {
+			username: string
+			password: string
+		}
+	} | {
+		type: "ssh"
+		ssh: {
+			user?:                     string
+			password:                  string
+			private_key_bytes:         string
+			insecure_ignore_host_key?: bool
+		} | {
+			user?:                     string
+			password:                  string
+			private_key_path:          string
+			insecure_ignore_host_key?: bool
+		}
+	} | {
+		type:         "access_token"
+		access_token: string
+	}
+
 	_#lower: ["debug", "error", "fatal", "info", "panic", "warn"]
 	_#all: list.Concat([_#lower, [for x in _#lower {strings.ToUpper(x)}]])
 	#log: {

diff --git a/config/flipt.schema.json b/config/flipt.schema.json
@@ -618,82 +618,8 @@
               "type": "boolean",
               "default": false
             },
-            "authentication": {
-              "oneOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "basic": {
-                      "type": "object",
-                      "properties": {
-                        "username": {
-                          "type": "string"
-                        },
-                        "password": {
-                          "type": "string"
-                        }
-                      },
-                      "required": ["username", "password"]
-                    }
-                  }
-                },
-                {
-                  "type": "object",
-                  "properties": {
-                    "token": {
-                      "type": "object",
-                      "properties": {
-                        "access_token": {
-                          "type": "string"
-                        }
-                      },
-                      "required": ["access_token"]
-                    }
-                  }
-                },
-                {
-                  "type": "object",
-                  "properties": {
-                    "ssh": {
-                      "type": "object",
-                      "properties": {
-                        "user": {
-                          "type": "string",
-                          "default": "git"
-                        },
-                        "password": {
-                          "type": "string"
-                        },
-                        "private_key_path": {
-                          "type": "string"
-                        }
-                      },
-                      "required": ["password", "private_key_path"]
-                    }
-                  }
-                },
-                {
-                  "type": "object",
-                  "properties": {
-                    "ssh": {
-                      "type": "object",
-                      "properties": {
-                        "user": {
-                          "type": "string",
-                          "default": "git"
-                        },
-                        "password": {
-                          "type": "string"
-                        },
-                        "private_key_bytes": {
-                          "type": "string"
-                        }
-                      },
-                      "required": ["password", "private_key_bytes"]
-                    }
-                  }
-                }
-              ]
+            "credentials": {
+              "type": "string"
             },
             "publishers": {
               "type": "object",
@@ -768,6 +694,88 @@
         }
       }
     },
+    "credentials": {
+      "type": "object",
+      "patternProperties": {
+         "^.*$": {
+           "oneOf": [
+             {
+               "type": "object",
+               "properties": {
+                 "basic": {
+                   "type": "object",
+                   "properties": {
+                     "username": {
+                       "type": "string"
+                     },
+                     "password": {
+                       "type": "string"
+                     }
+                   },
+                   "required": ["username", "password"]
+                 }
+               }
+             },
+             {
+               "type": "object",
+               "properties": {
+                 "token": {
+                   "type": "object",
+                   "properties": {
+                     "access_token": {
+                       "type": "string"
+                     }
+                   },
+                   "required": ["access_token"]
+                 }
+               }
+             },
+             {
+               "type": "object",
+               "properties": {
+                 "ssh": {
+                   "type": "object",
+                   "properties": {
+                     "user": {
+                       "type": "string",
+                       "default": "git"
+                     },
+                     "password": {
+                       "type": "string"
+                     },
+                     "private_key_path": {
+                       "type": "string"
+                     }
+                   },
+                   "required": ["password", "private_key_path"]
+                 }
+               }
+             },
+             {
+               "type": "object",
+               "properties": {
+                 "ssh": {
+                   "type": "object",
+                   "properties": {
+                     "user": {
+                       "type": "string",
+                       "default": "git"
+                     },
+                     "password": {
+                       "type": "string"
+                     },
+                     "private_key_bytes": {
+                       "type": "string"
+                     }
+                   },
+                   "required": ["password", "private_key_bytes"]
+                 }
+               }
+             }
+           ]
+         }
+       }
+    },
     "log": {
       "type": "object",
       "title": "Log",