Skip to content

Commit

Permalink
Release version v1.0.0
Browse files Browse the repository at this point in the history
  - Kokoro release: Cut off new release v1.0.0.
  - Updates aggregation service so that unauthenticated and u...
  - fix: Use the link of renamed control plane shared lib repo
  - feat: Update log output group to be terraform env name
  - doc: Update CHANGELOG.md for 1.0.0 release
  - doc: Add documentation for ErrorCounter categories
  - feat: Switch to use privacy sandbox coordinator repo v1.0.0
  - doc: Update links to /docs/aws-aggregation-service.md
  - fix: Modify coordinator regions comments in AMI BUILD file
  - fix: fixing input file in regression test
  (And 5 more changes)

GitOrigin-RevId: 7df847178c84a52751f4698355ff41d90aa3e66c
  • Loading branch information
Privacy Sandbox Team authored and copybara-github committed Jul 13, 2023
1 parent 1e8a40e commit 620138b
Show file tree
Hide file tree
Showing 32 changed files with 229 additions and 1,805 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [1.0.0](https://github.com/privacysandbox/aggregation-service/compare/v0.12.0...v1.0.0) (2023-07-11)

### Changes

- Updated document links for aws-aggregation-service.md.
- Updated comments in AMI BUILD file.

## [0.12.0](https://github.com/privacysandbox/aggregation-service/compare/v0.11.0...v0.12.0) (2023-06-28)

### Changes
Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The deployment of the Amazon Web Services
on several packaged artifacts listed below. These artifacts can be downloaded with the
[download_prebuilt_dependencies.sh](/terraform/aws/download_prebuilt_dependencies.sh) script. More
information can be found in the
[README](/README.md#download-terraform-scripts-and-prebuilt-dependencies).
[README](/docs/aws-aggregation-service.md#download-terraform-scripts-and-prebuilt-dependencies).

## Packaged AWS Lambda Jars

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.0
1.0.0
42 changes: 12 additions & 30 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ http_archive(
# Declare explicit protobuf version, to override any implicit dependencies.
PROTOBUF_CORE_VERSION = "3.19.4"

COORDINATOR_VERSION = "v0.51.15" # version updated on 2023-06-05
COORDINATOR_VERSION = "v1.0.0" # version updated on 2023-07-06

JACKSON_VERSION = "2.12.2"

Expand Down Expand Up @@ -63,13 +63,13 @@ http_archive(
git_repository(
name = "com_google_adm_cloud_scp",
patch_args = [
# Needed to import Git-based patches.
"-p1",
],
remote = "https://github.com/privacysandbox/coordinator-services-and-shared-libraries",
patches = [
"//build_defs/scp:scp-0.51.15.patch",
"//build_defs/scp:v1.0.0-1.patch",
"//build_defs/scp:coordinator.patch",
],
remote = "https://github.com/privacysandbox/control-plane-shared-libraries",
tag = COORDINATOR_VERSION,
)

Expand Down Expand Up @@ -315,8 +315,8 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
# Distroless image for running Java.
container_pull(
name = "java_base",
# Using SHA-256 for reproducibility. The tag is latest-amd64. Latest as of 2023-06-12.
digest = "sha256:1e4181aaff242e2b305bb4abbe811eb122d68ffd7fd87c25c19468a1bc387ce6",
# Using SHA-256 for reproducibility. The tag is latest-amd64. Latest as of 2023-07-10.
digest = "sha256:052076466984fd56979c15a9c3b7433262b0ad9aae55bc0c53d1da8ffdd829c3",
registry = "gcr.io",
repository = "distroless/java17-debian11",
)
Expand Down Expand Up @@ -392,28 +392,10 @@ rules_proto_toolchains()
# Binary Runtime Dependencies #
###############################

http_file(
name = "kmstool_enclave_cli",
downloaded_file_path = "kmstool_enclave_cli",
executable = True,
sha256 = "39ac7b55e30df69f963f8519686cd9e1ac3b815dd1f4cc85a35582bbc0fa6126",
urls = ["https://storage.googleapis.com/scp-dependencies/aws/2023-03-27/kmstool_enclave_cli"],
)
# Download the AWS enclave SDK repo and apply a patch for building the kmstool dependencies.
load("@com_google_adm_cloud_scp//build_defs/shared:enclaves_kmstools.bzl", "import_aws_nitro_enclaves_sdk_c")

http_file(
name = "kmstool_enclave",
downloaded_file_path = "kmstool_enclave",
executable = True,
urls = ["https://storage.googleapis.com/scp-dependencies/aws/2023-03-27/kmstool_enclave"],
)

http_file(
name = "libnsm",
downloaded_file_path = "libnsm.so",
executable = False,
sha256 = "df536a96458af26e4800b04aef0771a05728ed4fe7d24683cc4c1ea6bbd62d50",
urls = ["https://storage.googleapis.com/scp-dependencies/aws/2023-03-27/libnsm.so"],
)
import_aws_nitro_enclaves_sdk_c(repo_name = "@com_google_adm_cloud_scp")

###########################
# Binary Dev Dependencies #
Expand Down Expand Up @@ -497,11 +479,11 @@ http_archive(
# Needed for reproducibly building AL2 binaries (e.g. //cc/aws/proxy)
container_pull(
name = "amazonlinux_2",
# Latest as of 2023-06-12.
digest = "sha256:cd3d9deffbb15db51382022a67ad717c02e0573c45c312713c046e4c2ac07771",
# Latest as of 2023-07-10.
digest = "sha256:d41496df5f949d9b7567512efa42ecc21ec9dd2c49539f7452945ed435b0058a",
registry = "index.docker.io",
repository = "amazonlinux",
tag = "2.0.20230530.0",
tag = "2.0.20230612.0",
)

################################################################################
Expand Down
2 changes: 1 addition & 1 deletion build-scripts/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ Switch to `<repository_root>/terraform/aws`.
Run `bash fetch_terraform.sh`.

After downloading the artifacts and running above script continue with
[Set up your deployment environment](/README.md#set-up-your-deployment-environment)
[Set up your deployment environment](/docs/aws-aggregation-service.md#set-up-your-deployment-environment)
4 changes: 2 additions & 2 deletions build-scripts/aws/build-container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# bookworm-slim stable with latest security updates 2023-06-12
FROM debian@sha256:b396b38adb888af839a4b967ba919c49086987126500d6cd8f662531e202d038
# bookworm-slim stable with latest security updates 2023-07-10
FROM debian@sha256:01bd742e2c269abf94e2fefb47b08b5b61c9a880b993417d23a1d0bd9fa60dc4

RUN \
# This makes add-apt-repository available.
Expand Down
4 changes: 4 additions & 0 deletions build_defs/scp/coordinator.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
diff --git a/cc/tools/build/build_container_params.bzl.prebuilt b/cc/tools/build/build_container_params.bzl
similarity index 100%
rename from cc/tools/build/build_container_params.bzl.prebuilt
rename to cc/tools/build/build_container_params.bzl
Loading

0 comments on commit 620138b

Please sign in to comment.