Merge branch 'main' into dependabot/github_actions/actions/checkout-6

Author: max-ostapenko

.github/workflows/infra.yaml

@@ -6,11 +6,6 @@ on:
       - main
     paths:
       - 'infra/**'
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'infra/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

includes/reservations.js definitions/_reservations.jsincludes/reservations.js renamed to definitions/_reservations.js

@@ -1,4 +1,4 @@
-const reservations = require('@masthead-data/dataform-package')
+const { autoAssignActions } = require('@masthead-data/dataform-package')
 
 const RESERVATION_CONFIG = [
   {
@@ -14,8 +14,4 @@ const RESERVATION_CONFIG = [
   }
 ]
 
-const reservation_setter = reservations.createReservationSetter(RESERVATION_CONFIG)
-
-module.exports = {
-  reservation_setter
-}
+autoAssignActions(RESERVATION_CONFIG)

definitions/output/crawl/pages.js

@@ -59,8 +59,6 @@ publish('pages', {
   tags: ['crawl_complete'],
   dependOnDependencyAssertions: true
 }).preOps(ctx => `
-${reservations.reservation_setter(ctx)}
-
 DELETE FROM ${ctx.self()}
 WHERE date = '${constants.currentMonth}' AND
   client = 'desktop';

definitions/output/crawl/parsed_css.js

@@ -12,8 +12,6 @@ publish('parsed_css', {
   columns: columns,
   tags: ['crawl_complete']
 }).preOps(ctx => `
-${reservations.reservation_setter(ctx)}
-
 DELETE FROM ${ctx.self()}
 WHERE date = '${constants.currentMonth}'
   AND client = 'desktop';

definitions/output/crawl/requests.js

@@ -12,8 +12,6 @@ publish('requests', {
   columns: columns,
   tags: ['crawl_complete']
 }).preOps(ctx => `
-${reservations.reservation_setter(ctx)}
-
 FOR client_var IN (SELECT * FROM UNNEST(['desktop', 'mobile']) AS value) DO
   FOR is_root_page_var IN (SELECT * FROM UNNEST([TRUE, FALSE]) AS value) DO
     FOR rank_lt_50M_var IN (SELECT * FROM UNNEST([TRUE, FALSE]) AS value) DO

definitions/output/f1/pages_latest.js

@@ -7,9 +7,7 @@ publish('pages_latest', {
     clusterBy: ['client', 'is_root_page', 'rank', 'page']
   },
   tags: ['crawl_complete']
-}).preOps(ctx => `
-${reservations.reservation_setter(ctx)}
-`).query(ctx => `
+}).query(ctx => `
 SELECT
   date,
   client,

definitions/output/f1/requests_latest.js

@@ -7,9 +7,7 @@ publish('requests_latest', {
     clusterBy: ['client', 'is_root_page', 'rank', 'type']
   },
   tags: ['crawl_complete']
-}).preOps(ctx => `
-${reservations.reservation_setter(ctx)}
-`).query(ctx => `
+}).query(ctx => `
 SELECT
   date,
   client,