Skip to content

Commit 29dfc21

Browse files
author
Maciej Wojno
committed
Merge with main/origin
2 parents f0abeed + 28277f8 commit 29dfc21

File tree

3,848 files changed

+933434
-435521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,848 files changed

+933434
-435521
lines changed

.devcontainer/Dockerfile

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM python:3.8-slim
2+
3+
# Install system dependencies
4+
RUN apt-get update && apt-get install -y \
5+
wget \
6+
make \
7+
build-essential \
8+
curl \
9+
git \
10+
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
11+
&& . $HOME/.cargo/env \
12+
&& rustup default stable \
13+
&& rustup update \
14+
&& rustc --version \
15+
&& rustup component add rustfmt \
16+
&& apt-get clean \
17+
&& rm -rf /var/lib/apt/lists/*
18+
19+
# Set PATH environment variable to include the cargo bin directory
20+
ENV PATH="/root/.cargo/bin:${PATH}"
21+
22+
# Run app.py when the container launches
23+
CMD ["python", "app.py"]

.devcontainer/devcontainer.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "Google-ApiS-rs Dev Container",
3+
"build": {
4+
"context": "..",
5+
"dockerfile": "Dockerfile"
6+
},
7+
"remoteUser": "root"
8+
}

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
.PHONY: help deps regen-apis license test-gen test clean
22
.SUFFIXES:
33

4-
VIRTUALENV_VERSION = 16.0.0
54
VENV_BIN = .virtualenv.marker
6-
VENV_VERSION = 20.2.2
5+
VENV_VERSION = 20.24.3
76

87
VENV_DIR := .pyenv-$(shell uname)
98
PYTHON_BIN := $(VENV_DIR)/bin/python
@@ -65,11 +64,12 @@ $(PREPROC): $(PREPROC_DIR)/src/main.rs
6564
cd "$(PREPROC_DIR)" && cargo build --release
6665

6766
$(VENV_BIN):
67+
python3 -m pip install --user virtualenv==$(VENV_VERSION)
6868
touch $@
6969

7070
$(PYTHON_BIN): $(VENV_BIN) requirements.txt
7171
python3 -m venv $(VENV_DIR)
72-
$(VENV_DIR)/bin/pip install -r requirements.txt
72+
$@ -m pip install -r requirements.txt
7373

7474
$(MAKO_RENDER): $(PYTHON_BIN) $(wildcard $(GEN_LIB_SRC)/*)
7575

README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
These crates have been published under the `google-*` prefix in the early days of the Rust ecosystem, but by now it has become
2+
more of an issue as Google might become interested in publishing their own, and wondering why someone unaffiliated would take their name.
3+
4+
For that reason, these crates are now unmaintained and shall be handed over to Google when they choose to release their own.
5+
6+
### WARNING
7+
8+
The following crates are not under my control and have been published by another party
9+
10+
* `google-privateca1-cli`
11+
* `google-recaptchaenterprise1-cli`
12+
* `google-resourcesettings1-cli`
13+
14+
Use at your own risk.
15+
16+
----
17+
118
This repository holds [mako][mako] scripts to generate all Google APIs as described by the [google discovery service][api-discovery].
219

320
The generate source code of each google API can be found in the `gen` subdirectory. Each google API resides in it's own crate which can be used as any other crate.

etc/api/abusiveexperiencereport/v1/abusiveexperiencereport-api.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
}
140140
}
141141
},
142-
"revision": "20230114",
142+
"revision": "20240207",
143143
"rootUrl": "https://abusiveexperiencereport.googleapis.com/",
144144
"schemas": {
145145
"SiteSummaryResponse": {

etc/api/abusiveexperiencereport/v1/crates/5.0.3-api+20230114

Whitespace-only changes.

etc/api/abusiveexperiencereport/v1/crates/5.0.4-api+20240207

Whitespace-only changes.

etc/api/abusiveexperiencereport/v1/crates/5.0.4-cli+20240207

Whitespace-only changes.

etc/api/acceleratedmobilepageurl/v1/acceleratedmobilepageurl-api.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
}
116116
}
117117
},
118-
"revision": "20230123",
118+
"revision": "20240303",
119119
"rootUrl": "https://acceleratedmobilepageurl.googleapis.com/",
120120
"schemas": {
121121
"AmpUrl": {
@@ -151,6 +151,14 @@
151151
"URL_IS_VALID_AMP",
152152
"URL_IS_INVALID_AMP"
153153
],
154+
"enumDeprecated": [
155+
false,
156+
false,
157+
false,
158+
false,
159+
true,
160+
false
161+
],
154162
"enumDescriptions": [
155163
"Not specified error.",
156164
"Indicates the requested URL is not found in the index, possibly because it's unable to be found, not able to be accessed by Googlebot, or some other error.",

etc/api/acceleratedmobilepageurl/v1/crates/5.0.3-api+20230123

Whitespace-only changes.

0 commit comments

Comments
 (0)