-
Notifications
You must be signed in to change notification settings - Fork 42
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Release dev to main branch + production environment #531
base: main
Are you sure you want to change the base?
Conversation
sync dev with main
Add support for ad beacon reporting
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
…demos into ffar-ms
Pulling upstream changes to contributing guide.
for more information, see https://pre-commit.ci
Reorganize functions to keep relevant functions together
for more information, see https://pre-commit.ci
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi team,
I'm currently reviewing this pull request and will post a full review in a few minutes. In the meantime, here's a summary for you and other reviewers to quickly get up to speed:
This pull request, authored by Seburan, aims to release the changes from the dev
branch to the main
branch and the production environment. The description indicates that all services are affected.
Here's a breakdown of the changes:
.demos
file: Added a new file defining use case demos, their Cloud Function entry points, and synthetic monitor titles. This adds four new use cases:uc-single-touch-conversion
uc-remarketing
uc-vast-video-paapi
uc-video-multi-seller-seq-auction-paapi
.env
file: AddedDEMO_HOST_PREFIX
,HOME_URI
,NEWS_URI
,SHOP_URI
,TRAVEL_URI
,MOTO_NEWS_URI
,SOCCER_NEWS_URI
,GARDENING_NEWS_URI
, andAD_SERVER_URI
. RemovedTOPICS_MOTO_HOST
,TOPICS_SOCCER_HOST
,TOPICS_GARDENING_HOST
, andTOPICS_SERVER_HOST
. Added Google Analytics and Google Tag Manager IDs for the home page. UpdatedSERVICES
to removetopics
andtopics-server
..env.deploy.template
file: AddedGCP_REGION
andENV_FILE
..gcloudignore
file: Removed several entries, simplifying the files ignored bygcloud
..github/dependabot.yml
file: Removed several entries, simplifying the Dependabot configuration..github/workflows/github-repo-stats.yml
file: Added a new workflow to generate GitHub repository statistics..github/workflows/scorecard.yml
file: Updated the versions ofactions/upload-artifact
andgithub/codeql-action/upload-sarif
actions..gitignore
file: Added.env.deploy
to the ignored files..pre-commit-config.yaml
file: Updated the version ofmarkdownlint-cli2
.README.md
file: Updated the description, added a section on codebase dependencies, and updated the use case table.cicd/.env.dev
file: AddedDEMO_HOST_PREFIX
,HOME_URI
,NEWS_URI
,SHOP_URI
,TRAVEL_URI
,MOTO_NEWS_URI
,SOCCER_NEWS_URI
,GARDENING_NEWS_URI
, andAD_SERVER_URI
. RemovedTOPICS_MOTO_HOST
,TOPICS_SOCCER_HOST
,TOPICS_GARDENING_HOST
, andTOPICS_SERVER_HOST
. Added Google Analytics and Google Tag Manager IDs for the home page. UpdatedSERVICES
to removetopics
andtopics-server
. SetDSP_TOKEN
andSSP_TOKEN
to empty strings.cicd/.env.prod
file: AddedDEMO_HOST_PREFIX
,HOME_URI
,NEWS_URI
,SHOP_URI
,TRAVEL_URI
,MOTO_NEWS_URI
,SOCCER_NEWS_URI
,GARDENING_NEWS_URI
, andAD_SERVER_URI
. RemovedTOPICS_MOTO_HOST
,TOPICS_SOCCER_HOST
,TOPICS_GARDENING_HOST
, andTOPICS_SERVER_HOST
. Added Google Analytics and Google Tag Manager IDs for the home page. UpdatedSERVICES
to removetopics
andtopics-server
.cicd/cloudbuild.yaml
file: Simplified the attestation file copy step and removed the DSP, DSP-A, DSP-B, SSP, SSP-A, SSP-B, TOPICS, TOPICS-SERVER, and AD-SERVER deployment steps. Updated theHOME
deployment step to include environment variables. AddedHOSTNAME
environment variable to theHOME
andNEWS
deployment steps.docker-compose.yml
file: Removed thetopics
andtopics-server
services. Updated thedsp
,dsp-a
,dsp-b
,ssp
,ssp-a
, andssp-b
services to use thead-tech
image.docs/dependencies.md
file: Added a new file describing the codebase dependencies.firebase.json
file: Updated thepublic
directory fordsp
,dsp-a
,dsp-b
, andad-server
toservices/ad-tech/src/public
. Removedtopics
andtopics-server
targets.monitoring/puppeteer-nodejs/.gcloudignore
file: Added a new file to ignore files when deploying to Google Cloud.monitoring/puppeteer-nodejs/.gitignore
file: Added a new file to ignore files when committing to Git.monitoring/puppeteer-nodejs/.puppeteerrc.cjs
file: Added a new file to configure Puppeteer.monitoring/puppeteer-nodejs/README.md
file: Added a new file with instructions on how to use the Puppeteer Node.js package.monitoring/puppeteer-nodejs/index.js
file: Added a new file to define the Cloud Functions.monitoring/puppeteer-nodejs/lib/constants.js
file: Added a new file to define the constants.monitoring/puppeteer-nodejs/monitor-uc-remarketing.js
file: Added a new file to implement the remarketing monitoring function.monitoring/puppeteer-nodejs/monitor-uc-single-touch-conversion.js
file: Added a new file to implement the single-touch conversion monitoring function.monitoring/puppeteer-nodejs/monitor-uc-template.js
file: Added a new file to serve as a template for new monitoring functions.monitoring/puppeteer-nodejs/monitor-uc-vast-video-paapi.js
file: Added a new file to implement the VAST video ad monitoring function.monitoring/puppeteer-nodejs/monitor-uc-video-multi-seller-seq-auction-paapi.js
file: Added a new file to implement the multi-seller sequential auction monitoring function.monitoring/puppeteer-nodejs/package.json
file: Added a new file to define the package metadata.nginx/nginx.conf
file: Updated the server names and certificates to reflect the changes in the.env
file.
I hope this helps!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi team,
I'm currently reviewing this pull request and will post my full review in a few minutes. In the meantime, here's a summary of the changes for you and other reviewers to quickly get up to speed:
This pull request, authored by Seburan, aims to release the changes from the dev
branch to the main
branch and the production environment. The description indicates that all services are affected.
Here's a breakdown of the changes:
-
.demos
file: This file was added and contains an arrayDEMOS
listing use case demos, and associative arraysDEMO_MONITORING_ENTRYPOINT
andDEMO_TITLE
mapping demo names to Cloud Function entry points and synthetic monitor titles respectively. The use cases are:uc-single-touch-conversion
uc-remarketing
uc-vast-video-paapi
uc-video-multi-seller-seq-auction-paapi
-
.env
file: This file was modified to includeDEMO_HOST_PREFIX
, URIs for various services (home, news, shop, travel), and Google Analytics and Google Tag Manager IDs for the home page. -
.env.deploy.template
file: This file was modified to includeGCP_REGION
andENV_FILE
variables. -
.gcloudignore
file: This file was modified to remove some unnecessary entries. -
.github/dependabot.yml
file: This file was modified to remove entries related to dependabot updates for several services, likely due to the consolidation of services intoad-tech
. -
.github/github-repo-stats.yml
file: This file was added to configure a GitHub Actions workflow for generating repository statistics. -
.github/workflows/scorecard.yml
file: This file was modified to update the versions ofactions/upload-artifact
andgithub/codeql-action/upload-sarif
actions. -
.gitignore
file: This file was modified to include.env.deploy
. -
.pre-commit-config.yaml
file: This file was modified to update the version ofmarkdownlint-cli2
. -
README.md
file: This file was modified to improve clarity and add a link to a newdocs/dependencies.md
file. The table summarizing use cases was also updated to include multi-touch conversion attribution. -
cicd/.env.dev
file: This file was modified to includeDEMO_HOST_PREFIX
, URIs for various services, and Google Analytics and Google Tag Manager IDs for the home page. Also, DSP and SSP tokens were removed. -
cicd/.env.prod
file: This file was modified similarly tocicd/.env.dev
, including URIs and Google Analytics and Google Tag Manager IDs. Also, DSP and SSP tokens were removed. -
cicd/cloudbuild.yaml
file: This file was extensively modified to reflect changes in service structure and deployment. Specifically, the deployment of individual services (dsp, dsp-a, dsp-b, ssp, ssp-a, ssp-b, ad-server) has been consolidated into a single deployment ofad-tech
. -
docker-compose.yml
file: This file was modified to remove services related to topics. -
docs/dependencies.md
file: This file was added to document codebase dependencies. -
firebase.json
file: This file was modified to reflect changes in service structure, primarily movingpublic
directories underservices/ad-tech
. -
monitoring/puppeteer-nodejs/.gcloudignore
file: This file was added to configure gcloud ignore rules. -
monitoring/puppeteer-nodejs/.gitignore
file: This file was added to configure git ignore rules. -
monitoring/puppeteer-nodejs/.puppeteerrc.cjs
file: This file was added to configure puppeteer. -
monitoring/puppeteer-nodejs/README.md
file: This file was added to document the usage of the puppeteer-nodejs package. -
monitoring/puppeteer-nodejs/index.js
file: This file was modified to include new monitoring functions for the added use cases. -
monitoring/puppeteer-nodejs/lib/constants.js
file: This file was added to define constants for the monitoring functions. -
monitoring/puppeteer-nodejs/monitor-uc-remarketing.js
file: This file was added to implement a monitoring function for remarketing. -
monitoring/puppeteer-nodejs/monitor-uc-single-touch-conversion.js
file: This file was added to implement a monitoring function for single-touch conversion attribution. -
monitoring/puppeteer-nodejs/monitor-uc-template.js
file: This file was added as a template for monitoring functions. -
monitoring/puppeteer-nodejs/monitor-uc-vast-video-paapi.js
file: This file was added to implement a monitoring function for VAST video ads. -
monitoring/puppeteer-nodejs/monitor-uc-video-multi-seller-seq-auction-paapi.js
file: This file was added to implement a monitoring function for multi-seller sequential auction video ads. -
monitoring/puppeteer-nodejs/package.json
file: This file was added to define the package metadata. -
nginx/nginx.conf
file: This file was modified to remove configurations related to topics.
I'll provide more detailed feedback in my full review.
Code flows like a river,
Through branches, it finds its way,
To the main, it's free.
Gemini encountered an error creating the summary. You can try again by commenting |
…yload optimization
[github repo] disable pre-commit.ci autofix_prs
…ction bugfix run-ad-auction was moved to run-simple-ad-auction.js
+ remove the sudo command in setup.sh
[doc] add instruction and scripts to use podman as an alternative to …
Feature/bidding and auction
fixing the start command in package.json
- firebase hosting config - environment variables for cloud dev and prod environment - ci/cd config for Cloud Build - attestation files
[infra] adding missing elements for dsp-x, dsp-y, ssp-x, ssp-y
Update deployment config for DSP-X DSP-Y SSP-X SSP-Y
[infra] adding missing elements for dsp-x, dsp-y, ssp-x, ssp-y
Remarketing use case wasn't working in the new structure
Description
This Pull Request moves all the changes made to dev branch to main branch, releasing all the changes to production environment.
Affected services
Other: