Merge branch 'insiders-admin' into patch-2024.12.3

karrioapi · Feb 1, 2025 · 30ef22c · 30ef22c
2 parents 23dbcea + 24ba4ee
commit 30ef22c
Show file tree

Hide file tree

Showing 15 changed files with 240 additions and 234 deletions.
diff --git a/.github/workflows/platform-build.yml b/.github/workflows/platform-build.yml
@@ -55,6 +55,11 @@ jobs:
       contents: read
       packages: write
     steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.GH_PAT }}
+
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -100,4 +105,4 @@ jobs:
           PULUMI_STATE_BUCKET: ${{ secrets.PULUMI_STATE_BUCKET }}
         run: |
           pulumi login s3://${{ secrets.PULUMI_STATE_BUCKET }}
-          cd ee/platform/infra && pulumi up -s karrio-us --skip-preview --yes
+          cd ee/platform/packages/infra && pulumi up -s karrio-us --skip-preview --yes
diff --git a/apps/api/karrio/server/VERSION b/apps/api/karrio/server/VERSION
@@ -1 +1 @@
-2024.12.2
+2024.12.3
diff --git a/apps/www/openapi.yml b/apps/www/openapi.yml
@@ -14,7 +14,7 @@ info:
     ## Versioning
 
     When backwards-incompatible changes are made to the API, a new, dated version is released.
-    The current version is `2024.12.2`.
+    The current version is `2024.12.3`.
 
     Read our API changelog to learn more about backwards compatibility.
 
@@ -84,7 +84,7 @@ info:
     All API requests must be made over [HTTPS](http://en.wikipedia.org/wiki/HTTP_Secure).
     API requests without authentication will also fail.
   title: Karrio API
-  version: 2024.12.2
+  version: 2024.12.3
 paths:
   /:
     get:

diff --git a/bin/deploy-hobby b/bin/deploy-hobby
@@ -2,7 +2,7 @@
 
 set -e
 
-export KARRIO_TAG="${KARRIO_TAG:-2024.12.2}"
+export KARRIO_TAG="${KARRIO_TAG:-2024.12.3}"
 export SENTRY_DSN="${SENTRY_DSN:-'https://public@sentry.example.com/1'}"
 
 SECRET_KEY=$(head -c 28 /dev/urandom | sha224sum -b | head -c 56)
@@ -23,7 +23,7 @@ if ! [ -z "$1" ]
 then
 export KARRIO_TAG=$1
 else
-echo "What version of Karrio would you like to install? (We default to '2024.12.2')"
+echo "What version of Karrio would you like to install? (We default to '2024.12.3')"
 echo "You can check out available versions here: https://hub.docker.com/r/karrio/server/tags"
 read -r KARRIO_TAG_READ
 if [ -z "$KARRIO_TAG_READ" ]

diff --git a/bin/deploy-insiders b/bin/deploy-insiders
@@ -2,7 +2,7 @@
 
 set -e
 
-export KARRIO_TAG="${KARRIO_TAG:-2024.12.2}"
+export KARRIO_TAG="${KARRIO_TAG:-2024.12.3}"
 export SENTRY_DSN="${SENTRY_DSN:-'https://public@sentry.example.com/1'}"
 
 SECRET_KEY=$(head -c 28 /dev/urandom | sha224sum -b | head -c 56)

diff --git a/bin/update-version b/bin/update-version
@@ -15,5 +15,5 @@ if [ -d "ee/insiders" ]; then
 fi
 
 if [ -d "ee/platform" ]; then
-    sed -i '' -e "s/${1}/${2}/g" ee/platform/infra/Pulumi.karrio-us.yaml
+    sed -i '' -e "s/${1}/${2}/g" ee/platform/packages/infra/Pulumi.karrio-us.yaml
 fi
diff --git a/bin/upgrade-hobby b/bin/upgrade-hobby
@@ -44,7 +44,7 @@ else
 fi
 
 [[ -f ".env" ]] && export $(cat .env | xargs) || ( echo "No .env file found. Please create it with SECRET_KEY and DOMAIN set." && exit 1)
-export KARRIO_TAG="${KARRIO_TAG:-2024.12.2}"
+export KARRIO_TAG="${KARRIO_TAG:-2024.12.3}"
 
 # get karrio scripts
 mkdir -p ./karrio

diff --git a/docker/.env b/docker/.env
@@ -30,7 +30,7 @@ REDIS_PORT=6379
 # API - Configuration for the Nginx Reverse proxy.
 ############
 
-KARRIO_TAG=2024.12.2
+KARRIO_TAG=2024.12.3
 KARRIO_HTTP_PORT=5002
 
 ############

diff --git a/package.json b/package.json
@@ -20,7 +20,8 @@
     "apps/*",
     "packages/*",
     "ee/apps/*",
-    "ee/packages/*"
+    "ee/packages/*",
+    "ee/platform/packages/*"
   ],
   "packageManager": "npm@10.8.2"
 }
diff --git a/requirements.insiders.txt b/requirements.insiders.txt
diff --git a/requirements.platform.txt b/requirements.platform.txt
diff --git a/requirements.txt b/requirements.txt
diff --git a/source.requirements.insiders.txt b/source.requirements.insiders.txt
@@ -3,7 +3,7 @@ asgiref==3.8.1
 attrs==25.1.0
 backoff==2.2.1
 Brotli==1.1.0
-certifi==2024.12.14
+certifi==2025.1.31
 cffi==1.17.1
 charset-normalizer==3.4.1
 click==8.1.8
@@ -22,7 +22,7 @@ django-extensions==3.2.3
 django-filter==24.3
 django-formtools==2.5.1
 django-health-check==3.18.3
-django-import-export==4.3.4
+django-import-export==4.3.5
 django-oauth-toolkit==3.0.1
 django-organizations==2.5.0
 django-otp==1.5.4
@@ -34,7 +34,7 @@ djangorestframework==3.15.2
 djangorestframework_simplejwt==5.4.0
 drf-api-tracking==1.8.4
 drf-spectacular==0.28.0
-fonttools==4.55.6
+fonttools==4.55.8
 graphql-core==3.2.6
 gunicorn==23.0.0
 h11==0.14.0
@@ -117,9 +117,9 @@ monotonic==1.6
 more-itertools==10.6.0
 oauthlib==3.2.2
 packaging==24.2
-phonenumbers==8.13.53
+phonenumbers==8.13.54
 pillow==11.1.0
-posthog==3.10.0
+posthog==3.11.0
 psutil==6.1.1
 psycopg2-binary==2.9.10
 py-soap==2020.3.2
@@ -132,7 +132,7 @@ pypng==0.20220715.0
 python-barcode==0.15.1
 python-dateutil==2.9.0.post0
 python-decouple==3.8
-pytz==2024.2
+pytz==2025.1
 PyYAML==6.0.2
 pyzint==0.1.10
 qrcode==7.4.2
@@ -152,7 +152,7 @@ uritemplate==4.1.1
 urllib3==2.3.0
 uvicorn==0.34.0
 validators==0.34.0
-weasyprint==63.1
+weasyprint==64.0
 webencodings==0.5.1
 whitenoise==6.8.2
 xmltodict==0.14.2

diff --git a/source.requirements.platform.txt b/source.requirements.platform.txt
@@ -3,7 +3,7 @@ asgiref==3.8.1
 attrs==25.1.0
 backoff==2.2.1
 Brotli==1.1.0
-certifi==2024.12.14
+certifi==2025.1.31
 cffi==1.17.1
 charset-normalizer==3.4.1
 click==8.1.8
@@ -22,7 +22,7 @@ django-extensions==3.2.3
 django-filter==24.3
 django-formtools==2.5.1
 django-health-check==3.18.3
-django-import-export==4.3.4
+django-import-export==4.3.5
 django-oauth-toolkit==3.0.1
 django-organizations==2.5.0
 django-otp==1.5.4
@@ -35,7 +35,7 @@ djangorestframework==3.15.2
 djangorestframework_simplejwt==5.4.0
 drf-api-tracking==1.8.4
 drf-spectacular==0.28.0
-fonttools==4.55.6
+fonttools==4.55.8
 graphql-core==3.2.6
 gunicorn==23.0.0
 h11==0.14.0
@@ -119,9 +119,9 @@ monotonic==1.6
 more-itertools==10.6.0
 oauthlib==3.2.2
 packaging==24.2
-phonenumbers==8.13.53
+phonenumbers==8.13.54
 pillow==11.1.0
-posthog==3.10.0
+posthog==3.11.0
 psutil==6.1.1
 psycopg2-binary==2.9.10
 py-soap==2020.3.2
@@ -134,7 +134,7 @@ pypng==0.20220715.0
 python-barcode==0.15.1
 python-dateutil==2.9.0.post0
 python-decouple==3.8
-pytz==2024.2
+pytz==2025.1
 PyYAML==6.0.2
 pyzint==0.1.10
 qrcode==7.4.2
@@ -154,7 +154,7 @@ uritemplate==4.1.1
 urllib3==2.3.0
 uvicorn==0.34.0
 validators==0.34.0
-weasyprint==63.1
+weasyprint==64.0
 webencodings==0.5.1
 whitenoise==6.8.2
 xmltodict==0.14.2

diff --git a/source.requirements.txt b/source.requirements.txt
@@ -3,7 +3,7 @@ asgiref==3.8.1
 attrs==25.1.0
 backoff==2.2.1
 Brotli==1.1.0
-certifi==2024.12.14
+certifi==2025.1.31
 cffi==1.17.1
 charset-normalizer==3.4.1
 click==8.1.8
@@ -20,7 +20,7 @@ django-email-verification==0.3.3
 django-filter==24.3
 django-formtools==2.5.1
 django-health-check==3.18.3
-django-import-export==4.3.4
+django-import-export==4.3.5
 django-oauth-toolkit==3.0.1
 django-otp==1.5.4
 django-phonenumber-field==8.0.0
@@ -31,7 +31,7 @@ djangorestframework==3.15.2
 djangorestframework_simplejwt==5.4.0
 drf-api-tracking==1.8.4
 drf-spectacular==0.28.0
-fonttools==4.55.6
+fonttools==4.55.8
 graphql-core==3.2.6
 gunicorn==23.0.0
 h11==0.14.0
@@ -108,9 +108,9 @@ monotonic==1.6
 more-itertools==10.6.0
 oauthlib==3.2.2
 packaging==24.2
-phonenumbers==8.13.53
+phonenumbers==8.13.54
 pillow==11.1.0
-posthog==3.10.0
+posthog==3.11.0
 psutil==6.1.1
 psycopg2-binary==2.9.10
 py-soap==2020.3.2
@@ -123,7 +123,7 @@ pypng==0.20220715.0
 python-barcode==0.15.1
 python-dateutil==2.9.0.post0
 python-decouple==3.8
-pytz==2024.2
+pytz==2025.1
 PyYAML==6.0.2
 pyzint==0.1.10
 qrcode==7.4.2
@@ -143,7 +143,7 @@ uritemplate==4.1.1
 urllib3==2.3.0
 uvicorn==0.34.0
 validators==0.34.0
-weasyprint==63.1
+weasyprint==64.0
 webencodings==0.5.1
 whitenoise==6.8.2
 xmltodict==0.14.2