Append aws-cloud-map-mcs-controller-for-k8s specific User-Agent to AWS Cloudmap Requests.

Author: runakash

pkg/cloudmap/aws_facade.go

@@ -2,6 +2,8 @@ package cloudmap
 
 import (
 	"context"
+	"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/version"
+	"github.com/aws/aws-sdk-go-v2/aws/middleware"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	sd "github.com/aws/aws-sdk-go-v2/service/servicediscovery"
@@ -44,5 +46,9 @@ type awsFacade struct {
 
 // NewAwsFacadeFromConfig creates a new AWS facade from an AWS client config.
 func NewAwsFacadeFromConfig(cfg *aws.Config) AwsFacade {
-	return &awsFacade{sd.NewFromConfig(*cfg)}
+	sdClient := sd.NewFromConfig(*cfg, func(options *sd.Options) {
+		// Append User-Agent to all the request, the format is going to be aws-cloud-map-mcs-controller-for-k8s/0.0.0-abc
+		options.APIOptions = append(options.APIOptions, middleware.AddUserAgentKeyValue(version.GetUserAgentKey(), version.GetUserAgentValue()))
+	})
+	return &awsFacade{sdClient}
 }

pkg/controllers/multicluster/serviceexport_controller.go

@@ -71,13 +71,11 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	namespacedName := types.NamespacedName{Namespace: serviceExport.Namespace, Name: serviceExport.Name}
 	if err := r.Client.Get(ctx, namespacedName, &service); err != nil {
 		if errors.IsNotFound(err) {
-			r.Log.Info("no Service found, deleting the ServiceExport",
-				"Namespace", serviceExport.Namespace, "Name", serviceExport.Name)
+			r.Log.Info("no Service found, deleting the ServiceExport", "Namespace", serviceExport.Namespace, "Name", serviceExport.Name)
 			// Mark ServiceExport to be deleted, if the corresponding Service is not found
 			isServiceExportMarkedForDelete = true
 		} else {
-			r.Log.Error(err, "error fetching Service",
-				"Namespace", serviceExport.Namespace, "Name", serviceExport.Name)
+			r.Log.Error(err, "error fetching Service", "Namespace", serviceExport.Namespace, "Name", serviceExport.Name)
 			return ctrl.Result{}, nil
 		}
 	}
@@ -238,9 +236,7 @@ func (r *ServiceExportReconciler) extractEndpoints(ctx context.Context, svc *v1.
 	}
 
 	attributes := make(map[string]string)
-	if version.GetVersion() != "" {
-		attributes[model.K8sVersionAttr] = version.PackageName + " " + version.GetVersion()
-	}
+	attributes[model.K8sVersionAttr] = version.GetPackageVersion()
 
 	endpoints := make([]*model.Endpoint, 0)
 	for _, slice := range endpointSlices.Items {

pkg/version/version.go

@@ -22,3 +22,18 @@ func GetVersion() string {
 
 	return ""
 }
+
+func GetPackageVersion() string {
+	return PackageName + " " + GetVersion()
+}
+
+func GetUserAgentKey() string {
+	return PackageName
+}
+
+func GetUserAgentValue() string {
+	if GitVersion != "" {
+		return strings.TrimPrefix(GitVersion, "v")
+	}
+	return ""
+}