Merge pull request GoogleCloudPlatform#80 from GoogleCloudPlatform/update-cloudsqlv2

remi Taylor · web-flow · commit 403df4abe58b · 2017-03-22T10:55:35.000-07:00
Update placeholders for MySQL -- Cloud SQL v2
diff --git a/2-cloud-sql/config/database.example.yml b/2-cloud-sql/config/database.example.yml
@@ -2,10 +2,10 @@ mysql_settings: &mysql_settings
   adapter: mysql2
   encoding: utf8
   pool: 5
-  username: your-mysql-user-here
-  password: your-mysql-password-here
-  database: your-mysql-database-here
-  socket: your-cloud-sql-socket-path
+  username: [MYSQL_USER]
+  password: [MYSQL_PASS]
+  database: [MYSQL_DATABASE]
+  socket: /cloudsql/[YOUR_INSTANCE_CONNECTION_NAME]
 
 development:
   <<: *mysql_settings
diff --git a/2-cloud-sql/spec/spec_helper.rb b/2-cloud-sql/spec/spec_helper.rb
@@ -35,10 +35,10 @@
       db_file = File.expand_path("../../config/database.yml", __FILE__)
       db_config = File.read(db_file)
       db_values = {
-        "your-mysql-user-here" => "MYSQL_USER",
-        "your-mysql-password-here" =>  "MYSQL_PASSWORD",
-        "your-mysql-IPv4-address-here" => "MYSQL_HOST",
-        "your-mysql-database-here" => "MYSQL_DBNAME"
+        "[MYSQL_USER]" => "MYSQL_USER",
+        "[MYSQL_PASS]" =>  "MYSQL_PASSWORD",
+        "[MYSQL_DATABASE]" => "MYSQL_DBNAME",
+        "[YOUR_INSTANCE_CONNECTION_NAME]" => "MYSQL_SOCKET"
       }
 
       db_values.each { |key, envkey|
diff --git a/3-cloud-storage/config/database.example.yml b/3-cloud-storage/config/database.example.yml
@@ -4,10 +4,10 @@ default: &default
 #   adapter: mysql2
 #   encoding: utf8
 #   pool: 5
-#   username: your-mysql-user-here
-#   password: your-mysql-password-here
-#   host: your-mysql-IPv4-address-here
-#   database: your-mysql-database-here
+#   username: [MYSQL_USER]
+#   password: [MYSQL_PASS]
+#   database: [MYSQL_DATABASE]
+#   socket: /cloudsql/[YOUR_INSTANCE_CONNECTION_NAME]
 
 # Google Cloud Datastore Sample Database Configuration
 # ----------------------------------------------------
diff --git a/4-auth/config/database.example.yml b/4-auth/config/database.example.yml
@@ -4,10 +4,10 @@ default: &default
 #   adapter: mysql2
 #   encoding: utf8
 #   pool: 5
-#   username: your-mysql-user-here
-#   password: your-mysql-password-here
-#   host: your-mysql-IPv4-address-here
-#   database: your-mysql-database-here
+#   username: [MYSQL_USER]
+#   password: [MYSQL_PASS]
+#   database: [MYSQL_DATABASE]
+#   socket: /cloudsql/[YOUR_INSTANCE_CONNECTION_NAME]
 
 # Google Cloud Datastore Sample Database Configuration
 # ----------------------------------------------------
diff --git a/5-logging/config/database.example.yml b/5-logging/config/database.example.yml
@@ -4,10 +4,10 @@ default: &default
 #   adapter: mysql2
 #   encoding: utf8
 #   pool: 5
-#   username: your-mysql-user-here
-#   password: your-mysql-password-here
-#   host: your-mysql-IPv4-address-here
-#   database: your-mysql-database-here
+#   username: [MYSQL_USER]
+#   password: [MYSQL_PASS]
+#   database: [MYSQL_DATABASE]
+#   socket: /cloudsql/[YOUR_INSTANCE_CONNECTION_NAME]
 
 # Google Cloud Datastore Sample Database Configuration
 # ----------------------------------------------------
diff --git a/6-task-queueing/config/database.example.yml b/6-task-queueing/config/database.example.yml
@@ -4,10 +4,10 @@ default: &default
 #   adapter: mysql2
 #   encoding: utf8
 #   pool: 5
-#   username: your-mysql-user-here
-#   password: your-mysql-password-here
-#   host: your-mysql-IPv4-address-here
-#   database: your-mysql-database-here
+#   username: [MYSQL_USER]
+#   password: [MYSQL_PASS]
+#   database: [MYSQL_DATABASE]
+#   socket: /cloudsql/[YOUR_INSTANCE_CONNECTION_NAME]
 
 # Google Cloud Datastore Sample Database Configuration
 # ----------------------------------------------------
