update based on review feedback

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

Author: v-davegillies-upscale

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

@@ -5,9 +5,13 @@ 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 *plugins.Secret `json:"awsKeyId,omitempty"`
+	AwsKeyId *string `json:"awsKeyId,omitempty"`
 	// The AWS secret key.
-	AwsSecKey *plugins.Secret `json:"awsSecKey,omitempty"`
+	AwsSecKey *string `json:"awsSecKey,omitempty"`
+	// The AWS access key id from Secrets.
+	AwsKeyIdFromSecret *plugins.Secret `json:"awsKeyIdFromSecret,omitempty"`
+	// The AWS secret key from Secrets.
+	AwsSecKeyFromSecret *plugins.Secret `json:"awsSecKeyFromSecret,omitempty"`
 	// The Amazon S3 bucket name.
 	S3Bucket *string `json:"s3Bucket,omitempty"`
 	// The Amazon S3 region name

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

@@ -677,19 +677,23 @@ 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 {
-		value, err := loader.LoadSecret(*o.S3.AwsKeyId)
+	if o.S3.AwsKeyIdFromSecret != nil {
+		value, err := loader.LoadSecret(*o.S3.AwsKeyIdFromSecret)
 		if err != nil {
 			return nil
 		}
 		parent.InsertPairs("aws_key_id", value)
+	} else if o.S3.AwsKeyId != nil {
+		parent.InsertPairs("aws_key_id", fmt.Sprint(*o.S3.AwsKeyId))
 	}
-	if o.S3.AwsSecKey != nil {
-		value, err := loader.LoadSecret(*o.S3.AwsSecKey)
+	if o.S3.AwsSecKeyFromSecret != nil {
+		value, err := loader.LoadSecret(*o.S3.AwsSecKeyFromSecret)
 		if err != nil {
 			return nil
 		}
 		parent.InsertPairs("aws_sec_key", value)
+	} else if o.S3.AwsSecKey != nil {
+		parent.InsertPairs("aws_sec_key", fmt.Sprint(*o.S3.AwsSecKey))
 	}
 	if o.S3.S3Bucket != nil {
 		parent.InsertPairs("s3_bucket", fmt.Sprint(*o.S3.S3Bucket))

docs/plugins/fluentd/output/s3.md

@@ -5,8 +5,10 @@ S3 defines the parameters for out_s3 output plugin
 
 | Field | Description | Scheme |
 | ----- | ----------- | ------ |
-| awsKeyId |  | *[plugins.Secret](../secret.md) |
-| awsSecKey |  | *[plugins.Secret](../secret.md) |
+| awsKeyId | The AWS access key id. | *string |
+| awsSecKey | The AWS secret key. | *string |
+| awsKeyIdFromSecret | The AWS access key id from Secrets. | *[plugins.Secret](../secret.md) |
+| awsSecKeyFromSecret | The AWS secret key from Secrets.  | *[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 |