Merge pull request #42928 from nextcloud/backport/42923/stable28

[stable28] fix(build): Do not generated OpenAPI for non-shipped apps or apps without OpenAPI support
nextcloud · Jan 18, 2024 · ccd3a99 · ccd3a99
2 parents c16744c + 3e59696
commit ccd3a99
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 2 deletions.
diff --git a/apps/admin_audit/.noopenapi b/apps/admin_audit/.noopenapi
diff --git a/apps/contactsinteraction/.noopenapi b/apps/contactsinteraction/.noopenapi
diff --git a/apps/encryption/.noopenapi b/apps/encryption/.noopenapi
diff --git a/apps/lookup_server_connector/.noopenapi b/apps/lookup_server_connector/.noopenapi
diff --git a/apps/systemtags/openapi.json b/apps/systemtags/openapi.json
@@ -0,0 +1,49 @@
+{
+    "openapi": "3.0.3",
+    "info": {
+        "title": "systemtags",
+        "version": "0.0.1",
+        "description": "Collaborative tagging functionality which shares tags among users.",
+        "license": {
+            "name": "agpl"
+        }
+    },
+    "components": {
+        "securitySchemes": {
+            "basic_auth": {
+                "type": "http",
+                "scheme": "basic"
+            },
+            "bearer_auth": {
+                "type": "http",
+                "scheme": "bearer"
+            }
+        },
+        "schemas": {
+            "Capabilities": {
+                "type": "object",
+                "required": [
+                    "systemtags"
+                ],
+                "properties": {
+                    "systemtags": {
+                        "type": "object",
+                        "required": [
+                            "enabled"
+                        ],
+                        "properties": {
+                            "enabled": {
+                                "type": "boolean",
+                                "enum": [
+                                    true
+                                ]
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "paths": {},
+    "tags": []
+}
diff --git a/apps/testing/.noopenapi b/apps/testing/.noopenapi
diff --git a/apps/twofactor_backupcodes/.noopenapi b/apps/twofactor_backupcodes/.noopenapi
diff --git a/apps/workflowengine/.noopenapi b/apps/workflowengine/.noopenapi
diff --git a/build/openapi-checker.sh b/build/openapi-checker.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
-for path in core/openapi.json apps/*/openapi.json; do
-	composer exec generate-spec "$(dirname "$path")" "$path" || exit 1
+for path in core apps/*; do
+	if [ ! -f "$path/.noopenapi" ] && [[ "$(git check-ignore "$path")" != "$path" ]]; then
+		composer exec generate-spec "$path" "$path/openapi.json" || exit 1
+	fi
 done
 
 files="$(git diff --name-only)"