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.

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

Cloud UI merge #985

Merged
merged 48 commits into from
Jun 16, 2023
Merged

Cloud UI merge #985

merged 48 commits into from
Jun 16, 2023

Conversation

SvetaMemphis
Copy link
Contributor

No description provided.

avrham and others added 30 commits May 17, 2023 16:38
…949)

* fixing loose of unacked DLS msgs

* bugfix

* improve tiered storage mechanism

* comment in the reload part
The user will be asked to attach a station when he or she attaches a schema

resolves: #908
feature: Ask the user to attach a schema right after its creation
We can use `strings.IndexByte` to avoid an unnecessary byte slice
conversion and reduce allocations.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Fix issue with long named tags getting cut off in station view
* create db table + update existing tables

* create global tenant on first system load + add tenant to users

* fix db queries

* add tenant id to dls table

* add tenantId until half page of db.go and change all the calls to this functions

* wip

* add connection with account id

* _ to $

* lower all tenant names

* add accounts + users to reload (GetMemphisOpts function) + changes according to tenants with users logic

* add tenant name for users in db file

* change code due review

* add default value to tenant_name in users table

* change code due review

* add tenant name to schema struct

* add default value in tenant name + alter users table

* add missing return to some code + add missing lowercase to tenant name

* add missing lower case tenant name:

* fix issues

* fix issues

* add alter to other tables with tenent name

* fix alter fk in users table

* set memphis account and change global to memphis global

* change MEMPHIS_GLOBAL_ACCOUNT to $memphis + fix login endpoint

* change global account to memphis gacc

* fix account creation

* bug fixes

* fix consumer

* fix GetAllUsersByTypeAndTenantName +GetAllUsersByType

* get tenant db

* fix GetTenantByName

* add tenant name to ListenForSchemaverseDlsEvents

* add getTenantNameHandler

* added ws logic for multi tenancy

* add dynamic tenant name to jetstream api

* pass dynamic tenant name to queueSubscribe + respondWithErr functions

* clean code

* add dynamic tenant name

* add tenant name to audit logs

* fix ws loop

* fix UpdateConnectionsOfDeletedUser

* fix add user + remove user

* import export to reloader

* fix websocket for tenants

* fix reload users

* fix id

* Merge branch 'master' of https://github.com/memphisdev/memphis into multi-tenancy-jetstream

* fix db query

* add tenant name to queueSubscribe requests

* fix

* ws per tenant

* add memphis opts to NewServer

* test ws

* fix getTenantName

* fix imports exports

* test

* pass more params to serviceImport in GetMemphisOpts

* add se to imports

* fixing bug caused messages to not move between accounts

* fix create producer station from sdk + get tenant name

* remove print

* remove print

* fix create station direct

* fix createStationDirectIntern

* fix respondWithErrOrJsApiRespWithEco

* fix requests from sdk (create + destroy - station, producer, consumer, attach, deatch)

* fix alter in create tables in db

* fix

* fix

* $memphis -> $G

* fix create tenant

* ws

* remove getTenantName listener

* fix UpsertTenant

* removed by memphis

* add todo + clean code

* fix reload auth

* fix GetAllStationsDetails per tenant

* fix reload

* fix gacc enable jetstream

* fix ws sub

* test reload gacc

* undo last test

* remove unnecessary code

* test reload

* add comments

* usePub -> true

* move "$memphis_ws_pubs.>" from service to stream

* remove unneccessary subj

* remove comments and todo

* fix GetAllStationsDetails

* user details from middleware $G

* fix removeSchemaFromStationDirect

* fix go mod & go sum according to master version

* multi-tenancy integrations

* s3  integration crud

* update integration crud

* fix proto

* notifications + schemaverse dls

* remove comment

* throughput per tenant

* s3 integration with multi tenancy

* fix uploadToS3Storage

* poison messages multi tenancy

* fix disconnection event to slack

* clean code

* ui build

* remove unnecessary code

* fix UpsertConfiguration

* update flushMapToTire2Storage

* clean code

* remove unused function

* fix

* remove unused ui imports

* remove unused code

* fix issues

* fix

* fixes

* remove space

* add comment removed by memphis

* fix

* fix

* remove unused functions

* remove unused func

* fix

* tags insert fix

* fix root app user password

* fix msg ids

* fix Bug: no indication when trying to integrate with slack #964

* fix order of alter and creating tables

* fix alter tables if exist

* align with master

* nats compatibility create station

* remove station nats compatibility

* fix connection nats compatability - user password based auth

* fix NewServer logic with USER_PASS_BASED_AUTH false

* fix handleConnectMessage with USER_PASS_BASED_AUTH false

* remove fk_producer_id from dls_msgs table for nats compatibility

* add cloud package

* memory leak fix on update disconnection + fix create root user flow

* fix import ordering

* removed unnecessarry file

* test

* test

---------

Co-authored-by: shay23b <shay@memphis.dev>
Co-authored-by: ido <ido@ip-192-168-1-78.eu-central-1.compute.internal>
Co-authored-by: idanasulinStrech <idan@memphis.dev>
Fix issue with Purge button not responding to "Enter" key press.
* test

* test

* test

* test

* test

* test

* test

* test

* traces improvements

* allow connecting without mentioning tenant suffix

* allow dash in user names

* fix - flush sys logs from memory to a stream
daniel-davidd and others added 18 commits June 14, 2023 13:37
* create db table + update existing tables

* create global tenant on first system load + add tenant to users

* fix db queries

* add tenant id to dls table

* add tenantId until half page of db.go and change all the calls to this functions

* wip

* add connection with account id

* _ to $

* lower all tenant names

* add accounts + users to reload (GetMemphisOpts function) + changes according to tenants with users logic

* add tenant name for users in db file

* change code due review

* add default value to tenant_name in users table

* change code due review

* add tenant name to schema struct

* add default value in tenant name + alter users table

* add missing return to some code + add missing lowercase to tenant name

* add missing lower case tenant name:

* fix issues

* fix issues

* add alter to other tables with tenent name

* fix alter fk in users table

* set memphis account and change global to memphis global

* change MEMPHIS_GLOBAL_ACCOUNT to $memphis + fix login endpoint

* change global account to memphis gacc

* fix account creation

* bug fixes

* fix consumer

* fix GetAllUsersByTypeAndTenantName +GetAllUsersByType

* get tenant db

* fix GetTenantByName

* add tenant name to ListenForSchemaverseDlsEvents

* add getTenantNameHandler

* added ws logic for multi tenancy

* add dynamic tenant name to jetstream api

* pass dynamic tenant name to queueSubscribe + respondWithErr functions

* clean code

* add dynamic tenant name

* add tenant name to audit logs

* fix ws loop

* fix UpdateConnectionsOfDeletedUser

* fix add user + remove user

* import export to reloader

* fix websocket for tenants

* fix reload users

* fix id

* Merge branch 'master' of https://github.com/memphisdev/memphis into multi-tenancy-jetstream

* fix db query

* add tenant name to queueSubscribe requests

* fix

* ws per tenant

* add memphis opts to NewServer

* test ws

* fix getTenantName

* fix imports exports

* test

* pass more params to serviceImport in GetMemphisOpts

* add se to imports

* fixing bug caused messages to not move between accounts

* fix create producer station from sdk + get tenant name

* remove print

* remove print

* fix create station direct

* fix createStationDirectIntern

* fix respondWithErrOrJsApiRespWithEco

* fix requests from sdk (create + destroy - station, producer, consumer, attach, deatch)

* fix alter in create tables in db

* fix

* fix

* $memphis -> $G

* fix create tenant

* ws

* remove getTenantName listener

* fix UpsertTenant

* removed by memphis

* add todo + clean code

* fix reload auth

* fix GetAllStationsDetails per tenant

* fix reload

* fix gacc enable jetstream

* fix ws sub

* test reload gacc

* undo last test

* remove unnecessary code

* test reload

* add comments

* usePub -> true

* move "$memphis_ws_pubs.>" from service to stream

* remove unneccessary subj

* remove comments and todo

* fix GetAllStationsDetails

* user details from middleware $G

* fix removeSchemaFromStationDirect

* fix go mod & go sum according to master version

* multi-tenancy integrations

* s3  integration crud

* update integration crud

* fix proto

* notifications + schemaverse dls

* remove comment

* throughput per tenant

* s3 integration with multi tenancy

* fix uploadToS3Storage

* poison messages multi tenancy

* fix disconnection event to slack

* clean code

* ui build

* remove unnecessary code

* fix UpsertConfiguration

* update flushMapToTire2Storage

* clean code

* remove unused function

* fix

* remove unused ui imports

* remove unused code

* fix issues

* fix

* fixes

* remove space

* add comment removed by memphis

* fix

* fix

* remove unused functions

* remove unused func

* fix

* tags insert fix

* fix root app user password

* fix msg ids

* fix Bug: no indication when trying to integrate with slack #964

* fix order of alter and creating tables

* fix alter tables if exist

* align with master

* nats compatibility create station

* remove station nats compatibility

* fix connection nats compatability - user password based auth

* fix NewServer logic with USER_PASS_BASED_AUTH false

* fix handleConnectMessage with USER_PASS_BASED_AUTH false

* remove fk_producer_id from dls_msgs table for nats compatibility

* add cloud package

* station replicas + create root user

* change func name

* GetStationReplicas, GetStationMaxAge, CreateSystemRootUser

* station replicas/storage type + cloud

* move DownloadSystemLogs

* fixes

* align with cloud

* align with cloud

* cloud handler -> billing handler

* getStationReplicas add >5 condition

---------

Co-authored-by: ido <ido@ip-192-168-1-78.eu-central-1.compute.internal>
Co-authored-by: shohamroditimemphis <shoham@memphis.dev>
Co-authored-by: shohamroditimemphis <108217318+shohamroditimemphis@users.noreply.github.com>
Co-authored-by: idanasulinStrech <idan@memphis.dev>
* add sign up new account cloud

* changes for loginCloud endpoint

* add login + create user mnagement cloud

* fix

* move Login + AddUser  to cloud handler

* mova all the structs to handlers_cloud file

* fix issues

* add fields to addUser

* add fields to addUser

* update the response of GetAllUsers

* add remove user

* routes refactor

* typo

* fix

---------

Co-authored-by: idanasulinStrech <idan@memphis.dev>
* create db table + update existing tables

* create global tenant on first system load + add tenant to users

* fix db queries

* add tenant id to dls table

* add tenantId until half page of db.go and change all the calls to this functions

* wip

* add connection with account id

* _ to $

* lower all tenant names

* add accounts + users to reload (GetMemphisOpts function) + changes according to tenants with users logic

* add tenant name for users in db file

* change code due review

* add default value to tenant_name in users table

* change code due review

* add tenant name to schema struct

* add default value in tenant name + alter users table

* add missing return to some code + add missing lowercase to tenant name

* add missing lower case tenant name:

* fix issues

* fix issues

* add alter to other tables with tenent name

* fix alter fk in users table

* set memphis account and change global to memphis global

* change MEMPHIS_GLOBAL_ACCOUNT to $memphis + fix login endpoint

* change global account to memphis gacc

* fix account creation

* bug fixes

* fix consumer

* fix GetAllUsersByTypeAndTenantName +GetAllUsersByType

* get tenant db

* fix GetTenantByName

* add tenant name to ListenForSchemaverseDlsEvents

* add getTenantNameHandler

* added ws logic for multi tenancy

* add dynamic tenant name to jetstream api

* pass dynamic tenant name to queueSubscribe + respondWithErr functions

* clean code

* add dynamic tenant name

* add tenant name to audit logs

* fix ws loop

* fix UpdateConnectionsOfDeletedUser

* fix add user + remove user

* import export to reloader

* fix websocket for tenants

* fix reload users

* fix id

* Merge branch 'master' of https://github.com/memphisdev/memphis into multi-tenancy-jetstream

* fix db query

* add tenant name to queueSubscribe requests

* fix

* ws per tenant

* add memphis opts to NewServer

* test ws

* fix getTenantName

* fix imports exports

* test

* pass more params to serviceImport in GetMemphisOpts

* add se to imports

* fixing bug caused messages to not move between accounts

* fix create producer station from sdk + get tenant name

* remove print

* remove print

* fix create station direct

* fix createStationDirectIntern

* fix respondWithErrOrJsApiRespWithEco

* fix requests from sdk (create + destroy - station, producer, consumer, attach, deatch)

* fix alter in create tables in db

* fix

* fix

* $memphis -> $G

* fix create tenant

* ws

* remove getTenantName listener

* fix UpsertTenant

* removed by memphis

* add todo + clean code

* fix reload auth

* fix GetAllStationsDetails per tenant

* fix reload

* fix gacc enable jetstream

* fix ws sub

* test reload gacc

* undo last test

* remove unnecessary code

* test reload

* add comments

* usePub -> true

* move "$memphis_ws_pubs.>" from service to stream

* remove unneccessary subj

* remove comments and todo

* fix GetAllStationsDetails

* user details from middleware $G

* fix removeSchemaFromStationDirect

* fix go mod & go sum according to master version

* multi-tenancy integrations

* s3  integration crud

* update integration crud

* fix proto

* notifications + schemaverse dls

* remove comment

* throughput per tenant

* s3 integration with multi tenancy

* fix uploadToS3Storage

* poison messages multi tenancy

* fix disconnection event to slack

* clean code

* ui build

* remove unnecessary code

* fix UpsertConfiguration

* update flushMapToTire2Storage

* clean code

* remove unused function

* fix

* remove unused ui imports

* remove unused code

* fix issues

* fix

* fixes

* remove space

* add comment removed by memphis

* fix

* fix

* remove unused functions

* remove unused func

* fix

* tags insert fix

* fix root app user password

* fix msg ids

* fix Bug: no indication when trying to integrate with slack #964

* fix order of alter and creating tables

* fix alter tables if exist

* align with master

* nats compatibility create station

* remove station nats compatibility

* fix connection nats compatability - user password based auth

* fix NewServer logic with USER_PASS_BASED_AUTH false

* fix handleConnectMessage with USER_PASS_BASED_AUTH false

* remove fk_producer_id from dls_msgs table for nats compatibility

* add cloud package

* station replicas + create root user

* change func name

* GetStationReplicas, GetStationMaxAge, CreateSystemRootUser

* station replicas/storage type + cloud

* move DownloadSystemLogs

* fixes

* align with cloud

* align with cloud

* cloud handler -> billing handler

* getStationReplicas add >5 condition

* align with cloud

---------

Co-authored-by: ido <ido@ip-192-168-1-78.eu-central-1.compute.internal>
Co-authored-by: shohamroditimemphis <shoham@memphis.dev>
Co-authored-by: shohamroditimemphis <108217318+shohamroditimemphis@users.noreply.github.com>
Co-authored-by: idanasulinStrech <idan@memphis.dev>
@SvetaMemphis SvetaMemphis merged commit 927f989 into billing Jun 16, 2023
SvetaMemphis added a commit that referenced this pull request Jun 18, 2023
Merge pull request #985 from memphisdev/cloud-ui-merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants