Skip to content

Commit 1ceb49e

Browse files
Adjust framework functionalities considering recent pipeline modifications (#1298)
* Update manifest.yml * Adjust frameworks to pipeline changes for cflinuxfs5
1 parent 9ee755f commit 1ceb49e

5 files changed

Lines changed: 6 additions & 5 deletions

File tree

manifest.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ dependencies:
439439
sha256: 0f8b092a6c02035b29e9af6d0f025efe5f8ce95e0cc655b30e93d1c436d5d137
440440
cf_stacks:
441441
- cflinuxfs4
442+
- cflinuxfs5
442443
- name: newrelic
443444
version: 9.2.0
444445
uri: https://buildpacks.cloudfoundry.org/dependencies/newrelic/newrelic_9.2.0_linux_noarch_any-stack_befb6434.zip

src/java/frameworks/client_certificate_mapper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (c *ClientCertificateMapperFramework) Supply() error {
6161
func (c *ClientCertificateMapperFramework) Finalize() error {
6262
// Find the installed JAR
6363
mapperDir := filepath.Join(c.context.Stager.DepDir(), "client_certificate_mapper")
64-
jarPattern := filepath.Join(mapperDir, "client-certificate-mapper-*.jar")
64+
jarPattern := filepath.Join(mapperDir, "client-certificate-mapper*.jar")
6565

6666
matches, err := filepath.Glob(jarPattern)
6767
if err != nil || len(matches) == 0 {

src/java/frameworks/contrast_security_agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (c *ContrastSecurityAgentFramework) findContrastAgent(frameworkDir string)
4848
}
4949

5050
// Try specific pattern first, then fallback to generic
51-
path, err := FindFileByPattern(frameworkDir, "contrast-security-*.jar", []string{""})
51+
path, err := FindFileByPattern(frameworkDir, "contrast-security*.jar", []string{""})
5252
if err == nil {
5353
return path, nil
5454
}

src/java/frameworks/datadog_javaagent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ func (d *DatadogJavaagentFramework) getApplicationVersion() string {
305305

306306
func (d *DatadogJavaagentFramework) constructJarPathAndFixClassCount(datadogDir string) error {
307307
// Find the installed JAR
308-
jarPattern := filepath.Join(datadogDir, "dd-java-agent*.jar")
308+
jarPattern := filepath.Join(datadogDir, d.DependencyIdentifier()+"*.jar")
309309
matches, err := filepath.Glob(jarPattern)
310310
if err != nil {
311311
return fmt.Errorf("failed to search for Datadog agent JAR: %w", err)

src/java/frameworks/datadog_javaagent_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func installDatadogAgent(depsDir, version string, withClassdata bool) {
6363
agentDir := filepath.Join(depsDir, "0", "datadog_javaagent")
6464
Expect(os.MkdirAll(agentDir, 0755)).To(Succeed())
6565

66-
jarPath := filepath.Join(agentDir, "dd-java-agent-"+version+".jar")
66+
jarPath := filepath.Join(agentDir, "datadog-javaagent_"+version+"_linux_noarch_any-stack_def0ebd6.jar")
6767

6868
f, err := os.Create(jarPath)
6969
Expect(err).NotTo(HaveOccurred())
@@ -254,7 +254,7 @@ var _ = Describe("Datadog JavaAgent", func() {
254254
content, err := os.ReadFile(filepath.Join(depsDir, "0", "java_opts", "19_datadog_javaagent.opts"))
255255
Expect(err).NotTo(HaveOccurred())
256256
Expect(string(content)).To(ContainSubstring("-javaagent:"))
257-
Expect(string(content)).To(ContainSubstring("$DEPS_DIR/0/datadog_javaagent/dd-java-agent-1.28.0.jar"))
257+
Expect(string(content)).To(ContainSubstring("$DEPS_DIR/0/datadog_javaagent/datadog-javaagent_1.28.0_linux_noarch_any-stack_def0ebd6.jar"))
258258
})
259259

260260
It("opts file does not embed the staging-time absolute path", func() {

0 commit comments

Comments
 (0)