Merge branch 'master' into update-www-npm-packages-202302

cerpus · Aug 25, 2023 · 38e921c · 38e921c
2 parents 6dfd24d + 31d578d
commit 38e921c
Show file tree

Hide file tree

Showing 474 changed files with 18,894 additions and 26,072 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,6 @@
 root = true
 
-[localSetup/projects/nginx/**.conf]
+[localSetup/projects/nginx/**]
 charset = utf-8
 end_of_line = lf
 indent_size = 2

diff --git a/.github/actions/awsDeploy/action.yaml b/.github/actions/awsDeploy/action.yaml
@@ -69,7 +69,6 @@ runs:
       run: |
         echo "" >> ./chart/Chart.yaml
         echo "appVersion: \"${{ inputs.version }}\"" >> ./chart/Chart.yaml
-        cat ./chart/Chart.yaml
 
     - name: Create values string for helm command
       id: helm-values
@@ -79,11 +78,9 @@ runs:
         if  kubectl -n edlib get configmap edlib-helm-config; then
           kubectl -n edlib get configmap edlib-helm-config -o jsonpath="{.data.values}" > values.yaml
           HELM_VALUES="$HELM_VALUES -f ./values.yaml "
-          cat values.yaml
         elif [ -f "./chart/values/${{ inputs.environment }}.yaml" ]; then
           HELM_VALUES="$HELM_VALUES -f ./chart/values/${{ inputs.environment }}.yaml "
         fi
-        echo $HELM_VALUES
         echo "helm-values=$HELM_VALUES" >> $GITHUB_OUTPUT
 
     - name: helm deploy

diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -0,0 +1,8 @@
+component_management:
+  individual_components:
+    - component_id: "contentauthor"
+      paths:
+        - "sourcecode/apis/contentauthor/**"
+
+comment:
+  layout: "header, diff, flags, components"  # show component info in the PR comment
diff --git a/.github/workflows/api-auth.yaml b/.github/workflows/api-auth.yaml
@@ -30,10 +30,10 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build test image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           tags: "test:latest"
           outputs: "type=docker"
@@ -63,7 +63,7 @@ jobs:
 
       - name: Build and push app
         if: env.shouldPublishImage == '1'
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-auth-app:${{ inputs.versionToRelease }}
@@ -74,7 +74,7 @@ jobs:
 
       - name: Build and push migration container
         if: env.shouldPublishImage == '1'
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-auth-migration:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/api-common.yaml b/.github/workflows/api-common.yaml
@@ -72,7 +72,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -89,7 +89,7 @@ jobs:
 
       - name: Build and push web container
         id: docker_build_web
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-common-web:${{ inputs.versionToRelease }}
@@ -100,7 +100,7 @@ jobs:
 
       - name: Build and push fpm container
         id: docker_build_fpm
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-common-fpm:${{ inputs.versionToRelease }}
@@ -111,7 +111,7 @@ jobs:
 
       - name: Build and push migration container
         id: docker_build_migration
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-common-migration:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/api-contentauthor.yaml b/.github/workflows/api-contentauthor.yaml
@@ -54,7 +54,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Manage php-cs-fixer cache
         uses: actions/cache@v3
@@ -98,7 +98,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: oauth, sockets, zip
           coverage: pcov
 
@@ -128,10 +128,10 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build test image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           tags: "contentauthor-test:latest"
           outputs: "type=docker"
@@ -142,7 +142,13 @@ jobs:
 
       - name: Run tests
         run: |
-          docker run contentauthor-test
+          docker run -v "$(pwd):/reports" contentauthor-test \
+           vendor/bin/phpunit --coverage-clover /reports/coverage.xml
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          files: sourcecode/apis/contentauthor/coverage.xml
+          fail_ci_if_error: true
 
       - name: Configure AWS Credentials
         if: env.shouldPublishImage == '1'
@@ -161,7 +167,7 @@ jobs:
 
       - name: Build and push web container
         if: env.shouldPublishImage == '1'
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-contentauthor-app:${{ inputs.versionToRelease }}
@@ -172,7 +178,7 @@ jobs:
 
       - name: Build and push production container
         if: env.shouldPublishImage == '1'
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-contentauthor-phpfpm:${{ inputs.versionToRelease }}
@@ -183,7 +189,7 @@ jobs:
 
       - name: Build and push startup container
         if: env.shouldPublishImage == '1'
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-contentauthor-deploy:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/api-lti.yaml b/.github/workflows/api-lti.yaml
@@ -52,7 +52,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -69,7 +69,7 @@ jobs:
 
       - name: Build and push app
         id: docker_build_app
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-lti-app:${{ inputs.versionToRelease }}
@@ -80,7 +80,7 @@ jobs:
 
       - name: Build and push migration container
         id: docker_build_migration
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-lti-migration:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/api-resources.yaml b/.github/workflows/api-resources.yaml
@@ -52,7 +52,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -69,7 +69,7 @@ jobs:
 
       - name: Build and push app
         id: docker_build_app
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-resources-app:${{ inputs.versionToRelease }}
@@ -80,7 +80,7 @@ jobs:
 
       - name: Build and push migration container
         id: docker_build_migration
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-resources-migration:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/api-version.yaml b/.github/workflows/api-version.yaml
@@ -48,7 +48,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -65,7 +65,7 @@ jobs:
 
       - name: Build and push app
         id: docker_build_app
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-version-app:${{ inputs.versionToRelease }}
@@ -76,7 +76,7 @@ jobs:
 
       - name: Build and push migration container
         id: docker_build_migration
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/api-version-migration:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/docs-edlib-com.yaml b/.github/workflows/docs-edlib-com.yaml
@@ -32,10 +32,10 @@ jobs:
             node-version: 14
 
         - name: Set up Docker Buildx
-          uses: docker/setup-buildx-action@v1
+          uses: docker/setup-buildx-action@v2
 
         - name: Build to ensure everything works
-          uses: docker/build-push-action@v2
+          uses: docker/build-push-action@v4
           with:
             tags: "build:latest"
             context: ${{ env.workingDirectory }}
@@ -61,7 +61,7 @@ jobs:
         - name: Build and push app
           if: env.shouldPublishImage == '1'
           id: docker_build_app
-          uses: docker/build-push-action@v2
+          uses: docker/build-push-action@v4
           with:
             push: true
             tags: public.ecr.aws/f0t8l9h1/docs-edlib-com:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/proxy-admin.yaml b/.github/workflows/proxy-admin.yaml
@@ -27,10 +27,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build base image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           tags: "build:latest"
           outputs: "type=docker"
@@ -61,7 +61,7 @@ jobs:
       - name: Build and push app
         if: ${{ inputs.versionToRelease }}
         id: docker_build_app
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/proxy-admin-app:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/proxy-auth.yaml b/.github/workflows/proxy-auth.yaml
@@ -52,7 +52,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -69,7 +69,7 @@ jobs:
 
       - name: Build and push app
         id: docker_build_app
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/proxy-auth-app:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/proxy-lti.yaml b/.github/workflows/proxy-lti.yaml
@@ -52,7 +52,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -69,7 +69,7 @@ jobs:
 
       - name: Build and push app
         id: docker_build_app
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/proxy-lti-app:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/proxy-resource.yaml b/.github/workflows/proxy-resource.yaml
@@ -28,10 +28,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build test image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           tags: "test:latest"
           outputs: "type=docker"
@@ -62,7 +62,7 @@ jobs:
       - name: Build and push app
         if: env.shouldPublishImage == '1'
         id: docker_build_app
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/proxy-resource-app:${{ inputs.versionToRelease }}

diff --git a/.github/workflows/www.yaml b/.github/workflows/www.yaml
@@ -29,10 +29,10 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Build base image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           tags: "build:latest"
           context: ${{ env.workingDirectory }}
@@ -58,7 +58,7 @@ jobs:
       - name: Build and push app
         if: ${{ inputs.versionToRelease }}
         id: docker_build_app
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: public.ecr.aws/f0t8l9h1/www-app:${{ inputs.versionToRelease }}