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

License page and License verification #647

Merged
merged 2 commits into from
Mar 22, 2021
Merged

License page and License verification #647

merged 2 commits into from
Mar 22, 2021

Conversation

Alevsk
Copy link
Contributor

@Alevsk Alevsk commented Mar 17, 2021 •
edited

License Page

  • Add ref=op to all <a></a> elements in the License Page
  • If License is activated in Operator UI, change the label from Subscription to Upgrade, when the user click it, it will be redirected to the subnet subscription management page
  • Add Refresh License button to the License Page, when user click the button we will pull a new license from https://subnet.min.io/api/auth/subscription/license-key based on the existing one, and the license will be updated on all Console tenants (investigate if we need to restart all this pods)
  • Apply new design

License verification

  • When console starts verify current license passed via CONSOLE_SUBNET_LICENSE env variable is still valid against subnet https://subnet.min.io/api/auth/subscription/license-key endpoint
  • Launch a go routine that will verify every X amount of time current license is valid

How it looks (Operator screens)

Screen Shot 2021-03-18 at 15 29 04

Screen Shot 2021-03-18 at 14 59 02

Screen Shot 2021-03-18 at 14 59 09

How it looks (Console Admin screens)

Screen Shot 2021-03-18 at 15 24 24

Screen Shot 2021-03-18 at 15 26 12

@Alevsk Alevsk added the WIP This PR is WIP and cannot be merged yet label Mar 17, 2021
@Alevsk Alevsk self-assigned this Mar 17, 2021
@Alevsk Alevsk mentioned this pull request Mar 18, 2021
Closed
@Alevsk Alevsk changed the title [WIP] License page and License verification License page and License verification Mar 18, 2021
@Alevsk Alevsk removed the WIP This PR is WIP and cannot be merged yet label Mar 19, 2021
@Alevsk Alevsk assigned kaankabalak and unassigned kaankabalak Mar 19, 2021
@Alevsk Alevsk requested a review from kaankabalak March 19, 2021 02:22
@Alevsk
console license page improvements and fixes
15619a3 
- fixed issue when deploying tenant with tls disabled
- applied new design for tenant details and license screens
- added license refresh job to operator console
- added new refresh license endpoint
- console operator not longer store CONSOLE_ACCESS_KEY and
  CONSOLE_SECRET_KEY values in the tenant-console-secret
@nagashreem
Copy link

Some comments on the UI:

If License is activated in Operator UI, change the label from Subscription to Upgrade,

There is no Subscription Button on the first screenshot
image

In the second screenshot, the exclamation mark seems to have moved to the second line
image

Also showing the button label as Subscribe might be confusing here (unless we show Subscribe button in the previous state - 1st screenshot)
image

krisis
krisis previously approved these changes Mar 22, 2021
View reviewed changes
Copy link
Member

@krisis krisis left a comment

Choose a reason for hiding this comment

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

The license refresh part looks good to me.

pkg/subnet/subnet.go
if err != nil {
return nil, "", err
}
licenseInfo, rawLicense, err := ValidateLicense(client, license, "", "")
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to validate the license received from Subnet?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@krisis hi kp, this is used to parse the jwt token string into the license structure

@dvaldivia dvaldivia merged commit 7ce36ba into minio:master Mar 22, 2021
@Alevsk Alevsk deleted the issue-623 branch March 22, 2021 22:51
adfost pushed a commit to adfost/console that referenced this pull request Mar 24, 2021
hopefully last message # This is a combination of 3 commits.
3a5fa0d 
continuing rebase# This is a combination of 2 commits.

continuing rebase # This is a combination of 5 commits.tree 03d4bd0e2d374d903f129ab8fe42344cb8fb7dbb
parent 934e8c9
author Adam Stafford <adamstafford@MacBook-Pro-van-Adam-2.local> 1616022296 -0700
committer Adam Stafford <adam@minio.io> 1616543805 -0700

squashing part 2 This is a combination of 6 commits.

squashing all comits# This is a combination of 13 commits.

api for listing policies attatched to a bucket

Reverting go.mod and go.sum.

removing admin.json

getting rid of ./swagger

Attempting to add blank line

deleting commented code

new menu

adding ViewBucket.tsx

Bug fix with screens

Removing debug print statement

Committing types.tsx

api for listing policies attatched to a bucket (minio#660)

api for listing policies attatched to a bucket

Added versioning edit in console (minio#645)

Bump react-dev-utils from 11.0.1 to 11.0.4 in /portal-ui (minio#644)

Bumps [react-dev-utils](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-dev-utils) from 11.0.1 to 11.0.4.
- [Release notes](https://github.com/facebook/create-react-app/releases)
- [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG-1.x.md)
- [Commits](https://github.com/facebook/create-react-app/commits/HEAD/packages/react-dev-utils)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Valdivia <hola@danielvaldivia.com>

Allow to assign multiple policies to to a user or group (minio#646)

* Allow to assign multiple policies to to a user or group

* Latest assets

console license page improvements and fixes (minio#647)

- fixed issue when deploying tenant with tls disabled
- applied new design for tenant details and license screens
- added license refresh job to operator console
- added new refresh license endpoint
- console operator not longer store CONSOLE_ACCESS_KEY and
  CONSOLE_SECRET_KEY values in the tenant-console-secret

Co-authored-by: Daniel Valdivia <hola@danielvaldivia.com>

Interactive Feedback when list objects take a long time (minio#655)

* Interactive Feedback when list objects take a long time

* Remove cancel button

Co-authored-by: Alex <33497058+bexsoft@users.noreply.github.com>

Add Bucket Locking option and fix versioning configuration. (minio#661)

* Add Bucket Locking option and fix versioning configuration.

* Addres comments

* Rework the View Bucket options

* Remove extra padding

Update ViewBucket.tsx

Update portal-ui/src/screens/Console/Buckets/ViewBucket/PolicySelectors.tsx

Co-authored-by: Alex <33497058+bexsoft@users.noreply.github.com>

Update ViewBucket.tsx

Deleting unnecessary files

update ldap development example (minio#664)
adfost pushed a commit to adfost/console that referenced this pull request Mar 24, 2021
Adding UI to Bucket Policy # This is a combination of 9 commits.tree …
f69e5b7 
…5d49cb82c7a795d681469486d6961008d665fded

parent e088431
author Adam Stafford <adamstafford@MacBook-Pro-van-Adam-2.local> 1616022296 -0700
committer Adam Stafford <adam@minio.io> 1616606382 -0700

Adding UI to Bucket Policy

Adding UI for bucket policy

Adding UI for Bucket Policy API

api for listing policies attatched to a bucket (minio#660)

api for listing policies attatched to a bucket

Added versioning edit in console (minio#645)

Bump react-dev-utils from 11.0.1 to 11.0.4 in /portal-ui (minio#644)

Bumps [react-dev-utils](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-dev-utils) from 11.0.1 to 11.0.4.
- [Release notes](https://github.com/facebook/create-react-app/releases)
- [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG-1.x.md)
- [Commits](https://github.com/facebook/create-react-app/commits/HEAD/packages/react-dev-utils)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Valdivia <hola@danielvaldivia.com>

Allow to assign multiple policies to to a user or group (minio#646)

* Allow to assign multiple policies to to a user or group

* Latest assets

console license page improvements and fixes (minio#647)

- fixed issue when deploying tenant with tls disabled
- applied new design for tenant details and license screens
- added license refresh job to operator console
- added new refresh license endpoint
- console operator not longer store CONSOLE_ACCESS_KEY and
  CONSOLE_SECRET_KEY values in the tenant-console-secret

Co-authored-by: Daniel Valdivia <hola@danielvaldivia.com>

Interactive Feedback when list objects take a long time (minio#655)

* Interactive Feedback when list objects take a long time

* Remove cancel button

Co-authored-by: Alex <33497058+bexsoft@users.noreply.github.com>

Add Bucket Locking option and fix versioning configuration. (minio#661)

* Add Bucket Locking option and fix versioning configuration.

* Addres comments

* Rework the View Bucket options

* Remove extra padding

Update ViewBucket.tsx

Update portal-ui/src/screens/Console/Buckets/ViewBucket/PolicySelectors.tsx

Co-authored-by: Alex <33497058+bexsoft@users.noreply.github.com>

Update ViewBucket.tsx

Deleting unnecessary files

update ldap development example (minio#664)

removing admin.json

getting rid of ./swagger

Attempting to add blank line

deleting commented code

new menu

adding ViewBucket.tsx

Bug fix with screens

Removing debug print statement

Committing types.tsx

Update ViewBucket.tsx

Update portal-ui/src/screens/Console/Buckets/ViewBucket/PolicySelectors.tsx

Co-authored-by: Alex <33497058+bexsoft@users.noreply.github.com>

Update portal-ui/src/screens/Console/Buckets/ViewBucket/PolicySelectors.tsx

Co-authored-by: Alex <33497058+bexsoft@users.noreply.github.com>

Update portal-ui/src/screens/Console/Buckets/ViewBucket/PolicySelectors.tsx

Co-authored-by: Alex <33497058+bexsoft@users.noreply.github.com>

Update portal-ui/src/screens/Console/Buckets/ViewBucket/PolicySelectors.tsx

Co-authored-by: Alex <33497058+bexsoft@users.noreply.github.com>

Deleting unnecessary files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krisis krisis krisis approved these changes

@dvaldivia dvaldivia dvaldivia approved these changes

@bexsoft bexsoft bexsoft approved these changes

@kaankabalak kaankabalak Awaiting requested review from kaankabalak

@harshavardhana harshavardhana Awaiting requested review from harshavardhana

Assignees

@Alevsk Alevsk

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Alevsk @nagashreem @krisis @dvaldivia @bexsoft @kaankabalak