Adding ttl to crds. Default to 10.

Author: Maleware

deploy/helm/superset-operator/crds/crds.yaml

@@ -89,6 +89,10 @@ spec:
                             rule_name:
                               default: user_rules
                               type: string
+                            ttl:
+                              default: 10
+                              format: int8
+                              type: integer
                           required:
                             - configMapName
                           type: object

rust/crd/src/lib.rs

@@ -90,7 +90,7 @@ pub enum SupersetConfigOptions {
     StackableOpaBaseUrl,
     StackableOpaPackage,
     StackableOpaRule,
-    OpaRolesCache,
+    OpaRolesCacheTTL,
 }
 
 impl SupersetConfigOptions {
@@ -144,7 +144,7 @@ impl FlaskAppConfigOptions for SupersetConfigOptions {
             SupersetConfigOptions::StackableOpaBaseUrl => PythonType::StringLiteral,
             SupersetConfigOptions::StackableOpaPackage => PythonType::StringLiteral,
             SupersetConfigOptions::StackableOpaRule => PythonType::StringLiteral,
-            SupersetConfigOptions::OpaRolesCache => PythonType::Expression,
+            SupersetConfigOptions::OpaRolesCacheTTL => PythonType::IntLiteral,
         }
     }
 }
@@ -264,8 +264,13 @@ pub struct SupersetOpaConfig {
     pub opa: OpaConfig,
     #[serde(default = "opa_rule_name_default")]
     pub rule_name: String,
+    #[serde(default = "ttl_default_time")]
+    pub ttl: i8,
 }
 
+fn ttl_default_time() -> i8 {
+    10
+}
 fn opa_rule_name_default() -> String {
     "user_rules".to_string()
 }

rust/operator-binary/src/authorization/opa.rs

@@ -7,6 +7,7 @@ pub struct SupersetOpaConfigResolved {
     opa_base_url: String,
     opa_package: Option<String>,
     rule_name: String,
+    ttl: i8,
 }
 
 impl SupersetOpaConfigResolved {
@@ -34,6 +35,7 @@ impl SupersetOpaConfigResolved {
             opa_base_url,
             opa_package: opa_config.opa.package.to_owned(),
             rule_name: opa_config.rule_name.to_owned(),
+            ttl: opa_config.ttl.to_owned(),
         })
     }
 
@@ -64,8 +66,8 @@ impl SupersetOpaConfigResolved {
                 self.opa_package.clone(),
             ),
             (
-                "OPA_ROLES_CACHE".to_string(),
-                Some("os.getenv('OPA_ROLES_CACHE', '10')".to_string()),
+                "OPA_ROLES_CACHE_TTL".to_string(),
+                Some(self.ttl.to_string().clone()),
             ),
         ])
     }