Skip to content
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

dependabot: bump github.com/go-openapi/strfmt from 0.20.0 to 0.21.1 #9

Closed
wants to merge 2 commits into from
Closed

dependabot: bump github.com/go-openapi/strfmt from 0.20.0 to 0.21.1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e270848
Fix: User Agent and trace logger
kavya498 Nov 9, 2021
620d036
dependabot: bump github.com/go-openapi/strfmt from 0.20.0 to 0.21.1
dependabot[bot] Nov 24, 2021
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: 1 addition & 1 deletion api/account/accountv1/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (AccountServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/account/accountv2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (AccountServiceAPI, error) {
}
tokenRefreher, err := authentication.NewUAARepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/certificatemanager/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (CertificateManagerServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/cis/cisv1/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func New(sess *session.Session) (CisServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/container/containerv1/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func New(sess *session.Session) (ContainerServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/container/containerv2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func New(sess *session.Session) (ContainerServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/container/registryv1/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func New(sess *session.Session) (RegistryServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/cse/csev2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func New(sess *session.Session) (CseServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
4 changes: 2 additions & 2 deletions api/functions/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (FunctionServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down Expand Up @@ -75,7 +75,7 @@ func NewCF(sess *session.Session) (FunctionServiceAPI, error) {
}
tokenRefreher, err := authentication.NewUAARepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/globalsearch/globalsearchv2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (GlobalSearchServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/globaltagging/globaltaggingv3/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (GlobalTaggingServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/hpcs/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (HPCSV2, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/iam/iamv1/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func New(sess *session.Session) (IAMServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/iampap/iampapv1/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func New(sess *session.Session) (IAMPAPAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/iampap/iampapv2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (IAMPAPAPIV2, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/iamuum/iamuumv1/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func New(sess *session.Session) (IAMUUMServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/iamuum/iamuumv2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func New(sess *session.Session) (IAMUUMServiceAPIv2, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/icd/icdv4/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func New(sess *session.Session) (ICDServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/mccp/mccpv2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func New(sess *session.Session) (MccpServiceAPI, error) {
}
tokenRefreher, err := authentication.NewUAARepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/resource/resourcev1/catalog/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (ResourceCatalogAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/resource/resourcev1/controller/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func New(sess *session.Session) (ResourceControllerAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/resource/resourcev1/management/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func New(sess *session.Session) (ResourceManagementAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/resource/resourcev2/controllerv2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (ResourceControllerAPIV2, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/resource/resourcev2/managementv2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func New(sess *session.Session) (ResourceManagementAPIv2, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/satellite/satellitev1/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (SatelliteServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/schematics/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func New(sess *session.Session) (SchematicsServiceAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
2 changes: 1 addition & 1 deletion api/usermanagement/usermanagementv2/api_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func New(sess *session.Session) (UserManagementAPI, error) {
}
tokenRefreher, err := authentication.NewIAMAuthRepository(config, &rest.Client{
DefaultHeader: gohttp.Header{
"User-Agent": []string{http.UserAgent()},
"X-Original-User-Agent": []string{config.UserAgent},
},
HTTPClient: config.HTTPClient,
})
Expand Down
26 changes: 14 additions & 12 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (

bluemix "github.com/IBM-Cloud/bluemix-go"
"github.com/IBM-Cloud/bluemix-go/bmxerror"
"github.com/IBM-Cloud/bluemix-go/http"
"github.com/IBM-Cloud/bluemix-go/rest"
)

Expand Down Expand Up @@ -296,7 +295,7 @@ func cleanPath(p string) string {
}

const (
userAgentHeader = "User-Agent"
userAgentHeader = "X-Original-User-Agent"
authorizationHeader = "Authorization"
uaaAccessTokenHeader = "X-Auth-Uaa-Token"
userAccessTokenHeader = "X-Auth-User-Token"
Expand All @@ -308,46 +307,49 @@ func getDefaultAuthHeaders(serviceName bluemix.ServiceName, c *bluemix.Config) g
h := gohttp.Header{}
switch serviceName {
case bluemix.MccpService, bluemix.AccountService:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.UAAAccessToken)
case bluemix.ContainerService:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)
h.Set(iamRefreshTokenHeader, c.IAMRefreshToken)
h.Set(uaaAccessTokenHeader, c.UAAAccessToken)
case bluemix.VpcContainerService:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)
h.Set(iamRefreshTokenHeader, c.IAMRefreshToken)
case bluemix.SchematicsService:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)
h.Set(iamRefreshTokenHeader, c.IAMRefreshToken)
case bluemix.ContainerRegistryService:
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)
h.Set(crRefreshTokenHeader, c.IAMRefreshToken)
case bluemix.IAMPAPService, bluemix.AccountServicev1, bluemix.ResourceCatalogrService, bluemix.ResourceControllerService, bluemix.ResourceControllerServicev2, bluemix.ResourceManagementService, bluemix.ResourceManagementServicev2, bluemix.IAMService, bluemix.IAMUUMService, bluemix.IAMUUMServicev2, bluemix.IAMPAPServicev2, bluemix.CseService:
h.Set(authorizationHeader, c.IAMAccessToken)
h.Set(userAgentHeader, c.UserAgent)
case bluemix.UserManagement:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)
case bluemix.CisService:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(userAccessTokenHeader, c.IAMAccessToken)
case bluemix.GlobalSearchService, bluemix.GlobalTaggingService:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)
h.Set(iamRefreshTokenHeader, c.IAMRefreshToken)
case bluemix.ICDService:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)
case bluemix.CertificateManager:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)
case bluemix.HPCService:
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)
case bluemix.FunctionsService:
h.Set(userAgentHeader, http.UserAgent())
h.Set(userAgentHeader, c.UserAgent)
h.Set(authorizationHeader, c.IAMAccessToken)

default:
Expand Down
1 change: 1 addition & 0 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ type Config struct {
SSLDisable bool
Visibility string
EndpointsFile string
UserAgent string
}

//Copy allows the configuration to be overriden or added
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.13

require (
github.com/ghodss/yaml v1.0.0
github.com/go-openapi/strfmt v0.20.0
github.com/go-openapi/strfmt v0.21.1
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.16.0
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
Expand Down
Loading