fix: update appengine samples to allow local dev testing (#1528)

glasnt · web-flow · commit e087837527e9 · 2025-02-11T11:26:32.000-08:00
diff --git a/appengine/analytics/app.rb b/appengine/analytics/app.rb
@@ -16,6 +16,13 @@
 require "sinatra"
 require "net/http"
 
+# [END gae_flex_analytics_track_event]
+# Allows all hosts in development
+configure :development do
+  set :host_authorization, { permitted_hosts: [] }
+end
+
+# [START gae_flex_analytics_track_event]
 # The following environment variable is set by app.yaml when running on GAE,
 # but will need to be manually set when running locally. See README.md.
 GA_TRACKING_ID = ENV["GA_TRACKING_ID"]
diff --git a/appengine/cloud-tasks/app.rb b/appengine/cloud-tasks/app.rb
@@ -18,6 +18,13 @@
 require "sinatra"
 require "json"
 
+# [END cloud_tasks_appengine_quickstart]
+# Allows all hosts in development
+configure :development do
+  set :host_authorization, { permitted_hosts: [] }
+end
+
+# [START cloud_tasks_appengine_quickstart]
 get "/" do
   # Basic index to verify app is serving
   "Hello World!"
diff --git a/appengine/datastore/app.rb b/appengine/datastore/app.rb
@@ -17,6 +17,13 @@
 require "sinatra"
 require "google/cloud/datastore"
 
+# [END gae_flex_datastore_app]
+# Allows all hosts in development
+configure :development do
+  set :host_authorization, { permitted_hosts: [] }
+end
+
+# [START gae_flex_datastore_app]
 get "/" do
   datastore = Google::Cloud::Datastore.new
 
diff --git a/appengine/hello_world/app.rb b/appengine/hello_world/app.rb
@@ -15,6 +15,13 @@
 # [START gae_flex_quickstart]
 require "sinatra"
 
+# [END gae_flex_quickstart]
+# Allows all hosts in development
+configure :development do
+  set :host_authorization, { permitted_hosts: [] }
+end
+
+# [START gae_flex_quickstart]
 get "/" do
   "Hello world!"
 end
diff --git a/appengine/metadata_server/Gemfile b/appengine/metadata_server/Gemfile
@@ -14,7 +14,9 @@
 
 source "https://rubygems.org"
 
-gem "sinatra", "~> 3.2"
+gem "puma"
+gem "rackup", "~> 1.0"
+gem "sinatra"
 
 group :test do
   gem "faraday"
diff --git a/appengine/metadata_server/Gemfile.lock b/appengine/metadata_server/Gemfile.lock
@@ -11,10 +11,16 @@ GEM
       ruby2_keywords (~> 0.0.1)
     net-http (0.4.1)
       uri
+    nio4r (2.7.4)
+    puma (6.6.0)
+      nio4r (~> 2.0)
     rack (2.2.8.1)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
+    rackup (1.0.1)
+      rack (< 3)
+      webrick
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -38,15 +44,18 @@ GEM
       tilt (~> 2.0)
     tilt (2.3.0)
     uri (0.13.0)
+    webrick (1.9.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   faraday
+  puma
+  rackup (~> 1.0)
   rspec
   rspec_junit_formatter
-  sinatra (~> 3.2)
+  sinatra
 
 BUNDLED WITH
    2.4.22
diff --git a/appengine/metadata_server/app.rb b/appengine/metadata_server/app.rb
@@ -16,6 +16,13 @@
 require "sinatra"
 require "net/http"
 
+# [END gae_flex_metadata]
+# Allows all hosts in development
+configure :development do
+  set :host_authorization, { permitted_hosts: [] }
+end
+
+# [START gae_flex_metadata]
 get "/" do
   uri = URI.parse(
     "http://metadata.google.internal/computeMetadata/v1" +
diff --git a/appengine/metadata_server/app.yaml b/appengine/metadata_server/app.yaml
@@ -15,3 +15,6 @@
 runtime: ruby
 env: flex
 entrypoint: bundle exec ruby app.rb
+
+runtime_config:
+    operating_system: "ubuntu22"
diff --git a/appengine/pubsub/app.rb b/appengine/pubsub/app.rb
@@ -21,6 +21,11 @@
 
 pubsub = Google::Cloud::Pubsub.new
 
+# Allows all hosts in development
+configure :development do
+  set :host_authorization, { permitted_hosts: [] }
+end
+
 # [START gae_flex_pubsub_env]
 topic = pubsub.topic ENV["PUBSUB_TOPIC"]
 PUBSUB_VERIFICATION_TOKEN = ENV["PUBSUB_VERIFICATION_TOKEN"]
diff --git a/appengine/standard-analytics/app.yaml b/appengine/standard-analytics/app.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # [START gae_standard_analytics_env_variables]
-runtime: ruby30
+runtime: ruby33
 entrypoint: bundle exec ruby app.rb
 
 env_variables:
diff --git a/appengine/standard-cloud-tasks/app.yaml b/appengine/standard-cloud-tasks/app.yaml
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-runtime: ruby30
+runtime: ruby33
 entrypoint: bundle exec ruby app.rb
diff --git a/appengine/standard-datastore/app.yaml b/appengine/standard-datastore/app.yaml
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-runtime: ruby30
+runtime: ruby33
 entrypoint: bundle exec ruby app.rb
diff --git a/appengine/standard-hello_configs/app.yaml b/appengine/standard-hello_configs/app.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # [START gae_standard_configs_app_yaml]
-runtime: ruby30
+runtime: ruby33
 
 entrypoint: bundle exec puma -C ./puma.rb
 
diff --git a/appengine/standard-hello_world/app.yaml b/appengine/standard-hello_world/app.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # [START gae_standard_quickstart_yaml]
-runtime: ruby30
+runtime: ruby33
 entrypoint: bundle exec ruby app.rb
 instance_class: F2
 # [END gae_standard_quickstart_yaml]
diff --git a/appengine/standard-metadata-server/app.rb b/appengine/standard-metadata-server/app.rb
@@ -16,6 +16,13 @@
 require "sinatra"
 require "net/http"
 
+# [END gae_standard_metadata]
+# Allows all hosts in development
+configure :development do
+  set :host_authorization, { permitted_hosts: [] }
+end
+
+# [START gae_standard_metadata]
 get "/" do
   uri = URI.parse(
     "http://metadata.google.internal/computeMetadata/v1" +
diff --git a/appengine/standard-metadata-server/app.yaml b/appengine/standard-metadata-server/app.yaml
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-runtime: ruby30
+runtime: ruby33
 entrypoint: bundle exec ruby app.rb
diff --git a/appengine/standard-storage/app.yaml b/appengine/standard-storage/app.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # [START gae_standard_storage_yaml]
-runtime: ruby30
+runtime: ruby33
 entrypoint: bundle exec ruby app.rb
 
 env_variables:
diff --git a/appengine/storage/app.rb b/appengine/storage/app.rb
@@ -16,6 +16,13 @@
 require "sinatra"
 require "google/cloud/storage"
 
+# [END gae_flex_storage_app]
+# Allows all hosts in development
+configure :development do
+  set :host_authorization, { permitted_hosts: [] }
+end
+
+# [START gae_flex_storage_app]
 storage = Google::Cloud::Storage.new
 bucket  = storage.bucket ENV["GOOGLE_CLOUD_STORAGE_BUCKET"]
 
diff --git a/appengine/storage/spec/storage_spec.rb b/appengine/storage/spec/storage_spec.rb
@@ -19,7 +19,9 @@
 
 describe "Cloud Storage", type: :feature do
   before do
-    Capybara.current_driver = :cuprite
+    Capybara.register_driver :cuprite do |app|
+      Capybara::Cuprite::Driver.new(app, browser_options: {'no-sandbox': nil})
+    end
   end
   it "can upload and get public URL of uploaded file" do
     Capybara.app = Sinatra::Application
@@ -31,7 +33,7 @@
 
     uploaded_file_public_url = page.find("body").text
 
-    visit uploaded_file_public_url
-    expect(page).to have_content "This is the content of the test-upload.txt file"
+    page = Net::HTTP.get_response(URI(uploaded_file_public_url))
+    expect(page.body).to include "This is the content of the test-upload.txt file"
   end
 end
diff --git a/appengine/twilio/app.rb b/appengine/twilio/app.rb
@@ -15,6 +15,11 @@
 require "sinatra"
 require "twilio-ruby"
 
+# Allows all hosts in development
+configure :development do
+  set :host_authorization, { permitted_hosts: [] }
+end
+
 TWILIO_ACCOUNT_SID = ENV["TWILIO_ACCOUNT_SID"]
 TWILIO_AUTH_TOKEN  = ENV["TWILIO_AUTH_TOKEN"]
 TWILIO_NUMBER      = ENV["TWILIO_NUMBER"]
