doc: examples use declarative configuration 6/N (#380)

GoogleCloudPlatform · Jul 5, 2023 · 476644e · 476644e
1 parent 84de1d8
commit 476644e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/ci/build-examples.yaml b/ci/build-examples.yaml
@@ -361,7 +361,6 @@ steps:
     waitFor: ['gcf-builder-ready']
     id: 'site-tutorial_cloud_bigtable'
     args: ['build',
-      '--env', 'GOOGLE_FUNCTION_SIGNATURE_TYPE=http',
       '--env', 'GOOGLE_FUNCTION_TARGET=tutorial_cloud_bigtable',
       '--path', 'examples/site/tutorial_cloud_bigtable',
       'site-tutorial_cloud_bigtable',
@@ -370,7 +369,6 @@ steps:
     waitFor: ['gcf-builder-ready']
     id: 'site-tutorial_cloud_spanner'
     args: ['build',
-      '--env', 'GOOGLE_FUNCTION_SIGNATURE_TYPE=http',
       '--env', 'GOOGLE_FUNCTION_TARGET=tutorial_cloud_spanner',
       '--path', 'examples/site/tutorial_cloud_spanner',
       'site-tutorial_cloud_spanner',

diff --git a/examples/site/tutorial_cloud_bigtable/tutorial_cloud_bigtable.cc b/examples/site/tutorial_cloud_bigtable/tutorial_cloud_bigtable.cc
@@ -14,8 +14,7 @@
 
 // [START bigtable_functions_quickstart]
 #include <google/cloud/bigtable/table.h>
-#include <google/cloud/functions/http_request.h>
-#include <google/cloud/functions/http_response.h>
+#include <google/cloud/functions/function.h>
 #include <algorithm>
 #include <cctype>
 #include <mutex>
@@ -25,6 +24,8 @@
 namespace gcf = ::google::cloud::functions;
 namespace cbt = ::google::cloud::bigtable;
 
+namespace {
+
 cbt::Table get_table_client(std::string project_id, std::string instance_id,
                             std::string const& table_id) {
   static std::mutex mu;
@@ -42,7 +43,7 @@ cbt::Table get_table_client(std::string project_id, std::string instance_id,
   return *table;
 }
 
-gcf::HttpResponse tutorial_cloud_bigtable(gcf::HttpRequest request) {  // NOLINT
+gcf::HttpResponse handle_request(gcf::HttpRequest const& request) {
   auto get_header = [h = request.headers()](std::string key) {
     std::transform(key.begin(), key.end(), key.begin(),
                    [](auto x) { return static_cast<char>(std::tolower(x)); });
@@ -77,4 +78,11 @@ gcf::HttpResponse tutorial_cloud_bigtable(gcf::HttpRequest request) {  // NOLINT
       .set_header("content-type", "text/plain")
       .set_payload(std::move(os).str());
 }
+
+}  // namespace
+
+gcf::Function tutorial_cloud_bigtable() {
+  return gcf::MakeFunction(handle_request);
+}
+
 // [END bigtable_functions_quickstart]
diff --git a/examples/site/tutorial_cloud_spanner/tutorial_cloud_spanner.cc b/examples/site/tutorial_cloud_spanner/tutorial_cloud_spanner.cc
@@ -13,8 +13,7 @@
 // limitations under the License.
 
 // [START spanner_functions_quickstart]
-#include <google/cloud/functions/http_request.h>
-#include <google/cloud/functions/http_response.h>
+#include <google/cloud/functions/function.h>
 #include <google/cloud/spanner/client.h>
 #include <iostream>
 #include <sstream>
@@ -25,6 +24,7 @@ namespace gcf = ::google::cloud::functions;
 namespace spanner = ::google::cloud::spanner;
 
 namespace {
+
 auto get_spanner_database() {
   auto getenv = [](char const* var) {
     auto const* value = std::getenv(var);
@@ -38,10 +38,8 @@ auto get_spanner_database() {
                            getenv("SPANNER_INSTANCE"),
                            getenv("SPANNER_DATABASE"));
 }
-}  // namespace
 
-gcf::HttpResponse tutorial_cloud_spanner(
-    gcf::HttpRequest /*request*/) {  // NOLINT
+gcf::HttpResponse handle_request(gcf::HttpRequest const& /*request*/) {
   static auto const kClient =
       spanner::Client(spanner::MakeConnection(get_spanner_database()));
 
@@ -62,4 +60,11 @@ gcf::HttpResponse tutorial_cloud_spanner(
       .set_header("content-type", "text/plain")
       .set_payload(std::move(os).str());
 }
+
+}  // namespace
+
+gcf::Function tutorial_cloud_spanner() {
+  return gcf::MakeFunction(handle_request);
+}
+
 // [END spanner_functions_quickstart]