Add support for fetching sensitive parts of actions from secrets

Makefile

@@ -57,7 +57,7 @@ endif
 		eval \$$($(GOBIN)/setup-envtest use -p env ${TEST_K8S_VERSION}); \
 		export USE_CERTMANAGER=false; \
 		export TEST_USE_EXISTING_CLUSTER=false; \
-		$(GINKGO) -vv --procs 3 -output-dir=${PWD} --output-interceptor-mode=none -keep-separate-reports --junit-report=test-results-junit.xml --randomize-suites --randomize-all -timeout 10m ./... -covermode=count -coverprofile cover.out \
+		$(GINKGO) -vv --no-color --procs 3 -output-dir=${PWD} --output-interceptor-mode=none -keep-separate-reports --junit-report=test-results-junit.xml --randomize-suites --randomize-all -timeout 10m ./... -covermode=count -coverprofile cover.out \
 	"
 
 ##@ Build

api/v1alpha1/humioaction_types.go

@@ -34,12 +34,30 @@ const (
 
 // HumioActionWebhookProperties defines the desired state of HumioActionWebhookProperties
 type HumioActionWebhookProperties struct {
-	BodyTemplate string            `json:"bodyTemplate,omitempty"`
-	Headers      map[string]string `json:"headers,omitempty"`
-	Method       string            `json:"method,omitempty"`
-	Url          string            `json:"url,omitempty"`
-	IgnoreSSL    bool              `json:"ignoreSSL,omitempty"`
-	UseProxy     bool              `json:"useProxy,omitempty"`
+	BodyTemplate string `json:"bodyTemplate,omitempty"`
+	// Headers specifies what HTTP headers to use.
+	// If both Headers and SecretHeaders are specified, they will be merged together.
+	Headers map[string]string `json:"headers,omitempty"`
+	// SecretHeaders specifies what HTTP headers to use and where to fetch the values from.
+	// If both Headers and SecretHeaders are specified, they will be merged together.
+	SecretHeaders []HeadersSource `json:"secretHeaders,omitempty"`
+	Method        string          `json:"method,omitempty"`
+	// Url specifies what URL to use
+	// If both Url and UrlSource are specified, Url will be used.
+	Url string `json:"url,omitempty"`
+	// UrlSource specifies where to fetch the URL from
+	// If both Url and UrlSource are specified, Url will be used.
+	UrlSource VarSource `json:"urlSource,omitempty"`
+	IgnoreSSL bool      `json:"ignoreSSL,omitempty"`
+	UseProxy  bool      `json:"useProxy,omitempty"`
+}
+
+// HeadersSource defines a header and corresponding source for the value of it.
+type HeadersSource struct {
+	// Name is the name of the header.
+	Name string `json:"name,omitempty"`
+	// ValueFrom defines where to fetch the value of the header from.
+	ValueFrom VarSource `json:"valueFrom,omitempty"`
 }
 
 // HumioActionEmailProperties defines the desired state of HumioActionEmailProperties
@@ -52,50 +70,79 @@ type HumioActionEmailProperties struct {
 
 // HumioActionRepositoryProperties defines the desired state of HumioActionRepositoryProperties
 type HumioActionRepositoryProperties struct {
-	IngestToken       string    `json:"ingestToken,omitempty"`
+	// IngestToken specifies what ingest token to use.
+	// If both IngestToken and IngestTokenSource are specified, IngestToken will be used.
+	IngestToken string `json:"ingestToken,omitempty"`
+	// IngestTokenSource specifies where to fetch the ingest token from.
+	// If both IngestToken and IngestTokenSource are specified, IngestToken will be used.
 	IngestTokenSource VarSource `json:"ingestTokenSource,omitempty"`
 }
 
 // HumioActionOpsGenieProperties defines the desired state of HumioActionOpsGenieProperties
 type HumioActionOpsGenieProperties struct {
-	ApiUrl         string    `json:"apiUrl,omitempty"`
-	GenieKey       string    `json:"genieKey,omitempty"`
+	ApiUrl string `json:"apiUrl,omitempty"`
+	// GenieKey specifies what API key to use.
+	// If both GenieKey and GenieKeySource are specified, GenieKey will be used.
+	GenieKey string `json:"genieKey,omitempty"`
+	// GenieKeySource specifies where to fetch the API key from.
+	// If both GenieKey and GenieKeySource are specified, GenieKey will be used.
 	GenieKeySource VarSource `json:"genieKeySource,omitempty"`
 	UseProxy       bool      `json:"useProxy,omitempty"`
 }
 
 // HumioActionPagerDutyProperties defines the desired state of HumioActionPagerDutyProperties
 type HumioActionPagerDutyProperties struct {
+	// RoutingKey specifies what API key to use.
+	// If both RoutingKey and RoutingKeySource are specified, RoutingKey will be used.
 	RoutingKey string `json:"routingKey,omitempty"`
-	Severity   string `json:"severity,omitempty"`
-	UseProxy   bool   `json:"useProxy,omitempty"`
+	// RoutingKeySource specifies where to fetch the routing key from.
+	// If both RoutingKey and RoutingKeySource are specified, RoutingKey will be used.
+	RoutingKeySource VarSource `json:"routingKeySource,omitempty"`
+	Severity         string    `json:"severity,omitempty"`
+	UseProxy         bool      `json:"useProxy,omitempty"`
 }
 
 // HumioActionSlackProperties defines the desired state of HumioActionSlackProperties
 type HumioActionSlackProperties struct {
-	Fields   map[string]string `json:"fields,omitempty"`
-	Url      string            `json:"url,omitempty"`
-	UseProxy bool              `json:"useProxy,omitempty"`
+	Fields map[string]string `json:"fields,omitempty"`
+	// Url specifies what URL to use.
+	// If both Url and UrlSource are specified, Url will be used.
+	Url string `json:"url,omitempty"`
+	// UrlSource specifies where to fetch the URL from.
+	// If both Url and UrlSource are specified, Url will be used.
+	UrlSource VarSource `json:"urlSource,omitempty"`
+	UseProxy  bool      `json:"useProxy,omitempty"`
 }
 
 // HumioActionSlackPostMessageProperties defines the desired state of HumioActionSlackPostMessageProperties
 type HumioActionSlackPostMessageProperties struct {
-	ApiToken       string            `json:"apiToken,omitempty"`
+	// ApiToken specifies what API key to use.
+	// If both ApiToken and ApiTokenSource are specified, ApiToken will be used.
+	ApiToken string `json:"apiToken,omitempty"`
+	// ApiTokenSource specifies where to fetch the API key from.
+	// If both ApiToken and ApiTokenSource are specified, ApiToken will be used.
 	ApiTokenSource VarSource         `json:"apiTokenSource,omitempty"`
 	Channels       []string          `json:"channels,omitempty"`
 	Fields         map[string]string `json:"fields,omitempty"`
 	UseProxy       bool              `json:"useProxy,omitempty"`
 }
 
-type VarSource struct {
-	SecretKeyRef *corev1.SecretKeySelector `json:"secretKeyRef,omitempty"`
-}
-
 // HumioActionVictorOpsProperties defines the desired state of HumioActionVictorOpsProperties
 type HumioActionVictorOpsProperties struct {
 	MessageType string `json:"messageType,omitempty"`
-	NotifyUrl   string `json:"notifyUrl,omitempty"`
-	UseProxy    bool   `json:"useProxy,omitempty"`
+	// NotifyUrl specifies what URL to use.
+	// If both NotifyUrl and NotifyUrlSource are specified, NotifyUrl will be used.
+	NotifyUrl string `json:"notifyUrl,omitempty"`
+	// NotifyUrlSource specifies where to fetch the URL from.
+	// If both NotifyUrl and NotifyUrlSource are specified, NotifyUrl will be used.
+	NotifyUrlSource VarSource `json:"notifyUrlSource"`
+	UseProxy        bool      `json:"useProxy,omitempty"`
+}
+
+// VarSource is used to specify where a value should be pulled from
+type VarSource struct {
+	// SecretKeyRef allows specifying which secret and what key in that secret holds the value we want to use
+	SecretKeyRef *corev1.SecretKeySelector `json:"secretKeyRef,omitempty"`
 }
 
 // HumioActionSpec defines the desired state of HumioAction