Jsm222/postgres phinx juan

.gitignore

@@ -14,6 +14,8 @@
 /config/gpg/*.key
 /config/license
 /config/subscription_key.txt
+/config/jwt/jwt.key
+/config/jwt/jwt.pem
 
 # JS Dependencies #
 ################
@@ -37,12 +39,19 @@ debian/passbolt-api-pro/
 debian/*debhelper*
 debian/*substvars*
 
+# RPM Package #
+###############
+/_passbolt-configure
+/cron.d
+/logrotate.d
+
 # CakePHP specific files #
 ##########################
 /config/app_local.php
 /config/.env
 /logs/*
 /tmp/*
+!/tmp/avatars/empty
 /vendor/*
 
 # IDE and editor specific files #
@@ -115,3 +124,6 @@ atlassian-ide-plugin.xml
 ## File-based project format:
 *.ipr
 *.iws
+
+# Tilt
+tilt_modules*

.gitlab-ci.yml

@@ -1,10 +1,11 @@
 image: alpine:latest
+
 variables:
+  DOCKER_HOST: tcp://localhost:2375
+  DOCKER_DRIVER: overlay2
   DOCKER_TLS_CERTDIR: ""
 
-
 stages:
-#  - test
   - unit-test
   - package-deps
   - package-build
@@ -13,14 +14,13 @@ stages:
   - publish-artifacts
 
 include:
-#  - template: Code-Quality.gitlab-ci.yml
+  - template: Code-Quality.gitlab-ci.yml
   - local: '/.gitlab-ci/Jobs/php_unit_tests.yml'
-#  - local: '/.gitlab-ci/Jobs/artifact_build.yml'
-#  - local: '/.gitlab-ci/Jobs/debian_package_build.yml'
+  - local: '/.gitlab-ci/Jobs/artifact_build.yml'
+  - local: '/.gitlab-ci/Jobs/debian_package_build.yml'
+  - local: '/.gitlab-ci/Jobs/packages_tests.yml'
   - local: '/.gitlab-ci/Jobs/style_check.yml'
+  - local: '/.gitlab-ci/Jobs/rpm_package_build.yml'
 
-cache:
-  paths:
-    - vendor/
-
-
+code_quality:
+  stage: unit-test

.gitlab-ci/Jobs/debian_package_build.yml

@@ -3,7 +3,7 @@ services:
 
 .rules:
   rules:
-    - if: '$CI_COMMIT_BRANCH =~ /^(feature\/debian\_*|master|release)/ || ($CI_COMMIT_BRANCH == "develop" && $CI_PIPELINE_SOURCE == "schedule")'
+    - if: '$CI_COMMIT_BRANCH =~ /^(snyk-fix*|feature\/debian\_*|master|release)/ || ($CI_COMMIT_BRANCH == "develop" && $CI_PIPELINE_SOURCE == "schedule")'
       when: on_success
 
 .dependencies:
@@ -58,17 +58,6 @@ build-debian:
       cp ../*.buildinfo .
       cp ../*.changes .
 
-.kitchen-test:
-  extends: .rules
-  image: chef/chefdk:latest
-  stage: package-test
-  dependencies:
-    - composer
-    - build-debian
-  script:
-    - gem install bundler:2.1.2
-    - kitchen verify $KITCHEN_JOB -t tests/integration
-
 .publish:
   image: registry.gitlab.com/passbolt/passbolt-ops/passbolt-aptly
   stage: publish
@@ -117,57 +106,3 @@ ubuntu-stable:
     - if: '$CI_COMMIT_MESSAGE =~ /publish-package/'
       when: on_success
 
-debian-fs:
-  extends: .kitchen-test
-  dependencies:
-    - composer
-  variables:
-    KITCHEN_JOB: filesystem-benchmarks-debian-buster
-
-debian-purge:
-  extends: .kitchen-test
-  variables:
-    KITCHEN_JOB: purge-benchmarks-debian-buster
-
-debian-runtime:
-  extends: .kitchen-test
-  variables:
-    KITCHEN_JOB: runtime-benchmarks-debian-buster
-
-debian-break:
-  extends: .kitchen-test
-  variables:
-    KITCHEN_JOB: break-benchmarks-debian-buster
-
-ubuntu-1804-fs:
-  extends: .kitchen-test
-  allow_failure: true
-  variables:
-    KITCHEN_JOB: filesystem-benchmarks-ubuntu-1804
-
-ubuntu-1804-purge:
-  extends: .kitchen-test
-  allow_failure: true
-  variables:
-    KITCHEN_JOB: purge-benchmarks-ubuntu-1804
-
-ubuntu-1804-runtime:
-  extends: .kitchen-test
-  allow_failure: true
-  variables:
-    KITCHEN_JOB: runtime-benchmarks-ubuntu-1804
-
-ubuntu-2004-fs:
-  extends: .kitchen-test
-  variables:
-    KITCHEN_JOB: filesystem-benchmarks-ubuntu-2004
-
-ubuntu-2004-purge:
-  extends: .kitchen-test
-  variables:
-    KITCHEN_JOB: purge-benchmarks-ubuntu-2004
-
-ubuntu-2004-runtime:
-  extends: .kitchen-test
-  variables:
-    KITCHEN_JOB: runtime-benchmarks-ubuntu-2004

.gitlab-ci/Jobs/packages_tests.yml

@@ -0,0 +1,175 @@
+.kitchen-test:
+  extends: .rules
+  image: chef/chefdk:latest
+  stage: package-test
+  script:
+    - gem install bundler:2.1.2
+    - kitchen verify $KITCHEN_JOB -t tests/integration
+
+# Debian/Ubuntu package testing
+#
+.kitchen-test-debian:
+  extends: .kitchen-test
+  dependencies:
+    - composer
+    - build-debian
+  script:
+    - ls -las
+    - gem install bundler:2.1.2
+    - kitchen verify $KITCHEN_JOB -t tests/integration
+
+debian-buster-fs:
+  extends: .kitchen-test-debian
+  dependencies:
+    - composer
+  variables:
+    KITCHEN_JOB: filesystem-benchmarks-debian-buster
+
+debian-buster-purge:
+  extends: .kitchen-test-debian
+  variables:
+    KITCHEN_JOB: purge-benchmarks-debian-buster
+
+debian-buster-runtime:
+  extends: .kitchen-test-debian
+  variables:
+    KITCHEN_JOB: runtime-benchmarks-debian-buster
+
+debian-buster-break:
+  extends: .kitchen-test-debian
+  variables:
+    KITCHEN_JOB: break-benchmarks-debian-buster
+
+debian-bullseye-fs:
+  extends: .kitchen-test-debian
+  dependencies:
+    - composer
+  variables:
+    KITCHEN_JOB: filesystem-benchmarks-debian-bullseye
+
+debian-bullseye-purge:
+  extends: .kitchen-test-debian
+  variables:
+    KITCHEN_JOB: purge-benchmarks-debian-bullseye
+
+debian-bullseye-runtime:
+  extends: .kitchen-test-debian
+  variables:
+    KITCHEN_JOB: runtime-benchmarks-debian-bullseye
+
+debian-bullseye-break:
+  extends: .kitchen-test-debian
+  variables:
+    KITCHEN_JOB: break-benchmarks-debian-bullseye
+
+ubuntu-1804-fs:
+  extends: .kitchen-test-debian
+  allow_failure: true
+  variables:
+    KITCHEN_JOB: filesystem-benchmarks-ubuntu-1804
+
+ubuntu-1804-purge:
+  extends: .kitchen-test-debian
+  allow_failure: true
+  variables:
+    KITCHEN_JOB: purge-benchmarks-ubuntu-1804
+
+ubuntu-1804-runtime:
+  extends: .kitchen-test-debian
+  allow_failure: true
+  variables:
+    KITCHEN_JOB: runtime-benchmarks-ubuntu-1804
+
+ubuntu-2004-fs:
+  extends: .kitchen-test-debian
+  variables:
+    KITCHEN_JOB: filesystem-benchmarks-ubuntu-2004
+
+ubuntu-2004-purge:
+  extends: .kitchen-test-debian
+  variables:
+    KITCHEN_JOB: purge-benchmarks-ubuntu-2004
+
+ubuntu-2004-runtime:
+  extends: .kitchen-test-debian
+  variables:
+    KITCHEN_JOB: runtime-benchmarks-ubuntu-2004
+
+# Yum package testing
+
+.kitchen-test-yum:
+  extends: .kitchen-test
+  needs:
+    - job: composer
+      artifacts: true
+    - job: build-yum
+      artifacts: true
+
+.kitchen-test-yum-7:
+  extends: .kitchen-test
+  needs:
+    - job: composer
+      artifacts: true
+    - job: build-yum-7
+      artifacts: true
+
+centos-7-fs:
+  extends: .kitchen-test-yum-7
+  variables:
+    KITCHEN_JOB: filesystem-benchmarks-centos-7
+
+centos-7-purge:
+  extends: .kitchen-test-yum-7
+  variables:
+    KITCHEN_JOB: purge-benchmarks-centos-7
+
+centos-7-runtime:
+  extends: .kitchen-test-yum-7
+  variables:
+    KITCHEN_JOB: runtime-benchmarks-centos-7
+
+centos-7-break:
+  extends: .kitchen-test-yum-7
+  allow_failure: true
+  variables:
+    KITCHEN_JOB: break-benchmarks-centos-7
+
+centos-8-fs:
+  extends: .kitchen-test-yum
+  variables:
+    KITCHEN_JOB: filesystem-benchmarks-centos-8
+
+centos-8-purge:
+  extends: .kitchen-test-yum
+  variables:
+    KITCHEN_JOB: purge-benchmarks-centos-8
+
+centos-8-runtime:
+  extends: .kitchen-test-yum
+  variables:
+    KITCHEN_JOB: runtime-benchmarks-centos-8
+
+centos-8-break:
+  extends: .kitchen-test-yum
+  variables:
+    KITCHEN_JOB: break-benchmarks-centos-8
+
+rockylinux-8-fs:
+  extends: .kitchen-test-yum
+  variables:
+    KITCHEN_JOB: filesystem-benchmarks-rockylinux-8
+
+rockylinux-8-purge:
+  extends: .kitchen-test-yum
+  variables:
+    KITCHEN_JOB: purge-benchmarks-rockylinux-8
+
+rockylinux-8-runtime:
+  extends: .kitchen-test-yum
+  variables:
+    KITCHEN_JOB: runtime-benchmarks-rockylinux-8
+
+rockylinux-8-break:
+  extends: .kitchen-test-yum
+  variables:
+    KITCHEN_JOB: break-benchmarks-rockylinux-8