Merge pull request #58 from crossplane-contrib/user-agent

feat: report crossplane in user-agent
crossplane-contrib · Jul 22, 2024 · 24eaea8 · 24eaea8
2 parents 4c264c5 + d8f822d
commit 24eaea8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cluster/images/provider-jet-equinix/Dockerfile b/cluster/images/provider-jet-equinix/Dockerfile
@@ -9,6 +9,7 @@ ENV USER_ID=1001
 # Setup Terraform environment
 
 ## Provider-dependent configuration
+ARG CROSSPLANE_PROVIDER_VERSION
 ARG TERRAFORM_VERSION
 ARG TERRAFORM_PROVIDER_SOURCE
 ARG TERRAFORM_PROVIDER_VERSION
@@ -45,6 +46,7 @@ ENV TERRAFORM_VERSION ${TERRAFORM_VERSION}
 ENV TERRAFORM_PROVIDER_SOURCE ${TERRAFORM_PROVIDER_SOURCE}
 ENV TERRAFORM_PROVIDER_VERSION ${TERRAFORM_PROVIDER_VERSION}
 ENV TERRAFORM_NATIVE_PROVIDER_PATH ${PLUGIN_DIR}/${TERRAFORM_NATIVE_PROVIDER_BINARY}
+ENV TF_APPEND_USER_AGENT crossplane-provider-jet-equinix/${CROSSPLANE_PROVIDER_VERSION}
 
 USER ${USER_ID}
 EXPOSE 8080

diff --git a/cluster/images/provider-jet-equinix/Makefile b/cluster/images/provider-jet-equinix/Makefile
@@ -52,11 +52,12 @@ img.build.shared:
 		--build-arg TERRAFORM_PROVIDER_DOWNLOAD_NAME=$(TERRAFORM_PROVIDER_DOWNLOAD_NAME) \
 		--build-arg TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX=$(TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX) \
 		--build-arg TERRAFORM_NATIVE_PROVIDER_BINARY=$(TERRAFORM_NATIVE_PROVIDER_BINARY) \
+		--build-arg CROSSPLANE_PROVIDER_VERSION=$(VERSION) \
 		-t $(IMAGE) \
 		$(IMAGE_TEMP_DIR) || $(FAIL)
 	@$(OK) docker build $(IMAGE)
 
 img.promote:
 	@$(INFO) Skipping image promotion from $(FROM_IMAGE) to $(TO_IMAGE)
 	@echo Promote is deferred to xpkg machinery
-	@$(OK) Image promotion skipped for $(FROM_IMAGE) to $(TO_IMAGE)
+	@$(OK) Image promotion skipped for $(FROM_IMAGE) to $(TO_IMAGE)