adds APP_KEY to app.yaml and removes use of .env (GoogleCloudPlatform#384)

Author: bshaffer

appengine/flexible/laravel/app-dbsessions.yaml

@@ -4,14 +4,14 @@ env: flex
 runtime_config:
   document_root: public
 
-# required on some platforms so ".env" is not skipped
-skip_files: false
+# Ensure we skip ".env", which is only for local development
+skip_files:
+  - .env
 
 env_variables:
-  # The values here will override those in ".env". This is useful for
-  # production-specific configuration. However, Feel free to set these values
-  # in ".env" instead if you prefer.
+  # Put production environment variables here.
   APP_LOG: errorlog
+  APP_KEY: YOUR_APP_KEY
   STORAGE_DIR: /tmp
   CACHE_DRIVER: database
   SESSION_DRIVER: database
@@ -20,7 +20,7 @@ env_variables:
   DB_DATABASE: YOUR_DB_DATABASE
   DB_USERNAME: YOUR_DB_USERNAME
   DB_PASSWORD: YOUR_DB_PASSWORD
-  DB_SOCKET: /cloudsql/YOUR_CLOUDSQL_CONNECTION_NAME
+  DB_SOCKET: "/cloudsql/YOUR_CLOUDSQL_CONNECTION_NAME"
 
 beta_settings:
     # for Cloud SQL, uncomment and set this value to the Cloud SQL

appengine/flexible/laravel/app.yaml

@@ -4,12 +4,12 @@ env: flex
 runtime_config:
   document_root: public
 
-# required on some platforms so ".env" is not skipped
-skip_files: false
+# Ensure we skip ".env", which is only for local development
+skip_files:
+  - .env
 
 env_variables:
-  # The values here will override those in ".env". This is useful for
-  # production-specific configuration. However, Feel free to set these values
-  # in ".env" instead if you prefer.
+  # Put production environment variables here.
   APP_LOG: errorlog
+  APP_KEY: YOUR_APP_KEY
   STORAGE_DIR: /tmp

appengine/flexible/laravel/composer.lock

@@ -73,23 +73,19 @@ private static function createLaravelProject($targetDir)
 
         // copy and set the proper env vars in app.yaml
         $appYaml = str_replace([
+            'YOUR_APP_KEY',
             'YOUR_CLOUDSQL_CONNECTION_NAME',
             'YOUR_DB_DATABASE',
             'YOUR_DB_USERNAME',
             'YOUR_DB_PASSWORD',
         ], [
+            self::execute('php artisan key:generate --show --no-ansi'),
             getenv('LARAVEL_CLOUDSQL_CONNECTION_NAME'),
             getenv('LARAVEL_DB_DATABASE'),
             getenv('LARAVEL_DB_USERNAME'),
             getenv('LARAVEL_DB_PASSWORD'),
         ], file_get_contents(__DIR__ . '/../app-dbsessions.yaml'));
         file_put_contents($targetDir . '/app.yaml', $appYaml);
-
-        // copy over the base .env file
-        self::execute('cp .env.example .env');
-
-        // generate the secret
-        self::execute('php artisan key:generate');
     }
 
     private static function addPostDeployCommands($targetDir)

appengine/flexible/laravel/test/DeployDatabaseSessionTest.php

@@ -53,14 +53,13 @@ private static function createLaravelProject($targetDir)
         $process->setTimeout(300); // 5 minutes
         self::executeProcess($process);
 
-        // copy in the app.yaml
-        copy(__DIR__ . '/../app.yaml', $targetDir . '/app.yaml');
-
-        // copy over the base .env file
-        self::execute('cp .env.example .env');
-
-        // generate the secret
-        self::execute('php artisan key:generate');
+        // copy in the app.yaml and add the app key.
+        $appYaml = str_replace([
+            'YOUR_APP_KEY',
+        ], [
+            self::execute('php artisan key:generate --show --no-ansi'),
+        ], file_get_contents(__DIR__ . '/../app.yaml'));
+        file_put_contents($targetDir . '/app.yaml', $appYaml);
     }
 
     private static function addPostDeployCommands($targetDir)