fix(tests): zip file causes failure in cargo release (cdklabs#533)

Author: TheRealAmazonKendra

build.rs

@@ -1,7 +1,9 @@
+use std::env;
 use std::io;
 
 use std::fs;
 use std::io::{Read, Write};
+use std::path;
 use std::path::Path;
 
 use walkdir::WalkDir;
@@ -10,7 +12,7 @@ use zip::ZipWriter;
 
 fn main() -> io::Result<()> {
     cdk::update_schema()?;
-    zip_test_snapshots();
+    zip_test_snapshots()?;
     Ok(())
 }
 
@@ -191,18 +193,6 @@ mod cdk {
         }
     }
 
-    // struct WrappedOptionalTypeReference<'a>(&'a Option<TypeReference>);
-    // impl fmt::Debug for WrappedOptionalTypeReference<'_> {
-    //     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-    //         match self.0 {
-    //             Some(r) => {
-    //                 write!(f, "Some({:#?})", &WrappedTypeReference(r))
-    //             }
-    //             None => write!(f, "None"),
-    //         }
-    //     }
-    // }
-
     struct WrappedTypeReference<'a>(&'a TypeReference);
     impl fmt::Debug for WrappedTypeReference<'_> {
         fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -359,14 +349,16 @@ mod cdk {
     }
 }
 
-fn zip_test_snapshots() {
+fn zip_test_snapshots() -> io::Result<()> {
     // Zip the expected output files for the end-to-end tests so that they can be included in the test binary. This will not affect the size of the cdk-from-cfn binary.
 
     let src_dir = "./tests/end-to-end";
-    let dst_file = "./tests/end-to-end-test-snapshots.zip";
+    let out_dir = path::PathBuf::from(env::var("OUT_DIR").unwrap()).join("test");
+    fs::create_dir_all(&out_dir)?;
+    let out_file = out_dir.join("end-to-end-test-snapshots.zip");
     let do_not_zip = ["app-boiler-plate-files", "working-dir"];
 
-    let file = fs::File::create(Path::new(dst_file)).unwrap();
+    let file = fs::File::create(&out_file)?;
 
     let walkdir = WalkDir::new(src_dir);
     let mut zip = ZipWriter::new(file);
@@ -403,4 +395,11 @@ fn zip_test_snapshots() {
         }
     }
     zip.finish().expect("failed to write zip file");
+
+    println!(
+        "cargo:rustc-env=END_TO_END_SNAPSHOTS={}",
+        out_file.display()
+    );
+
+    Ok(())
 }

tests/end-to-end.rs

@@ -1,9 +1,11 @@
 use core::panic;
 use std::fs::{self, canonicalize, copy, create_dir_all, remove_dir_all, File};
-use std::io::{Cursor, Read, Write};
+use std::io::{Read, Write};
 use std::path::{Path, PathBuf};
 use std::process::Command;
+use std::{env, path};
 
+use aws_config::BehaviorVersion;
 use aws_sdk_cloudformation::types::{Capability, OnFailure};
 
 use aws_config::meta::region::RegionProviderChain;
@@ -92,7 +94,7 @@ struct EndToEndTest<'a> {
     language_boilerplate_dir: String,
     test_working_dir: String,
     expected_outputs_dir: String,
-    snapshots_zip: ZipArchive<Cursor<&'a [u8]>>,
+    snapshots_zip: ZipArchive<File>,
     skip_cdk_synth: bool,
 }
 
@@ -139,9 +141,11 @@ impl EndToEndTest<'_> {
                 other => panic!("Unsupported language: {other}"),
             };
 
-        let cursor: Cursor<&[u8]> =
-            std::io::Cursor::new(include_bytes!("./end-to-end-test-snapshots.zip"));
-        let snapshots_zip = zip::read::ZipArchive::new(cursor)
+        let source = File::open(path::PathBuf::from(
+            env::var("END_TO_END_SNAPSHOTS").unwrap(),
+        ))
+        .unwrap();
+        let snapshots_zip = ZipArchive::new(source)
             .expect("Failed to convert end-to-end-test-snapshots.zip contents into ZipArchive");
 
         EndToEndTest {
@@ -209,7 +213,10 @@ impl EndToEndTest<'_> {
     async fn create_cfn_stack(&mut self) {
         println!("Verifying a CloudFormation stack can be created from original template");
         let region_provider = RegionProviderChain::default_provider().or_else("us-east-1");
-        let config = aws_config::from_env().region(region_provider).load().await;
+        let config = aws_config::defaults(BehaviorVersion::latest())
+            .region(region_provider)
+            .load()
+            .await;
         let client = Client::new(&config);
 
         if let Ok(mut create_first_template) = self