Ingress: pathType can't be empty

Icinga · Sep 10, 2024 · a046ab9 · a046ab9
1 parent b17ae2f
commit a046ab9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/pkg/schema/v1/ingress.go b/pkg/schema/v1/ingress.go
@@ -50,7 +50,7 @@ type IngressRule struct {
 	IngressUuid types.UUID
 	Host        sql.NullString
 	Path        sql.NullString
-	PathType    sql.NullString
+	PathType    string
 }
 
 func NewIngress() Resource {
@@ -106,11 +106,8 @@ func (i *Ingress) Obtain(k8s kmetav1.Object) {
 		}
 
 		for _, ruleValue := range rules.IngressRuleValue.HTTP.Paths {
-			var pathType sql.NullString
-			if ruleValue.PathType != nil {
-				pathType.String = string(*ruleValue.PathType)
-				pathType.Valid = true
-			}
+			// It is safe to use the pointer directly here.
+			pathType := string(*ruleValue.PathType)
 			if ruleValue.Backend.Service != nil {
 				ingressRuleUuid := NewUUID(i.Uuid, rules.Host+ruleValue.Path+ruleValue.Backend.Service.Name)
 				serviceUuid := NewUUID(ingressRuleUuid, ruleValue.Backend.Service.Name)

diff --git a/schema/mysql/schema.sql b/schema/mysql/schema.sql
@@ -331,7 +331,7 @@ CREATE TABLE ingress_rule (
   ingress_uuid binary(16) NOT NULL,
   host varchar(255) COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
   path varchar(255) COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
-  path_type varchar(255) COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
+  path_type enum('Exact', 'Prefix', 'ImplementationSpecific') COLLATE utf8mb4_unicode_ci NOT NULL,
   PRIMARY KEY (uuid)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;