Align named Cloud webhook behavior

Author: jnunemaker

lib/flipper/cloud/routes.rb

@@ -18,7 +18,7 @@
       next unless named.cloud? && named.cloud_path
 
       cloud_options = named.resolve_cloud_credentials
-      next unless cloud_options[:sync_secret]
+      next if !cloud_options[:sync_secret] || cloud_options[:sync_secret].empty?
 
       require "flipper/cloud"
       cloud_app = Flipper::Cloud.app(Flipper.named(name),

lib/flipper/engine.rb

@@ -131,9 +131,12 @@ def self.default_strict_value
 
       named_paths = Flipper.configuration.named_instance_names.map do |name|
         named = Flipper.configuration.named_configuration(name)
-        named.cloud_path if named.cloud? && named.cloud_path && named.resolve_cloud_credentials[:sync_secret]
+        next unless named.cloud? && named.cloud_path
+
+        sync_secret = named.resolve_cloud_credentials[:sync_secret]
+        named.cloud_path if sync_secret && !sync_secret.empty?
       end.compact
-      default_paths = if cloud? && ENV["FLIPPER_CLOUD_SYNC_SECRET"]
+      default_paths = if cloud? && !ENV.fetch("FLIPPER_CLOUD_SYNC_SECRET", "").empty?
         [app.config.flipper.cloud_path]
       else
         []

lib/flipper/test_help.rb

@@ -28,6 +28,12 @@ def flipper_reset
 
       if Flipper.configuration.respond_to?(:named_instance_names)
         Flipper.configuration.named_instance_names.each do |name|
+          named = Flipper.configuration.named_configuration(name)
+          if named.cloud?
+            named_adapter = Flipper::Adapters::Memory.new
+            named.adapter { named_adapter }
+            named.default { Flipper.new(named.adapter) }
+          end
           Flipper.named(name).features.each(&:remove) rescue nil
         end
       end

spec/flipper/engine_spec.rb

@@ -318,6 +318,7 @@ def get_all
     context "with named Cloud" do
       let(:app) { application.routes }
       let(:named_cloud_path) { "_cross_app" }
+      let(:named_sync_secret) { "named-secret" }
       let(:request_body) do
         JSON.generate({
           "environment_id" => 1,
@@ -331,12 +332,12 @@ def get_all
         Flipper::Cloud::MessageVerifier.new(secret: "named-secret").generate(request_body, timestamp)
       end
       let(:signature_header_value) do
-        Flipper::Cloud::MessageVerifier.new(secret: "").header(signature, timestamp)
+        Flipper::Cloud::MessageVerifier.new(secret: "header-secret").header(signature, timestamp)
       end
 
       before do
         ENV["FLIPPER_CLOUD_CROSS_APP_TOKEN"] = "named-token"
-        ENV["FLIPPER_CLOUD_CROSS_APP_SYNC_SECRET"] = "named-secret"
+        ENV["FLIPPER_CLOUD_CROSS_APP_SYNC_SECRET"] = named_sync_secret
         initializer do
           Flipper.configure do |flipper_config|
             flipper_config.named(:cross_app) do |named|
@@ -385,6 +386,20 @@ def get_all
           ENV.delete("FLIPPER_CLOUD_SYNC_SECRET")
         end
       end
+
+      context "with an empty sync secret" do
+        let(:named_sync_secret) { "" }
+
+        it "does not mount a webhook" do
+          silence { application.initialize! }
+
+          post "/_cross_app", request_body, {
+            "HTTP_FLIPPER_CLOUD_SIGNATURE" => signature_header_value,
+          }
+
+          expect(last_response.status).to eq(404)
+        end
+      end
     end
 
     it "loads named Cloud credentials from the matching Rails credential scope" do

spec/flipper/test_help_spec.rb

@@ -26,6 +26,20 @@
     expect(a_request(:any, /flippercloud/)).not_to have_been_made
   end
 
+  it "replaces a named polling Cloud instance added after test setup" do
+    described_class.flipper_configure
+    Flipper.configure do |config|
+      config.named(:cross_app) do |named|
+        named.cloud(token: "cloud-token", sync_secret: "")
+      end
+    end
+
+    described_class.flipper_reset
+
+    expect(Flipper.cross_app.instance.class).to be(Flipper::DSL)
+    expect(a_request(:any, /flippercloud/)).not_to have_been_made
+  end
+
   it "clears named features while preserving registered groups" do
     Flipper.configure do |config|
       config.named(:cross_app)