From e32e0fdb6ce342e55f7af79736ece745b2098809 Mon Sep 17 00:00:00 2001
From: Ethan Blackwelder <eblackwelder@google.com>
Date: Sat, 17 Dec 2022 00:47:43 +0000
Subject: [PATCH] chore(functions/httpContent): using gen2 declarative
 signature

---
 functions/http/httpContent/index.js           |  5 ++-
 functions/http/httpContent/package.json       |  2 +-
 functions/http/httpContent/test/index.test.js | 38 +++++--------------
 3 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/functions/http/httpContent/index.js b/functions/http/httpContent/index.js
index c08dc178ee..8ffab395e6 100644
--- a/functions/http/httpContent/index.js
+++ b/functions/http/httpContent/index.js
@@ -16,6 +16,7 @@
 
 // [START functions_http_content]
 const escapeHtml = require('escape-html');
+const functions = require('@google-cloud/functions-framework');
 
 /**
  * Responds to an HTTP request using data from the request body parsed according
@@ -24,7 +25,7 @@ const escapeHtml = require('escape-html');
  * @param {Object} req Cloud Function request context.
  * @param {Object} res Cloud Function response context.
  */
-exports.helloContent = (req, res) => {
+functions.http('helloContent', (req, res) => {
   let name;
 
   switch (req.get('content-type')) {
@@ -50,5 +51,5 @@ exports.helloContent = (req, res) => {
   }
 
   res.status(200).send(`Hello ${escapeHtml(name || 'World')}!`);
-};
+});
 // [END functions_http_content]
diff --git a/functions/http/httpContent/package.json b/functions/http/httpContent/package.json
index 06dc0e3608..d2c7583f75 100644
--- a/functions/http/httpContent/package.json
+++ b/functions/http/httpContent/package.json
@@ -16,10 +16,10 @@
   },
   "devDependencies": {
     "mocha": "^9.0.0",
-    "proxyquire": "^2.1.0",
     "sinon": "^15.0.0"
   },
   "dependencies": {
+    "@google-cloud/functions-framework": "^3.1.2",
     "escape-html": "^1.0.3"
   }
 }
diff --git a/functions/http/httpContent/test/index.test.js b/functions/http/httpContent/test/index.test.js
index 7ef811e09d..8bdd5ea440 100644
--- a/functions/http/httpContent/test/index.test.js
+++ b/functions/http/httpContent/test/index.test.js
@@ -15,23 +15,8 @@
 'use strict';
 
 const sinon = require('sinon');
-const proxyquire = require('proxyquire').noCallThru();
 const assert = require('assert');
-
-const getSample = () => {
-  const requestPromise = sinon
-    .stub()
-    .returns(new Promise(resolve => resolve('test')));
-
-  return {
-    sample: proxyquire('../', {
-      'request-promise': requestPromise,
-    }),
-    mocks: {
-      requestPromise: requestPromise,
-    },
-  };
-};
+const {getFunction} = require('@google-cloud/functions-framework/testing');
 
 const getMocks = () => {
   const req = {
@@ -76,12 +61,14 @@ beforeEach(stubConsole);
 afterEach(restoreConsole);
 
 describe('functions_http_content', () => {
+  require('..');
+  const helloContent = getFunction('helloContent');
+
   it('http:helloContent: should handle application/json', () => {
     const mocks = getMocks();
-    const httpSample = getSample();
     mocks.req.headers['content-type'] = 'application/json';
     mocks.req.body = {name: 'John'};
-    httpSample.sample.helloContent(mocks.req, mocks.res);
+    helloContent(mocks.req, mocks.res);
 
     assert.strictEqual(mocks.res.status.calledOnce, true);
     assert.strictEqual(mocks.res.status.firstCall.args[0], 200);
@@ -91,10 +78,9 @@ describe('functions_http_content', () => {
 
   it('http:helloContent: should handle application/octet-stream', () => {
     const mocks = getMocks();
-    const httpSample = getSample();
     mocks.req.headers['content-type'] = 'application/octet-stream';
     mocks.req.body = Buffer.from('John');
-    httpSample.sample.helloContent(mocks.req, mocks.res);
+    helloContent(mocks.req, mocks.res);
 
     assert.strictEqual(mocks.res.status.calledOnce, true);
     assert.strictEqual(mocks.res.status.firstCall.args[0], 200);
@@ -104,10 +90,9 @@ describe('functions_http_content', () => {
 
   it('http:helloContent: should handle text/plain', () => {
     const mocks = getMocks();
-    const httpSample = getSample();
     mocks.req.headers['content-type'] = 'text/plain';
     mocks.req.body = 'John';
-    httpSample.sample.helloContent(mocks.req, mocks.res);
+    helloContent(mocks.req, mocks.res);
 
     assert.strictEqual(mocks.res.status.calledOnce, true);
     assert.strictEqual(mocks.res.status.firstCall.args[0], 200);
@@ -117,10 +102,9 @@ describe('functions_http_content', () => {
 
   it('http:helloContent: should handle application/x-www-form-urlencoded', () => {
     const mocks = getMocks();
-    const httpSample = getSample();
     mocks.req.headers['content-type'] = 'application/x-www-form-urlencoded';
     mocks.req.body = {name: 'John'};
-    httpSample.sample.helloContent(mocks.req, mocks.res);
+    helloContent(mocks.req, mocks.res);
 
     assert.strictEqual(mocks.res.status.calledOnce, true);
     assert.strictEqual(mocks.res.status.firstCall.args[0], 200);
@@ -130,8 +114,7 @@ describe('functions_http_content', () => {
 
   it('http:helloContent: should handle other', () => {
     const mocks = getMocks();
-    const httpSample = getSample();
-    httpSample.sample.helloContent(mocks.req, mocks.res);
+    helloContent(mocks.req, mocks.res);
 
     assert.strictEqual(mocks.res.status.calledOnce, true);
     assert.strictEqual(mocks.res.status.firstCall.args[0], 200);
@@ -141,10 +124,9 @@ describe('functions_http_content', () => {
 
   it('http:helloContent: should escape XSS', () => {
     const mocks = getMocks();
-    const httpSample = getSample();
     mocks.req.headers['content-type'] = 'text/plain';
     mocks.req.body = {name: '<script>alert(1)</script>'};
-    httpSample.sample.helloContent(mocks.req, mocks.res);
+    helloContent(mocks.req, mocks.res);
 
     assert.strictEqual(mocks.res.status.calledOnce, true);
     assert.strictEqual(mocks.res.status.firstCall.args[0], 200);