Test

.github/workflows/main.yaml

@@ -1,9 +1,11 @@
 name: Upload Documentation
 
-on:
-  pull_request:
-    branches:
-      - main
+# on:
+#   pull_request:
+#     branches:
+#       - main
+
+on: [push]
 
 jobs:
   hello_world_job:
@@ -14,10 +16,13 @@ jobs:
         uses: actions/checkout@v3
       - name: Conversion step
         env:
-          CONFLUENCE_URL: 'https://at-bachelor.atlassian.net/wiki'
+          CONFLUENCE_URL: 'https://at-bachelor.atlassian.net'
           CONFLUENCE_SPACE_KEY: '~955037829'
-          AUTH_TOKEN: ${{ secrets.AUTH_TOKEN }}
+          AUTH_USERNAME: ${{ secrets.AUTH_USERNAME }}
+          AUTH_API_TOKEN: ${{ secrets.AUTH_API_TOKEN }}
         uses: ./ # Uses an action in the root directory
         id: Convert
         with:
           fileslocation: './documentation'
+
+

.github/workflows/test.yaml

@@ -2,9 +2,6 @@ name: Run PyTest
 
 on: [push]
 
-permissions:
-  contents: read
-
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -19,16 +16,16 @@ jobs:
         apt-get update && apt-get install -y python3-venv
         python3 -m venv venv
         . venv/bin/activate
-        python -m pip install --upgrade pip
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         pip install -e .
     - name: Test with pytest
       env:
         CONFLUENCE_URL: 'https://at-bachelor.atlassian.net/wiki'
         CONFLUENCE_SPACE_KEY: '~955037829'
-        AUTH_TOKEN: ${{ secrets.AUTH_TOKEN }}
+        AUTH_USERNAME: ${{ secrets.AUTH_USERNAME }}
+        AUTH_API_TOKEN: ${{ secrets.AUTH_API_TOKEN }}
         INPUT_FILESLOCATION: './documentation'
       run: |
         . venv/bin/activate
         pip install -e .
-        pytest -v
+        python3 -m pytest -v

Dockerfile

@@ -1,26 +1,29 @@
 FROM ubuntu:latest
 
-RUN apt-get update && apt-get install -y software-properties-common gcc && \
-    add-apt-repository -y ppa:deadsnakes/ppa
+RUN apt-get update 
+ #&& apt-get install -y software-properties-common gcc && \
+ #    add-apt-repository -y ppa:deadsnakes/ppa
 
-RUN apt-get install -y python3.6 python3-distutils python3-pip python3-apt python3-venv
+#RUN apt-get install -y python3.6 python3-distutils python3-pip python3-apt python3-venv
 
-RUN apt-get install -y pandoc
+RUN apt-get install -y git jq
+
+# RUN apt-get install -y pandoc
 #ffmpeg libsm6 libxext6
 
-RUN python3 -m venv venv
-RUN chmod +x /venv/*
-RUN . /venv/bin/activate
+# RUN python3 -m venv venv
+# RUN chmod +x /venv/*
+# RUN . /venv/bin/activate
 
-COPY setup.py /setup.py
-COPY requirements.txt requirements.txt
-RUN pip install -r requirements.txt
+# COPY setup.py /setup.py
+# COPY requirements.txt requirements.txt
+# RUN pip install -r requirements.txt
 COPY ./MarkdownToConfluence /MarkdownToConfluence
-RUN pip install -e .
+# RUN pip install -e .
 
 
-RUN chmod +x /MarkdownToConfluence/convert_all.sh
-RUN chmod +x /MarkdownToConfluence/convert.sh
-#RUN chmod +x /MarkdownToConfluence/entrypoint.sh
+# RUN chmod +x /MarkdownToConfluence/convert_all.sh
+# RUN chmod +x /MarkdownToConfluence/convert.sh
+RUN chmod +x /MarkdownToConfluence/entrypoint.sh
 
-ENTRYPOINT [ "sh", "/MarkdownToConfluence/convert_all.sh" ]
+ENTRYPOINT [ "bash", "/MarkdownToConfluence/entrypoint.sh" ]

MarkdownToConfluence/__init__.py

@@ -0,0 +1 @@
+__all__ = ['utils', 'modules', 'confluence', 'globals']

MarkdownToConfluence/confluence/check_if_page_exists.py

@@ -1,19 +1,22 @@
 from urllib.parse import quote
 import requests, json
 import os
+from requests.auth import HTTPBasicAuth
+
+from MarkdownToConfluence.confluence.PageNotFoundError import PageNotFoundError 
 
-AUTH_TOKEN = os.environ.get("AUTH_TOKEN")
 BASE_URL = os.environ.get("CONFLUENCE_URL")
+AUTH_USERNAME = os.environ.get("AUTH_USERNAME")
+AUTH_API_TOKEN = os.environ.get("AUTH_API_TOKEN")
 
-authorization_string = f"Basic {AUTH_TOKEN}"
+auth = HTTPBasicAuth(AUTH_USERNAME, AUTH_API_TOKEN)
 
 def page_exists_in_space(title: str, spaceKey: str) -> bool:
-    url = f"{BASE_URL}/rest/api/content?spaceKey={spaceKey}&title={quote(title)}"
+    url = f"{BASE_URL}/wiki/rest/api/content?spaceKey={spaceKey}&title={quote(title)}"
     headers = {
-    'Authorization': authorization_string,
     'User-Agent': 'python'
     }
-    response = requests.request('GET', url, headers=headers)
+    response = requests.request('GET', url, headers=headers, auth=auth)
     if(response.status_code == 200):
         results = json.loads(response.text)['results']
         if(len(results) > 0):
@@ -22,19 +25,20 @@ def page_exists_in_space(title: str, spaceKey: str) -> bool:
             return False
     else:
         print(response.text)
+        return False
 
 def get_page_id(title: str, spaceKey: str) -> str:
-    url = f"{BASE_URL}/rest/api/content?spaceKey={spaceKey}&title={quote(title)}"
+    url = f"{BASE_URL}/wiki/rest/api/content?spaceKey={spaceKey}&title={quote(title)}"
     headers = {
-    'Authorization': authorization_string,
     'User-Agent': 'python'
     }
-    response = requests.request('GET', url, headers=headers)
+    response = requests.request('GET', url, headers=headers, auth=auth)
     if(response.status_code == 200):
         results = json.loads(response.text)['results']
         if(len(results) > 0):
             return results[0]['id']
         else:
-            return 'Page does not exist'
+            raise PageNotFoundError(title, spaceKey)
     else:
-        print(response.text)
+        print(response.text)
+        raise PageNotFoundError(title, spaceKey)

MarkdownToConfluence/confluence/create_content.py

@@ -1,12 +1,14 @@
 import json
 import codecs
 import requests
-import sys, os
+import sys, os, base64
+from requests.auth import HTTPBasicAuth
 
-AUTH_TOKEN = os.environ.get("AUTH_TOKEN")
 BASE_URL = os.environ.get("CONFLUENCE_URL")
+AUTH_USERNAME = os.environ.get("AUTH_USERNAME")
+AUTH_API_TOKEN = os.environ.get("AUTH_API_TOKEN")
 
-authorization_string = f"Basic {AUTH_TOKEN}"
+auth = HTTPBasicAuth(AUTH_USERNAME, AUTH_API_TOKEN)
 
 def create_page(filename: str, title: str, space_obj, parent_id="none"):
     filename = filename.replace(".md", ".html")
@@ -45,16 +47,15 @@ def create_page(filename: str, title: str, space_obj, parent_id="none"):
     f = codecs.open(f"{filename}", 'r', encoding='utf-8')
     template['body']['storage']['value'] = f.read()
 
-    url = f'{BASE_URL}/rest/api/content'
+    url = f'{BASE_URL}/wiki/rest/api/content'
 
     headers = {
-    'Authorization': authorization_string,
     'Content-Type': 'application/json; charset=utf-8',
     'User-Agent': 'python'
     }
 
     # Upload html to confluence
-    response = requests.request("POST", url, headers=headers, data=json.dumps(template))
+    response = requests.request("POST", url, headers=headers, data=json.dumps(template), auth=auth)
 
     return response
 

MarkdownToConfluence/confluence/delete_content.py

@@ -1,26 +1,25 @@
 import requests, json
-from MarkdownToConfluence.filetools import get_all_page_names_in_filesystem
-import sys, os
+from MarkdownToConfluence.utils import get_all_page_names_in_filesystem
+import sys, os, base64
+from requests.auth import HTTPBasicAuth
 
-#BASE_URL = os.environ.get("CONFLUENCE_URL")
-BASE_URL = 'https://at-bachelor.atlassian.net/wiki'
+BASE_URL = os.environ.get("CONFLUENCE_URL")
 FILES_PATH = os.environ.get("INPUT_FILESLOCATION")
-#AUTH_TOKEN = os.environ.get("AUTH_TOKEN")
-AUTH_TOKEN = "bGFyc2UxOUBzdHVkZW50LnNkdS5kazp6RzFrQk1ick9PUEtZblNSSFA0bTQxNUI="
 SPACE_KEY = os.environ.get("CONFLUENCE_SPACE_KEY")
+AUTH_USERNAME = os.environ.get("AUTH_USERNAME")
+AUTH_API_TOKEN = os.environ.get("AUTH_API_TOKEN")
 
-authorization_string = f"Basic {AUTH_TOKEN}"
+auth = HTTPBasicAuth(AUTH_USERNAME, AUTH_API_TOKEN)
 
 def delete_page(page_id: str, page_name=""):
 
-    url = f"{BASE_URL}/rest/api/content/{page_id}"
+    url = f"{BASE_URL}/wiki/rest/api/content/{page_id}"
 
     headers = {
-    'Authorization': authorization_string,
     'User-Agent': 'python'
     }
 
-    response = requests.request('DELETE', url, headers=headers)
+    response = requests.request('DELETE', url, headers=headers, auth=auth)
 
     if(response.status_code == 204):
         print(f"Deleted {page_id} {page_name}")
@@ -33,21 +32,20 @@ def delete_page(page_id: str, page_name=""):
     the exclude arg takes a list of page names, that are not to be deleted, even if they dont exist in the filesystem
 """
 def delete_non_existing_pages(space_key: str, root: str, exclude=['Overview']):
-    url = f"{BASE_URL}/rest/api/content?spaceKey={space_key}"
+    url = f"{BASE_URL}/wiki/rest/api/content?spaceKey={space_key}"
 
     headers = {
-    'Authorization': authorization_string,
     'User-Agent': 'python'
     }
 
     results = []
-    response = requests.request("GET", url, headers=headers)
+    response = requests.request("GET", url, headers=headers, auth=auth)
     response_json = json.loads(response.text)
     if(response.status_code == 200):
         results.extend(response_json['results'])
         while("next" in response_json['_links']):
             url = BASE_URL + response_json["_links"]["next"]
-            response = requests.request("GET", url, headers=headers)
+            response = requests.request("GET", url, headers=headers, auth=auth)
             response_json = json.loads(response.text)
             results.extend(response_json['results'])
 

MarkdownToConfluence/confluence/update_content.py

@@ -1,12 +1,14 @@
 import json
 import codecs
 import requests
-import os
+import os, base64
+from requests.auth import HTTPBasicAuth
 
-AUTH_TOKEN = os.environ.get("AUTH_TOKEN")
 BASE_URL = os.environ.get("CONFLUENCE_URL")
+AUTH_USERNAME = os.environ.get("AUTH_USERNAME")
+AUTH_API_TOKEN = os.environ.get("AUTH_API_TOKEN")
 
-authorization_string = f"Basic {AUTH_TOKEN}"
+auth = HTTPBasicAuth(AUTH_USERNAME, AUTH_API_TOKEN)
 
 def update_page_content(filename: str, title: str, page_id: str, space_obj,):
     filename = filename.replace(".md", ".html")
@@ -37,21 +39,20 @@ def update_page_content(filename: str, title: str, page_id: str, space_obj,):
     f = codecs.open(f"{filename}", 'r', encoding='utf-8')
     template['body']['storage']['value'] = f.read()
 
-    url = f"{BASE_URL}/rest/api/content/{page_id}"
+    url = f"{BASE_URL}/wiki/rest/api/content/{page_id}"
 
     headers = {
-    'Authorization': authorization_string,
     'Content-Type': 'application/json; charset=utf-8',
     'User-Agent': 'python'
     }
 
     # Get current version
-    get_response = requests.request("GET", f"{url}?expand=version", headers=headers)
+    get_response = requests.request("GET", f"{url}?expand=version", headers=headers, auth=auth)
     version_number = int(json.loads(get_response.text)['version']['number'])
     template['version']['number'] = version_number + 1
 
     # Upload html to confluence
-    put_response = requests.request("PUT", url, headers=headers, data=json.dumps(template))
+    put_response = requests.request("PUT", url, headers=headers, data=json.dumps(template), auth=auth)
 
     if(put_response.status_code != 200):
         print(template['body'])

MarkdownToConfluence/confluence/upload_attachments.py

@@ -1,37 +1,38 @@
-import requests, json, os
+import requests, json, os, base64
 from .check_if_page_exists import page_exists_in_space, get_page_id
 from .PageNotFoundError import PageNotFoundError
+from requests.auth import HTTPBasicAuth
 
 BASE_URL = os.environ.get("CONFLUENCE_URL")
-AUTH_TOKEN = os.environ.get("AUTH_TOKEN")
 SPACEKEY = os.environ.get("CONFLUENCE_SPACE_KEY")
+AUTH_USERNAME = os.environ.get("AUTH_USERNAME")
+AUTH_API_TOKEN = os.environ.get("AUTH_API_TOKEN")
 
-authorization_string = f"Basic {AUTH_TOKEN}"
+auth = HTTPBasicAuth(AUTH_USERNAME, AUTH_API_TOKEN)
 
 headers = {
-'Authorization': authorization_string,
 'User-Agent': 'python',
 'X-Atlassian-Token': 'no-check'
 }
 
 def upload_attachment(page_title, attactchment_name, filepath):
     if(page_exists_in_space(page_title, SPACEKEY)):
-        url = f"{BASE_URL}/rest/api/content/{get_page_id(page_title, SPACEKEY)}/child/attachment"
+        url = f"{BASE_URL}/wiki/rest/api/content/{get_page_id(page_title, SPACEKEY)}/child/attachment"
 
         # Get attachment id
         id = ""
-        attachments = requests.get(url, headers=headers)
+        attachments = requests.get(url, headers=headers, auth=auth)
         for result in json.loads(attachments.text)['results']:
             if(result['title'] == attactchment_name):
                 id = result['id']
         if(id == ""): # Attachment doesnt exist, create it
             # Create attachment
             file = {'file': (attactchment_name, open(filepath, 'rb'))}
-            response = requests.post(url, headers=headers, files=file)
+            response = requests.post(url, headers=headers, files=file, auth=auth)
         else: # Attachment exists, update it
              # Update attachment
             files = {'file': (attactchment_name, open(os.path.abspath(filepath), 'rb'))}
-            response = requests.post(f'{url}/{id}/data', headers=headers, files=files)
+            response = requests.post(f'{url}/{id}/data', headers=headers, files=files, auth=auth)
 
         if(response.status_code == 200):
             print(f"Uploaded {attactchment_name} as attachment on page {page_title}")
@@ -40,24 +41,3 @@ def upload_attachment(page_title, attactchment_name, filepath):
         return response
     else:
         raise PageNotFoundError(page_title, SPACEKEY)
-
-"""
-def update_attachment_data(page_title, attactchment_name, filepath):
-    if(page_exists_in_space(page_title, SPACEKEY)):
-        url = f"{BASE_URL}/rest/api/content/{get_page_id(page_title, SPACEKEY)}/child/attachment"
-
-        # Get attachment id
-        id = ""
-        attachments = requests.get(url, headers=headers)
-        for result in json.loads(attachments.text)['results']:
-            if(result['title'] == attactchment_name):
-                id = result['id']
-
-        # Update attachment
-        files = {'file': (f'{attactchment_name}', open(f'./{filepath}', 'rb'))}
-        response = requests.post(url + f'/{id}/data', headers=headers, files=files)
-
-        return response
-    else:
-        raise PageNotFoundError(page_title, SPACEKEY)
-"""