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

[full-ci] ocis init & remove default secrets #3551

Merged
merged 68 commits into from
May 2, 2022
Merged

[full-ci] ocis init & remove default secrets #3551

merged 68 commits into from
May 2, 2022

Conversation

dragonchaser
Copy link
Contributor

@dragonchaser dragonchaser commented Apr 20, 2022 •
edited by wkloucek
Loading

Add ocis init subcommand and remove default secrets

fixes #212
fixes #3628

@dragonchaser
initial skel for subcommand
c9c329b 
Signed-off-by: Christian Richter <[email protected]>
@dragonchaser
refactor yaml labels, add overwrite protection
8d81e39 
Signed-off-by: Christian Richter <[email protected]>
@dragonchaser
add password generator
3956108 
Signed-off-by: Christian Richter <[email protected]>
@update-docs
Copy link

update-docs bot commented Apr 20, 2022

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@dragonchaser dragonchaser force-pushed the ocis-init branch 2 times, most recently from f82fad3 to 66cbd96 Compare April 20, 2022 09:45
@dragonchaser
handle insecure flag
88cf3ee 
Signed-off-by: Christian Richter <[email protected]>
@dragonchaser dragonchaser force-pushed the ocis-init branch 4 times, most recently from a49a5cc to f77c001 Compare April 25, 2022 14:28
@dragonchaser
Move Tokenmanager to shared.Commons
acf75af 
Signed-off-by: Christian Richter <[email protected]>
@wkloucek wkloucek mentioned this pull request Apr 26, 2022
Merged
9 tasks
@wkloucek wkloucek requested review from C0rby, butonic and kobergj and removed request for phil-davis, individual-it, kulmann, pascalwengerter and wkloucek April 29, 2022 14:15
kobergj
kobergj previously requested changes Apr 29, 2022
View reviewed changes
Copy link
Collaborator

@kobergj kobergj left a comment

Choose a reason for hiding this comment

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

Picky me found the one typo in your 2700 added lines. Rest looks awesome 👍

.vscode/launch.json Show resolved Hide resolved
ocis/pkg/command/init.go Outdated Show resolved Hide resolved
ocis/pkg/init/init.go Show resolved Hide resolved
@butonic
nitpicks and typo
6474d46 
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
butonic
butonic reviewed Apr 29, 2022
View reviewed changes
extensions/thumbnails/pkg/config/config.go
@@ -42,6 +42,6 @@ type Thumbnail struct {
CS3AllowInsecure bool `yaml:"cs3_allow_insecure" env:"OCIS_INSECURE;THUMBNAILS_CS3SOURCE_INSECURE"`
RevaGateway string `yaml:"reva_gateway" env:"REVA_GATEWAY"` //TODO: use REVA config
FontMapFile string `yaml:"font_map_file" env:"THUMBNAILS_TXT_FONTMAP_FILE"`
TransferTokenSecret string `yaml:"transfer_token" env:"THUMBNAILS_TRANSFER_TOKEN"`
TransferSecret string `yaml:"transfer_secret" env:"STORAGE_TRANSFER_TOKEN;THUMBNAILS_TRANSFER_TOKEN"`
Copy link
Member

Choose a reason for hiding this comment

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

why use transfer_secret when the env var is *_TRANSFER_TOKEN and the actual response uses transferToken as well?

@butonic
try to make lint happy
9d8072c 
Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
butonic
butonic approved these changes Apr 29, 2022
View reviewed changes
Copy link
Member

@butonic butonic 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.

what a beast. the only thing we should address in subsequent PRs are:

@dragonchaser I found a way to make the linter happy ;-)

Code duplication is expected for this kind of repetitiveness. The config structs eg. need to be duplicated so the services can configure their own environment variables using tags.

I will merge ASAG

@butonic
Copy link
Member

butonic commented Apr 29, 2022 •
edited
Loading

ok one unexpected pass in https://drone.owncloud.com/owncloud/ocis/11166/44/9

runsh: There were no unexpected failures.
runsh: Total unexpected passed scenarios throughout the test run:
webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:41

restarting to see if it is flakyness

seems to be constant:
https://drone.owncloud.com/owncloud/ocis/11165/44/9
https://drone.owncloud.com/owncloud/ocis/11167/44/9

@sonarqubecloud
Copy link

sonarqubecloud bot commented May 2, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 21 Code Smells

2.6% 2.6% Coverage
50.8% 50.8% Duplication

@wkloucek
Copy link
Contributor

wkloucek commented May 2, 2022

ok one unexpected pass in https://drone.owncloud.com/owncloud/ocis/11166/44/9

runsh: There were no unexpected failures.
runsh: Total unexpected passed scenarios throughout the test run:
webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:41

restarting to see if it is flakyness

seems to be constant: https://drone.owncloud.com/owncloud/ocis/11165/44/9 https://drone.owncloud.com/owncloud/ocis/11167/44/9

Merging master, which pulls in a test-middleware update, seems to fix it.

@wkloucek wkloucek merged commit 9934895 into master May 2, 2022
@delete-merged-branch delete-merged-branch bot deleted the ocis-init branch May 2, 2022 07:31
ownclouders pushed a commit that referenced this pull request May 2, 2022
@wkloucek
commit 9934895
87778b8 
Merge: b013974 f9dcf37
Author: Willy Kloucek <[email protected]>
Date:   Mon May 2 09:31:01 2022 +0200

    Merge pull request #3551 from owncloud/ocis-init

    [full-ci] ocis init & remove default secrets
This was referenced May 2, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wkloucek wkloucek wkloucek left review comments

@butonic butonic butonic approved these changes

@kobergj kobergj kobergj left review comments

@micbar micbar Awaiting requested review from micbar

@C0rby C0rby Awaiting requested review from C0rby

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

Successfully merging this pull request may close these issues.

Ocis Init subcommand Ocis should not have default secrets
5 participants
@dragonchaser @ownclouders @butonic @wkloucek @kobergj