[minor] Decline ISLE-shaped Drupal projects

Teach the Drupal plugin project detector to reject Compose projects that contain ISLE services such as alpaca, fcrepo, blazegraph, milliner, triplet, cantaloupe, or activemq.

This allows sitectl-isle to own isle-site-template checkouts and keeps commands like sitectl set bot-mitigation on from being routed to the generic Drupal plugin.

Author: joecorall

cmd/root.go

@@ -6,8 +6,9 @@ import (
 )
 
 var (
-	drupalServiceName = func() *string { s := "drupal"; return &s }()
-	sdk               *plugin.SDK
+	drupalServiceName                  = func() *string { s := "drupal"; return &s }()
+	drupalForbiddenISLEProjectServices = []string{"activemq", "alpaca", "blazegraph", "cantaloupe", "fcrepo", "milliner", "triplet"}
+	sdk                                *plugin.SDK
 )
 
 func init() {
@@ -19,8 +20,9 @@ func RegisterCommands(s *plugin.SDK) error {
 	sdk = s
 	sdk.SetComposeProjectDiscovery(plugin.ComposeProjectDiscovery{
 		RequiredServices:          []string{"drupal"},
+		ForbiddenServices:         drupalForbiddenISLEProjectServices,
 		ForbiddenComposerPackages: []string{"drupal/islandora"},
-		Reason:                    "drupal service without drupal/islandora in composer.json",
+		Reason:                    "drupal service without drupal/islandora in composer.json or ISLE services",
 	})
 	pluginjobs.Register(s)
 	if err := registerDrupalComponents(s); err != nil {

cmd/root_test.go

@@ -0,0 +1,89 @@
+package cmd
+
+import (
+	"bytes"
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/libops/sitectl/pkg/plugin"
+)
+
+func TestProjectDetectClaimsPlainDrupalProject(t *testing.T) {
+	projectDir := t.TempDir()
+	writeFileForTest(t, filepath.Join(projectDir, "docker-compose.yml"), "services:\n  drupal:\n    image: drupal:latest\n")
+	writeFileForTest(t, filepath.Join(projectDir, "composer.json"), `{"require": {}}`)
+
+	result := runDrupalProjectDetectForTest(t, projectDir)
+	if !result.Claimed {
+		t.Fatalf("expected Drupal project detection to claim %s", projectDir)
+	}
+	if result.Plugin != "drupal" {
+		t.Fatalf("expected drupal claim, got %#v", result)
+	}
+}
+
+func TestProjectDetectDeclinesISLEServices(t *testing.T) {
+	projectDir := t.TempDir()
+	writeFileForTest(t, filepath.Join(projectDir, "docker-compose.yml"), "services:\n  alpaca:\n    image: libops/alpaca:2\n  drupal:\n    image: islandora/drupal:main\n")
+	writeFileForTest(t, filepath.Join(projectDir, "composer.json"), `{"require": {}}`)
+
+	result := runDrupalProjectDetectForTest(t, projectDir)
+	if result.Claimed {
+		t.Fatalf("expected Drupal project detection to decline ISLE services, got %#v", result)
+	}
+}
+
+func runDrupalProjectDetectForTest(t *testing.T, projectDir string) projectDetectResultForTest {
+	t.Helper()
+
+	sdk := plugin.NewSDK(plugin.Metadata{Name: "drupal"})
+	if err := RegisterCommands(sdk); err != nil {
+		t.Fatalf("RegisterCommands() error = %v", err)
+	}
+
+	req, err := plugin.NewProjectDetectRequest(projectDir)
+	if err != nil {
+		t.Fatalf("NewProjectDetectRequest() error = %v", err)
+	}
+	requestData, err := json.Marshal(req)
+	if err != nil {
+		t.Fatalf("Marshal(RPCRequest) error = %v", err)
+	}
+
+	cmd := sdk.GetRPCCommand()
+	var stdout bytes.Buffer
+	cmd.SetIn(bytes.NewReader(requestData))
+	cmd.SetOut(&stdout)
+	if err := cmd.Execute(); err != nil {
+		t.Fatalf("Execute() error = %v", err)
+	}
+
+	var resp plugin.RPCResponse
+	if err := json.Unmarshal(stdout.Bytes(), &resp); err != nil {
+		t.Fatalf("Unmarshal(RPCResponse) error = %v: %s", err, stdout.String())
+	}
+	if !resp.OK {
+		t.Fatalf("project.detect failed: %+v", resp.Error)
+	}
+	var result projectDetectResultForTest
+	if err := json.Unmarshal(resp.Result, &result); err != nil {
+		t.Fatalf("Unmarshal(project detect result) error = %v", err)
+	}
+	return result
+}
+
+type projectDetectResultForTest struct {
+	Claimed    bool   `json:"claimed"`
+	Plugin     string `json:"plugin"`
+	ProjectDir string `json:"project_dir"`
+	Reason     string `json:"reason"`
+}
+
+func writeFileForTest(t *testing.T, path, contents string) {
+	t.Helper()
+	if err := os.WriteFile(path, []byte(contents), 0o644); err != nil {
+		t.Fatalf("WriteFile(%s) error = %v", path, err)
+	}
+}