From 2cb5cc38907e61d5ae006612dde6dd30f9b23fec Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Sun, 27 Feb 2022 16:31:54 +0000 Subject: [PATCH 01/61] Updated rook to version 0.1.165 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2125a02..d9fb2ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.164 +rook>=0.1.165 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 9e5a56bae0cf8ea636ae53114f9e934ba458c4be Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Sun, 3 Apr 2022 11:41:20 +0000 Subject: [PATCH 02/61] Updated rook to version 0.1.166 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d9fb2ef..cc9eb78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.165 +rook>=0.1.166 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 6f3d7509987b5aee927b4f44d3fe930937c5fc96 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Thu, 14 Apr 2022 16:45:37 +0000 Subject: [PATCH 03/61] Updated rook to version 0.1.167 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cc9eb78..84da1d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.166 +rook>=0.1.167 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 32b57a08522f1f5fcb5fa4ebf8028dee12887a0b Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Mon, 18 Apr 2022 12:59:37 +0000 Subject: [PATCH 04/61] Updated rook to version 0.1.168 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 84da1d4..b384870 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.167 +rook>=0.1.168 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 91612342cb029ffbba44fc926d7bd933b0ca0caa Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 19 Apr 2022 18:55:05 +0000 Subject: [PATCH 05/61] Updated rook to version 0.1.169 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b384870..8d9ad2c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.168 +rook>=0.1.169 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From d473b6ed48ef3c15a3ca8a728b0392b8ebf1d433 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Thu, 28 Apr 2022 12:16:44 +0000 Subject: [PATCH 06/61] Updated rook to version 0.1.170 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8d9ad2c..f78ccc9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.169 +rook>=0.1.170 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 6b967107060dbd0b8d435b922eb1878cbb7a2ea3 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Mon, 2 May 2022 13:55:16 +0000 Subject: [PATCH 07/61] Updated rook to version 0.1.171 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f78ccc9..3152b89 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.170 +rook>=0.1.171 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 516ccc00be343ec927c1787d0eef4fee59c3590d Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 17 May 2022 17:46:45 +0000 Subject: [PATCH 08/61] Updated rook to version 0.1.172 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3152b89..418a723 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.171 +rook>=0.1.172 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 7e0338b8a79c70db21587aa88b6a30eaef6ecbd6 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 18 May 2022 09:15:48 +0000 Subject: [PATCH 09/61] Updated rook to version 0.1.173 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 418a723..f27b2f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.172 +rook>=0.1.173 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From bc3497cdba782145780b3ec477e195dc6059be00 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 24 May 2022 04:37:10 +0000 Subject: [PATCH 10/61] Updated rook to version 0.1.174 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f27b2f7..3b5732e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.173 +rook>=0.1.174 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 9264ce9b253fa7d58be118b77ce60c5c4869e9ab Mon Sep 17 00:00:00 2001 From: Urook <95576653+Urook@users.noreply.github.com> Date: Thu, 26 May 2022 13:03:14 +0300 Subject: [PATCH 11/61] RK-12382 - Added a dev container (#59) * Added a dev container * Avoid confusion --- .devcontainer/Dockerfile | 21 +++++++++++++++ .devcontainer/devcontainer.json | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..b3c6238 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,21 @@ +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/python-3/.devcontainer/base.Dockerfile + +# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster +ARG VARIANT="3.8-bullseye" +FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT} + +# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 +ARG NODE_VERSION="14" +RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi + +# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image. +# COPY requirements.txt /tmp/pip-tmp/ +# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \ +# && rm -rf /tmp/pip-tmp + +# [Optional] Uncomment this section to install additional OS packages. +# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ +# && apt-get -y install --no-install-recommends + +# [Optional] Uncomment this line to install global node packages. +# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g " 2>&1 \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..144ac44 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,48 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/python-3 +{ + "name": "Python 3", + "build": { + "dockerfile": "Dockerfile", + "context": "..", + "args": { + // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6 + // Append -bullseye or -buster to pin to an OS version. + // Use -bullseye variants on local on arm64/Apple Silicon. + "VARIANT": "3.8-bullseye", + // Options + "NODE_VERSION": "14" + } + }, + + // Set *default* container specific settings.json values on container create. + "settings": { + "python.defaultInterpreterPath": "/usr/local/bin/python", + "python.linting.enabled": true, + "python.linting.pylintEnabled": true, + "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", + "python.formatting.blackPath": "/usr/local/py-utils/bin/black", + "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf", + "python.linting.banditPath": "/usr/local/py-utils/bin/bandit", + "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8", + "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy", + "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle", + "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle", + "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint" + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "ms-python.python", + "ms-python.vscode-pylance" + ], + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + "postCreateCommand": "pip3 install --user -r requirements.txt", + + // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode" +} From 22faa4748165858a44a5e73869941746d2235412 Mon Sep 17 00:00:00 2001 From: "Lir (Rookout)" <79785236+lirook@users.noreply.github.com> Date: Sun, 29 May 2022 14:16:47 +0300 Subject: [PATCH 12/61] Port 5000 already in use M1 macs Added a note to change the port bindings. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index bb133a9..28fcbc8 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,8 @@ python app.py docker run -p 5000:5000 -e ROOKOUT_TOKEN=$ROOKOUT_TOKEN rookout/tutorial-python ``` +**Note:** On M1-based Macbook laptops, port 5000 is already in use by default, so changing the port binding (`5001:5000` for example) may be required. + ## Usage - Log in to the [Rookout IDE](https://app.rookout.com/) From d01d15bffc5890846364f56813ee38049f7b4e80 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Sun, 29 May 2022 17:46:44 +0000 Subject: [PATCH 13/61] Updated rook to version 0.1.175 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3b5732e..4649f26 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.174 +rook>=0.1.175 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From f16ac6fc40e3490abc18fbfac92b723b48bb9519 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Mon, 20 Jun 2022 14:14:12 +0000 Subject: [PATCH 14/61] Updated rook to version 0.1.176 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4649f26..929b3e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.175 +rook>=0.1.176 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 45b7b4a2362de7053d0846586e44cc142fa5aaa4 Mon Sep 17 00:00:00 2001 From: gosharo <106976988+gosharo@users.noreply.github.com> Date: Thu, 14 Jul 2022 07:27:01 +0300 Subject: [PATCH 15/61] Update dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e653b1f..3ea0b54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM python:3.8-slim # pip installing the requirements.txt requires git because we're installing a fork RUN apt-get -y update -RUN apt-get -y install git +RUN apt-get -y install git wget ARG GIT_COMMIT=unspecified ENV ROOKOUT_COMMIT=$GIT_COMMIT From e3f4f9634e3445c36c39b473beca11ce456202df Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 24 Aug 2022 08:11:59 +0000 Subject: [PATCH 16/61] Updated rook to version 0.1.177 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 929b3e4..b066898 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.176 +rook>=0.1.177 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 5cc959e9a3a08d40b3ed9ef15e8950a883552cb6 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 24 Aug 2022 21:44:35 +0000 Subject: [PATCH 17/61] Updated rook to version 0.1.178 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b066898..45cfe9a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.177 +rook>=0.1.178 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From c267912f0039ade6e331c576b4c1976b21e14eba Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 6 Sep 2022 18:09:25 +0000 Subject: [PATCH 18/61] Updated rook to version 0.1.179 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 45cfe9a..7181e71 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.178 +rook>=0.1.179 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From cf401b582a1ed3d5d79e8d41f253934bb5352972 Mon Sep 17 00:00:00 2001 From: alexeygutkin <101189168+alexeygutkin@users.noreply.github.com> Date: Tue, 13 Sep 2022 08:41:08 -0700 Subject: [PATCH 19/61] RK-13916 - deploy argo (#63) * deploy argo * add to workflow * change yq install * change yq install * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * final --- .circleci/config.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7b1e08a..f2437d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,9 +46,17 @@ references: branches: only: master + docker_login: &docker_login run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD + install_deps: &install_deps + run: + command: | + apt-get update + apt-get install wget git -y + wget https://github.com/mikefarah/yq/releases/download/v4.27.5/yq_linux_amd64 -O /usr/bin/yq &&\ + chmod +x /usr/bin/yq jobs: checkout_code_upver: @@ -86,6 +94,24 @@ jobs: - run: apt install make -y - run: make build-and-upload + deploy_demo_argo: + docker: + - image: ubuntu:focal + working_directory: ~/demo + steps: + - add_ssh_keys + - *disable_strict_git + - *load_cache + - *setup_workspace + - *load_version + - *install_deps + - run: git config --global user.email "sonario@rookout.com" + - run: git clone -b staging git@github.com:Rookout/gitops-demo.git + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i '.tutorialPython.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml + - run: cd gitops-demo && git add argocd/apps/values.yaml + - run: cd gitops-demo && git commit -m "update tutorial-python $NEW_VERSION" + - run: cd gitops-demo && git push --set-upstream origin staging + deploy_demo: docker: - image: google/cloud-sdk:latest @@ -104,6 +130,9 @@ jobs: - run: export GOOGLE_APPLICATION_CREDENTIALS=/root/demo/gcp-key.json && cd deployment-demo && export env=sandbox && make install-helm deploy-demo - run: export GOOGLE_APPLICATION_CREDENTIALS=/root/demo/gcp-key.json && cd deployment-demo && export env=staging-sandbox && make install-helm deploy-demo + + + test_demo_servers_up: docker: - image: google/cloud-sdk:latest @@ -139,6 +168,10 @@ workflows: requires: - checkout_code_upver <<: *filter_master + - deploy_demo_argo: + requires: + - build_and_push_demo_image + <<: *filter_master - deploy_demo: requires: - build_and_push_demo_image From 65822f6a6c04675304abdcb5b398f6a7e9f7bbf6 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 13 Sep 2022 22:09:05 +0000 Subject: [PATCH 20/61] Updated rook to version 0.1.180 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7181e71..6c30eea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.179 +rook>=0.1.180 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 5497828af8fc8f609fc6618df40df6772d061ed2 Mon Sep 17 00:00:00 2001 From: alexeygutkin <101189168+alexeygutkin@users.noreply.github.com> Date: Wed, 14 Sep 2022 07:23:21 -0700 Subject: [PATCH 21/61] deploy 2 argo prod (#64) --- .circleci/config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f2437d8..6149210 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,10 +107,15 @@ jobs: - *install_deps - run: git config --global user.email "sonario@rookout.com" - run: git clone -b staging git@github.com:Rookout/gitops-demo.git - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i '.tutorialPython.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i -v '.tutorialPython.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml - run: cd gitops-demo && git add argocd/apps/values.yaml - run: cd gitops-demo && git commit -m "update tutorial-python $NEW_VERSION" - run: cd gitops-demo && git push --set-upstream origin staging + - run: cd gitops-demo && git checkout production && git pull + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i -v '.tutorialPython.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml + - run: cd gitops-demo && git add argocd/apps/values.yaml + - run: cd gitops-demo && git commit -m "update tutorial-python $NEW_VERSION" + - run: cd gitops-demo && git push --set-upstream origin production deploy_demo: docker: From 52beb67ee8ee779b8004a845f6793e3ec2172093 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Thu, 15 Sep 2022 17:59:11 +0000 Subject: [PATCH 22/61] Updated rook to version 0.1.181 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6c30eea..3640ea6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.180 +rook>=0.1.181 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 0ef3f9f32fd44c37d9014d1a447e11c5bfe1657c Mon Sep 17 00:00:00 2001 From: alexeygutkin <101189168+alexeygutkin@users.noreply.github.com> Date: Sun, 18 Sep 2022 05:57:45 -0700 Subject: [PATCH 23/61] fix argo deploy (#65) --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6149210..4cde932 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,17 +105,17 @@ jobs: - *setup_workspace - *load_version - *install_deps - - run: git config --global user.email "sonario@rookout.com" + - run: git config --global user.email "sonario@rookout.com" && git config --global user.name "sonariorobot" - run: git clone -b staging git@github.com:Rookout/gitops-demo.git - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i -v '.tutorialPython.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml - run: cd gitops-demo && git add argocd/apps/values.yaml - run: cd gitops-demo && git commit -m "update tutorial-python $NEW_VERSION" - - run: cd gitops-demo && git push --set-upstream origin staging + - run: cd gitops-demo && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops-demo.git staging - run: cd gitops-demo && git checkout production && git pull - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i -v '.tutorialPython.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml - run: cd gitops-demo && git add argocd/apps/values.yaml - run: cd gitops-demo && git commit -m "update tutorial-python $NEW_VERSION" - - run: cd gitops-demo && git push --set-upstream origin production + - run: cd gitops-demo && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops-demo.git production deploy_demo: docker: From e88a4dcbbdbc37d9a833afdfaa945483cc666a37 Mon Sep 17 00:00:00 2001 From: alexeygutkin <101189168+alexeygutkin@users.noreply.github.com> Date: Mon, 19 Sep 2022 08:40:52 -0700 Subject: [PATCH 24/61] RK-14059 - helm-deploy-deprecation (#66) * helm-deploy-deprecation * helm-deploy-deprecation --- .circleci/config.yml | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cde932..8f7ccfa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -117,27 +117,6 @@ jobs: - run: cd gitops-demo && git commit -m "update tutorial-python $NEW_VERSION" - run: cd gitops-demo && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops-demo.git production - deploy_demo: - docker: - - image: google/cloud-sdk:latest - working_directory: ~/demo - steps: - - add_ssh_keys - - *disable_strict_git - - *load_cache - - *setup_workspace - - *auth_google - - *load_version - - run: git clone git@github.com:Rookout/deployment-demo - - run: apt install make -y - - run: export GOOGLE_APPLICATION_CREDENTIALS=/root/demo/gcp-key.json && cd deployment-demo && export env=staging && make install-helm deploy-demo - - run: export GOOGLE_APPLICATION_CREDENTIALS=/root/demo/gcp-key.json && cd deployment-demo && export env=production && make install-helm deploy-demo - - run: export GOOGLE_APPLICATION_CREDENTIALS=/root/demo/gcp-key.json && cd deployment-demo && export env=sandbox && make install-helm deploy-demo - - run: export GOOGLE_APPLICATION_CREDENTIALS=/root/demo/gcp-key.json && cd deployment-demo && export env=staging-sandbox && make install-helm deploy-demo - - - - test_demo_servers_up: docker: - image: google/cloud-sdk:latest @@ -177,13 +156,9 @@ workflows: requires: - build_and_push_demo_image <<: *filter_master - - deploy_demo: - requires: - - build_and_push_demo_image - <<: *filter_master - test_demo_servers_up: requires: - - deploy_demo + - deploy_demo_argo <<: *filter_master - notify_slack: requires: From c4ef08ff353cc2f8c80ff78ffb977b54f57b517d Mon Sep 17 00:00:00 2001 From: alexeygutkin <101189168+alexeygutkin@users.noreply.github.com> Date: Wed, 21 Sep 2022 08:42:47 -0700 Subject: [PATCH 25/61] fix-staging-url (#67) --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f7ccfa..834b9f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,11 +123,11 @@ jobs: working_directory: ~/demo steps: - run: sleep 15 && echo "Checking Staging..." - - run: curl 'http://staging.machina.rookout-demo.com/account/register' - - run: curl 'http://staging.python.rookout-demo.com/' - - run: curl 'http://staging.java.rookout-demo.com/' - - run: curl 'http://staging.nodejs.rookout-demo.com/' - - run: curl 'http://staging.ruby.rookout-demo.com/' + - run: curl 'https://machina.staging.rookout-demo.com/account/register' + - run: curl 'https://python.staging.rookout-demo.com/' + - run: curl 'https://java.staging.rookout-demo.com/' + - run: curl 'https://nodejs.staging.rookout-demo.com/' + - run: curl 'https://ruby.staging.rookout-demo.com/' - run: sleep 15 && echo "Checking Production..." - run: curl 'http://machina.rookout-demo.com/account/register' - run: curl 'http://python.rookout-demo.com/' From 1d652e479e4bf07e02ebebcaac9ed1380da2a5b5 Mon Sep 17 00:00:00 2001 From: Idan Lousky <95428317+idanrookout@users.noreply.github.com> Date: Wed, 28 Sep 2022 08:55:28 +0300 Subject: [PATCH 26/61] fix: requirements.txt to reduce vulnerabilities (#69) The following vulnerabilities are fixed by pinning transitive dependencies: - https://snyk.io/vuln/SNYK-PYTHON-PROTOBUF-3031740 Co-authored-by: snyk-bot --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 3640ea6..319c8eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing jaeger-client +protobuf>=3.18.3 # not directly required, pinned by Snyk to avoid a vulnerability From 5741b4e1ff6ab68ba06e66a1bd045dbf69c3da1c Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Sun, 2 Oct 2022 14:07:39 +0000 Subject: [PATCH 27/61] Updated rook to version 0.1.182 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 319c8eb..709f165 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.181 +rook>=0.1.182 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From d3f42bc3ae44b2386cf2c4f604be55c731b9ce8e Mon Sep 17 00:00:00 2001 From: Ryan Hoffman Date: Tue, 11 Oct 2022 09:41:26 +0300 Subject: [PATCH 28/61] RK-14201-remove-all-option (#70) * RK-14201-remove-all-optio * Update jenkins test file --- .jenkins/Jenkinsfile.test | 4 ++-- app.py | 4 ++++ static/css/style.css | 5 +++++ static/index.html | 1 + static/js/app.js | 6 ++++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.jenkins/Jenkinsfile.test b/.jenkins/Jenkinsfile.test index f08e060..7197f2d 100644 --- a/.jenkins/Jenkinsfile.test +++ b/.jenkins/Jenkinsfile.test @@ -1,7 +1,7 @@ regressionTest { FILE_PATH = "app.py" - LINE_NUM = "114" - SHA = "6833c3840a3542adddde98bceaa1aa715d49cf29b5295b6b3e84817a0b967129" + LINE_NUM = "118" + SHA = "5fcb058ac94ae67512e5c48d720980c6796152fd6f822aea80dfd7cf3c6008cd" LANG = "Python" BACKGROUND_IMAGE_CMD = "python /app/app.py &" URL_FOR_TRIGGER = "http://localhost:5000/todos" diff --git a/app.py b/app.py index d39a9ae..18d2a48 100644 --- a/app.py +++ b/app.py @@ -74,6 +74,10 @@ def clear_completed(): todo = [t for t in todos if not t['completed']] return '', 204 +@app.route('/todos/remove_all', methods=['DELETE']) +def remove_all(): + Store.getInstance().todos = [] + return '', 204 @app.route('/todos', methods=['UPDATE']) def update_todo(): diff --git a/static/css/style.css b/static/css/style.css index 1013c60..b314064 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -373,6 +373,11 @@ html .clear-completed:active { text-decoration: underline; } +.clear-all-items { + cursor: pointer; +} + + /* Hack to remove background from Mobile Safari. Can't use it globally since it destroys checkboxes in Firefox diff --git a/static/index.html b/static/index.html index 00334ef..c300598 100644 --- a/static/index.html +++ b/static/index.html @@ -42,6 +42,7 @@

todos

Double-click to edit a todo

+

Click here to remove all items

diff --git a/static/js/app.js b/static/js/app.js index c5102a8..48ad7c8 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -61,6 +61,12 @@ $().ready(() => { method: 'DELETE' }); this.reloadOnFinish(action); + }, + removeAll() { + const action = $.ajax('/todos/remove_all', { + method: 'DELETE' + }); + this.reloadOnFinish(action); }, updateTodo(todo) { const action = $.ajax('/todos', { From 66a7603df345e9bce8f8e6b445c19c2c31fd6b2f Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Thu, 13 Oct 2022 06:46:14 +0000 Subject: [PATCH 29/61] Updated rook to version 0.1.183 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 709f165..525d2e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.182 +rook>=0.1.183 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 966e682476edf854ce2c4bc360390215a4dead88 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 18 Oct 2022 13:01:17 +0000 Subject: [PATCH 30/61] Updated rook to version 0.1.184 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 525d2e4..60cc5b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.183 +rook>=0.1.184 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 2ad73e2e14c89e579430bf19e34ae70df9022eba Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 19 Oct 2022 07:10:06 +0000 Subject: [PATCH 31/61] Updated rook to version 0.1.185 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 60cc5b0..afff6d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.184 +rook>=0.1.185 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 50ef95ba698f08ce41803e32662a1c797f9373b4 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 25 Oct 2022 09:32:31 +0000 Subject: [PATCH 32/61] Updated rook to version 0.1.186 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index afff6d4..55c2523 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.185 +rook>=0.1.186 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 12c9b5a44c42516c0a53f2eaa5d985809cdf9200 Mon Sep 17 00:00:00 2001 From: Urook <95576653+Urook@users.noreply.github.com> Date: Wed, 26 Oct 2022 15:54:42 +0300 Subject: [PATCH 33/61] Make sure add_todo starts in line 95 and ends in 109 (#71) --- app.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index 18d2a48..8116eb9 100644 --- a/app.py +++ b/app.py @@ -74,10 +74,6 @@ def clear_completed(): todo = [t for t in todos if not t['completed']] return '', 204 -@app.route('/todos/remove_all', methods=['DELETE']) -def remove_all(): - Store.getInstance().todos = [] - return '', 204 @app.route('/todos', methods=['UPDATE']) def update_todo(): @@ -132,6 +128,13 @@ def duplicate_todo(todoId): break return '', 204 + +@app.route('/todos/remove_all', methods=['DELETE']) +def remove_all(): + Store.getInstance().todos = [] + return '', 204 + + @app.route('/favicon.ico') def favicon(): return send_from_directory(os.path.join(app.root_path, 'static'), 'rookout_favicon.ico', mimetype='image/vnd.microsoft.icon') From 51860133dc0677daf85bbb1cf90bc082bf2f7153 Mon Sep 17 00:00:00 2001 From: Urook <95576653+Urook@users.noreply.github.com> Date: Wed, 26 Oct 2022 16:52:42 +0300 Subject: [PATCH 34/61] RK-14555 - Update the sha of app.py (#72) * Update the sha of app.py * Update line --- .jenkins/Jenkinsfile.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jenkins/Jenkinsfile.test b/.jenkins/Jenkinsfile.test index 7197f2d..c90b17c 100644 --- a/.jenkins/Jenkinsfile.test +++ b/.jenkins/Jenkinsfile.test @@ -1,7 +1,7 @@ regressionTest { FILE_PATH = "app.py" - LINE_NUM = "118" - SHA = "5fcb058ac94ae67512e5c48d720980c6796152fd6f822aea80dfd7cf3c6008cd" + LINE_NUM = "114" + SHA = "27b674504743b0c2472db804da5e6e7234d8bbd4b274f3c8db2903de1e9e3bd2" LANG = "Python" BACKGROUND_IMAGE_CMD = "python /app/app.py &" URL_FOR_TRIGGER = "http://localhost:5000/todos" From 6a2a8709720e2d24da12453bb75330e0a45ba61d Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Thu, 17 Nov 2022 17:36:23 +0000 Subject: [PATCH 35/61] Updated rook to version 0.1.187 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 55c2523..33bc8f5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.186 +rook>=0.1.187 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 47a6a806e494280c81d8e5ad454857066ff46c40 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 30 Nov 2022 09:13:15 +0000 Subject: [PATCH 36/61] Updated rook to version 0.1.188 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 33bc8f5..c858b39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.187 +rook>=0.1.188 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 6edba38636e68ec9426da89f4c35c043dd6fa91a Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 13 Dec 2022 13:06:13 +0000 Subject: [PATCH 37/61] Updated rook to version 0.1.189 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c858b39..ad8d226 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.188 +rook>=0.1.189 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From cfc40289483b8eb744fb49bb9c94f1b7bb474812 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 14 Dec 2022 11:30:52 +0000 Subject: [PATCH 38/61] Updated rook to version 0.1.190 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ad8d226..840840f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.189 +rook>=0.1.190 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 4a58efdb938279694a17acafecaeef05d3097da2 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 28 Dec 2022 14:52:35 +0000 Subject: [PATCH 39/61] Updated rook to version 0.1.191 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 840840f..59a2689 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.190 +rook>=0.1.191 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 639aec18d796a743d797ff1e5651a9dc4675e138 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Mon, 2 Jan 2023 09:05:38 +0000 Subject: [PATCH 40/61] Updated rook to version 0.1.192 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 59a2689..a279644 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.191 +rook>=0.1.192 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From f4589efb968e8d4c370cd1861e9b2948438c5661 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Mon, 2 Jan 2023 13:30:57 +0000 Subject: [PATCH 41/61] Updated rook to version 0.1.193 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a279644..83680b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.192 +rook>=0.1.193 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From dc685fa637af2e1a5459a6493084d4abb60c49d5 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Sun, 5 Feb 2023 07:56:41 +0000 Subject: [PATCH 42/61] Updated rook to version 0.1.194 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 83680b5..475359e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.193 +rook>=0.1.194 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 4b92bbdb1638dff578ba542130263192e60c60e1 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 8 Feb 2023 09:15:00 +0000 Subject: [PATCH 43/61] Updated rook to version 0.1.195 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 475359e..2eb7eb4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.194 +rook>=0.1.195 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From e43a6d55561f4c657be2a8ff8fa6dc913513e238 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Fri, 17 Feb 2023 12:20:53 +0000 Subject: [PATCH 44/61] Updated rook to version 0.1.196 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2eb7eb4..e315fba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.195 +rook>=0.1.196 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From eb721dc914047a0ba5ad8153a6ee20540c5accbd Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Sun, 26 Feb 2023 14:29:41 +0000 Subject: [PATCH 45/61] Updated rook to version 0.1.197 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e315fba..10c57ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.196 +rook>=0.1.197 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From b030b17e0173bd0abd07b93e782a50f7736475a1 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 8 Mar 2023 12:51:58 +0000 Subject: [PATCH 46/61] Updated rook to version 0.1.198 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 10c57ff..779a044 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.197 +rook>=0.1.198 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 88b2c41a9384dab6ea8cb4ececf44ece91a70878 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Thu, 9 Mar 2023 08:25:12 +0000 Subject: [PATCH 47/61] Updated rook to version 0.1.199 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 779a044..22058b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.198 +rook>=0.1.199 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From c66de8ab9ad68dc3954e2c0f391683d97f69ceab Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 15 Mar 2023 13:41:55 +0000 Subject: [PATCH 48/61] Updated rook to version 0.1.200 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 22058b6..ab774a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.199 +rook>=0.1.200 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From acd4a6c190aa854f1ba358c0ee232ebc204e8124 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Wed, 22 Mar 2023 10:11:05 +0000 Subject: [PATCH 49/61] Updated rook to version 0.1.201 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ab774a7..313318c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.200 +rook>=0.1.201 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 45ac045e7fd34b15662a66047ee9c51f84c00b21 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Thu, 23 Mar 2023 12:37:06 +0000 Subject: [PATCH 50/61] Updated rook to version 0.1.202 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 313318c..837da71 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.201 +rook>=0.1.202 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 8d49227804835be3969d0e18147c610ce19abc74 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Thu, 30 Mar 2023 09:04:51 +0000 Subject: [PATCH 51/61] Updated rook to version 0.1.203 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 837da71..9b4ae27 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.202 +rook>=0.1.203 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From fb730d23fe0cfcb7fe4f81798ec97d717b198e75 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Mon, 10 Apr 2023 07:13:49 +0000 Subject: [PATCH 52/61] Updated rook to version 0.1.204 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9b4ae27..2588285 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.203 +rook>=0.1.204 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 838aa91a45c2d549f3cccbc80628f1f9a419b283 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 23 May 2023 09:02:42 +0000 Subject: [PATCH 53/61] Updated rook to version 0.1.205 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2588285..810f658 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.204 +rook>=0.1.205 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 7e84644367cf8f816938fe008a2eb45573bc9ad4 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 23 May 2023 09:40:06 +0000 Subject: [PATCH 54/61] Updated rook to version 0.1.206 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 810f658..2766e6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.205 +rook>=0.1.206 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 400400d83fe794f3c9b2d3190810ff5847f76b02 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Tue, 13 Jun 2023 07:13:03 +0000 Subject: [PATCH 55/61] Updated rook to version 0.1.207 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2766e6c..da4b4fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.206 +rook>=0.1.207 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 6b13fdfa015f92dd5e60c8a5e6bdf826376572a1 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Thu, 29 Jun 2023 07:32:42 +0000 Subject: [PATCH 56/61] Updated rook to version 0.1.208 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index da4b4fc..0362da9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.207 +rook>=0.1.208 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 3329df239280a43b315fe5c1f1e3d92217703da1 Mon Sep 17 00:00:00 2001 From: sonariorobot Date: Sun, 2 Jul 2023 15:34:41 +0000 Subject: [PATCH 57/61] Updated rook to version 0.1.209 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0362da9..587a7ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -rook>=0.1.208 +rook>=0.1.209 flask>=1.0,<=2.0 sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing From 730cfbc9028e434a4c1b87c3aa2d10f993bc1d9b Mon Sep 17 00:00:00 2001 From: Dudi Cohen <31986166+ElDuderinos@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:26:06 +0200 Subject: [PATCH 58/61] RK-19777 - remove sentry (#77) * remove sentry * update test file * keep line numbers * more cleanup * update sha --- .jenkins/Jenkinsfile.test | 2 +- app.py | 12 ++++++------ requirements.txt | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.jenkins/Jenkinsfile.test b/.jenkins/Jenkinsfile.test index c90b17c..f7d992a 100644 --- a/.jenkins/Jenkinsfile.test +++ b/.jenkins/Jenkinsfile.test @@ -1,7 +1,7 @@ regressionTest { FILE_PATH = "app.py" LINE_NUM = "114" - SHA = "27b674504743b0c2472db804da5e6e7234d8bbd4b274f3c8db2903de1e9e3bd2" + SHA = "3658556546f8bb925e5be01da38432f0a924d48f9c05bfbe0c40981dbf34ca66" LANG = "Python" BACKGROUND_IMAGE_CMD = "python /app/app.py &" URL_FOR_TRIGGER = "http://localhost:5000/todos" diff --git a/app.py b/app.py index 8116eb9..498207f 100644 --- a/app.py +++ b/app.py @@ -6,18 +6,18 @@ from datetime import datetime from random import randint from todos_store import Store -import sentry_sdk -from sentry_sdk.integrations.flask import FlaskIntegration + + from jaeger_client import Config from flask_opentracing import FlaskTracer from utils.logging import on_add_todo_logging, on_get_todos_logging import os from flask import send_from_directory -sentry_sdk.init( - dsn="https://2acefaf842814814848afd40457bc55d@sentry.io/1381062", - integrations=[FlaskIntegration()] -) + + + + app = flask.Flask(__name__, static_url_path='/static') diff --git a/requirements.txt b/requirements.txt index 587a7ae..65f4a9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ rook>=0.1.209 flask>=1.0,<=2.0 -sentry-sdk[flask]>=0.6.9 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing jaeger-client protobuf>=3.18.3 # not directly required, pinned by Snyk to avoid a vulnerability From b7d8e8a583628f299d3c14df0ec809bb74c62f91 Mon Sep 17 00:00:00 2001 From: alexeygutkin <101189168+alexeygutkin@users.noreply.github.com> Date: Tue, 31 Oct 2023 11:56:48 +0200 Subject: [PATCH 59/61] migration-to-gitops-repo (#79) Co-authored-by: Alexey Gutkin --- .circleci/config.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 834b9f8..c25b145 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -106,16 +106,12 @@ jobs: - *load_version - *install_deps - run: git config --global user.email "sonario@rookout.com" && git config --global user.name "sonariorobot" - - run: git clone -b staging git@github.com:Rookout/gitops-demo.git - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i -v '.tutorialPython.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml - - run: cd gitops-demo && git add argocd/apps/values.yaml - - run: cd gitops-demo && git commit -m "update tutorial-python $NEW_VERSION" - - run: cd gitops-demo && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops-demo.git staging - - run: cd gitops-demo && git checkout production && git pull - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq -i -v '.tutorialPython.image.tag = strenv(PUBLISH_VERSION)' gitops-demo/argocd/apps/values.yaml - - run: cd gitops-demo && git add argocd/apps/values.yaml - - run: cd gitops-demo && git commit -m "update tutorial-python $NEW_VERSION" - - run: cd gitops-demo && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops-demo.git production + - run: git clone git@github.com:Rookout/gitops.git + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-python").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-python").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml + - run: cd gitops && git add apps/demo/staging/apps.yaml apps/demo/production/apps.yaml + - run: cd gitops && git commit -m "update tutorial-python $NEW_VERSION" + - run: cd gitops && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops.git test_demo_servers_up: docker: From aa8ea2906300d38b6be9e454f27c0ed394f65be4 Mon Sep 17 00:00:00 2001 From: alexeygutkin <101189168+alexeygutkin@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:01:51 +0200 Subject: [PATCH 60/61] RK-19956 - Migration to gitops repo (#80) * migration-to-gitops-repo * fix-path --------- Co-authored-by: Alexey Gutkin --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c25b145..866bdab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,8 +107,8 @@ jobs: - *install_deps - run: git config --global user.email "sonario@rookout.com" && git config --global user.name "sonariorobot" - run: git clone git@github.com:Rookout/gitops.git - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-python").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/staging/apps.yaml - - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-python").helmValues.image.tag = strenv(PUBLISH_VERSION)' apps/demo/production/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-python").helmValues.image.tag = strenv(PUBLISH_VERSION)' gitops/apps/demo/staging/apps.yaml + - run: PUBLISH_VERSION=$(echo $NEW_VERSION | sed 's/inner-999/1/g') yq eval -i -v '.apps[] |= select(.chart.name == "tutorial-python").helmValues.image.tag = strenv(PUBLISH_VERSION)' gitops/apps/demo/production/apps.yaml - run: cd gitops && git add apps/demo/staging/apps.yaml apps/demo/production/apps.yaml - run: cd gitops && git commit -m "update tutorial-python $NEW_VERSION" - run: cd gitops && git push https://sonariorobot:$GITHUB_TOKEN@github.com/Rookout/gitops.git From 04404559143e101724c2bc6dd016c7f83ac79e32 Mon Sep 17 00:00:00 2001 From: GoshaDozoretz Date: Tue, 31 Oct 2023 14:27:00 +0200 Subject: [PATCH 61/61] RK-19961 - Update requirements.txt (#81) * Update requirements.txt * Update requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 65f4a9b..5b11b4c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ flask>=1.0,<=2.0 -e git+https://github.com/Rookout/python-flask.git@e56318f9c84978ecdaeaaff4aa819dc86f5509c7#egg=Flask_OpenTracing jaeger-client protobuf>=3.18.3 # not directly required, pinned by Snyk to avoid a vulnerability +werkzeug==2.3.7