Skip to content

Commit c6ce551

Browse files
committed
session: Note operations which omit UserAgent (vmware#7887)
Log a message (at debug, since this indicates a programming error, not something a user could address) any time we create a Session without specifying a UserAgent. Specify a UserAgent in several places where we were not doing so. (cherry picked from commit ff1db6e)
1 parent 8114a68 commit c6ce551

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

cmd/vic-ui/ui/ui.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/vmware/vic/lib/install/plugin"
2828
"github.com/vmware/vic/pkg/errors"
2929
"github.com/vmware/vic/pkg/trace"
30+
"github.com/vmware/vic/pkg/version"
3031
"github.com/vmware/vic/pkg/vsphere/session"
3132
)
3233

@@ -300,6 +301,7 @@ func (p *Plugin) Install(cli *cli.Context) error {
300301
User: p.Target.URL.User,
301302
Thumbprint: p.Thumbprint,
302303
Insecure: true,
304+
UserAgent: version.UserAgent("vic-ui-installer"),
303305
}
304306

305307
// Configure the OVA vm to be managed by this plugin

lib/apiservers/engine/backends/backends.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import (
4848
"github.com/vmware/vic/lib/imagec"
4949
"github.com/vmware/vic/pkg/errors"
5050
"github.com/vmware/vic/pkg/registry"
51+
"github.com/vmware/vic/pkg/version"
5152
"github.com/vmware/vic/pkg/vsphere/session"
5253
"github.com/vmware/vic/pkg/vsphere/sys"
5354
)
@@ -528,6 +529,7 @@ func newSession(ctx context.Context, config *config.VirtualContainerHostConfigSp
528529
User: url.UserPassword(config.Username, config.Token),
529530
Thumbprint: config.TargetThumbprint,
530531
Keepalive: defaultSessionKeepAlive,
532+
UserAgent: version.UserAgent("vic-engine"),
531533
}
532534

533535
sess := session.NewSession(sessCfg)

lib/install/plugin/register.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package plugin
1616

1717
import (
18+
"context"
1819
"crypto/tls"
1920
"errors"
2021
"fmt"
@@ -27,9 +28,8 @@ import (
2728
"github.com/vmware/govmomi/object"
2829
"github.com/vmware/govmomi/vim25/types"
2930
"github.com/vmware/vic/pkg/trace"
31+
"github.com/vmware/vic/pkg/version"
3032
"github.com/vmware/vic/pkg/vsphere/session"
31-
32-
"context"
3333
)
3434

3535
type Info struct {
@@ -117,6 +117,7 @@ func (p *Pluginator) connect() error {
117117

118118
sessionconfig := &session.Config{
119119
Thumbprint: p.tThumbprint,
120+
UserAgent: version.UserAgent("vic-ui-installer"),
120121
}
121122
sessionconfig.Service = p.tURL.String()
122123

pkg/vsphere/session/session.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ func (s *Session) Connect(ctx context.Context) (*Session, error) {
226226
}
227227

228228
soapClient.UserAgent = s.UserAgent
229+
if s.UserAgent == "" {
230+
op.Debug("DEVNOTICE: Session created with default user agent.")
231+
}
229232

230233
soapClient.SetThumbprint(soapURL.Host, s.Thumbprint)
231234

0 commit comments

Comments
 (0)