Add Apple brand (home-assistant#79227)

KevinCathcart · Sep 28, 2022 · 62c114e · 62c114e
1 parent b49d499
commit 62c114e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 28 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -106,7 +106,7 @@ repos:
         pass_filenames: false
         language: script
         types: [text]
-        files: ^(homeassistant/.+/manifest\.json|pyproject\.toml|\.pre-commit-config\.yaml|script/gen_requirements_all\.py)$
+        files: ^(homeassistant/.+/manifest\.json|homeassistant/brands/.+\.json|pyproject\.toml|\.pre-commit-config\.yaml|script/gen_requirements_all\.py)$
       - id: hassfest
         name: hassfest
         entry: script/run-in-env.sh python3 -m script.hassfest

diff --git a/homeassistant/brands/apple.json b/homeassistant/brands/apple.json
@@ -0,0 +1,11 @@
+{
+  "domain": "apple",
+  "name": "Apple",
+  "integrations": [
+    "icloud",
+    "ibeacon",
+    "apple_tv",
+    "homekit",
+    "homekit_controller"
+  ]
+}
diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json
@@ -189,10 +189,34 @@
       "iot_class": null,
       "name": "Home Assistant API"
     },
-    "apple_tv": {
-      "config_flow": true,
-      "iot_class": "local_push",
-      "name": "Apple TV"
+    "apple": {
+      "name": "Apple",
+      "integrations": {
+        "icloud": {
+          "config_flow": true,
+          "iot_class": "cloud_polling",
+          "name": "Apple iCloud"
+        },
+        "ibeacon": {
+          "config_flow": true,
+          "iot_class": "local_push",
+          "name": "iBeacon Tracker"
+        },
+        "apple_tv": {
+          "config_flow": true,
+          "iot_class": "local_push",
+          "name": "Apple TV"
+        },
+        "homekit": {
+          "config_flow": true,
+          "iot_class": "local_push",
+          "name": "HomeKit"
+        },
+        "homekit_controller": {
+          "config_flow": true,
+          "iot_class": "local_push"
+        }
+      }
     },
     "application_credentials": {
       "config_flow": false,
@@ -1811,15 +1835,6 @@
       "iot_class": null,
       "name": "Home Assistant Alerts"
     },
-    "homekit": {
-      "config_flow": true,
-      "iot_class": "local_push",
-      "name": "HomeKit"
-    },
-    "homekit_controller": {
-      "config_flow": true,
-      "iot_class": "local_push"
-    },
     "homematic": {
       "config_flow": false,
       "iot_class": "local_push",
@@ -1919,16 +1934,6 @@
       "iot_class": "cloud_polling",
       "name": "Jandy iAqualink"
     },
-    "ibeacon": {
-      "config_flow": true,
-      "iot_class": "local_push",
-      "name": "iBeacon Tracker"
-    },
-    "icloud": {
-      "config_flow": true,
-      "iot_class": "cloud_polling",
-      "name": "Apple iCloud"
-    },
     "idteck_prox": {
       "config_flow": false,
       "iot_class": "local_push",

diff --git a/script/hassfest/brand.py b/script/hassfest/brand.py
@@ -51,10 +51,8 @@ def _validate_brand(
                     f"'{sub_integration}' to 'integrations'",
                 )
 
-    if (
-        brand.domain in integrations
-        and not brand.integrations
-        or brand.domain not in brand.integrations
+    if brand.domain in integrations and (
+        not brand.integrations or brand.domain not in brand.integrations
     ):
         config.add_error(
             "brand",