Skip to content

Commit

Permalink
[receiver/nsxt] Change the type of Config.Password to be `configopa…
Browse files Browse the repository at this point in the history
…que.String` (#23891)

**Description:**
Split out from: #17353

**Link to tracking Issue:** #17273
  • Loading branch information
mackjmr committed Jul 5, 2023
1 parent 0f055e0 commit bd94c71
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 4 deletions.
20 changes: 20 additions & 0 deletions .chloggen/nsxt-use-configopaque.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use this changelog template to create an entry for release notes.
# If your change doesn't affect end users, such as a test fix or a tooling change,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: receiver/nsxt

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Change the type of `Config.Password` to be `configopaque.String`

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [17273]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
2 changes: 1 addition & 1 deletion receiver/nsxtreceiver/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func (c *nsxClient) doRequest(ctx context.Context, path string) ([]byte, error)
if err != nil {
return nil, err
}
req.SetBasicAuth(c.config.Username, c.config.Password)
req.SetBasicAuth(c.config.Username, string(c.config.Password))
h := req.Header
h.Add("User-Agent", "opentelemetry-collector")
h.Add("Accept", "application/json")
Expand Down
5 changes: 3 additions & 2 deletions receiver/nsxtreceiver/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"net/url"

"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.uber.org/multierr"

Expand All @@ -20,8 +21,8 @@ type Config struct {
scraperhelper.ScraperControllerSettings `mapstructure:",squash"`
confighttp.HTTPClientSettings `mapstructure:",squash"`
metadata.MetricsBuilderConfig `mapstructure:",squash"`
Username string `mapstructure:"username"`
Password string `mapstructure:"password"`
Username string `mapstructure:"username"`
Password configopaque.String `mapstructure:"password"`
}

// Validate returns if the NSX configuration is valid
Expand Down
2 changes: 1 addition & 1 deletion receiver/nsxtreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require (
github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f
go.opentelemetry.io/collector/component v0.81.0
go.opentelemetry.io/collector/config/confighttp v0.81.0
go.opentelemetry.io/collector/config/configopaque v0.81.0
go.opentelemetry.io/collector/confmap v0.81.0
go.opentelemetry.io/collector/consumer v0.81.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0013
Expand Down Expand Up @@ -45,7 +46,6 @@ require (
go.opentelemetry.io/collector v0.81.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.81.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.81.0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.81.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.81.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.81.0 // indirect
go.opentelemetry.io/collector/config/internal v0.81.0 // indirect
Expand Down

0 comments on commit bd94c71

Please sign in to comment.