Allow trailing slash in gcs dag location

google/datalab/contrib/pipeline/composer/_composer.py

@@ -22,7 +22,7 @@ class Composer(object):
   This object can be used to generate the python airflow spec.
   """
 
-  gcs_file_regexp = re.compile('gs://.*[^/]$')
+  gcs_file_regexp = re.compile('gs://.*')
 
   def __init__(self, zone, environment):
     """ Initializes an instance of a Composer object.
@@ -60,6 +60,8 @@ def gcs_dag_location(self):
           'Dag location {0} from Composer environment {1} is in incorrect format'.format(
             gcs_dag_location, self._environment))
 
-      self._gcs_dag_location = gcs_dag_location + '/'
+      self._gcs_dag_location = gcs_dag_location
+      if gcs_dag_location.endswith('/') is False:
+        self._gcs_dag_location = self._gcs_dag_location + '/'
 
     return self._gcs_dag_location

tests/pipeline/composer_tests.py

@@ -74,10 +74,17 @@ def test_gcs_dag_location(self, mock_environment_details):
       test_composer = Composer('foo_zone', 'foo_environment')
       self.assertEqual('gs://foo_bucket/dags/', test_composer.gcs_dag_location)
 
-      # Composer returns good result
       mock_environment_details.return_value = {
         'config': {
-          'gcsDagLocation': 'gs://foo_bucket'
+          'gcsDagLocation': 'gs://foo_bucket'  # only bucket
+        }
+      }
+      test_composer = Composer('foo_zone', 'foo_environment')
+      self.assertEqual('gs://foo_bucket/', test_composer.gcs_dag_location)
+
+      mock_environment_details.return_value = {
+        'config': {
+          'gcsDagLocation': 'gs://foo_bucket/'  # with trailing slash
         }
       }
       test_composer = Composer('foo_zone', 'foo_environment')
@@ -135,15 +142,3 @@ def test_gcs_dag_location(self, mock_environment_details):
               ('Dag location as://foo_bucket from Composer environment foo_environment is in'
                ' incorrect format')):
         test_composer.gcs_dag_location
-
-      mock_environment_details.return_value = {
-        'config': {
-          'gcsDagLocation': 'gs://foo_bucket/'  # trailing slash should be disallowed
-        }
-      }
-      test_composer = Composer('foo_zone', 'foo_environment')
-      with self.assertRaisesRegexp(
-              ValueError,
-              ('Dag location as://foo_bucket from Composer environment foo_environment is in'
-               ' incorrect format')):
-        test_composer.gcs_dag_location