1
0
Fork 0
mirror of synced 2024-08-31 01:41:15 +12:00
Commit graph

3448 commits

Author SHA1 Message Date
Christy Jacob
0c2cd174a5 chore: prep for 1.4.4 2023-09-27 21:28:28 +00:00
Christy Jacob
50600d6f2a
Merge pull request #6343 from appwrite/master
Merge master into 1.4.x
2023-09-27 17:20:32 -04:00
shimon
dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
shimon
c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Matej Bačo
872531dc95 Fix execution call timeout 2023-09-26 10:06:22 +02:00
Christy Jacob
79d7bd8379 chore: linter 2023-09-26 00:10:17 +04:00
Christy Jacob
39dc153a22 chore: remove comments 2023-09-26 00:05:01 +04:00
Christy Jacob
d4debddc46 chore: update hamster script 2023-09-26 00:01:42 +04:00
Christy Jacob
d1d523e1dc chore: update hamster script 2023-09-26 00:01:34 +04:00
Torsten Dittmann
c273e3d8e1
Merge pull request #6229 from btme0011/fix-6212-Issue-With-Linkedin-OAuth 2023-09-24 01:57:58 +02:00
Matej Bačo
4984b01ef4 Merge branch '1.4.x' into feat-https-function-domains 2023-09-21 10:10:07 +02:00
Matej Bačo
8926d24a0d One more env var rename 2023-09-19 09:35:32 +02:00
Matej Bačo
d87dbad768 PR review changes 2023-09-19 09:31:57 +02:00
Matej Bačo
94117ed471 Fix build race condition 2023-09-18 12:33:05 +02:00
Matej Bačo
6a7950aa34 Add function domains force https 2023-09-18 12:27:47 +02:00
Jake Barnby
9ba609c46e
Merge pull request #6238 from appwrite/1.4.x
1.4.x
2023-09-15 18:49:55 -04:00
Jake Barnby
ff7b102550
Merge remote-tracking branch 'origin/1.4.x' into chore-update-appwrite-version 2023-09-15 12:21:42 -04:00
Christy Jacob
bede0d43d4 fix: add try catch block in the schedules task 2023-09-15 05:24:00 +00:00
Christy Jacob
1e6b37f980 chore: update appwrite version 2023-09-14 19:53:32 +00:00
Christy Jacob
50405f838e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into chore-cleanup-dockerfile 2023-09-14 18:07:53 +00:00
Akhil Anand
5ba6491dd5 fix-6212-Issue-With-Linkedin-OAuth 2023-09-14 13:16:45 +05:30
Akhil Anand
2aa788d7d5 fix-6212-Issue-With-Linkedin-OAuth 2023-09-13 21:31:26 +05:30
Binyamin Yawitz
5cb03da001 Extracting function event validator to its own class. 2023-09-11 23:24:11 -04:00
Jake Barnby
d4f6b99ee2
Fix mock enum endpoint 2023-09-07 19:25:42 -04:00
Christy Jacob
b9675f736b
Update src/Appwrite/Migration/Version/V19.php
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2023-09-06 23:32:49 -04:00
Christy Jacob
732a2b4a98 chore: linter 2023-09-06 22:10:43 +00:00
Christy Jacob
4250a634d3 Merge branch 'fix-migration-issues' of https://github.com/appwrite/appwrite into fix-migration-issues 2023-09-06 22:08:55 +00:00
Christy Jacob
c439202d3c chore: review comments 2023-09-06 22:08:26 +00:00
Christy Jacob
d96a6d7883
Apply suggestions from code review
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2023-09-06 18:06:31 -04:00
Christy Jacob
ec9ecb6cd4 chore: linter 2023-09-06 20:08:07 +00:00
Christy Jacob
430ec73a98 fix: incorrect attribute name 2023-09-06 20:01:43 +00:00
Christy Jacob
aac46cd5fe fix: migration issues 2023-09-06 19:59:42 +00:00
Christy Jacob
5cfabc7a12 fix: migrations fix and update changelog 2023-09-06 19:25:07 +00:00
Christy Jacob
11f2ee8a1c feat: prep for 1.4.2 2023-09-06 18:22:04 +00:00
Christy Jacob
4ea0541623
Merge pull request #6150 from appwrite/fix-global-vars
Fix: Global variables
2023-09-06 13:51:13 -04:00
Christy Jacob
30713f58f9
Merge pull request #6146 from appwrite/fix-create-function-request-filter
Fix create execution request filter from previous SDK version
2023-09-05 23:50:08 -04:00
Christy Jacob
53b1c87c6e
Merge pull request #6141 from appwrite/fix-overwrite-executor-variable
Fix _APP_EXECUTOR_HOST for upgrades
2023-09-05 19:35:31 -04:00
Matej Bačo
79726dbfb6 Fix formatting 2023-09-05 13:16:20 +02:00
Matej Bačo
1b9236ba3f Improve VCS error when creating repository 2023-09-05 11:48:23 +02:00
Matej Bačo
1a6530fb57 Fix project variables 2023-09-05 10:21:36 +02:00
Steven Nguyen
4c90b6bb1c
Add required params for scheduled functions 2023-09-04 17:02:17 -07:00
Steven Nguyen
65e2e79457
Fix create execution request filter from previous SDK version
When an older SDK executes a function without passing any data, the
data param is unset/null so we need to make sure to handle that case.
2023-09-04 16:10:49 -07:00
Steven Nguyen
ceb1188e8a
Override forEachDocument() to skip the cache collection
Skip the cache collection because:

1. There may be * in the $id of the document which causes problems
   when paginating with a cursor.
1. Nothing was done to the cache collection so we don't need to process
   it.
2023-09-04 13:25:27 -07:00
Steven Nguyen
3c7c44adda
Fix _APP_EXECUTOR_HOST for upgrades
As of 1.4.0, the hostname of the executor should be executor rather than
appwrite-executor. The problem is our install command always uses the
existing installation's variable values as the default for the upgrade.
This means the _APP_EXECUTOR_HOST will retain it's old value.

This PR Adds an overwrite key to variables.php to allow overwriting the
variable value regardless of whatever was in the previous installation.
2023-09-04 11:06:43 -07:00
Steven Nguyen
c7929572f3
Fix builds migration 2023-09-04 09:04:15 -07:00
Steven Nguyen
605ee2f7c5
Update create deployment default commands
Default to function commands only if commands weren't supplied.
2023-09-04 09:04:15 -07:00
Steven Nguyen
87b0851092
Fix executions migrations 2023-09-02 19:13:15 -07:00
Steven Nguyen
9aeb15c337
Fix variables migration
Set new resourceType attribute to function since all variables were
function variables.
2023-09-02 18:35:26 -07:00
Steven Nguyen
f317d33fc7
Skip migrating domains without project because it would throw an error 2023-09-02 18:06:50 -07:00
Steven Nguyen
03c2a16306
Fix update migrations for functions and deployments
- Create additional attributes for the deployments collection.
- Set the commands attribute for the functions and deployments based on
  runtime.
2023-09-02 17:29:38 -07:00
Christy Jacob
31a7cca906 chore: add missing env variable 2023-09-01 17:08:51 -04:00
Jake Barnby
1dc2c08e15
Merge pull request #6095 from appwrite/fix-function-schedule-migration
Update migration script to not remove schedule from functions
2023-09-01 15:06:37 -04:00
Steven Nguyen
dcc676a0c9
Make install confirmation case insensitive
When a previous installation is found during installation/upgrade, the
user is prompted to confirm whether they want to overwrite it. We
originally only accepted 'Y', but this PR changes it to accept 'y' as
well to reduce friction.
2023-08-31 12:25:42 -07:00
Steven Nguyen
c8d6ac0267
Update migration script to not remove schedule from functions 2023-08-31 08:40:53 -07:00
Steven Nguyen
bd89fd4bf5
Fix domains migration
The previous approach tried to migrate the 'rules' collection, but that
didn't work because the data was in the 'domains' collection.

Since the 'domains' collection was removed, the migration is now done
when migrating the 'projects' collection by fetching the domains and
then creating the rule documents.
2023-08-30 14:22:06 -07:00
Jake Barnby
f10698aebe
Merge pull request #6073 from appwrite/chore-update-version
Chore update version
2023-08-30 16:25:06 -04:00
Jake Barnby
513d913298
Merge remote-tracking branch 'origin/1.4.x' into chore-sync-master
# Conflicts:
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-latest-console.json
2023-08-30 16:11:48 -04:00
Jake Barnby
24bd21e980
Update version 2023-08-30 16:05:51 -04:00
Steven Nguyen
917f2f1d74
Update installation confirmation text
Let the user know a backup will be created.
2023-08-30 12:32:10 -07:00
Steven Nguyen
2f2edd41d5
Update install.php not specify docker-compose.yml file
By not specifying a docker-compose.yml file, docker compose
automatically uses the docker-compose.yml file in the project directory
and a docker-compose.override.yml file if one is present.
2023-08-30 10:17:37 -07:00
Steven Nguyen
7d56c6f37e
Prompt developer to confirm installing over existing install 2023-08-30 09:55:27 -07:00
Steven Nguyen
75f7459c40
Create a dedicated upgrade task
Before, we used the same command for both installation and upgrades.
This lead to problems because developers would try to upgrade in the
wrong folder and end up creating a new installation.

This new upgrade command validates the existence of an existing
installation before proceeding with the upgrade to ensure no new
installation is created when upgrading.
2023-08-30 09:55:18 -07:00
Steven Nguyen
48f0ff86ba
Make the install path a class property
This makes it so the property can be used by subclasses.
2023-08-30 09:50:47 -07:00
Christy Jacob
cc8aa27fea feat: update specs 2023-08-30 12:36:47 -04:00
Torsten Dittmann
48c5a09b4f fix: string interpolation 2023-08-30 11:21:28 +02:00
Jake Barnby
84177b0fb0
Merge remote-tracking branch 'origin/feat-git-integration' into feat-git-integration-no-hook 2023-08-29 11:59:44 -04:00
Matej Bačo
ca40bf6702 Merge branch 'feat-git-integration' into fix-smtp-behaviour 2023-08-29 11:41:15 +02:00
Matej Bačo
c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Jake Barnby
0a1ab4ae60
Add back codes env var 2023-08-28 22:24:52 -04:00
Jake Barnby
ece93a14e5
Fix install task 2023-08-28 18:09:37 -04:00
Matej Bačo
d4acbcf4f0 Add domain_enabled var 2023-08-28 16:08:50 +02:00
Matej Bačo
89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Bradley Schofield
77aa48c22a Update Mail.php 2023-08-28 06:53:29 +01:00
Bradley Schofield
608b6b3847
Continue work 2023-08-27 23:45:37 +01:00
Matej Bačo
596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Matej Bačo
8802e318d5 Fix pools resource 2023-08-23 13:52:17 +02:00
Matej Bačo
d3a9766c4f Sync env & storage setup with 1.4.x 2023-08-23 12:08:48 +02:00
Matej Bačo
bdc9cb5bb5 QA changes 2023-08-23 10:29:01 +02:00
Matej Bačo
43b1c196e0 Merge branch 'feat-git-integration' into feat-git-integration-copy 2023-08-23 10:16:23 +02:00
Jake Barnby
e15a9ac280
Clean up attributes to be deleted 2023-08-22 19:36:46 -04:00
Jake Barnby
6f775a2411
Review updates 2023-08-22 19:14:23 -04:00
Jake Barnby
39ef0cc3c9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-git-integration-update-migration
# Conflicts:
#	app/controllers/api/proxy.php
#	composer.lock
2023-08-22 18:07:11 -04:00
Jake Barnby
aec59074df
Update src/Appwrite/Utopia/Request/Filters/V16.php 2023-08-22 17:24:27 -04:00
Jake Barnby
02f8e7796d
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters 2023-08-22 17:20:50 -04:00
Jake Barnby
0094ced967
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4.x-response-filters 2023-08-22 17:13:12 -04:00
Vincent (Wen Yu) Ge
07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00:00
Jake Barnby
87b72e4d0d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4-request-response-filters 2023-08-22 16:01:19 -04:00
Jake Barnby
360935fd28
Apply suggestions from code review 2023-08-22 14:13:37 -04:00
Jake Barnby
6a9588c4be
Update src/Appwrite/Extend/Exception.php 2023-08-22 13:38:43 -04:00
Jake Barnby
c3682362e9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:44 -04:00
Jake Barnby
e7d5d25263
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4.x-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:03 -04:00
Jake Barnby
c929fe113e
Fix colliding ID overrides 2023-08-22 13:11:32 -04:00
Jake Barnby
97429bf57f
Merge remote-tracking branch 'origin/feat-git-integration-update-migration' into revert-some-migrations
# Conflicts:
#	src/Appwrite/Migration/Version/V19.php
2023-08-22 10:10:46 -04:00
Matej Bačo
ee06ecf5c5 Linter 2023-08-22 15:18:07 +02:00
Matej Bačo
eea43e17bd Fix function request filter 2023-08-22 15:16:07 +02:00
Khushboo Verma
ad680d547a Fix grammar in GitHub comments 2023-08-22 16:52:42 +05:30
Matej Bačo
7c1a387a37 Improve commands quality 2023-08-22 10:16:17 +02:00
Steven Nguyen
7e6eb59cdf
Additional updates from index changes 2023-08-21 17:12:10 -07:00
Steven Nguyen
8ebfbf04b8
Revert usage/stats migrations
We won't releasing the usage changes this release because the migrations
would be too big/complex.
2023-08-21 15:53:30 -07:00
Steven Nguyen
45be279b75
Skip updating _uid attribute and _permission index
These updates make use of the PDO to manually execute a SQL statement,
but the PDO is not available in the new migration platform task. So
that we can move forward with the release, we will skip these updates
and then figure it out in a subsequent release.
2023-08-21 15:53:30 -07:00