Bump actions/setup-java from 3.6.0 to 3.9.0

.github/workflows/build_playground_backend.yml

@@ -42,7 +42,7 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-      - uses: actions/setup-java@v3.6.0
+      - uses: actions/setup-java@v3.9.0
         with:
             distribution: 'zulu'
             java-version: '8'

.github/workflows/build_playground_frontend.yml

@@ -43,7 +43,7 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-      - uses: actions/setup-java@v3.6.0
+      - uses: actions/setup-java@v3.9.0
         with:
             distribution: 'zulu'
             java-version: '8'

.github/workflows/java_tests.yml

@@ -172,7 +172,7 @@ jobs:
           project_id: ${{ secrets.GCP_PROJECT_ID }}
           export_default_credentials: true
       - name: Set Java Version
-        uses: actions/setup-java@v3.6.0
+        uses: actions/setup-java@v3.9.0
         with:
           distribution: 'zulu'
           java-version: 8

.github/workflows/playground_deploy_backend.yml

@@ -42,7 +42,7 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v3.9.0
         with:
             distribution: 'zulu'
             java-version: '8'

.github/workflows/playground_deploy_examples.yml

@@ -78,7 +78,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.8'
-      - uses: actions/setup-java@v3.6.0
+      - uses: actions/setup-java@v3.9.0
         with:
             distribution: 'zulu'
             java-version: '8'

.github/workflows/playground_examples_ci_reusable.yml

@@ -100,7 +100,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.8'
-      - uses: actions/setup-java@v3.6.0
+      - uses: actions/setup-java@v3.9.0
         with:
             distribution: 'zulu'
             java-version: '8'

.github/workflows/run_rc_validation.yml

@@ -120,7 +120,7 @@ jobs:
 
 
     - name: Setup Java JDK
-      uses: actions/setup-java@v3.6.0
+      uses: actions/setup-java@v3.9.0
       with:
         distribution: 'temurin'
         java-version: 11
@@ -187,7 +187,7 @@ jobs:
       uses: azure/setup-kubectl@v3
 
     - name: Setup Java JDK
-      uses: actions/setup-java@v3.6.0
+      uses: actions/setup-java@v3.9.0
       with:
         distribution: 'temurin'
         java-version: 11

cloudbuild.yaml

@@ -0,0 +1,58 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+steps:
+  - name: 'ubuntu'
+    entrypoint: 'bash'
+    args:
+      - '-c'
+      - |
+        apt-get update
+        export DEBIAN_FRONTEND=noninteractive
+        apt-get install -y software-properties-common
+        add-apt-repository -y ppa:deadsnakes/ppa && apt update
+        apt install -y python3.8 python3-pip
+        cd playground/infrastructure
+        pip install -r requirements.txt
+        export \
+        BEAM_ROOT_DIR="../../" \
+        SDK_CONFIG="../../playground/sdks.yaml" \
+        BEAM_EXAMPLE_CATEGORIES="../categories.yaml" \
+        SERVER_ADDRESS="https://backend-${_SDK}-beta-dot-apache-beam-testing.appspot.com" \
+        BEAM_USE_WEBGRPC=yes \
+        BEAM_CONCURRENCY=4
+        python3 ci_cd.py --step ${_STEP} --sdk SDK_${_SDK} --origin ${_ORIGIN} \
+        --subdirs ${_SUBDIRS}
+
+    env:
+      - 'ORIGIN=${_ORIGIN}'
+      - 'SDK=${_SDK}'
+      - 'STEP=${_STEP}'
+      - 'SUBDIRS=${_SUBDIRS}'
+      - 'GOOGLE_CLOUD_PROJECT=$PROJECT_ID'
+
+substitutions:
+  _STEP: CD
+  _SDK: GO
+  _ORIGIN: PG_EXAMPLES
+  _SUBDIRS: "../../learning/katas ../../examples ../../sdks"
+
+# This option enables writing logs to Cloud Logging
+options:
+  logging: CLOUD_LOGGING_ONLY
+
+timeout: 3600s

learning/tour-of-beam/terraform-v2/README.md

@@ -0,0 +1,79 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+      http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+# Overview
+
+This project deploys backend infrastructure for Tour of Beam as GCP Cloud Functions using Terraform.
+
+# Requirements
+
+## Development requirements
+
+- [Active GCP project with billing enabled](https://developers.google.com/workspace/guides/create-project)
+- [Existing bucket to store Terraform state](https://cloud.google.com/storage/docs/creating-buckets)
+- [Existing service account with the following roles](https://cloud.google.com/iam/docs/creating-managing-service-accounts):
+    - Cloud Functions Admin
+    - Project IAM Admin
+    - Service Account Admin
+    - Service Account User
+    - Storage Admin
+    - Storage Object Admin
+
+#### Configuring your environment
+
+Steps below will:
+1. Enable required APIs for the project
+2. Create service account and assign required IAM roles to it (service account to run the function with)
+3. Create bucket to archive and store source code
+4. Create cloud functions to each function defined in backend source code
+
+
+```bash
+# Create environment directory per your requirements/policy
+mkdir environments/dev
+cd ../environments/dev
+# Create new configuration to auth to GCP Project
+gcloud init
+# Acquire new user credentials to use for Application Default Credentials
+gcloud auth application-default login
+# Initiliaze and run terraform
+terraform init
+terraform plan
+terraform apply
+```
+
+
+### Sample usage
+
+Entry point: list sdk names
+```
+$ curl -X GET https://$REGION-$PROJECT_ID.cloudfunctions.net/getSdkList | json_pp
+```
+[response](./samples/api/get_sdk_list.json)
+
+Get content tree by sdk name (SDK name == SDK id)
+```
+$ curl -X GET 'https://$REGION-$PROJECT_ID.cloudfunctions.net/getContentTree?sdk=python'
+```
+[response](./samples/api/get_content_tree.json)
+
+
+Get unit content tree by sdk name and unitId
+```
+$ curl -X GET 'https://$REGION-$PROJECT_ID.cloudfunctions.net/getContentTree?sdk=python&id=challenge1'
+```
+[response](./samples/api/get_unit_content.json)

learning/tour-of-beam/terraform-v2/backend_state.tf

@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+terraform {
+  backend "gcs" {
+    prefix = "terraform-state"
+  }
+  required_providers {
+    google = {
+      source = "hashicorp/google"
+      version = "~> 4.40.0"
+    }
+  }
+}

learning/tour-of-beam/terraform-v2/main.tf

@@ -0,0 +1,50 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+provider "google" {
+  project = var.project_id
+}
+
+module "iam" {
+  source = "./modules/iam"
+  project_id = var.project_id
+  service_account_id = var.service_account_id
+  depends_on = [module.api_enable]
+}
+
+module "buckets" {
+  source = "./modules/buckets"
+  project_id = var.project_id
+  bucket_name = var.bucket_name
+  depends_on = [module.iam, module.api_enable]
+}
+
+module "api_enable" {
+  source = "./modules/api_enable"
+  project_id = var.project_id
+}
+
+module "cloud_functions" {
+  source = "./modules/cloud_functions"
+  region = var.region
+  project_id = var.project_id
+  bucket_name = var.bucket_name
+  service_account_id = module.iam.service-account-email
+  source_archive_bucket = module.buckets.functions-bucket-name
+  source_archive_object = module.buckets.function-bucket-object
+  depends_on = [module.buckets, module.iam, module.api_enable]
+}

learning/tour-of-beam/terraform-v2/modules/api_enable/main.tf

@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+resource "google_project_service" "required_services" {
+  project   = var.project_id
+  for_each  = toset([
+    "cloudbuild",
+    "cloudfunctions",
+    "cloudresourcemanager",
+    "iam",
+    ])
+  service   = "${each.key}.googleapis.com"
+  disable_on_destroy = false
+}

learning/tour-of-beam/terraform-v2/modules/api_enable/variables.tf

@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+variable "project_id" {
+  description = "The ID of the Google Cloud project within which resources are provisioned"
+}

learning/tour-of-beam/terraform-v2/modules/buckets/main.tf

@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+resource "google_storage_bucket" "cloud_functions_bucket" {
+  name          = var.bucket_name
+  location      = var.location
+  project       = var.project_id
+  storage_class = "STANDARD"
+}
+
+resource "google_storage_bucket_object" "zip" {
+  # Use an MD5 here. If there's no changes to the source code, this won't change either.
+  # We can avoid unnecessary redeployments by validating the code is unchanged, and forcing
+  # a redeployment when it has!
+  name         = "${data.archive_file.source_code.output_md5}.zip"
+  bucket       = google_storage_bucket.cloud_functions_bucket.name
+  source       = data.archive_file.source_code.output_path
+  content_type = "application/zip"
+}