Skip to content

Commit d220dda

Browse files
Merge branch 'main' into deprecate_cwv_looker
2 parents b7b28ac + 3935d6a commit d220dda

10 files changed

Lines changed: 99 additions & 52 deletions

File tree

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ updates:
1313
- "/infra/dataform-service"
1414
schedule:
1515
interval: "weekly"
16+
cooldown:
17+
default-days: 7
1618

1719
- package-ecosystem: "terraform"
1820
directories:
1921
- "/infra/tf/"
2022
schedule:
2123
interval: "weekly"
24+
cooldown:
25+
default-days: 7
2226

2327
- package-ecosystem: "github-actions"
2428
directory: "/"
2529
schedule:
2630
interval: "weekly"
31+
cooldown:
32+
default-days: 7

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
persist-credentials: false
2828

2929
- name: Lint Code Base
30-
uses: super-linter/super-linter/slim@v8.2.1
30+
uses: super-linter/super-linter/slim@v8.3.0
3131
env:
3232
DEFAULT_BRANCH: main
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
node_modules
1+
node_modules/
22
npm-debug.log
33
.git
44
.gitignore
55
.env
6-
.nyc_output
7-
coverage
86
*.md
97
.DS_Store
10-
cloudbuild.yaml

infra/dataform-service/.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Ignore node_modules and other files that shouldn't be in the Docker context
2-
node_modules
2+
node_modules/
33
.git
44
.gitignore
55
.DS_Store

infra/dataform-service/package-lock.json

Lines changed: 49 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infra/tf/.terraform.lock.hcl

Lines changed: 26 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infra/tf/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
terraform {
2-
required_version = ">= 1.9.7"
2+
required_version = ">= 1.11.4"
33
required_providers {
44
google = {
55
source = "hashicorp/google"
6-
version = ">= 6.40.0"
6+
version = "7.13.0"
77
}
88
google-beta = {
99
source = "hashicorp/google-beta"
10-
version = ">= 6.40.0"
10+
version = "7.13.0"
1111
}
1212
}
1313

package-lock.json

Lines changed: 7 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"superlint": "docker run --platform linux/amd64 -e DEFAULT_BRANCH=main -e VALIDATE_GIT_COMMITLINT=false -e VALIDATE_TERRAFORM_TERRASCAN=false -e VALIDATE_TERRAFORM_TFLINT=false -e FIX_JSON_PRETTIER=true -e IGNORE_GITIGNORED_FILES=true -e VALIDATE_ALL_CODEBASE=true -e VALIDATE_JSCPD=false -e RUN_LOCAL=true -v ./:/tmp/lint ghcr.io/super-linter/super-linter:slim-latest"
88
},
99
"dependencies": {
10-
"@dataform/core": "3.0.38",
10+
"@dataform/core": "3.0.39",
1111
"@masthead-data/dataform-package": "0.1.0"
1212
},
1313
"devDependencies": {

workspace/restore_data.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
},
2424
"outputs": [],
2525
"source": [
26-
"QUERY = \"\"\"\n",
26+
"query = \"\"\"\n",
2727
"## [Restore deleted dataset](https://docs.cloud.google.com/bigquery/docs/restore-deleted-datasets#restore_a_dataset)\n",
2828
"UNDROP SCHEMA httparchive.crawl;\n",
2929
"\"\"\"\n",
30-
"client.query(QUERY).result()"
30+
"client.query(query).result()"
3131
]
3232
},
3333
{
@@ -55,14 +55,14 @@
5555
},
5656
"outputs": [],
5757
"source": [
58-
"QUERY = \"\"\"\n",
58+
"query = \"\"\"\n",
5959
"## [Restore a table to a specific point in time](https://cloud.google.com/bigquery/docs/restore-tables#restoring_a_table_to_a_specific_point_in_time)\n",
6060
"CREATE TABLE httparchive.crawl_staging.pages_restored_20250804 AS\n",
6161
"SELECT *\n",
6262
"FROM httparchive.crawl.pages\n",
6363
" FOR SYSTEM_TIME AS OF TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 1 HOUR);\n",
6464
"\"\"\"\n",
65-
"client.query(QUERY).result()"
65+
"client.query(query).result()"
6666
]
6767
}
6868
],

0 commit comments

Comments
 (0)