Skip to content
Merged

Ci #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
e864296
Removed Text column compare prohibition
ColinBeebyHEE Apr 1, 2025
3cf30c7
Using sql_compare_text in send_new_user_passwords
ColinBeebyHEE Apr 1, 2025
1780dd8
Switched off audio and video recording in tinyMCE
ColinBeebyHEE Apr 3, 2025
1fb4843
Merge pull request #8 from TechnologyEnhancedLearning/Implement_OpenI…
ColinBeebyHEE Apr 3, 2025
3520586
TD-5136:custom plugin created
Apr 5, 2025
6f481c1
TD-5136:Auth oidc unit test issue fix
Apr 5, 2025
2436d25
Merge pull request #10 from TechnologyEnhancedLearning/Develop/Featur…
ColinBeebyHEE Apr 7, 2025
9381c1a
TD-5485: Modify the migration tool add SCORM content to courses using…
Apr 28, 2025
6d3b400
Merge pull request #11 from TechnologyEnhancedLearning/Develop/Featur…
sarathlal-sarangadharan Apr 28, 2025
e4535fb
Sending data to findwise API
May 1, 2025
3cb8f40
New plug in- TEL Organisation Specific Configurations
May 2, 2025
3da5416
Updated telconfig
May 2, 2025
be6fd8b
Added the privacy metadata
May 6, 2025
ca31195
Merge pull request #12 from TechnologyEnhancedLearning/Develop/Featur…
binon May 6, 2025
538f0b5
TD-5537: New custom page has been created to kill user session when t…
May 7, 2025
12b741f
Merge pull request #13 from TechnologyEnhancedLearning/TD-5537-Implem…
sarathlal-sarangadharan May 8, 2025
2483909
Reverted the self entrol changes from core php plugin page and moved …
May 12, 2025
cb07648
Merge remote-tracking branch 'origin/CI' into Develop/Features/TD-537…
May 13, 2025
4fb6932
Refaaactoed the code to accomodate the test
May 13, 2025
99c7a91
Fixing the build error in github action - telconfig_helper_test
May 13, 2025
efeaecc
Fixing build error in GitHUb action by slighly modifyingthe test
May 14, 2025
b0cd509
Updated the test script
May 14, 2025
3736362
Created custom constant while testing to fix build error
May 14, 2025
7bde6f3
Updated the logic
May 15, 2025
ab8766c
Reomoved the condition as it is breaking Test
May 15, 2025
1409667
Removed unncessary debuggng code to fix the test failure
May 15, 2025
1cb5fde
Merge pull request #14 from TechnologyEnhancedLearning/Develop/Featur…
binon May 16, 2025
716f9e3
TD-5485:Max attempts increased
May 16, 2025
0d5efa8
TD-5485: Mam attempt increased
May 16, 2025
7efc0ca
Merge pull request #15 from TechnologyEnhancedLearning/Develop/Featur…
sarathlal-sarangadharan May 19, 2025
93f134e
Update the course meta data and added remove funciton
May 29, 2025
b53054b
Updated resource type from moodle to course
Jun 2, 2025
e06198e
Fixing the test error
Jun 5, 2025
fc3d940
Fixed the test
Jun 5, 2025
d1aceab
Merge pull request #16 from TechnologyEnhancedLearning/Develop/Featur…
binon Jun 6, 2025
14535fa
Added PersistentVolume and PersistentVolumeClaim for rest uploads
ColinBeebyHEE Jun 6, 2025
2b1f55a
Added moodlerestuploads file store to terraform
ColinBeebyHEE Jun 6, 2025
feb699d
Added uploads folder to give path to persistent volume
ColinBeebyHEE Jun 6, 2025
2295c09
corrected mount path for webservice/rest/uploads
ColinBeebyHEE Jun 6, 2025
4f80648
Added persistent volumes and claims for uploads for all environments
ColinBeebyHEE Jun 6, 2025
e3137b5
Masked the token field
Jun 13, 2025
b77d3a8
Merge pull request #17 from TechnologyEnhancedLearning/Develop/Featur…
binon Jun 13, 2025
af97d33
added uploads folder permissions correction to Action
ColinBeebyHEE Jun 17, 2025
775b13d
Added permission modified to all CI/CD branches
ColinBeebyHEE Jun 17, 2025
e67d277
When course details updated fire the external API
Jun 19, 2025
5bb1523
Fixing the test and making the keywords all lower before send to find…
Jun 19, 2025
9067720
Merge pull request #18 from TechnologyEnhancedLearning/Develop/Featur…
binon Jun 19, 2025
199738d
Fixing the failure when catalogue id is null
Jun 20, 2025
1824019
Merge pull request #19 from TechnologyEnhancedLearning/Develop/Featur…
ColinBeebyHEE Jun 20, 2025
3c1a874
Added validation on self entrol check
Jun 23, 2025
d7c1792
Unit tests are now run only when required, not on pull request
ColinBeebyHEE Jun 23, 2025
02e3b52
Merge pull request #20 from TechnologyEnhancedLearning/Develop/Featur…
binon Jun 23, 2025
f8d9406
Courses can be searched using section name and resource name
Jun 24, 2025
e8d8df5
Merge pull request #21 from TechnologyEnhancedLearning/Develop/Featur…
binon Jun 25, 2025
752a9b8
removing/hiding activity and resources are now triggered
Jun 25, 2025
d3b2801
Merge pull request #23 from TechnologyEnhancedLearning/Develop/Featur…
binon Jun 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/learninghub-moodle_Deploy_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,19 @@ jobs:

- name: Create PersistentVolume for theme
run: kubectl apply -f kubectl/pv-definition-theme-dev.yml

- name: Create PersistentVolume for uploads
run: kubectl apply -f kubectl/pv-definition-uploads-dev.yml

- name: Create PersistentVolumeClaim
run: kubectl apply -f kubectl/pvc-definition-dev.yml

- name: Create PersistentVolumeClaim for theme
run: kubectl apply -f kubectl/pvc-definition-theme-dev.yml

- name: Create PersistentVolumeClaim for uploads
run: kubectl apply -f kubectl/pvc-definition-uploads-dev.yml

- name: Attach ACR to cluster
run: az aks update -n ${{ vars.AZURE_CLUSTER_NAME }} -g ${{ vars.AZURE_RESOURCE_GROUP_NAME }} --attach-acr ${{ vars.AZURE_CONTAINER_REGISTRY_NAME }}
continue-on-error: true
Expand Down Expand Up @@ -188,6 +194,9 @@ jobs:
rm -f $(basename $zipfile); \
done

- name: Ensure uploads folder has correct permissions applied
run: chmod ugo+rwx ./webservice/rest/uploads

- name: Build and push Docker image
run: |
docker build \
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/learninghub-moodle_Deploy_pgvle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,19 @@ jobs:

- name: Create PersistentVolume for theme
run: kubectl apply -f kubectl/pv-definition-theme-${{ vars.AZURE_ENVIRONMENT }}.yml

- name: Create PersistentVolume for uploads
run: kubectl apply -f kubectl/pv-definition-uploads-${{ vars.AZURE_ENVIRONMENT }}.yml

- name: Create PersistentVolumeClaim
run: kubectl apply -f kubectl/pvc-definition-${{ vars.AZURE_ENVIRONMENT }}.yml

- name: Create PersistentVolumeClaim for theme
run: kubectl apply -f kubectl/pvc-definition-theme-${{ vars.AZURE_ENVIRONMENT }}.yml

- name: Create PersistentVolumeClaim for uploads
run: kubectl apply -f kubectl/pvc-definition-uploads-${{ vars.AZURE_ENVIRONMENT }}.yml

- name: Attach ACR to cluster
run: az aks update -n ${{ vars.AZURE_CLUSTER_NAME }} -g ${{ vars.AZURE_RESOURCE_GROUP_NAME }} --attach-acr ${{ vars.AZURE_CONTAINER_REGISTRY_NAME }}
continue-on-error: true
Expand Down Expand Up @@ -188,6 +194,9 @@ jobs:
rm -f $(basename $zipfile); \
done

- name: Ensure uploads folder has correct permissions applied
run: chmod ugo+rwx ./webservice/rest/uploads

- name: Build and push Docker image
run: |
docker build -t ${{ vars.AZURE_CONTAINER_REGISTRY_NAME }}.azurecr.io/${{ vars.DOCKER_IMAGE_NAME }}:latest .
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/learninghub-moodle_Deploy_prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,19 @@ jobs:

- name: Create PersistentVolume for theme
run: kubectl apply -f kubectl/pv-definition-theme-prod.yml

- name: Create PersistentVolume for uploads
run: kubectl apply -f kubectl/pv-definition-uploads-prod.yml

- name: Create PersistentVolumeClaim
run: kubectl apply -f kubectl/pvc-definition-prod.yml

- name: Create PersistentVolumeClaim for theme
run: kubectl apply -f kubectl/pvc-definition-theme-prod.yml

- name: Create PersistentVolumeClaim for uploads
run: kubectl apply -f kubectl/pvc-definition-uploads-prod.yml

- name: Attach ACR to cluster
run: az aks update -n ${{ vars.AZURE_CLUSTER_NAME }} -g ${{ vars.AZURE_RESOURCE_GROUP_NAME }} --attach-acr ${{ vars.AZURE_CONTAINER_REGISTRY_NAME }}
continue-on-error: true
Expand Down Expand Up @@ -233,6 +239,9 @@ jobs:
rm -f $(basename $zipfile); \
done

- name: Ensure uploads folder has correct permissions applied
run: chmod ugo+rwx ./webservice/rest/uploads

- name: Build and push Docker image
run: |
docker build \
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/learninghub-moodle_Deploy_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,19 @@ jobs:

- name: Create PersistentVolume for theme
run: kubectl apply -f kubectl/pv-definition-theme-test.yml

- name: Create PersistentVolume for uploads
run: kubectl apply -f kubectl/pv-definition-uploads-test.yml

- name: Create PersistentVolumeClaim
run: kubectl apply -f kubectl/pvc-definition-test.yml

- name: Create PersistentVolumeClaim for theme
run: kubectl apply -f kubectl/pvc-definition-theme-test.yml

- name: Create PersistentVolumeClaim for uploads
run: kubectl apply -f kubectl/pvc-definition-uploads-test.yml

- name: Attach ACR to cluster
run: az aks update -n ${{ vars.AZURE_CLUSTER_NAME }} -g ${{ vars.AZURE_RESOURCE_GROUP_NAME }} --attach-acr ${{ vars.AZURE_CONTAINER_REGISTRY_NAME }}
continue-on-error: true
Expand Down Expand Up @@ -188,6 +194,9 @@ jobs:
rm -f $(basename $zipfile); \
done

- name: Ensure uploads folder has correct permissions applied
run: chmod ugo+rwx ./webservice/rest/uploads

- name: Build and push Docker image
run: |
docker build -t ${{ vars.AZURE_CONTAINER_REGISTRY_NAME }}.azurecr.io/${{ vars.DOCKER_IMAGE_NAME }}:latest .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/learninghub-moodle_Test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Run tests for LearningHub-Moodle
on:
pull_request:
workflow_dispatch:

permissions:
id-token: write
Expand Down
6 changes: 6 additions & 0 deletions Terraform/dev/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ resource "azurerm_storage_share" "storage_share_theme" {
quota = var.StorageQuota
}

resource "azurerm_storage_share" "storage_share_uploads" {
name = "moodlerestuploads"
storage_account_name = azurerm_storage_account.storage_account.name
quota = var.StorageQuota
}

resource "azurerm_storage_container" "assessment_container" {
name = "assessmentstoragecontainer"
storage_account_name = azurerm_storage_account.storage_account.name
Expand Down
6 changes: 6 additions & 0 deletions Terraform/pgvle/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ resource "azurerm_storage_share" "storage_share_theme" {
quota = var.StorageQuota
}

resource "azurerm_storage_share" "storage_share_uploads" {
name = "moodlerestuploads"
storage_account_name = azurerm_storage_account.storage_account.name
quota = var.StorageQuota
}

resource "azurerm_storage_container" "assessment_container" {
name = "assessmentstoragecontainer"
storage_account_name = azurerm_storage_account.storage_account.name
Expand Down
6 changes: 6 additions & 0 deletions Terraform/prod/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ resource "azurerm_storage_share" "storage_share_theme" {
quota = var.StorageQuota
}

resource "azurerm_storage_share" "storage_share_uploads" {
name = "moodlerestuploads"
storage_account_name = azurerm_storage_account.storage_account.name
quota = var.StorageQuota
}

resource "azurerm_storage_container" "assessment_container" {
name = "assessmentstoragecontainer"
storage_account_name = azurerm_storage_account.storage_account.name
Expand Down
6 changes: 6 additions & 0 deletions Terraform/test/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ resource "azurerm_storage_share" "storage_share_theme" {
quota = var.StorageQuota
}

resource "azurerm_storage_share" "storage_share_uploads" {
name = "moodlerestuploads"
storage_account_name = azurerm_storage_account.storage_account.name
quota = var.StorageQuota
}

resource "azurerm_storage_container" "assessment_container" {
name = "assessmentstoragecontainer"
storage_account_name = azurerm_storage_account.storage_account.name
Expand Down
5 changes: 5 additions & 0 deletions auth/oidc/classes/privacy/provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ public static function get_metadata(collection $collection): collection {
'refreshtoken',
'idtoken',
],
'auth_oidc_sid' => [ // ✅ Add this block
'userid',
'sid',
'timecreated',
],
];

foreach ($tables as $table => $fields) {
Expand Down
4 changes: 4 additions & 0 deletions auth/oidc/lang/en/auth_oidc.php
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,10 @@
$string['update_username_results'] = 'Update username results';
$string['new_username'] = 'New username';
$string['missing_idp_type'] = 'This configuration is only available if an IdP type is configured.';
$string['privacy:metadata:auth_oidc_sid'] = 'Stores OIDC session identifiers linked to users.';
$string['privacy:metadata:auth_oidc_sid:userid'] = 'The ID of the user associated with the session.';
$string['privacy:metadata:auth_oidc_sid:sid'] = 'The session ID from the OIDC provider.';
$string['privacy:metadata:auth_oidc_sid:timecreated'] = 'The time the session ID was created.';

// phpcs:enable moodle.Files.LangFilesOrdering.IncorrectOrder
// phpcs:enable moodle.Files.LangFilesOrdering.UnexpectedComment
3 changes: 3 additions & 0 deletions config.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
$CFG->phpunit_prefix = 'phpu_';
$CFG->phpunit_dataroot = 'phpu_moodledata';

$CFG->recordrtc_audio = false;
$CFG->recordrtc_video = false;

require_once(__DIR__ . '/lib/setup.php');

// There is no php closing tag in this file,
Expand Down
7 changes: 6 additions & 1 deletion kubectl/deployment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,15 @@ spec:
readOnly: false
- name: moodletheme
mountPath: /var/www/html/theme
- name: moodlerestuploads
mountPath: /var/www/html/webservice/rest/uploads
volumes:
- name: moodledata
persistentVolumeClaim:
claimName: moodledataclaim
- name: moodletheme
persistentVolumeClaim:
claimName: moodlethemeclaim
claimName: moodlethemeclaim
- name: moodlerestuploads
persistentVolumeClaim:
claimName: moodleuploadsclaim
1 change: 1 addition & 0 deletions kubectl/pv-definition-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
volumeHandle: "moodleCluster#learninghubmoodleprod#moodledata" # make sure this volumeid is unique for every identical share in the cluster
volumeAttributes:
shareName: moodledata
server: learninghubmoodleprod.privatelink.file.core.windows.net
nodeStageSecretRef:
name: azure-secret
namespace: learninghubmoodle
Expand Down
31 changes: 31 additions & 0 deletions kubectl/pv-definition-uploads-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
apiVersion: v1
kind: PersistentVolume
metadata:
annotations:
pv.kubernetes.io/provisioned-by: file.csi.azure.com
name: moodlerestuploads
spec:
capacity:
storage: 5Gi
accessModes:
- ReadWriteMany
persistentVolumeReclaimPolicy: Retain
storageClassName: azurefile-csi
csi:
driver: file.csi.azure.com
volumeHandle: "moodleCluster#learninghubmoodledev#moodlerestuploads" # make sure this volumeid is unique for every identical share in the cluster
volumeAttributes:
shareName: moodlerestuploads
server: learninghubmoodledev.privatelink.file.core.windows.net
nodeStageSecretRef:
name: azure-secret
namespace: learninghubmoodle
mountOptions:
- dir_mode=0777
- file_mode=0777
- uid=0
- gid=0
- mfsymlinks
- cache=strict
- nosharesock
- nobrl # disable sending byte range lock requests to the server and for applications which have challenges with posix locks
31 changes: 31 additions & 0 deletions kubectl/pv-definition-uploads-pgvle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
apiVersion: v1
kind: PersistentVolume
metadata:
annotations:
pv.kubernetes.io/provisioned-by: file.csi.azure.com
name: moodlerestuploads
spec:
capacity:
storage: 5Gi
accessModes:
- ReadWriteMany
persistentVolumeReclaimPolicy: Retain
storageClassName: azurefile-csi
csi:
driver: file.csi.azure.com
volumeHandle: "moodleCluster#learninghubmoodlepgvle#moodlerestuploads" # make sure this volumeid is unique for every identical share in the cluster
volumeAttributes:
shareName: moodlerestuploads
server: learninghubmoodledev.privatelink.file.core.windows.net
nodeStageSecretRef:
name: azure-secret
namespace: learninghubmoodle
mountOptions:
- dir_mode=0777
- file_mode=0777
- uid=0
- gid=0
- mfsymlinks
- cache=strict
- nosharesock
- nobrl # disable sending byte range lock requests to the server and for applications which have challenges with posix locks
31 changes: 31 additions & 0 deletions kubectl/pv-definition-uploads-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
apiVersion: v1
kind: PersistentVolume
metadata:
annotations:
pv.kubernetes.io/provisioned-by: file.csi.azure.com
name: moodlerestuploads
spec:
capacity:
storage: 5Gi
accessModes:
- ReadWriteMany
persistentVolumeReclaimPolicy: Retain
storageClassName: azurefile-csi
csi:
driver: file.csi.azure.com
volumeHandle: "moodleCluster#learninghubmoodleprod#moodlerestuploads" # make sure this volumeid is unique for every identical share in the cluster
volumeAttributes:
shareName: moodlerestuploads
server: learninghubmoodleprod.privatelink.file.core.windows.net
nodeStageSecretRef:
name: azure-secret
namespace: learninghubmoodle
mountOptions:
- dir_mode=0777
- file_mode=0777
- uid=0
- gid=0
- mfsymlinks
- cache=strict
- nosharesock
- nobrl # disable sending byte range lock requests to the server and for applications which have challenges with posix locks
31 changes: 31 additions & 0 deletions kubectl/pv-definition-uploads-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
apiVersion: v1
kind: PersistentVolume
metadata:
annotations:
pv.kubernetes.io/provisioned-by: file.csi.azure.com
name: moodlerestuploads
spec:
capacity:
storage: 5Gi
accessModes:
- ReadWriteMany
persistentVolumeReclaimPolicy: Retain
storageClassName: azurefile-csi
csi:
driver: file.csi.azure.com
volumeHandle: "moodleCluster#learninghubmoodletest#moodlerestuploads" # make sure this volumeid is unique for every identical share in the cluster
volumeAttributes:
shareName: moodlerestuploads
server: learninghubmoodletest.privatelink.file.core.windows.net
nodeStageSecretRef:
name: azure-secret
namespace: learninghubmoodle
mountOptions:
- dir_mode=0777
- file_mode=0777
- uid=0
- gid=0
- mfsymlinks
- cache=strict
- nosharesock
- nobrl # disable sending byte range lock requests to the server and for applications which have challenges with posix locks
13 changes: 13 additions & 0 deletions kubectl/pvc-definition-uploads-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: moodleuploadsclaim
namespace: learninghubmoodle
spec:
accessModes:
- ReadWriteMany
resources:
requests:
storage: 5Gi
storageClassName: azurefile-csi
volumeName: moodlerestuploads
Loading
Loading