From e811f3b069ba0b6763e3eeb1eae9fe67d0660b97 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Fri, 24 Nov 2023 15:58:19 +0000 Subject: [PATCH 1/2] fix: owlbot-cli image sha to be locked (hermetic) --- library_generation/configuration/owlbot-cli-sha | 1 + library_generation/postprocess_library.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 library_generation/configuration/owlbot-cli-sha diff --git a/library_generation/configuration/owlbot-cli-sha b/library_generation/configuration/owlbot-cli-sha new file mode 100644 index 0000000000..2faa65da26 --- /dev/null +++ b/library_generation/configuration/owlbot-cli-sha @@ -0,0 +1 @@ +sha256:623647ee79ac605858d09e60c1382a716c125fb776f69301b72de1cd35d49409 diff --git a/library_generation/postprocess_library.sh b/library_generation/postprocess_library.sh index 880139db73..c6f539f48d 100755 --- a/library_generation/postprocess_library.sh +++ b/library_generation/postprocess_library.sh @@ -75,13 +75,15 @@ git init git commit --allow-empty -m 'empty commit' popd # pre_processed_libs_folder +owlbot_cli_image_sha=$(cat "${scripts_root}/configuration/owlbot-cli-sha") + docker run --rm \ --user $(id -u):$(id -g) \ -v "${workspace}:/repo" \ -v "${pre_processed_libs_folder}:/pre-processed-libraries" \ -w /repo \ --env HOME=/tmp \ - gcr.io/cloud-devrel-public-resources/owlbot-cli:latest \ + gcr.io/cloud-devrel-public-resources/owlbot-cli@"${owlbot_cli_image_sha}" \ copy-code \ --source-repo-commit-hash=none \ --source-repo=/pre-processed-libraries \ From 9a34e6569feb2d696dbcc6f1d71be9b27b5c46e1 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Fri, 24 Nov 2023 18:29:07 +0000 Subject: [PATCH 2/2] add date to owlbot-cli image file --- library_generation/configuration/owlbot-cli-sha | 1 + library_generation/postprocess_library.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/library_generation/configuration/owlbot-cli-sha b/library_generation/configuration/owlbot-cli-sha index 2faa65da26..aad884ebfc 100644 --- a/library_generation/configuration/owlbot-cli-sha +++ b/library_generation/configuration/owlbot-cli-sha @@ -1 +1,2 @@ +# owlbot-cli image from 20231010 sha256:623647ee79ac605858d09e60c1382a716c125fb776f69301b72de1cd35d49409 diff --git a/library_generation/postprocess_library.sh b/library_generation/postprocess_library.sh index c6f539f48d..bbb7789bd3 100755 --- a/library_generation/postprocess_library.sh +++ b/library_generation/postprocess_library.sh @@ -75,7 +75,7 @@ git init git commit --allow-empty -m 'empty commit' popd # pre_processed_libs_folder -owlbot_cli_image_sha=$(cat "${scripts_root}/configuration/owlbot-cli-sha") +owlbot_cli_image_sha=$(cat "${scripts_root}/configuration/owlbot-cli-sha" | grep "sha256") docker run --rm \ --user $(id -u):$(id -g) \