Sync with upstream

Author: waciejm

.cargo/config renamed to .cargo/config.toml

@@ -0,0 +1,75 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  common-check:
+    name: Check the common code
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: make common-check
+
+  common-test:
+    name: Test the common code
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: make common-test
+
+  api-check:
+    name: Check the generated APIs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          make gen-all-api
+          make cargo-api ARGS=check
+          make cargo-api ARGS='check --no-default-features'
+        env:
+          CI: true
+
+  api-test:
+    name: Test the generated APIs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          make gen-all-api
+          make cargo-api ARGS=test
+        env:
+          CI: true
+
+  api-document:
+    name: Document the generated APIs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          make gen-all-api
+          make cargo-api ARGS=doc
+          make docs-all
+        env:
+          CI: true
+          RUSTDOCFLAGS: -A warnings
+
+  cli-check:
+    name: Check the generated CLIs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          make gen-all-api
+          make gen-all-cli
+          make cargo-cli ARGS=check
+          make cargo-cli ARGS='check --no-default-features'
+        env:
+          CI: true

.github/workflows/ci.yml

@@ -1,14 +1,14 @@
+**/Cargo.lock
+**/build_html/
+**/target/
+*.go
+.*.deps
 .DS_Store
-/.vscode/
-/.idea/
 .timestamp
-gen/doc
-*.go    
-**/target/
+/.idea/
+/.vscode/
 gen/**/docs/
-**/build_html/
-.*.deps
-**/Cargo.lock
+gen/doc
 
 # Python: Makefile lead dirs
 .pyenv-*
@@ -18,43 +18,43 @@ gen/**/docs/
 *.sublime-workspace
 
 # Python: Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
 *$py.class
+*.py[cod]
+__pycache__/
 
 # Python: Distribution / packaging
+*.egg
+*.egg-info/
 .Python
+.eggs/
+.installed.cfg
+MANIFEST
 build/
 develop-eggs/
 dist/
 downloads/
 eggs/
-.eggs/
 parts/
 sdist/
 var/
 wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
 
 # Python: Installer logs
-pip-log.txt
 pip-delete-this-directory.txt
+pip-log.txt
 
 # Python: Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
+*.cover
+.cache
 .coverage
 .coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
 .hypothesis/
+.nox/
 .pytest_cache/
+.tox/
+coverage.xml
+htmlcov/
+nosetests.xml
 
 # Python: pyenv
 .python-version

.github/workflows/rust.yml

@@ -0,0 +1,12 @@
+exclude: etc/api|gen/
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: check-yaml
+      # This seems to fail on CHANGELOG.md, which is generated and shouldn't be checked.
+      # - id: trailing-whitespace
+  - repo: https://github.com/psf/black
+    rev: 24.8.0
+    hooks:
+      - id: black

.gitignore

@@ -1,8 +1,8 @@
 [workspace]
-
+resolver = "2"
 members = [
     "google-apis-common",
     "google-clis-common",
     "src/rust/preproc"
 ]
-exclude = ["gen"]
+exclude = ["gen"]

.pre-commit-config.yaml

@@ -199,4 +199,3 @@
    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.
-

Cargo.toml

@@ -10,7 +10,7 @@ PYTHON_BIN := $(VENV_DIR)/bin/python
 PYTHON := . $(VENV_DIR)/bin/activate; python
 PYTEST := $(PYTHON) -m pytest
 
-MAKO_RENDER := etc/bin/mako-render
+MAKO_RENDER := etc/bin/mako-render.py
 API_VERSION_GEN := etc/bin/api_version_to_yaml.py
 SORT_JSON_FILE := etc/bin/sort_json_file.py
 TPL := $(PYTHON) $(MAKO_RENDER)
@@ -61,14 +61,14 @@ help:
 	$(info help           -   print this help)
 
 $(PREPROC): $(PREPROC_DIR)/src/main.rs
-	cd "$(PREPROC_DIR)" && cargo build --release 
+	cd "$(PREPROC_DIR)" && cargo build --release
 
 $(VENV_BIN):
-	python3 -m pip install --user virtualenv==$(VENV_VERSION)
+	python -m pip install --user virtualenv==$(VENV_VERSION)
 	touch $@
 
 $(PYTHON_BIN): $(VENV_BIN) requirements.txt
-	python3 -m venv $(VENV_DIR)
+	python -m venv $(VENV_DIR)
 	$@ -m pip install -r requirements.txt
 
 $(MAKO_RENDER): $(PYTHON_BIN) $(wildcard $(GEN_LIB_SRC)/*)
@@ -93,10 +93,21 @@ license: LICENSE.md
 
 regen-apis: | clean-all-api clean-all-cli gen-all-api gen-all-cli license
 
-test-gen: $(PYTHON_BIN)
-	export PYTEST_DISABLE_PLUGIN_AUTOLOAD=1; $(PYTEST) src
+common-test: common-test-python common-test-rust
 
-test: test-gen
+common-test-python: $(PYTHON_BIN)
+	PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 $(PYTEST) src
+
+common-test-rust:
+	cargo test
+
+common-check: common-check-python common-check-rust
+
+common-check-python: $(PYTHON_BIN)
+	$(VENV_DIR)/bin/pre-commit run --all-files --show-diff-on-failure
+
+common-check-rust:
+	cargo clippy -- -D warnings
 
 typecheck: $(PYTHON_BIN)
 	$(PYTHON) -m pyright $(GEN_LIB_SRC)

LICENSE-APACHE

@@ -4027,6 +4027,21 @@
       "documentationLink": "https://developers.google.com/people/",
       "preferred": true
     },
+    {
+      "kind": "discovery#directoryItem",
+      "id": "places:v1",
+      "name": "places",
+      "version": "v1",
+      "title": "Places API (New)",
+      "description": "",
+      "discoveryRestUrl": "https://places.googleapis.com/$discovery/rest?version=v1",
+      "icons": {
+        "x16": "https://www.gstatic.com/images/branding/product/1x/googleg_16dp.png",
+        "x32": "https://www.gstatic.com/images/branding/product/1x/googleg_32dp.png"
+      },
+      "documentationLink": "https://mapsplatform.google.com/maps-products/#places-section",
+      "preferred": true
+    },
     {
       "kind": "discovery#directoryItem",
       "id": "playcustomapp:v1",