chore: convert htpasswd settings to block

Author: pkarakal

docs/sources/reference/components/otelcol/otelcol.auth.basic.md

@@ -32,35 +32,48 @@ otelcol.auth.basic "<LABEL>" {
   username = "<USERNAME>"
   password = "<PASSWORD>"
   
-  htpasswd_file = "/etc/alloy/.htpasswd"
+  htpasswd {
+    file = "/etc/alloy/.htpasswd"
+    inline = "<USERNAME>:<PASSWORD>"
+  }
 }
 ```
 
 ## Arguments
 
 You can use the following arguments with `otelcol.auth.basic`:
 
-| Name            | Type     | Description                                                                     | Default | Required |
-|-----------------|----------|---------------------------------------------------------------------------------|---------|----------|
-| `password`      | `secret` | Password to use for basic authentication requests.                              |         | no       |
-| `username`      | `string` | Username to use for basic authentication requests.                              |         | no       |
-| `htpasswd_file` | `string` | File to use for basic authentication requests. It can be used in receivers only |         | no       |
+| Name       | Type     | Description                                                                     | Default | Required |
+|------------|----------|---------------------------------------------------------------------------------|---------|----------|
+| `password` | `secret` | Password to use for basic authentication requests.                              |         | no       |
+| `username` | `string` | Username to use for basic authentication requests.                              |         | no       |
 
 
 ## Blocks
 
 You can use the following block with `otelcol.auth.basic`:
 
 | Block                            | Description                                                                | Required |
-| -------------------------------- | -------------------------------------------------------------------------- | -------- |
+|----------------------------------|----------------------------------------------------------------------------|----------|
 | [`debug_metrics`][debug_metrics] | Configures the metrics that this component generates to monitor its state. | no       |
+| [`htpasswd`][htpasswd]           | Configures the service authentication for a receiver                       | no       |
 
 [debug_metrics]: #debug_metrics
+[htpasswd]: #htpasswd
 
 ### `debug_metrics`
 
 {{< docs/shared lookup="reference/components/otelcol-debug-metrics-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
 
+### `htpasswd`
+
+The `htpasswd` block configures how the server extensions will authenticate calls.
+
+| Name     | Type     | Description                                                        | Default | Required |
+|----------|----------|--------------------------------------------------------------------|---------|----------|
+| `file`   | `string` | Path to the htpasswd file to use for basic authentication requests | `""`    | no       |
+| `inline` | `string` | The htpasswd file inline content                                   | `""`    | no       |
+
 ## Exported fields
 
 The following fields are exported and can be referenced by other components:
@@ -148,7 +161,9 @@ otelcol.receiver.otlp "example" {
 otelcol.exporter.debug "default" {}
 
 otelcol.auth.basic "creds" {
-  htpasswd_file = "/etc/alloy/.htpasswd"
+  htpasswd {
+    file = "/etc/alloy/.htpasswd"
+  }
 }
 ```
 
@@ -178,7 +193,9 @@ otelcol.auth.basic "creds" {
   username = "demo"
   password = sys.env("API_KEY")
   
-  htpasswd_file = "/etc/alloy/.htpasswd"
+  htpasswd {
+    file = "/etc/alloy/.htpasswd"
+  }
 }
 ```
 

internal/component/otelcol/auth/basic/basic.go

@@ -35,12 +35,28 @@ func init() {
 	})
 }
 
+type HtpasswdConfig struct {
+	File   string `alloy:"file,attr,optional"`
+	Inline string `alloy:"inline,attr,optional"`
+}
+
+func (c HtpasswdConfig) convert() *basicauthextension.HtpasswdSettings {
+	settings := &basicauthextension.HtpasswdSettings{}
+	if c.File != "" {
+		settings.File = c.File
+	}
+	if c.Inline != "" {
+		settings.Inline = c.Inline
+	}
+	return settings
+}
+
 // Arguments configures the otelcol.auth.basic component.
 type Arguments struct {
 	Username string            `alloy:"username,attr,optional"`
 	Password alloytypes.Secret `alloy:"password,attr,optional"`
 
-	HtpasswdFile string `alloy:"htpasswd_file,attr,optional"`
+	Htpasswd *HtpasswdConfig `alloy:"htpasswd,block,optional"`
 
 	// DebugMetrics configures component internal metrics. Optional.
 	DebugMetrics otelcolCfg.DebugMetricsArguments `alloy:"debug_metrics,block,optional"`
@@ -56,7 +72,7 @@ func (args *Arguments) SetToDefault() {
 // Validate implements syntax.Validator
 func (args Arguments) Validate() error {
 	// check if no argument was provided
-	if args.Username == "" && args.Password == "" && args.HtpasswdFile == "" {
+	if args.Username == "" && args.Password == "" && args.Htpasswd == nil {
 		return errNoCredentialSource
 	}
 	// the downstream basicauthextension package supports having both inline
@@ -86,11 +102,11 @@ func (args Arguments) ConvertServer() (otelcomponent.Config, error) {
 	c := &basicauthextension.Config{
 		Htpasswd: &basicauthextension.HtpasswdSettings{},
 	}
-	if args.HtpasswdFile != "" {
-		c.Htpasswd.File = args.HtpasswdFile
+	if args.Htpasswd != nil {
+		c.Htpasswd = args.Htpasswd.convert()
 	}
 	if args.Username != "" && args.Password != "" {
-		c.Htpasswd.Inline = fmt.Sprintf("%s:%s", args.Username, args.Password)
+		c.Htpasswd.Inline += fmt.Sprintf("\n%s:%s", args.Username, args.Password)
 	}
 
 	return c, nil

internal/component/otelcol/auth/basic/basic_test.go

@@ -35,7 +35,9 @@ var (
 	cfg = fmt.Sprintf(`
 		username = "%s"
 		password = "%s"
-		htpasswd_file = "%s"
+		htpasswd = {
+			file = "%s"
+		}
 	`, actualUsername, actualPassword, htpasswdPath)
 )