updated makefile

equinix-labs · Sep 19, 2024 · df464e0 · df464e0
1 parent 4b7f1ea
commit df464e0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,9 @@ CURRENT_GID := $(shell id -g)
 
 # git repo : equinix fabric-java sdk
 GIT_ORG=equinix-labs
-GIT_REPO=fabric-java
+GIT_REPO=fabric-sdk-java
+
+PACKAGE_VERSION=$(shell cat spec/oas3.fabric.config.json | jq -r '.artifactVersion')
 
 # Equinix fabric OAS 3.0.0
 SPEC_FETCHED_FILE:=spec/oas3.fabric.fetched.json
@@ -57,6 +59,8 @@ pull:
 
 docker_generate:
  ${DOCKER_OPENAPI} generate \
+ --http-user-agent "${GIT_REPO}/${PACKAGE_VERSION}" \
+ -p artifactVersion=${PACKAGE_VERSION} \
  -i /local/${SPEC_PATCHED_FILE} \
  -t /local/templates/Java \
  -g java \

diff --git a/equinix-openapi-fabric/git_push.sh b/equinix-openapi-fabric/git_push.sh
@@ -19,7 +19,7 @@ if [ "$git_user_id" = "" ]; then
 fi
 
 if [ "$git_repo_id" = "" ]; then
- git_repo_id="fabric-java"
+ git_repo_id="fabric-sdk-java"
  echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
 fi
 

diff --git a/equinix-openapi-fabric/src/main/java/com/equinix/openapi/fabric/ApiClient.java b/equinix-openapi-fabric/src/main/java/com/equinix/openapi/fabric/ApiClient.java
@@ -141,7 +141,7 @@ private void init() {
  json = new JSON();
 
  // Set default User-Agent.
- setUserAgent("OpenAPI-Generator/0.5.0/java");
+ setUserAgent("fabric-sdk-java/0.5.0");
 
  authentications = new HashMap<String, Authentication>();
  }

diff --git a/templates/Java/libraries/okhttp-gson/ApiClient.mustache b/templates/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -267,7 +267,7 @@ public class ApiClient {
  json = new JSON();
 
  // Set default User-Agent.
- setUserAgent("fabric-sdk-java-{{{artifactVersion}}}");
+ setUserAgent("{{{httpUserAgent}}}{{^httpUserAgent}}OpenAPI-Generator/{{{artifactVersion}}}/java{{/httpUserAgent}}");
 
  authentications = new HashMap<String, Authentication>();
  {{#dynamicOperations}}