Merge pull request #393 from hanleyyin/dynamicUserAgent

Set the user-agent based on the destination repo of the built image

Author: cert-manager-prow[bot]

.github/workflows/on-release.yml

@@ -8,6 +8,8 @@ on:
 env:
   PUBLIC_REGISTRY: public.ecr.aws/k1n1h4h4
   PRIVATE_REGISTRY: 105154636954.dkr.ecr.us-east-1.amazonaws.com
+  ECR_USER_AGENT: aws-privateca-issuer
+  EKS_USER_AGENT: aws-privateca-connector-for-kubernetes-eks-addon
 
 jobs:
   build:
@@ -44,6 +46,7 @@ jobs:
         with:
           build-args: |
             pkg_version=${{ steps.tag.outputs.tag }}
+            user_agent=${{ env.ECR_USER_AGENT }}
           context: .
           platforms: linux/amd64,linux/arm64
           tags: |
@@ -65,6 +68,7 @@ jobs:
         with:
           build-args: |
             pkg_version=${{ steps.tag.outputs.tag }}
+            user_agent=${{ env.EKS_USER_AGENT }}
           context: .
           platforms: linux/arm64
           provenance: false
@@ -76,6 +80,7 @@ jobs:
         with:
           build-args: |
             pkg_version=${{ steps.tag.outputs.tag }}
+            user_agent=${{ env.EKS_USER_AGENT }}
           context: .
           platforms: linux/amd64
           provenance: false
@@ -87,6 +92,7 @@ jobs:
         with:
           build-args: |
             pkg_version=${{ steps.tag.outputs.tag }}
+            user_agent=${{ env.EKS_USER_AGENT }}
           context: .
           platforms: linux/amd64,linux/arm64
           provenance: false

Dockerfile

@@ -30,12 +30,16 @@ RUN --mount=type=cache,target=${go_cache} --mount=type=cache,target=${go_mod_cac
 
 ARG pkg_version
 
+ARG user_agent="aws-privateca-issuer"
+
 # Build
 RUN --mount=type=cache,target=${go_cache} --mount=type=cache,target=${go_mod_cache} \
     VERSION=$pkg_version && \
+    USER_AGENT=$user_agent && \
     go build \
     -ldflags="-X=github.com/cert-manager/acm-pca-issuer/internal/version.Version=${VERSION} \
-    -X github.com/cert-manager/aws-privateca-issuer/pkg/api/injections.PlugInVersion=${VERSION}" \
+    -X github.com/cert-manager/aws-privateca-issuer/pkg/api/injections.PlugInVersion=${VERSION} \
+    -X github.com/cert-manager/aws-privateca-issuer/pkg/api/injections.UserAgent=${USER_AGENT}" \
     -mod=readonly \
     -o manager main.go
 

Makefile

@@ -85,7 +85,8 @@ blog-test:
 # Build manager binary
 manager: generate fmt vet lint
 	go build \
-	-ldflags="-X github.com/cert-manager/aws-privateca-issuer/pkg/api/injections.PlugInVersion=${VERSION}" \
+	-ldflags="-X github.com/cert-manager/aws-privateca-issuer/pkg/api/injections.PlugInVersion=${VERSION} \
+	-X github.com/cert-manager/aws-privateca-issuer/pkg/api/injections.UserAgent=aws-privateca-issuer" \
 	-o bin/manager main.go
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
@@ -148,6 +149,7 @@ docker-build: test
 		--build-arg go_cache=${GOCACHE} \
 		--build-arg go_mod_cache=${GOMODCACHE} \
 		--build-arg pkg_version=${VERSION} \
+		--build-arg user_agent=aws-privateca-issuer \
 		--tag ${IMG} \
 		--file Dockerfile \
 		--platform=linux/amd64,linux/arm64 \

pkg/api/injections/injection_targets.go

@@ -4,3 +4,7 @@ var (
 	// PlugInVersion is the git version of the cert-manager plugin
 	PlugInVersion string
 )
+
+var (
+	UserAgent string
+)

pkg/aws/pca.go

@@ -156,7 +156,7 @@ func GetProvisioner(ctx context.Context, client client.Client, name types.Namesp
 
 	provisioner := &PCAProvisioner{
 		pcaClient: acmpca.NewFromConfig(config, acmpca.WithAPIOptions(
-			middleware.AddUserAgentKeyValue("aws-privateca-issuer", injections.PlugInVersion),
+			middleware.AddUserAgentKeyValue(injections.UserAgent, injections.PlugInVersion),
 		)),
 		arn: spec.Arn,
 	}