Delete sql instructions (GoogleCloudPlatform#292)

2-structured-data/README.md

@@ -1,9 +1,8 @@
 # 2 - Structured data
 
-![Cloud SQL Build Status][ci-badge-cloudsql] ![Datastore Build Status][ci-badge-datastore]
+![Datastore Build Status][ci-badge-datastore]
 
 [ci-badge-datastore]: https://storage.googleapis.com/nodejs-getting-started-tests-badges/2-datastore.svg
-[ci-badge-cloudsql]: https://storage.googleapis.com/nodejs-getting-started-tests-badges/2-cloudsql.svg
 
 This folder contains the sample code for the [Structured data][step-2]
 tutorial. Please refer to the tutorial for instructions on configuring, running,

2-structured-data/books/api.js

@@ -15,10 +15,7 @@
 
 const express = require('express');
 const bodyParser = require('body-parser');
-
-function getModel() {
-  return require(`./model-${require('../config').get('DATA_BACKEND')}`);
-}
+const model = require('./model-datastore');
 
 const router = express.Router();
 
@@ -31,7 +28,7 @@ router.use(bodyParser.json());
  * Retrieve a page of books (up to ten at a time).
  */
 router.get('/', (req, res, next) => {
-  getModel().list(10, req.query.pageToken, (err, entities, cursor) => {
+  model.list(10, req.query.pageToken, (err, entities, cursor) => {
     if (err) {
       next(err);
       return;
@@ -49,7 +46,7 @@ router.get('/', (req, res, next) => {
  * Create a new book.
  */
 router.post('/', (req, res, next) => {
-  getModel().create(req.body, (err, entity) => {
+  model.create(req.body, (err, entity) => {
     if (err) {
       next(err);
       return;
@@ -64,7 +61,7 @@ router.post('/', (req, res, next) => {
  * Retrieve a book.
  */
 router.get('/:book', (req, res, next) => {
-  getModel().read(req.params.book, (err, entity) => {
+  model.read(req.params.book, (err, entity) => {
     if (err) {
       next(err);
       return;
@@ -79,7 +76,7 @@ router.get('/:book', (req, res, next) => {
  * Update a book.
  */
 router.put('/:book', (req, res, next) => {
-  getModel().update(req.params.book, req.body, (err, entity) => {
+  model.update(req.params.book, req.body, (err, entity) => {
     if (err) {
       next(err);
       return;
@@ -94,7 +91,7 @@ router.put('/:book', (req, res, next) => {
  * Delete a book.
  */
 router.delete('/:book', (req, res, next) => {
-  getModel().delete(req.params.book, err => {
+  model.delete(req.params.book, err => {
     if (err) {
       next(err);
       return;

2-structured-data/books/crud.js

@@ -15,10 +15,7 @@
 
 const express = require('express');
 const bodyParser = require('body-parser');
-
-function getModel() {
-  return require(`./model-${require('../config').get('DATA_BACKEND')}`);
-}
+const model = require('./model-datastore');
 
 const router = express.Router();
 
@@ -37,7 +34,7 @@ router.use((req, res, next) => {
  * Display a page of books (up to ten at a time).
  */
 router.get('/', (req, res, next) => {
-  getModel().list(10, req.query.pageToken, (err, entities, cursor) => {
+  model.list(10, req.query.pageToken, (err, entities, cursor) => {
     if (err) {
       next(err);
       return;
@@ -73,7 +70,7 @@ router.post('/add', (req, res, next) => {
   const data = req.body;
 
   // Save the data to the database.
-  getModel().create(data, (err, savedData) => {
+  model.create(data, (err, savedData) => {
     if (err) {
       next(err);
       return;
@@ -89,7 +86,7 @@ router.post('/add', (req, res, next) => {
  * Display a book for editing.
  */
 router.get('/:book/edit', (req, res, next) => {
-  getModel().read(req.params.book, (err, entity) => {
+  model.read(req.params.book, (err, entity) => {
     if (err) {
       next(err);
       return;
@@ -109,7 +106,7 @@ router.get('/:book/edit', (req, res, next) => {
 router.post('/:book/edit', (req, res, next) => {
   const data = req.body;
 
-  getModel().update(req.params.book, data, (err, savedData) => {
+  model.update(req.params.book, data, (err, savedData) => {
     if (err) {
       next(err);
       return;
@@ -124,7 +121,7 @@ router.post('/:book/edit', (req, res, next) => {
  * Display a book.
  */
 router.get('/:book', (req, res, next) => {
-  getModel().read(req.params.book, (err, entity) => {
+  model.read(req.params.book, (err, entity) => {
     if (err) {
       next(err);
       return;
@@ -141,7 +138,7 @@ router.get('/:book', (req, res, next) => {
  * Delete a book.
  */
 router.get('/:book/delete', (req, res, next) => {
-  getModel().delete(req.params.book, err => {
+  model.delete(req.params.book, err => {
     if (err) {
       next(err);
       return;

2-structured-data/config.js

@@ -22,42 +22,10 @@ nconf
   // 1. Command-line arguments
   .argv()
   // 2. Environment variables
-  .env([
-    'DATA_BACKEND',
-    'INSTANCE_CONNECTION_NAME',
-    'MYSQL_USER',
-    'MYSQL_PASSWORD',
-    'NODE_ENV',
-    'PORT',
-  ])
+  .env(['NODE_ENV', 'PORT'])
   // 3. Config file
   .file({file: path.join(__dirname, 'config.json')})
   // 4. Defaults
   .defaults({
-    // dataBackend can be 'datastore' or 'cloudsql'. Be sure to
-    // configure the appropriate settings for each storage engine below.
-    // If you are unsure, use datastore as it requires no additional
-    // configuration.
-    DATA_BACKEND: 'datastore',
-
-    MYSQL_USER: '',
-    MYSQL_PASSWORD: '',
-
     PORT: 8080,
   });
-
-if (nconf.get('DATA_BACKEND') === 'cloudsql') {
-  checkConfig('MYSQL_USER');
-  checkConfig('MYSQL_PASSWORD');
-  if (nconf.get('NODE_ENV') === 'production') {
-    checkConfig('INSTANCE_CONNECTION_NAME');
-  }
-}
-
-function checkConfig(setting) {
-  if (!nconf.get(setting)) {
-    throw new Error(
-      `You must set ${setting} as an environment variable or in config.json!`
-    );
-  }
-}