Create new copydoc file if webpage is new

.env

@@ -4,11 +4,16 @@ VALKEY_HOST=localhost
 VALKEY_PORT=6379
 GH_TOKEN=token
 REPO_ORG=https://github.com/canonical
-SQLALCHEMY_DATABASE_URI=postgresql://postgres:postgres@localhost:5432/postgres
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/content
 TASK_DELAY=30
 DIRECTORY_API_TOKEN=token
 JIRA_EMAIL=email@example.com
 JIRA_TOKEN=token
 JIRA_URL=https://warthogs.atlassian.net
 JIRA_LABELS=sites_BAU
 JIRA_COPY_UPDATES_EPIC=KAN-1
+GOOGLE_CREDENTIALS=googlecreds
+GOOGLE_DRIVE_FOLDER_ID=googlecreds
+COPYD0C_TEMPLATE_ID=googlecreds
+GOOGLE_PRIVATE_KEY=base64encodedprivatekey
+GOOGLE_PRIVATE_KEY_ID=privatekeyid

.github/workflows/CI.yml

@@ -116,10 +116,23 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r requirements.txt
       - name: Run service
+        env:
+          GOOGLE_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          GOOGLE_PRIVATE_KEY_ID: ${{ secrets.PRIVATE_KEY_ID }}
+          DATABASE_URL: postgresql://postgres:postgres@localhost:5432/postgres
+          SECRET_KEY: secret_key
+          VALKEY_HOST: localhost
+          VALKEY_PORT: 6379
+          GH_TOKEN: token
+          REPO_ORG: https://github.com/canonical
+          JIRA_EMAIL: example@canonical.com
+          JIRA_TOKEN: jiratoken
+          JIRA_URL: https://example.atlassian.net
+          JIRA_LABELS: somelabel
+          JIRA_COPY_UPDATES_EPIC: WD-9999999
+          GOOGLE_DRIVE_FOLDER_ID: folderid
+          COPYDOC_TEMPLATE_ID: templateid
         run: |
-          set -a
-          source .env
-          set +a
           talisker.gunicorn webapp.app:app --daemon --bind 0.0.0.0:8104
           curl --head --fail --retry-delay 1 --retry 30 --retry-connrefused http://localhost:8104
 
@@ -150,6 +163,9 @@ jobs:
         run: DOCKER_BUILDKIT=1 docker build --tag websites-content-system .
 
       - name: Run image
+        env:
+          GOOGLE_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          GOOGLE_PRIVATE_KEY_ID: ${{ secrets.PRIVATE_KEY_ID }}
         run: |
           docker run \
           -p 8104:8104 \
@@ -158,12 +174,16 @@ jobs:
           -e VALKEY_PORT=6379 \
           -e GH_TOKEN=token \
           -e REPO_ORG=https://github.com/canonical \
-          -e SQLALCHEMY_DATABASE_URI=postgresql://postgres:postgres@localhost:5432/postgres \
+          -e DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres \
           -e JIRA_EMAIL=example@canonical.com \
           -e JIRA_TOKEN=jiratoken \
           -e JIRA_URL=https://example.atlassian.net \
           -e JIRA_LABELS=somelabel \
           -e JIRA_COPY_UPDATES_EPIC=WD-9999999 \
+          -e GOOGLE_DRIVE_FOLDER_ID=folderid \
+          -e COPYDOC_TEMPLATE_ID=templateid \
+          -e GOOGLE_PRIVATE_KEY="$GOOGLE_PRIVATE_KEY" \
+          -e GOOGLE_PRIVATE_KEY_ID="$GOOGLE_PRIVATE_KEY_ID" \
           --network host \
           websites-content-system & sleep 1
           curl --head --fail --retry-delay 1 --retry 30 --retry-connrefused http://localhost

.github/workflows/playwright.yml

@@ -31,7 +31,16 @@ jobs:
       VALKEY_PORT: 6379 
       GH_TOKEN: token 
       REPO_ORG: https://github.com/canonical 
-      SQLALCHEMY_DATABASE_URI: postgresql://postgres:postgres@localhost:5432/postgres 
+      DATABASE_URL: postgresql://postgres:postgres@localhost:5432/postgres 
+      GOOGLE_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+      GOOGLE_PRIVATE_KEY_ID: ${{ secrets.PRIVATE_KEY_ID }}
+      JIRA_EMAIL: example@canonical.com
+      JIRA_TOKEN: jiratoken
+      JIRA_URL: https://example.atlassian.net
+      JIRA_LABELS: somelabel
+      JIRA_COPY_UPDATES_EPIC: WD-9999999
+      GOOGLE_DRIVE_FOLDER_ID: folderid
+      COPYDOC_TEMPLATE_ID: templateid
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.12

README.md

@@ -8,6 +8,8 @@ Backend service for the CMS template parser
 
 Before starting, update the environment variables if needed. The default values will work for docker, save the `GH_TOKEN` which must be manually set. You can create a token [here](https://github.com/settings/tokens), by following [these](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) instructions. Make sure to select the `repo` scope for the token.
 
+You will also require a credentials file for google drive. Please store it as credentials.json in the `credentials` directory.
+
 ```env
 PORT=8104
 FLASK_DEBUG=true
@@ -16,6 +18,19 @@ DEVEL=True
 VALKEY_HOST=0.0.0.0
 VALKEY_PORT=6379
 GH_TOKEN=ghp_somepersonaltoken
+REPO_ORG=https://github.com/canonical
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/content
+TASK_DELAY=30
+DIRECTORY_API_TOKEN=token
+JIRA_EMAIL=example@canonical.com
+JIRA_TOKEN=jiratoken
+JIRA_URL=https://warthogs.atlassian.net
+JIRA_LABELS=sites_BAU
+JIRA_COPY_UPDATES_EPIC=WD-12643
+GOOGLE_DRIVE_FOLDER_ID=1EIFOGJ8DIWpsYIfWk7Yos3YijZIkbJDk
+COPYD0C_TEMPLATE_ID=125auRsLQukYH-tKN1oEKaksmpCXd_DTGiswvmbeS2iA
+GOOGLE_PRIVATE_KEY=base64encodedprivatekey
+GOOGLE_PRIVATE_KEY_ID=privatekeyid
 ```
 
 ### Using docker

konf/site.yaml

@@ -18,11 +18,6 @@ env:
       key: github
       name: webteam-valkey
 
-  - name: SECRET_KEY
-    secretKeyRef:
-      key: websites-content-system
-      name: secret-keys
-
   - name: DIRECTORY_API_TOKEN
     secretKeyRef:
       key: token
@@ -31,12 +26,12 @@ env:
   - name: JIRA_EMAIL
     secretKeyRef:
       key: jira-email
-      name: cms-jira
+      name: cs-canonical-com
 
   - name: JIRA_TOKEN
     secretKeyRef:
       key: jira-token
-      name: cms-jira
+      name: cs-canonical-com
 
   - name: JIRA_URL
     value: "https://warthogs.atlassian.net"
@@ -47,16 +42,108 @@ env:
   - name: JIRA_COPY_UPDATES_EPIC
     value: "WD-12643"
 
+  - name: GOOGLE_DRIVE_FOLDER_ID
+    secretKeyRef:
+      key: google-drive-folder-id
+      name: cs-canonical-com
+
+  - name: COPYDOC_TEMPLATE_ID
+    secretKeyRef:
+      key: copydoc-template-id
+      name: cs-canonical-com
+
+  - name: GOOGLE_PRIVATE_KEY
+    secretKeyRef:
+      key: google-private-key
+      name: cs-canonical-com
+
+  - name: GOOGLE_PRIVATE_KEY_ID
+    secretKeyRef:
+      key: google-private-key-id
+      name: cs-canonical-com
+
 # Overrides for production
 production:
   replicas: 1
   nginxConfigurationSnippet: |
     more_set_headers "X-Robots-Tag: noindex";
     more_set_headers "Link: <https://assets.ubuntu.com>; rel=preconnect; crossorigin, <https://assets.ubuntu.com>; rel=preconnect";
+  env:
+    - name: DATABASE_URL
+      secretKeyRef:
+        key: websites-content-system
+        name: database-urls
 
 # Overrides for staging
 staging:
   replicas: 1
   nginxConfigurationSnippet: |
     more_set_headers "X-Robots-Tag: noindex";
     more_set_headers "Link: <https://assets.ubuntu.com>; rel=preconnect; crossorigin, <https://assets.ubuntu.com>; rel=preconnect";
+  env:
+    - name: DATABASE_URL
+      secretKeyRef:
+        key: websites-content-system
+        name: database-urls
+
+# Overrides for demos
+demo:
+  env:
+    - name: VALKEY_HOST
+      secretKeyRef:
+        key: host
+        name: webteam-valkey
+
+    - name: VALKEY_PORT
+      secretKeyRef:
+        key: port
+        name: webteam-valkey
+
+    - name: GH_TOKEN
+      secretKeyRef:
+        key: github
+        name: webteam-valkey
+
+    - name: DIRECTORY_API_TOKEN
+      secretKeyRef:
+        key: token
+        name: directory-api
+
+    - name: JIRA_EMAIL
+      secretKeyRef:
+        key: jira-email
+        name: cs-canonical-com
+
+    - name: JIRA_TOKEN
+      secretKeyRef:
+        key: jira-token
+        name: cs-canonical-com
+
+    - name: JIRA_URL
+      value: "https://warthogs.atlassian.net"
+
+    - name: JIRA_LABELS
+      value: "sites_BAU"
+
+    - name: JIRA_COPY_UPDATES_EPIC
+      value: "WD-12643"
+
+    - name: GOOGLE_DRIVE_FOLDER_ID
+      secretKeyRef:
+        key: google-drive-folder-id
+        name: cs-canonical-com
+
+    - name: COPYDOC_TEMPLATE_ID
+      secretKeyRef:
+        key: copydoc-template-id
+        name: cs-canonical-com
+
+    - name: GOOGLE_PRIVATE_KEY
+      secretKeyRef:
+        key: google-private-key
+        name: cs-canonical-com
+
+    - name: GOOGLE_PRIVATE_KEY_ID
+      secretKeyRef:
+        key: google-private-key-id
+        name: cs-canonical-com

requirements.txt

@@ -4,6 +4,7 @@ click==8.1.7
 django-openid-auth==0.17
 Flask==2.3.3
 Flask-OpenID==1.3.1
+google-api-python-client==2.78.0
 itsdangerous==2.2.0
 Jinja2==3.1.4
 MarkupSafe==2.1.5

webapp/__init__.py

@@ -2,6 +2,7 @@
 
 from webapp.cache import init_cache
 from webapp.context import base_context
+from webapp.gdrive import init_gdrive
 from webapp.jira import init_jira
 from webapp.models import init_db
 from webapp.sso import init_sso
@@ -30,4 +31,7 @@ def create_app():
     # Initialize JIRA
     init_jira(app)
 
+    # Initialize gdrive
+    init_gdrive(app)
+
     return app

webapp/app.py

@@ -135,11 +135,12 @@ def request_changes(body: ChangesRequestModel):
 
     # Make a request to JIRA to create a task
     try:
-        create_jira_task(app, body.model_dump())
+        task = create_jira_task(app, body.model_dump())
+        task_url = f"https://docs.google.com/document/d/{task['id']}"
     except Exception as e:
         return jsonify(str(e)), 500
 
-    return jsonify("Task created successfully"), 201
+    return jsonify({"message": f"Task created successfully\n{task_url}"}), 201
 
 
 @app.route("/get-jira-tasks/<webpage_id>", methods=["GET"])