Implement non-breaking solution.

api/v1alpha1/humioaction_secret_helpers.go

@@ -0,0 +1,19 @@
+package v1alpha1
+
+import "fmt"
+
+var HaSecrets map[string]string = make(map[string]string)
+
+func HaHasSecret(hn *HumioAction) (string, bool) {
+	if secret, found := HaSecrets[fmt.Sprintf("%s-%s", hn.Namespace, hn.Name)]; found {
+		return secret, true
+	}
+	return "", false
+}
+
+// Call this to set the secret in the map
+func SecretFromHa(hn *HumioAction, token string) {
+	key := fmt.Sprintf("%s-%s", hn.Namespace, hn.Name)
+	value := token
+	HaSecrets[key] = value
+}

api/v1alpha1/humioaction_types.go

@@ -32,8 +32,6 @@ const (
 	HumioActionStateConfigError = "ConfigError"
 )
 
-var HaSecrets map[string]string
-
 // HumioActionWebhookProperties defines the desired state of HumioActionWebhookProperties
 type HumioActionWebhookProperties struct {
 	BodyTemplate string            `json:"bodyTemplate,omitempty"`
@@ -54,13 +52,15 @@ type HumioActionEmailProperties struct {
 
 // HumioActionRepositoryProperties defines the desired state of HumioActionRepositoryProperties
 type HumioActionRepositoryProperties struct {
-	IngestTokenSource VarSource `json:"ingestTokenSource"`
+	IngestToken       string    `json:"ingestToken,omitempty"`
+	IngestTokenSource VarSource `json:"ingestTokenSource,omitempty"`
 }
 
 // HumioActionOpsGenieProperties defines the desired state of HumioActionOpsGenieProperties
 type HumioActionOpsGenieProperties struct {
 	ApiUrl         string    `json:"apiUrl,omitempty"`
-	GenieKeySource VarSource `json:"genieKeySource"`
+	GenieKey       string    `json:"genieKey,omitempty"`
+	GenieKeySource VarSource `json:"genieKeySource,omitempty"`
 	UseProxy       bool      `json:"useProxy,omitempty"`
 }
 
@@ -80,7 +80,8 @@ type HumioActionSlackProperties struct {
 
 // HumioActionSlackPostMessageProperties defines the desired state of HumioActionSlackPostMessageProperties
 type HumioActionSlackPostMessageProperties struct {
-	ApiTokenSource VarSource         `json:"apiTokenSource"`
+	ApiToken       string            `json:"apiToken,omitempty"`
+	ApiTokenSource VarSource         `json:"apiTokenSource,omitempty"`
 	Channels       []string          `json:"channels,omitempty"`
 	Fields         map[string]string `json:"fields,omitempty"`
 	UseProxy       bool              `json:"useProxy,omitempty"`

charts/humio-operator/crds/core.humio.com_humioactions.yaml

@@ -66,6 +66,8 @@ spec:
                 description: HumioRepositoryProperties indicates this is a Humio Repository
                   Action, and contains the corresponding properties
                 properties:
+                  ingestToken:
+                    type: string
                   ingestTokenSource:
                     properties:
                       secretKeyRef:
@@ -87,8 +89,6 @@ spec:
                         - key
                         type: object
                     type: object
-                required:
-                - ingestTokenSource
                 type: object
               managedClusterName:
                 description: ManagedClusterName refers to an object of type HumioCluster
@@ -104,6 +104,8 @@ spec:
                 properties:
                   apiUrl:
                     type: string
+                  genieKey:
+                    type: string
                   genieKeySource:
                     properties:
                       secretKeyRef:
@@ -127,8 +129,6 @@ spec:
                     type: object
                   useProxy:
                     type: boolean
-                required:
-                - genieKeySource
                 type: object
               pagerDutyProperties:
                 description: PagerDutyProperties indicates this is a PagerDuty Action,
@@ -145,6 +145,8 @@ spec:
                 description: SlackPostMessageProperties indicates this is a Slack
                   Post Message Action, and contains the corresponding properties
                 properties:
+                  apiToken:
+                    type: string
                   apiTokenSource:
                     properties:
                       secretKeyRef:
@@ -176,8 +178,6 @@ spec:
                     type: object
                   useProxy:
                     type: boolean
-                required:
-                - apiTokenSource
                 type: object
               slackProperties:
                 description: SlackProperties indicates this is a Slack Action, and

config/crd/bases/core.humio.com_humioactions.yaml

@@ -66,6 +66,8 @@ spec:
                 description: HumioRepositoryProperties indicates this is a Humio Repository
                   Action, and contains the corresponding properties
                 properties:
+                  ingestToken:
+                    type: string
                   ingestTokenSource:
                     properties:
                       secretKeyRef:
@@ -87,8 +89,6 @@ spec:
                         - key
                         type: object
                     type: object
-                required:
-                - ingestTokenSource
                 type: object
               managedClusterName:
                 description: ManagedClusterName refers to an object of type HumioCluster
@@ -104,6 +104,8 @@ spec:
                 properties:
                   apiUrl:
                     type: string
+                  genieKey:
+                    type: string
                   genieKeySource:
                     properties:
                       secretKeyRef:
@@ -127,8 +129,6 @@ spec:
                     type: object
                   useProxy:
                     type: boolean
-                required:
-                - genieKeySource
                 type: object
               pagerDutyProperties:
                 description: PagerDutyProperties indicates this is a PagerDuty Action,
@@ -145,6 +145,8 @@ spec:
                 description: SlackPostMessageProperties indicates this is a Slack
                   Post Message Action, and contains the corresponding properties
                 properties:
+                  apiToken:
+                    type: string
                   apiTokenSource:
                     properties:
                       secretKeyRef:
@@ -176,8 +178,6 @@ spec:
                     type: object
                   useProxy:
                     type: boolean
-                required:
-                - apiTokenSource
                 type: object
               slackProperties:
                 description: SlackProperties indicates this is a Slack Action, and

controllers/humioaction_annotations.go

@@ -32,7 +32,6 @@ func (r *HumioActionReconciler) reconcileHumioActionAnnotations(ctx context.Cont
 		actionCR.ObjectMeta.Annotations[k] = v
 	}
 
-	// TODO: Hack it here
 	err = r.Update(ctx, actionCR)
 	if err != nil {
 		return reconcile.Result{}, r.logErrorAndReturn(err, "failed to add ID annotation to action")

controllers/humioaction_controller.go

@@ -197,43 +197,39 @@ func (r *HumioActionReconciler) reconcileHumioAction(ctx context.Context, config
 
 func (r *HumioActionReconciler) resolveSecrets(ctx context.Context, ha *humiov1alpha1.HumioAction) error {
 	var err error
-	var secretKey string
-	var secretValue string
+	var apiToken string
 
-	if ha.Spec.SlackPostMessageProperties != nil && ha.Spec.SlackPostMessageProperties.ApiTokenSource.SecretKeyRef != nil {
-		secretKey = fmt.Sprintf("%s-%s", ha.Namespace, ha.Spec.SlackPostMessageProperties.ApiTokenSource.SecretKeyRef.Name)
-		secretValue, err = r.resolveField(ctx, ha.Namespace, ha.Spec.SlackPostMessageProperties.ApiTokenSource)
+	if ha.Spec.SlackPostMessageProperties != nil {
+		apiToken, err = r.resolveField(ctx, ha.Namespace, ha.Spec.SlackPostMessageProperties.ApiToken, ha.Spec.SlackPostMessageProperties.ApiTokenSource)
 		if err != nil {
-			return fmt.Errorf("SlackPostMessageProperties.ApiTokenSource.%v", err)
+			return fmt.Errorf("slackPostMessageProperties.ApiTokenSource.%v", err)
 		}
 	}
 
-	if ha.Spec.OpsGenieProperties != nil && ha.Spec.OpsGenieProperties.GenieKeySource.SecretKeyRef != nil {
-		secretKey = fmt.Sprintf("%s-%s", ha.Namespace, ha.Spec.OpsGenieProperties.GenieKeySource.SecretKeyRef.Name)
-		secretValue, err = r.resolveField(ctx, ha.Namespace, ha.Spec.OpsGenieProperties.GenieKeySource)
+	if ha.Spec.OpsGenieProperties != nil {
+		ha.Spec.OpsGenieProperties.GenieKey, err = r.resolveField(ctx, ha.Namespace, ha.Spec.OpsGenieProperties.GenieKey, ha.Spec.OpsGenieProperties.GenieKeySource)
 		if err != nil {
 			return fmt.Errorf("opsGenieProperties.ingestTokenSource.%v", err)
 		}
 	}
 
-	if ha.Spec.HumioRepositoryProperties != nil && ha.Spec.HumioRepositoryProperties.IngestTokenSource.SecretKeyRef != nil {
-		secretKey = fmt.Sprintf("%s-%s", ha.Namespace, ha.Spec.HumioRepositoryProperties.IngestTokenSource.SecretKeyRef.Name)
-		secretValue, err = r.resolveField(ctx, ha.Namespace, ha.Spec.HumioRepositoryProperties.IngestTokenSource)
+	if ha.Spec.HumioRepositoryProperties != nil {
+		ha.Spec.HumioRepositoryProperties.IngestToken, err = r.resolveField(ctx, ha.Namespace, ha.Spec.HumioRepositoryProperties.IngestToken, ha.Spec.HumioRepositoryProperties.IngestTokenSource)
 		if err != nil {
 			return fmt.Errorf("humioRepositoryProperties.ingestTokenSource.%v", err)
 		}
 	}
-	// TODO: Remove the if-condition here once the pattern is complete
-	if humiov1alpha1.HaSecrets == nil {
-		humiov1alpha1.HaSecrets = make(map[string]string)
-	}
-	if secretValue != "" {
-		humiov1alpha1.HaSecrets[secretKey] = secretValue
-	}
+
+	humiov1alpha1.SecretFromHa(ha, apiToken)
+
 	return nil
 }
 
-func (r *HumioActionReconciler) resolveField(ctx context.Context, namespace string, ref humiov1alpha1.VarSource) (string, error) {
+func (r *HumioActionReconciler) resolveField(ctx context.Context, namespace, value string, ref humiov1alpha1.VarSource) (string, error) {
+	if value != "" {
+		return value, nil
+	}
+
 	if ref.SecretKeyRef != nil {
 		secret, err := kubernetes.GetSecret(ctx, r, ref.SecretKeyRef.Name, namespace)
 		if err != nil {

controllers/suite/common.go

@@ -47,8 +47,6 @@ const (
 
 const TestInterval = time.Second * 1
 
-var haSecrets map[string]string
-
 func UsingClusterBy(cluster, text string, callbacks ...func()) {
 	timestamp := time.Now().Format(time.RFC3339Nano)
 	fmt.Fprintln(GinkgoWriter, "STEP | "+timestamp+" | "+cluster+": "+text)