Skip to content

session: Note operations which omit UserAgent #7887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zjs merged 2 commits into from
May 7, 2018
Merged

session: Note operations which omit UserAgent #7887

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e51ea6
session: Note operations which omit UserAgent
zjs May 3, 2018
d517a86
Merge branch 'master' into topic/refactor-session-split/user-agent
zjs May 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/vic-ui/ui/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/vmware/vic/lib/install/plugin"
"github.com/vmware/vic/pkg/errors"
"github.com/vmware/vic/pkg/trace"
"github.com/vmware/vic/pkg/version"
"github.com/vmware/vic/pkg/vsphere/session"
)

Expand Down Expand Up @@ -300,6 +301,7 @@ func (p *Plugin) Install(cli *cli.Context) error {
User: p.Target.URL.User,
Thumbprint: p.Thumbprint,
Insecure: true,
UserAgent: version.UserAgent("vic-ui-installer"),
}

// Configure the OVA vm to be managed by this plugin
Expand Down
2 changes: 2 additions & 0 deletions lib/apiservers/engine/backends/backends.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import (
"github.com/vmware/vic/lib/imagec"
"github.com/vmware/vic/pkg/errors"
"github.com/vmware/vic/pkg/registry"
"github.com/vmware/vic/pkg/version"
"github.com/vmware/vic/pkg/vsphere/session"
"github.com/vmware/vic/pkg/vsphere/sys"
)
Expand Down Expand Up @@ -528,6 +529,7 @@ func newSession(ctx context.Context, config *config.VirtualContainerHostConfigSp
User: url.UserPassword(config.Username, config.Token),
Thumbprint: config.TargetThumbprint,
Keepalive: defaultSessionKeepAlive,
UserAgent: version.UserAgent("vic-engine"),
}

sess := session.NewSession(sessCfg)
Expand Down
5 changes: 3 additions & 2 deletions lib/install/plugin/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package plugin

import (
"context"
"crypto/tls"
"errors"
"fmt"
Expand All @@ -27,9 +28,8 @@ import (
"github.com/vmware/govmomi/object"
"github.com/vmware/govmomi/vim25/types"
"github.com/vmware/vic/pkg/trace"
"github.com/vmware/vic/pkg/version"
"github.com/vmware/vic/pkg/vsphere/session"

"context"
)

type Info struct {
Expand Down Expand Up @@ -117,6 +117,7 @@ func (p *Pluginator) connect() error {

sessionconfig := &session.Config{
Thumbprint: p.tThumbprint,
UserAgent: version.UserAgent("vic-ui-installer"),
}
sessionconfig.Service = p.tURL.String()

Expand Down
3 changes: 3 additions & 0 deletions pkg/vsphere/session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@ func (s *Session) Connect(ctx context.Context) (*Session, error) {
}

soapClient.UserAgent = s.UserAgent
if s.UserAgent == "" {
op.Debug("DEVNOTICE: Session created with default user agent.")
}

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

Expand Down