Revert "feat: enhance user-agent logic" (#14)

Rollback of BREAKING CHANGE.

This PR reverts #12 to previous behavior (user-agent prepending instead of appending)

Author: icerzack

README.md

@@ -45,7 +45,7 @@ After that initialize `Client` with the retrieved token.
 
 ### Usage example
 
-> [!NOTE] It is highly recommended to use the `WithClientUserAgent` option to set a custom User-Agent for the client.
+> [!NOTE] It is highly recommended to use the `WithUserAgentPrefix` option to set a custom User-Agent for the client.
 
 ```go
 package main
@@ -63,13 +63,13 @@ func main() {
     // It should be Service User Token
     token := "gAAAAABeVNzu-..."
 
-    // A client User-Agent.
-    userAgent := "iam-custom"
+    // A Prefix to be added to User-Agent.
+    prefix := "iam-custom"
 
     // Create a new IAM client.
     iamClient, err := iam.New(
     	iam.WithAuthOpts(&iam.AuthOpts{KeystoneToken: token}),
-    	iam.WithClientUserAgent(userAgent),
+    	iam.WithUserAgentPrefix(prefix),
     )
     // Handle the error.
     if err != nil {

examples/federation-with-user/main.go

@@ -25,8 +25,8 @@ var (
 	token          = "gAAAAA..."
 	deleteAfterRun = false
 
-	// Client User-Agent to be added.
-	clientUserAgent = "iam-go"
+	// Prefix to be added to User-Agent.
+	prefix = "iam-go"
 
 	federationName               = "federation_name"
 	federationDescription        = "federation_description"
@@ -45,7 +45,7 @@ func main() {
 	// Create a new IAM client.
 	iamClient, err := iam.New(
 		iam.WithAuthOpts(&iam.AuthOpts{KeystoneToken: token}),
-		iam.WithClientUserAgent(clientUserAgent),
+		iam.WithUserAgentPrefix(prefix),
 	)
 	if err != nil {
 		fmt.Println(err)

examples/group-with-user/main.go

@@ -27,8 +27,8 @@ var (
 	token          = "gAAAAA..."
 	deleteAfterRun = false
 
-	// Client User-Agent to be added.
-	clientUserAgent = "iam-go"
+	// Prefix to be added to User-Agent.
+	prefix = "iam-go"
 
 	groupName          = "test_group_name"
 	description        = "group_description"
@@ -41,7 +41,7 @@ func main() {
 	// Create a new IAM client.
 	iamClient, err := iam.New(
 		iam.WithAuthOpts(&iam.AuthOpts{KeystoneToken: token}),
-		iam.WithClientUserAgent(clientUserAgent),
+		iam.WithUserAgentPrefix(prefix),
 	)
 	if err != nil {
 		fmt.Println(err)

examples/s3credentials-create-delete/main.go

@@ -12,8 +12,8 @@ var (
 	token          = "gAAAAA..."
 	deleteAfterRun = false
 
-	// Client User-Agent to be added.
-	clientUserAgent = "iam-go"
+	// Prefix to be added to User-Agent.
+	prefix = "iam-go"
 
 	// ID of the User to create S3 Credentials for.
 	userID = "a1b2c3..."
@@ -29,7 +29,7 @@ func main() {
 	// Create a new IAM client.
 	iamClient, err := iam.New(
 		iam.WithAuthOpts(&iam.AuthOpts{KeystoneToken: token}),
-		iam.WithClientUserAgent(clientUserAgent),
+		iam.WithUserAgentPrefix(prefix),
 	)
 	// Handle the error.
 	if err != nil {

examples/serviceuser-create-update-delete/main.go

@@ -22,12 +22,10 @@ var (
 	token          = "gAAAAA..."
 	deleteAfterRun = false
 
-	// Client User-Agent to be added.
-	clientUserAgent = "iam-go"
-
+	// Prefix to be added to User-Agent.
+	prefix = "iam-go"
 	// Name of the Service User to create.
 	name = "service-user"
-
 	// Password of the Service User to create.
 	password = "Qazwsxedc123"
 )
@@ -36,7 +34,7 @@ func main() {
 	// Create a new IAM client.
 	iamClient, err := iam.New(
 		iam.WithAuthOpts(&iam.AuthOpts{KeystoneToken: token}),
-		iam.WithClientUserAgent(clientUserAgent),
+		iam.WithUserAgentPrefix(prefix),
 	)
 	if err != nil {
 		fmt.Println(err)

examples/transfer-role/main.go

@@ -21,16 +21,16 @@ func main() {
 	// KeystoneToken
 	token := "gAAAAA..."
 
-	// Client User-Agent to be added.
-	clientUserAgent := "iam-go"
+	// Prefix to be added to User-Agent.
+	prefix := "iam-go"
 
 	// ID of the User to assign role to.
 	userID := "654321_65432"
 
 	// Create a new IAM client.
 	iamClient, err := iam.New(
 		iam.WithAuthOpts(&iam.AuthOpts{KeystoneToken: token}),
-		iam.WithClientUserAgent(clientUserAgent),
+		iam.WithUserAgentPrefix(prefix),
 	)
 	// Handle the error.
 	if err != nil {

examples/user-create-delete/main.go

@@ -22,8 +22,8 @@ var (
 	token          = "gAAAAA..."
 	deleteAfterRun = false
 
-	// Client User-Agent to be added.
-	clientUserAgent = "iam-go"
+	// Prefix to be added to User-Agent.
+	prefix = "iam-go"
 
 	// Email of the User to create.
 	email = "testmail@example.com"
@@ -33,7 +33,7 @@ func main() {
 	// Create a new IAM client.
 	iamClient, err := iam.New(
 		iam.WithAuthOpts(&iam.AuthOpts{KeystoneToken: token}),
-		iam.WithClientUserAgent(clientUserAgent),
+		iam.WithUserAgentPrefix(prefix),
 	)
 	// Handle the error.
 	if err != nil {

iam.go

@@ -95,12 +95,12 @@ func WithAuthOpts(authOpts *AuthOpts) Option {
 	}
 }
 
-// WithClientUserAgent is a functional parameter for Client, used to set a custom User-Agent postfix.
+// WithUserAgentPrefix is a functional parameter for Client, used to set a custom prefix.
 //
 // It is highly recommended to use this option!
-func WithClientUserAgent(userAgent string) Option {
+func WithUserAgentPrefix(prefix string) Option {
 	return func(c *Client) {
-		c.baseClient.ClientUserAgent = userAgent
+		c.baseClient.UserAgentPrefix = prefix
 	}
 }
 
@@ -129,9 +129,10 @@ func New(opts ...Option) (*Client, error) {
 
 	appVersion := findModuleVersion()
 	userAgent := appName + "/" + appVersion
-	c.baseClient.UserAgent = userAgent
-	if c.baseClient.ClientUserAgent != "" {
-		c.baseClient.UserAgent += " " + c.baseClient.ClientUserAgent
+	if c.baseClient.UserAgentPrefix == "" {
+		c.baseClient.UserAgent = userAgent
+	} else {
+		c.baseClient.UserAgent = c.baseClient.UserAgentPrefix + " " + userAgent
 	}
 
 	c.Users = users.New(c.baseClient)

internal/client/client.go

@@ -30,8 +30,8 @@ type BaseClient struct {
 	// UserAgent represents a User-Agent to be added to all requests.
 	UserAgent string
 
-	// ClientUserAgent contains custom User-Agent postfix to be added.
-	ClientUserAgent string
+	// UserAgentPrefix contains custom prefix to be added to userAgent.
+	UserAgentPrefix string
 }
 
 // DoRequest performs the HTTP request with the current Client.HTTPClient and given User-Agent prefix.