From 3536c4ddb32f8f8716dfba7711d3883718cb22be Mon Sep 17 00:00:00 2001 From: David O'Sullivan Date: Fri, 21 Jun 2024 17:09:06 +0100 Subject: [PATCH] supports more specific plan combinations for PHP + web servers --- dt/detect.go | 20 ++++++++++++++++++++ dt/detect_test.go | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dt/detect.go b/dt/detect.go index 9d26ef0..6db1c36 100644 --- a/dt/detect.go +++ b/dt/detect.go @@ -40,6 +40,26 @@ func (d Detect) Detect(context libcnb.DetectContext) (libcnb.DetectResult, error return libcnb.DetectResult{ Pass: true, Plans: []libcnb.BuildPlan{ + { + Provides: []libcnb.BuildPlanProvide{ + {Name: "dynatrace-php"}, + }, + Requires: []libcnb.BuildPlanRequire{ + {Name: "dynatrace-php"}, + {Name: "php"}, + {Name: "httpd"}, + }, + }, + { + Provides: []libcnb.BuildPlanProvide{ + {Name: "dynatrace-php"}, + }, + Requires: []libcnb.BuildPlanRequire{ + {Name: "dynatrace-php"}, + {Name: "php"}, + {Name: "nginx"}, + }, + }, { Provides: []libcnb.BuildPlanProvide{ {Name: "dynatrace-apache"}, diff --git a/dt/detect_test.go b/dt/detect_test.go index 48fd0fa..479ec95 100644 --- a/dt/detect_test.go +++ b/dt/detect_test.go @@ -29,6 +29,26 @@ import ( var expectedResult = libcnb.DetectResult{ Pass: true, Plans: []libcnb.BuildPlan{ + { + Provides: []libcnb.BuildPlanProvide{ + {Name: "dynatrace-php"}, + }, + Requires: []libcnb.BuildPlanRequire{ + {Name: "dynatrace-php"}, + {Name: "php"}, + {Name: "httpd"}, + }, + }, + { + Provides: []libcnb.BuildPlanProvide{ + {Name: "dynatrace-php"}, + }, + Requires: []libcnb.BuildPlanRequire{ + {Name: "dynatrace-php"}, + {Name: "php"}, + {Name: "nginx"}, + }, + }, { Provides: []libcnb.BuildPlanProvide{ {Name: "dynatrace-apache"},