Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[tests-only] Merge master to edge #2774

Merged
merged 142 commits into from
Apr 25, 2022
Merged

[tests-only] Merge master to edge #2774

merged 142 commits into from
Apr 25, 2022

Conversation

ishank011
Copy link
Contributor

No description provided.

glpatcern and others added 30 commits December 3, 2021 23:57
@glpatcern
[Build-deps] Additional rules for CODEOWNERS (cs3org#2323)
939768a
@gmgigi96
Remove share refs from trashbin (cs3org#2298)
ed9517b
Public link propfind (cs3org#2315)
147c0c2
fix public share type in propfinds (cs3org#2316)
7f7f9ec
@SwikritiT
Bump core commit id for tests (cs3org#2331)
d9eefe2
@ishank011
Revert "Fix content disposition (cs3org#2303)" (cs3org#2332)
4dde766 
This reverts commit 3cba223.
@dependabot
[Build-deps]: Bump github.com/gomodule/redigo from 1.8.5 to 1.8.6 (cs…
8fde5db 
…3org#2326)
@dependabot
[Build-deps]: Bump github.com/mitchellh/mapstructure from 1.4.2 to 1.…
e210912 
…4.3 (cs3org#2324)
@dependabot
[Build-deps]: Bump github.com/aws/aws-sdk-go from 1.42.9 to 1.42.19 (c…
66071c8 
…s3org#2325)
@wkloucek
fix app provider new file action and improve app provider error codes (…
68b64bf 
…cs3org#2210)
@ishank011
Parse URL path to determine file name (cs3org#2346)
2f727fc
@ishank011
v1.17.0
d54df2f
@micbar
handle non existent spaces gracefully (cs3org#2354)
778de37
@SwikritiT
Bump core commit id for tests (cs3org#2365)
7e9eff3
@dependabot
[Build-deps]: Bump github.com/minio/minio-go/v7 from 7.0.16 to 7.0.18 (…
30b629e 
…cs3org#2363)
@dependabot
[Build-deps]: Bump github.com/ReneKroon/ttlcache/v2 from 2.9.0 to 2.1…
2fae455 
…0.0 (cs3org#2358)
@dependabot
[Build-deps]: Bump go.opentelemetry.io/otel/exporters/jaeger (cs3org#…
0771dfa 
…2362)
@wkloucek
fix tests by pointing to the right owncloud/core commit id for tests (c…
8236ffa 
…s3org#2375)
@wkloucek
add new file capabilties to ocs for the app provider (cs3org#2379)
f76d428
@SwikritiT
Remove test from expected to fail and bump commit id (cs3org#2380)
8c6bad6
@phil-davis
add .drone.env to CODEOWNERS as it is part of the test files (cs3org#…
e65efdc 
…2378)
@wkloucek
fix webdav copy for zero byte files (cs3org#2374)
5cde018
@wkloucek @glpatcern
Implement touch file (cs3org#2369)
f3c8b62 
* implement cs3org/cs3apis#154

* use TouchFile for the app provider

* add changelog and comments

* revert use TouchFile in app provider

* fix resource typo

Co-authored-by: Giuseppe Lo Presti <[email protected]>

Co-authored-by: Giuseppe Lo Presti <[email protected]>
@wkloucek
Dummy implementation of the Lock CS3APIs (cs3org#2350)
7196229
@wkloucek
allow new file create with app provider on public links (cs3org#2385)
9c822d0
@phil-davis
Bump core commit id and use core master for tests (cs3org#2391)
cd9a6fb
@kulmann
Add product to ocs Version struct (cs3org#2397)
28ad25c 
The web ui will announce the backend version in the javascript console
and is supposed to include the product name as well. The version seems
to be a good location for the product field as it already includes the
software edition as well.
@saw-jan
bump core commit id for tests (cs3org#2404)
e541601
@dependabot
[Build-deps]: Bump github.com/mattn/go-sqlite3 from 1.14.9 to 1.14.10 (…
f2f4d9d 
…cs3org#2409)
@dependabot
[Build-deps]: Bump github.com/minio/minio-go/v7 from 7.0.18 to 7.0.20 (…
66369ba 
…cs3org#2408)
@ishank011 ishank011 requested review from labkode, wkloucek, glpatcern and a team as code owners April 22, 2022 13:53
@ishank011 ishank011 force-pushed the edge-master-merge branch 4 times, most recently from b3596c8 to 2faea4b Compare April 22, 2022 14:48
@lgtm-com
Copy link

lgtm-com bot commented Apr 22, 2022

This pull request introduces 3 alerts and fixes 1 when merging 2faea4b into c437e57 - view on LGTM.com

new alerts:

  • 2 for Uncontrolled data used in network request
  • 1 for Wrapped error is always nil

fixed alerts:

  • 1 for Wrapped error is always nil

@lgtm-com
Copy link

lgtm-com bot commented Apr 22, 2022

This pull request introduces 3 alerts and fixes 1 when merging 41fa63f into c437e57 - view on LGTM.com

new alerts:

  • 2 for Uncontrolled data used in network request
  • 1 for Wrapped error is always nil

fixed alerts:

  • 1 for Wrapped error is always nil

@ishank011 ishank011 force-pushed the edge-master-merge branch 2 times, most recently from 3a18af1 to 3cd4618 Compare April 22, 2022 17:02
@ishank011
Copy link
Contributor Author

@butonic @micbar @wkloucek @C0rby this is green! PLEASE merge it before any other PRs

@lgtm-com
Copy link

lgtm-com bot commented Apr 22, 2022

This pull request introduces 3 alerts and fixes 1 when merging 3cd4618 into c437e57 - view on LGTM.com

new alerts:

  • 2 for Uncontrolled data used in network request
  • 1 for Wrapped error is always nil

fixed alerts:

  • 1 for Wrapped error is always nil

phil-davis
phil-davis approved these changes Apr 23, 2022
View reviewed changes
Copy link
Contributor

@phil-davis phil-davis left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no changes to expected-failures, or to the drone CI pipelines. So the large amount of code, docs, example... changes here have not introduced any obvious regressions (and have not fixed anything either :)

Someone else can review more detail (if that is possible with 10k lines of diff). But from my point-of-view it may as well be merged and then we move on.,..

@micbar
Copy link
Member

micbar commented Apr 24, 2022

We need to check for regressions with the full ocis CI.

PR in owncloud/ocis#3570

micbar
micbar requested changes Apr 24, 2022
View reviewed changes
Copy link
Member

@micbar micbar left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have some regressions with public links.

@micbar
Copy link
Member

micbar commented Apr 24, 2022 •
edited
Loading

We need to investigate https://drone.owncloud.com/owncloud/ocis/10843/22/6 and https://drone.owncloud.com/owncloud/ocis/10843/49/9

micbar
micbar requested changes Apr 24, 2022
View reviewed changes
Copy link
Member

@micbar micbar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue is the date format change for expire dates. It was only done in the backend, but not yet in ownCloud web. I suggest to revert this one line to make the tests pass. Then do a sychronized change of backend and frontend at the same time.

internal/http/services/owncloud/ocs/conversions/main.go Outdated Show resolved Hide resolved
@micbar
Copy link
Member

micbar commented Apr 24, 2022

Apart from that, awesome job! 🎉

@micbar
Copy link
Member

micbar commented Apr 25, 2022

I restarted the full-CI in oCIS. Should become green now. I will approve then.

@ishank011 @labkode BUT: One last thing, we should not "Squash-merge" this PR, I would like to merge all the commits as they are. Can you change the github config to make that possible?

@lgtm-com
Copy link

lgtm-com bot commented Apr 25, 2022

This pull request introduces 3 alerts and fixes 1 when merging 37c14f1 into c437e57 - view on LGTM.com

new alerts:

  • 2 for Uncontrolled data used in network request
  • 1 for Wrapped error is always nil

fixed alerts:

  • 1 for Wrapped error is always nil

@ishank011
Copy link
Contributor Author

ishank011 commented Apr 25, 2022 •
edited
Loading

@micbar makes sense. I've enabled that option

micbar
micbar approved these changes Apr 25, 2022
View reviewed changes
Copy link
Member

@micbar micbar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oCIS Full test suite is green

@micbar micbar merged commit 0b734be into cs3org:edge Apr 25, 2022
@ishank011 ishank011 deleted the edge-master-merge branch April 25, 2022 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@labkode labkode labkode approved these changes

@micbar micbar micbar approved these changes

@phil-davis phil-davis phil-davis approved these changes

@wkloucek wkloucek Awaiting requested review from wkloucek

@glpatcern glpatcern Awaiting requested review from glpatcern glpatcern is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.