Merge pull request #21 from platformsh/local-vars

Refactor dynamic property access to be more permissive, too.

Author: chadwcarlson

platformshconfig/config.py

@@ -492,58 +492,32 @@ def __getattr__(self, config_property):
 
         """
 
-        if not self.is_valid_platform():
-            raise NotValidPlatformException(
-                'You are not running on Platform.sh, so the {0} variable is not available.'.format(config_property)
-            )
         is_build_var = config_property in self._directVariables.keys()
         is_runtime_var = config_property in self._directVariablesRuntime.keys()
 
         # For now, all unprefixed variables are also runtime variables. If that ever changes this logic will change
         # with it.
         is_unprefixed_var = config_property in self._unPrefixedVariablesRuntime.keys()
 
-        if self.in_build() and is_runtime_var:
-            raise BuildTimeVariableAccessException(
-                'The {0} variable is not available during build time.'.format(config_property)
-            )
         if is_build_var:
-            return self[self._directVariables[config_property]]
-        if is_runtime_var:
-            return self[self._directVariablesRuntime[config_property]]
-        if is_unprefixed_var:
-            return self._environmentVariables.get(self._unPrefixedVariablesRuntime[config_property])
-        raise AttributeError('No such variable defined: '.format(config_property))
-
-    def isset(self, config_property):
-        """Checks whether a configuration property is set.
-
-        Args:
-            config_property:
-                A (magic) property name.
-
-        Returns:
-            bool:
-                True if the property exists and is not None, False otherwise.
-
-        """
-
-        if not self.is_valid_platform():
-            return False
-
-        is_build_var = config_property in self._directVariables.keys()
-        is_runtime_var = config_property in self._directVariablesRuntime.keys()
-
-        # For now, all unprefixed variables are also runtime variables. If that ever changes this logic will change
-        # with it.
-        is_unprefixed_var = config_property in self._unPrefixedVariablesRuntime.keys()
-
-        if self.in_build():
-            return is_build_var and config_property is not None
-        if is_build_var or is_runtime_var or is_unprefixed_var:
-            return config_property is not None
-        return False
+            value = self[self._directVariables[config_property]]
+        elif is_runtime_var:
+            value = self[self._directVariablesRuntime[config_property]]
+        elif is_unprefixed_var:
+            value = self._environmentVariables.get(self._unPrefixedVariablesRuntime[config_property])
+        else:
+            raise AttributeError('No such variable defined: {}'.format(config_property))
+
+        if not value:
+            if self.in_build() and (is_runtime_var or is_unprefixed_var):
+                raise BuildTimeVariableAccessException(
+                    'The {} variable is not available during build time.'.format(config_property)
+                )
+            raise NotValidPlatformException(
+                'The {} variable is not defined. Are you sure you\'re running on Platform.sh?'.format(config_property)
+            )
 
+        return value
 
 def pymongo_formatter(credentials):
     """Returns a DSN for a pymongo-MongoDB connection.

tests/test_config.py

@@ -308,6 +308,36 @@ def test_build_and_deploy_properties_in_deploy_exists(self):
         self.assertTrue(hasattr(config, 'port'))
         self.assertTrue(hasattr(config, 'socket'))
 
+    def test_build_and_deploy_properties_mocked_in_local_exist(self):
+        env = self.mockEnvironmentDeploy
+        env.pop('PLATFORM_APPLICATION', None)
+        env.pop('PLATFORM_ENVIRONMENT', None)
+        env.pop('PLATFORM_BRANCH', None)
+
+        config = Config(env)
+
+        self.assertEqual('/app', config.appDir)
+        self.assertEqual('app', config.applicationName)
+        self.assertEqual('test-project', config.project)
+        self.assertEqual('abc123', config.treeID)
+        self.assertEqual('def789', config.projectEntropy)
+
+        self.assertEqual('/app/web', config.documentRoot)
+        self.assertEqual('1.2.3.4', config.smtpHost)
+        self.assertEqual('8080', config.port)
+        self.assertEqual('unix://tmp/blah.sock', config.socket)
+
+        self.assertTrue(hasattr(config, 'appDir'))
+        self.assertTrue(hasattr(config, 'applicationName'))
+        self.assertTrue(hasattr(config, 'project'))
+        self.assertTrue(hasattr(config, 'treeID'))
+        self.assertTrue(hasattr(config, 'projectEntropy'))
+
+        self.assertTrue(hasattr(config, 'documentRoot'))
+        self.assertTrue(hasattr(config, 'smtpHost'))
+        self.assertTrue(hasattr(config, 'port'))
+        self.assertTrue(hasattr(config, 'socket'))
+
     def test_deploy_property_in_build_throws(self):
 
         env = self.mockEnvironmentBuild