Update voluptuous for existing notify platforms (#3133)

* Update voluptuous for exists notify platforms

* fix constants

homeassistant/components/notify/aws_lambda.py

@@ -7,29 +7,30 @@
 import logging
 import json
 import base64
+
 import voluptuous as vol
 
 from homeassistant.const import (
     CONF_PLATFORM, CONF_NAME)
 from homeassistant.components.notify import (
-    ATTR_TARGET, BaseNotificationService)
+    ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService)
+import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 REQUIREMENTS = ["boto3==1.3.1"]
 
-CONF_REGION = "region_name"
-CONF_ACCESS_KEY_ID = "aws_access_key_id"
-CONF_SECRET_ACCESS_KEY = "aws_secret_access_key"
-CONF_PROFILE_NAME = "profile_name"
-CONF_CONTEXT = "context"
-
-PLATFORM_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): "aws_lambda",
-    vol.Optional(CONF_NAME): vol.Coerce(str),
-    vol.Optional(CONF_REGION, default="us-east-1"): vol.Coerce(str),
-    vol.Inclusive(CONF_ACCESS_KEY_ID, "credentials"): vol.Coerce(str),
-    vol.Inclusive(CONF_SECRET_ACCESS_KEY, "credentials"): vol.Coerce(str),
-    vol.Exclusive(CONF_PROFILE_NAME, "credentials"): vol.Coerce(str),
+CONF_REGION = 'region_name'
+CONF_ACCESS_KEY_ID = 'aws_access_key_id'
+CONF_SECRET_ACCESS_KEY = 'aws_secret_access_key'
+CONF_PROFILE_NAME = 'profile_name'
+CONF_CONTEXT = 'context'
+ATTR_CREDENTIALS = 'credentials'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_REGION, default="us-east-1"): cv.string,
+    vol.Inclusive(CONF_ACCESS_KEY_ID, ATTR_CREDENTIALS): cv.string,
+    vol.Inclusive(CONF_SECRET_ACCESS_KEY, ATTR_CREDENTIALS): cv.string,
+    vol.Exclusive(CONF_PROFILE_NAME, ATTR_CREDENTIALS): cv.string,
     vol.Optional(CONF_CONTEXT, default=dict()): vol.Coerce(dict)
 })
 

homeassistant/components/notify/aws_sns.py

@@ -6,28 +6,30 @@
 """
 import logging
 import json
+
 import voluptuous as vol
 
 from homeassistant.const import (
     CONF_PLATFORM, CONF_NAME)
 from homeassistant.components.notify import (
-    ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_TARGET, BaseNotificationService)
+    ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_TARGET, PLATFORM_SCHEMA,
+    BaseNotificationService)
+import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 REQUIREMENTS = ["boto3==1.3.1"]
 
-CONF_REGION = "region_name"
-CONF_ACCESS_KEY_ID = "aws_access_key_id"
-CONF_SECRET_ACCESS_KEY = "aws_secret_access_key"
-CONF_PROFILE_NAME = "profile_name"
-
-PLATFORM_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): "aws_sns",
-    vol.Optional(CONF_NAME): vol.Coerce(str),
-    vol.Optional(CONF_REGION, default="us-east-1"): vol.Coerce(str),
-    vol.Inclusive(CONF_ACCESS_KEY_ID, "credentials"): vol.Coerce(str),
-    vol.Inclusive(CONF_SECRET_ACCESS_KEY, "credentials"): vol.Coerce(str),
-    vol.Exclusive(CONF_PROFILE_NAME, "credentials"): vol.Coerce(str)
+CONF_REGION = 'region_name'
+CONF_ACCESS_KEY_ID = 'aws_access_key_id'
+CONF_SECRET_ACCESS_KEY = 'aws_secret_access_key'
+CONF_PROFILE_NAME = 'profile_name'
+ATTR_CREDENTIALS = 'credentials'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_REGION, default="us-east-1"): cv.string,
+    vol.Inclusive(CONF_ACCESS_KEY_ID, ATTR_CREDENTIALS): cv.string,
+    vol.Inclusive(CONF_SECRET_ACCESS_KEY, ATTR_CREDENTIALS): cv.string,
+    vol.Exclusive(CONF_PROFILE_NAME, ATTR_CREDENTIALS): cv.string,
 })
 
 

homeassistant/components/notify/aws_sqs.py

@@ -6,28 +6,29 @@
 """
 import logging
 import json
+
 import voluptuous as vol
 
 from homeassistant.const import (
     CONF_PLATFORM, CONF_NAME)
 from homeassistant.components.notify import (
-    ATTR_TARGET, BaseNotificationService)
+    ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService)
+import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 REQUIREMENTS = ["boto3==1.3.1"]
 
-CONF_REGION = "region_name"
-CONF_ACCESS_KEY_ID = "aws_access_key_id"
-CONF_SECRET_ACCESS_KEY = "aws_secret_access_key"
-CONF_PROFILE_NAME = "profile_name"
-
-PLATFORM_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): "aws_sqs",
-    vol.Optional(CONF_NAME): vol.Coerce(str),
-    vol.Optional(CONF_REGION, default="us-east-1"): vol.Coerce(str),
-    vol.Inclusive(CONF_ACCESS_KEY_ID, "credentials"): vol.Coerce(str),
-    vol.Inclusive(CONF_SECRET_ACCESS_KEY, "credentials"): vol.Coerce(str),
-    vol.Exclusive(CONF_PROFILE_NAME, "credentials"): vol.Coerce(str)
+CONF_REGION = 'region_name'
+CONF_ACCESS_KEY_ID = 'aws_access_key_id'
+CONF_SECRET_ACCESS_KEY = 'aws_secret_access_key'
+CONF_PROFILE_NAME = 'profile_name'
+ATTR_CREDENTIALS = 'credentials'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_REGION, default="us-east-1"): cv.string,
+    vol.Inclusive(CONF_ACCESS_KEY_ID, ATTR_CREDENTIALS): cv.string,
+    vol.Inclusive(CONF_SECRET_ACCESS_KEY, ATTR_CREDENTIALS): cv.string,
+    vol.Exclusive(CONF_PROFILE_NAME, ATTR_CREDENTIALS): cv.string,
 })
 
 

homeassistant/components/notify/group.py

@@ -8,18 +8,17 @@
 import logging
 import voluptuous as vol
 
-from homeassistant.const import (CONF_PLATFORM, CONF_NAME, ATTR_SERVICE)
+from homeassistant.const import ATTR_SERVICE
 from homeassistant.components.notify import (DOMAIN, ATTR_MESSAGE, ATTR_DATA,
+                                             PLATFORM_SCHEMA,
                                              BaseNotificationService)
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
 CONF_SERVICES = "services"
 
-PLATFORM_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): "group",
-    vol.Required(CONF_NAME): vol.Coerce(str),
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_SERVICES): vol.All(cv.ensure_list, [{
         vol.Required(ATTR_SERVICE): cv.slug,
         vol.Optional(ATTR_DATA): dict,

homeassistant/components/notify/joaoapps_join.py

@@ -7,8 +7,9 @@
 import logging
 import voluptuous as vol
 from homeassistant.components.notify import (
-    ATTR_DATA, ATTR_TITLE, ATTR_TITLE_DEFAULT, BaseNotificationService)
-from homeassistant.const import CONF_PLATFORM, CONF_NAME, CONF_API_KEY
+    ATTR_DATA, ATTR_TITLE, ATTR_TITLE_DEFAULT, PLATFORM_SCHEMA,
+    BaseNotificationService)
+from homeassistant.const import CONF_API_KEY
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = [
@@ -19,10 +20,8 @@
 
 CONF_DEVICE_ID = 'device_id'
 
-PLATFORM_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): 'joaoapps_join',
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_DEVICE_ID): cv.string,
-    vol.Optional(CONF_NAME): cv.string,
     vol.Optional(CONF_API_KEY): cv.string
 })
 

homeassistant/components/notify/telegram.py

@@ -7,14 +7,15 @@
 import io
 import logging
 import urllib
+
 import requests
 import voluptuous as vol
 
 import homeassistant.helpers.config_validation as cv
 from homeassistant.components.notify import (
-    ATTR_TITLE, ATTR_DATA, BaseNotificationService)
-from homeassistant.const import (CONF_API_KEY, CONF_NAME, ATTR_LOCATION,
-                                 ATTR_LATITUDE, ATTR_LONGITUDE, CONF_PLATFORM)
+    ATTR_TITLE, ATTR_DATA, PLATFORM_SCHEMA, BaseNotificationService)
+from homeassistant.const import (CONF_API_KEY, ATTR_LOCATION, ATTR_LATITUDE,
+                                 ATTR_LONGITUDE)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,9 +27,7 @@
 
 CONF_CHAT_ID = 'chat_id'
 
-PLATFORM_SCHEMA = vol.Schema({
-    vol.Required(CONF_PLATFORM): "telegram",
-    vol.Optional(CONF_NAME): cv.string,
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_API_KEY): cv.string,
     vol.Required(CONF_CHAT_ID): cv.string,
 })