Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Region Tags #718

Merged
merged 4 commits into from
Aug 27, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions appengine/endpoints/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,12 @@

'use strict';

// [START app]
// [START setup]
const express = require('express');
const bodyParser = require('body-parser');
const Buffer = require('safe-buffer').Buffer;

const app = express();
app.use(bodyParser.json());
// [END setup]

app.post('/echo', (req, res) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this sample not used in the docs anymore? If so, can/should we delete it outright?

res.status(200).json({ message: req.body.message });
Expand All @@ -42,14 +39,11 @@ app.get('/auth/info/googlejwt', authInfoHandler);
app.get('/auth/info/googleidtoken', authInfoHandler);

if (module === require.main) {
// [START listen]
const PORT = process.env.PORT || 8080;
app.listen(PORT, () => {
console.log(`App listening on port ${PORT}`);
console.log('Press Ctrl+C to quit.');
});
// [END listen]
}
// [END app]

module.exports = app;
2 changes: 0 additions & 2 deletions appengine/errorreporting/app.flexible.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs
env: flex
# [END app_yaml]
6 changes: 0 additions & 6 deletions appengine/errorreporting/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,12 @@
* limitations under the License.
*/

// [START app]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto to above - are we still using this? If not, can we delete it?

'use strict';

// [START setup]
const express = require('express');
const errors = require('@google-cloud/error-reporting')();

const app = express();
// [END setup]

app.get('/', (req, res, next) => {
next(new Error('something is wrong!'));
Expand All @@ -32,13 +29,10 @@ app.use((err, req, res, next) => {
res.status(500).send(err.message || 'Something broke!');
});

// [START listen]
const PORT = process.env.PORT || 8080;
app.listen(PORT, () => {
console.log(`App listening on port ${PORT}`);
console.log('Press Ctrl+C to quit.');
});
// [END listen]
// [END app]

module.exports = app;
2 changes: 0 additions & 2 deletions appengine/errorreporting/app.standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs8
# [END app_yaml]
4 changes: 0 additions & 4 deletions appengine/grunt/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

module.exports = function (grunt) {
grunt.initConfig({
// [START config]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto to above - are we still using this? If not, can we delete it?

jshint: {
files: ['Gruntfile.js', 'src/**/*.js'],
options: {
Expand All @@ -31,7 +30,6 @@ module.exports = function (grunt) {
dest: 'src/public/stylesheets/style.min.css'
}
},
// [END config]
clean: ['src/public/stylesheets/style.min.css'],
watch: {
js: {
Expand All @@ -48,12 +46,10 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-clean');

// [START tasks]
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-cssmin');

grunt.registerTask('build', ['jshint', 'cssmin']);
// [END tasks]

grunt.registerTask('default', ['watch']);
};
2 changes: 0 additions & 2 deletions appengine/grunt/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs
env: flex
# [END app_yaml]
2 changes: 0 additions & 2 deletions appengine/grunt/src/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
const express = require('express');
const router = express.Router();

// [START hello_world]
router.get('/', (req, res) => {
res.render('index', {
title: 'Hello World! Express.js + Grunt.js on Google App Engine.'
});
});
// [END hello_world]

module.exports = router;
4 changes: 2 additions & 2 deletions appengine/hello-world/standard/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
# [START gae_quickstart_yaml]
runtime: nodejs8
# [END app_yaml]
# [END gae_quickstart_yaml]
2 changes: 0 additions & 2 deletions appengine/loopback/app.flexible.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs
env: flex
# [END app_yaml]
2 changes: 0 additions & 2 deletions appengine/loopback/app.standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs8
# [END app_yaml]
4 changes: 2 additions & 2 deletions appengine/memcached/app.standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

runtime: nodejs8

# [START gae_flex_redislabs_memcache_yaml]
# [START gae_redislabs_memcache_yaml]
# The following env variables may contain sensitive information that grants
# anyone access to your memcached service. Do not add this file to your source
# control.
Expand All @@ -23,4 +23,4 @@ env_variables:
# fill in these values with your username and password.
MEMCACHE_USERNAME: your-memcache-username
MEMCACHE_PASSWORD: your-memcache-password
# [END gae_flex_redislabs_memcache_yaml]
# [END gae_redislabs_memcache_yaml]
2 changes: 0 additions & 2 deletions appengine/metadata/flexible/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs
env: flex
# [END app_yaml]
4 changes: 2 additions & 2 deletions appengine/metadata/flexible/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

'use strict';

// [START appengine_metadata]
// [START gae_flex_metadata]
const express = require('express');
const request = require('got');

Expand Down Expand Up @@ -57,4 +57,4 @@ app.listen(PORT, () => {
console.log(`App listening on port ${PORT}`);
console.log('Press Ctrl+C to quit.');
});
// [END appengine_metadata]
// [END gae_flex_metadata]
2 changes: 0 additions & 2 deletions appengine/metadata/standard/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs8
# [END app_yaml]
2 changes: 0 additions & 2 deletions appengine/metadata/standard/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

'use strict';

// [START appengine_metadata]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto to above - are we still using this? If not, can we delete it?

const express = require('express');
const request = require('got');

Expand Down Expand Up @@ -55,4 +54,3 @@ app.listen(PORT, () => {
console.log(`App listening on port ${PORT}`);
console.log('Press Ctrl+C to quit.');
});
// [END appengine_metadata]
2 changes: 0 additions & 2 deletions appengine/mongodb/app.flexible.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs
env: flex
# [END app_yaml]
2 changes: 0 additions & 2 deletions appengine/mongodb/app.standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs8
# [END app_yaml]
2 changes: 0 additions & 2 deletions appengine/mongodb/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ const pass = nconf.get('mongoPass');
const host = nconf.get('mongoHost');
const port = nconf.get('mongoPort');

// [START client]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto to above - are we still using this? If not, can we delete it?

let uri = `mongodb://${user}:${pass}@${host}:${port}`;
if (nconf.get('mongoDatabase')) {
uri = `${uri}/${nconf.get('mongoDatabase')}`;
Expand Down Expand Up @@ -86,4 +85,3 @@ mongodb.MongoClient.connect(uri, (err, client) => {
console.log('started web process');
});
});
// [END client]
2 changes: 0 additions & 2 deletions appengine/parse-server/app.flexible.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs
env: flex
# [END app_yaml]
2 changes: 0 additions & 2 deletions appengine/parse-server/app.standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs8
# [END app_yaml]
2 changes: 0 additions & 2 deletions appengine/parse-server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

'use strict';

// [START app]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto to above - are we still using this? If not, can we delete it?

const express = require('express');
const nconf = require('nconf');
const ParseServer = require('parse-server').ParseServer;
Expand Down Expand Up @@ -46,4 +45,3 @@ app.listen(PORT, () => {
console.log(`App listening on port ${PORT}`);
console.log('Press Ctrl+C to quit.');
});
// [END app]
4 changes: 2 additions & 2 deletions appengine/pubsub/app.standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ runtime: nodejs8

instance_class: F2

# [START gae_flex_pubsub_yaml]
# [START gae_pubsub_yaml]
env_variables:
PUBSUB_TOPIC: YOUR_TOPIC_NAME
# This token is used to verify that requests originate from your
# application. It can be any sufficiently random string.
PUBSUB_VERIFICATION_TOKEN: YOUR_VERIFICATION_TOKEN
# [END gae_flex_pubsub_yaml]
# [END gae_pubsub_yaml]
2 changes: 0 additions & 2 deletions appengine/redis/app.flexible.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs
env: flex
# [END app_yaml]
2 changes: 0 additions & 2 deletions appengine/redis/app.standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# [START app_yaml]
runtime: nodejs8
# [END app_yaml]