apollo_gateway: fix conflicts in static config and proof_archive_writer_config

Author: ArniStarkware

crates/apollo_gateway/src/gateway.rs

@@ -330,10 +330,12 @@ pub fn create_gateway(
 
     // Create proof archive writer: use NoOp if bucket name is empty, otherwise use real GCS.
     let proof_archive_writer: Arc<dyn ProofArchiveWriterTrait> =
-        if config.proof_archive_writer_config.bucket_name.is_empty() {
+        if config.static_config.proof_archive_writer_config.bucket_name.is_empty() {
             Arc::new(NoOpProofArchiveWriter)
         } else {
-            Arc::new(GcsProofArchiveWriter::new(config.proof_archive_writer_config.clone()))
+            Arc::new(GcsProofArchiveWriter::new(
+                config.static_config.proof_archive_writer_config.clone(),
+            ))
         };
 
     Gateway::new(

crates/apollo_gateway/src/gateway_test.rs

@@ -6,8 +6,8 @@ use apollo_config::dumping::SerializeConfig;
 use apollo_config::loading::load_and_process_config;
 use apollo_gateway_config::config::{
     GatewayConfig,
-    ProofArchiveWriterConfig,
     GatewayStaticConfig,
+    ProofArchiveWriterConfig,
     StatefulTransactionValidatorConfig,
     StatelessTransactionValidatorConfig,
 };