From 747d6160b5d2d242b716491b2192f5390a67f52f Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Tue, 8 Jul 2025 14:17:48 -0400 Subject: [PATCH] Use token to access Akka secure repository (cherry picked from commit 9488168f7bb06434403be21d276badb0655aed3c) --- .gitlab-ci.yml | 3 +++ .../akka-http/akka-http-10.6/build.gradle | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95c1d49573c..f793fce5842 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,6 +133,8 @@ default: policy: $BUILD_CACHE_POLICY before_script: - source .gitlab/gitlab-utils.sh + # Akka token added to SSM from https://account.akka.io/token + - export AKKA_REPO_TOKEN=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.akka_repo_token --with-decryption --query "Parameter.Value" --out text) - mkdir -p .gradle - export GRADLE_USER_HOME=$(pwd)/.gradle - | @@ -140,6 +142,7 @@ default: cat << EOF > $GRADLE_USER_HOME/gradle.properties mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY gradlePluginProxy=$GRADLE_PLUGIN_PROXY + akkaRepositoryToken=$AKKA_REPO_TOKEN EOF - | # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.6/build.gradle b/dd-java-agent/instrumentation/akka-http/akka-http-10.6/build.gradle index 0c6522331c3..f4c1b42c05c 100644 --- a/dd-java-agent/instrumentation/akka-http/akka-http-10.6/build.gradle +++ b/dd-java-agent/instrumentation/akka-http/akka-http-10.6/build.gradle @@ -15,15 +15,27 @@ muzzle { versions = "[10.6.0,)" javaVersion = "11" extraDependency 'com.typesafe.akka:akka-stream_2.13:2.9.0' - extraRepository('akka', 'https://repo.akka.io/maven') + + if (project.rootProject.hasProperty("akkaRepositoryToken")) { + extraRepository('akka', "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure") + } else { + extraRepository('akka', 'https://repo.akka.io/maven') + } + assertInverse = true } } repositories { - maven { - url "https://repo.akka.io/maven" + if (project.rootProject.hasProperty("akkaRepositoryToken")) { + maven { + url "https://repo.akka.io/${project.rootProject.property("akkaRepositoryToken")}/secure" + } + } else { + maven { + url "https://repo.akka.io/maven" + } } }