allow s3 output plugin to get keys from secrets

Signed-off-by: Dave Gillies <[email protected]>

Author: v-davegillies-upscale

apis/fluentd/v1alpha1/plugins/output/s3.go

@@ -1,11 +1,13 @@
 package output
 
+import "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1/plugins"
+
 // S3 defines the parameters for out_s3 output plugin
 type S3 struct {
 	// The AWS access key id.
-	AwsKeyId *string `json:"awsKeyId,omitempty"`
+	AwsKeyId *plugins.Secret `json:"awsKeyId,omitempty"`
 	// The AWS secret key.
-	AwsSecKey *string `json:"awsSecKey,omitempty"`
+	AwsSecKey *plugins.Secret `json:"awsSecKey,omitempty"`
 	// The Amazon S3 bucket name.
 	S3Bucket *string `json:"s3Bucket,omitempty"`
 	// The Amazon S3 region name

apis/fluentd/v1alpha1/plugins/output/types.go

@@ -678,10 +678,18 @@ func (o *Output) kafka2Plugin(parent *params.PluginStore, loader plugins.SecretL
 
 func (o *Output) s3Plugin(parent *params.PluginStore, loader plugins.SecretLoader) *params.PluginStore {
 	if o.S3.AwsKeyId != nil {
-		parent.InsertPairs("aws_key_id", fmt.Sprint(*o.S3.AwsKeyId))
+		value, err := loader.LoadSecret(*o.S3.AwsKeyId)
+		if err != nil {
+			return nil
+		}
+		parent.InsertPairs("aws_key_id", value)
 	}
 	if o.S3.AwsSecKey != nil {
-		parent.InsertPairs("aws_sec_key", fmt.Sprint(*o.S3.AwsSecKey))
+		value, err := loader.LoadSecret(*o.S3.AwsSecKey)
+		if err != nil {
+			return nil
+		}
+		parent.InsertPairs("aws_sec_key", value)
 	}
 	if o.S3.S3Bucket != nil {
 		parent.InsertPairs("s3_bucket", fmt.Sprint(*o.S3.S3Bucket))

docs/plugins/fluentd/output/s3.md

@@ -5,8 +5,8 @@ S3 defines the parameters for out_s3 output plugin
 
 | Field | Description | Scheme |
 | ----- | ----------- | ------ |
-| awsKeyId | The AWS access key id. | *string |
-| awsSecKey | The AWS secret key. | *string |
+| awsKeyId |  | *[plugins.Secret](../secret.md) |
+| awsSecKey |  | *[plugins.Secret](../secret.md) |
 | s3Bucket | The Amazon S3 bucket name. | *string |
 | s3Region | The Amazon S3 region name | *string |
 | s3Endpoint | The endpoint URL (like \"http://localhost:9000/\") | *string |