Merge pull request GoogleCloudPlatform#96 from GoogleCloudPlatform/flex-beta

Jon Wayne Parrott · web-flow · commit c6c3ee13fd89 · 2016-11-14T10:11:02.000-08:00
Update to env: flex
diff --git a/1-hello-world/app.yaml b/1-hello-world/app.yaml
@@ -18,7 +18,7 @@
 
 # [START runtime]
 runtime: python
-vm: true
+env: flex
 entrypoint: gunicorn -b :$PORT main:app
 
 runtime_config:
diff --git a/2-structured-data/app.yaml b/2-structured-data/app.yaml
@@ -17,7 +17,7 @@
 # for details.
 
 runtime: python
-vm: true
+env: flex
 entrypoint: gunicorn -b :$PORT main:app
 
 runtime_config:
diff --git a/2-structured-data/bookshelf/model_cloudsql.py b/2-structured-data/bookshelf/model_cloudsql.py
@@ -45,7 +45,7 @@ class Book(db.Model):
     author = db.Column(db.String(255))
     publishedDate = db.Column(db.String(255))
     imageUrl = db.Column(db.String(255))
-    description = db.Column(db.String(255))
+    description = db.Column(db.String(4096))
     createdBy = db.Column(db.String(255))
     createdById = db.Column(db.String(255))
 
diff --git a/2-structured-data/config.py b/2-structured-data/config.py
@@ -64,7 +64,7 @@
         user=CLOUDSQL_USER, password=CLOUDSQL_PASSWORD,
         database=CLOUDSQL_DATABASE, connection_name=CLOUDSQL_CONNECTION_NAME)
 
-if os.environ.get('GAE_APPENGINE_HOSTNAME'):
+if os.environ.get('GAE_INSTANCE'):
     SQLALCHEMY_DATABASE_URI = LIVE_SQLALCHEMY_DATABASE_URI
 else:
     SQLALCHEMY_DATABASE_URI = LOCAL_SQLALCHEMY_DATABASE_URI
diff --git a/3-binary-data/app.yaml b/3-binary-data/app.yaml
@@ -16,7 +16,7 @@
 # See https://cloud.google.com/appengine/docs/managed-vms/config for details.
 
 runtime: python
-vm: true
+env: flex
 entrypoint: gunicorn -b :$PORT main:app
 
 runtime_config:
diff --git a/3-binary-data/bookshelf/model_cloudsql.py b/3-binary-data/bookshelf/model_cloudsql.py
@@ -44,7 +44,7 @@ class Book(db.Model):
     author = db.Column(db.String(255))
     publishedDate = db.Column(db.String(255))
     imageUrl = db.Column(db.String(255))
-    description = db.Column(db.String(255))
+    description = db.Column(db.String(4096))
     createdBy = db.Column(db.String(255))
     createdById = db.Column(db.String(255))
 
diff --git a/3-binary-data/config.py b/3-binary-data/config.py
@@ -64,7 +64,7 @@
         user=CLOUDSQL_USER, password=CLOUDSQL_PASSWORD,
         database=CLOUDSQL_DATABASE, connection_name=CLOUDSQL_CONNECTION_NAME)
 
-if os.environ.get('GAE_APPENGINE_HOSTNAME'):
+if os.environ.get('GAE_INSTANCE'):
     SQLALCHEMY_DATABASE_URI = LIVE_SQLALCHEMY_DATABASE_URI
 else:
     SQLALCHEMY_DATABASE_URI = LOCAL_SQLALCHEMY_DATABASE_URI
diff --git a/4-auth/app.yaml b/4-auth/app.yaml
@@ -17,7 +17,7 @@
 # for details.
 
 runtime: python
-vm: true
+env: flex
 entrypoint: gunicorn -b :$PORT main:app
 
 runtime_config:
diff --git a/4-auth/bookshelf/model_cloudsql.py b/4-auth/bookshelf/model_cloudsql.py
@@ -44,7 +44,7 @@ class Book(db.Model):
     author = db.Column(db.String(255))
     publishedDate = db.Column(db.String(255))
     imageUrl = db.Column(db.String(255))
-    description = db.Column(db.String(255))
+    description = db.Column(db.String(4096))
     createdBy = db.Column(db.String(255))
     createdById = db.Column(db.String(255))
 
diff --git a/4-auth/config.py b/4-auth/config.py
@@ -66,7 +66,7 @@
         user=CLOUDSQL_USER, password=CLOUDSQL_PASSWORD,
         database=CLOUDSQL_DATABASE, connection_name=CLOUDSQL_CONNECTION_NAME)
 
-if os.environ.get('GAE_APPENGINE_HOSTNAME'):
+if os.environ.get('GAE_INSTANCE'):
     SQLALCHEMY_DATABASE_URI = LIVE_SQLALCHEMY_DATABASE_URI
 else:
     SQLALCHEMY_DATABASE_URI = LOCAL_SQLALCHEMY_DATABASE_URI
diff --git a/5-logging/app.yaml b/5-logging/app.yaml
@@ -17,7 +17,7 @@
 # for details.
 
 runtime: python
-vm: true
+env: flex
 entrypoint: gunicorn -b :$PORT main:app
 
 runtime_config:
diff --git a/5-logging/bookshelf/model_cloudsql.py b/5-logging/bookshelf/model_cloudsql.py
@@ -44,7 +44,7 @@ class Book(db.Model):
     author = db.Column(db.String(255))
     publishedDate = db.Column(db.String(255))
     imageUrl = db.Column(db.String(255))
-    description = db.Column(db.String(255))
+    description = db.Column(db.String(4096))
     createdBy = db.Column(db.String(255))
     createdById = db.Column(db.String(255))
 
diff --git a/5-logging/config.py b/5-logging/config.py
@@ -64,7 +64,7 @@
         user=CLOUDSQL_USER, password=CLOUDSQL_PASSWORD,
         database=CLOUDSQL_DATABASE, connection_name=CLOUDSQL_CONNECTION_NAME)
 
-if os.environ.get('GAE_APPENGINE_HOSTNAME'):
+if os.environ.get('GAE_INSTANCE'):
     SQLALCHEMY_DATABASE_URI = LIVE_SQLALCHEMY_DATABASE_URI
 else:
     SQLALCHEMY_DATABASE_URI = LOCAL_SQLALCHEMY_DATABASE_URI
diff --git a/6-pubsub/app.yaml b/6-pubsub/app.yaml
@@ -17,7 +17,7 @@
 # for details.
 
 runtime: python
-vm: true
+env: flex
 
 # [START entrypoint]
 # Instead of using gunicorn directly, we'll use Honcho. Honcho is a python port
diff --git a/6-pubsub/bookshelf/model_cloudsql.py b/6-pubsub/bookshelf/model_cloudsql.py
@@ -44,7 +44,7 @@ class Book(db.Model):
     author = db.Column(db.String(255))
     publishedDate = db.Column(db.String(255))
     imageUrl = db.Column(db.String(255))
-    description = db.Column(db.String(255))
+    description = db.Column(db.String(4096))
     createdBy = db.Column(db.String(255))
     createdById = db.Column(db.String(255))
 
diff --git a/6-pubsub/config.py b/6-pubsub/config.py
@@ -67,7 +67,7 @@
         user=CLOUDSQL_USER, password=CLOUDSQL_PASSWORD,
         database=CLOUDSQL_DATABASE, connection_name=CLOUDSQL_CONNECTION_NAME)
 
-if os.environ.get('GAE_APPENGINE_HOSTNAME'):
+if os.environ.get('GAE_INSTANCE'):
     SQLALCHEMY_DATABASE_URI = LIVE_SQLALCHEMY_DATABASE_URI
 else:
     SQLALCHEMY_DATABASE_URI = LOCAL_SQLALCHEMY_DATABASE_URI
diff --git a/6-pubsub/worker.yaml b/6-pubsub/worker.yaml
@@ -19,7 +19,7 @@
 # [START worker]
 service: worker
 runtime: python
-vm: true
+env: flex
 
 # Instead of using gunicorn directly, we'll use Honcho. Honcho is a python port
 # of the Foreman process manager. For the worker module, both the queue worker
diff --git a/7-gce/bookshelf/model_cloudsql.py b/7-gce/bookshelf/model_cloudsql.py
@@ -44,7 +44,7 @@ class Book(db.Model):
     author = db.Column(db.String(255))
     publishedDate = db.Column(db.String(255))
     imageUrl = db.Column(db.String(255))
-    description = db.Column(db.String(255))
+    description = db.Column(db.String(4096))
     createdBy = db.Column(db.String(255))
     createdById = db.Column(db.String(255))
 
diff --git a/7-gce/config.py b/7-gce/config.py
@@ -64,7 +64,7 @@
         user=CLOUDSQL_USER, password=CLOUDSQL_PASSWORD,
         database=CLOUDSQL_DATABASE, connection_name=CLOUDSQL_CONNECTION_NAME)
 
-if os.environ.get('GAE_APPENGINE_HOSTNAME'):
+if os.environ.get('GAE_INSTANCE'):
     SQLALCHEMY_DATABASE_URI = LIVE_SQLALCHEMY_DATABASE_URI
 else:
     SQLALCHEMY_DATABASE_URI = LOCAL_SQLALCHEMY_DATABASE_URI
diff --git a/optional-container-engine/bookshelf/model_cloudsql.py b/optional-container-engine/bookshelf/model_cloudsql.py
@@ -44,7 +44,7 @@ class Book(db.Model):
     author = db.Column(db.String(255))
     publishedDate = db.Column(db.String(255))
     imageUrl = db.Column(db.String(255))
-    description = db.Column(db.String(255))
+    description = db.Column(db.String(4096))
     createdBy = db.Column(db.String(255))
     createdById = db.Column(db.String(255))
 
diff --git a/optional-container-engine/config.py b/optional-container-engine/config.py
@@ -64,7 +64,7 @@
         user=CLOUDSQL_USER, password=CLOUDSQL_PASSWORD,
         database=CLOUDSQL_DATABASE, connection_name=CLOUDSQL_CONNECTION_NAME)
 
-if os.environ.get('GAE_APPENGINE_HOSTNAME'):
+if os.environ.get('GAE_INSTANCE'):
     SQLALCHEMY_DATABASE_URI = LIVE_SQLALCHEMY_DATABASE_URI
 else:
     SQLALCHEMY_DATABASE_URI = LOCAL_SQLALCHEMY_DATABASE_URI
