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

feat: adjust enroll logic and output for the new subscription plans #8661

Merged

Conversation

adrianbenavides
Copy link
Member

@adrianbenavides adrianbenavides commented Nov 22, 2024

  • Ignore the errors at the end, that's happening when retrieving the project and is not related to this PR.
  • The output in the code is the final version. I did a final adjustment after the recordings (the blank line after the Please go to ... and subscribe to an Ockam plan... line)

New space is created using the subscription flow

    Getting available Spaces accessible to your account.                                                                                                                                                                                         
    No Spaces are accessible to your account.                                                                                                                                                                                                    
                                                                                                                                                                                                                                                 
    Please go to https://orchestrator.ockam.io and subscribe to an Ockam plan to create a new Space.         
                                                                                                                                    
    Press  ENTER ↵  to open https://orchestrator.ockam.io in your browser.                                                                                                                                                                       
    Opening your browser...                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                 
  ⠴ Waiting for you to subscribe to an Ockam plan using your browser...                                                                                                                                                                                                                                              
  ✔ Marked aspiring-goosefish as your default Space, on this machine.                                                                                                                                                                            
                                                                                                                                                                                                                                                 
    This Space has a developer-free Subscription attached to it.       

Enroll with an existing space with valid trial

    Getting available Spaces accessible to your account.                                                                                                                                                                                         
    Found existing Space touching-swift.                                                                                                                                                                                                         
                                                                                                                                                                                                                                                 
  ✔ Marked touching-swift as your default Space, on this machine.                                                                                                                                                                                
                                                                                                                                                                                                                                                 
    This Space has a developer-free (trial) Subscription attached to it.
    Started on 2024-09-12 12:00:00.0 +00:00:00 and will end on 2024-11-25 15:07:14.0 +00:00:00.

    Please subscribe to an Ockam plan before the trial ends to avoid any service interruptions https://orchestrator.ockam.io
    If you don't subscribe in that time, your Space and all associated Projects will be permanently deleted.

Enroll with an existing space with expired trial

    Getting available Spaces accessible to your account.                                                                                                                                                                                         
    Found existing Space touching-swift.                                                                                                                                                                                                         
                                                                                                                                                                                                                                                 
    Your Space touching-swift has an expired subscription plan attached to it.                                                                                                                                                                   
    Please go to https://orchestrator.ockam.io and update your Ockam subscription plan to use your Space.                                                                                                                                        
    
    Press  ENTER ↵  to open https://orchestrator.ockam.io in your browser.                                                                                                                                                                       
    Opening your browser...      
                                                                                                                                                                                                                
  ⠴ Waiting for you to subscribe to an Ockam plan using your browser...                                                                                                                                                                                                                                                  
  ✔ Marked touching-swift as your default Space, on this machine.                                                                                                                                                                                
                                                                                                                                                                                                                                                 
    This Space has a developer-free Subscription attached to it. 

Enroll with an existing space without a subscription

    Getting available Spaces accessible to your account.                                                                                                                                                                                         
    Found existing Space touching-swift.                                                                                                                                                                                                         
                                                                                                                                                                                                                                                 
    Your Space touching-swift doesn't have a subscription plan attached to it.                                                                                                                                                                   
    Please go to https://orchestrator.ockam.io and subscribe to an Ockam plan to use your Space. 
                                                                                                                                                
    Press  ENTER ↵  to open https://orchestrator.ockam.io in your browser.                                                                                                                                                                       
    Opening your browser...                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                 
  ⠧ Waiting for you to subscribe to an Ockam plan using your browser... 
  ✔ Marked touching-swift as your default Space, on this machine.                                                                                                                                                                                
                                                                                                                                                                                                                                                 
    This Space has a developer-free Subscription attached to it. 

@adrianbenavides adrianbenavides force-pushed the adrian/enroll-changes-for-subscription-plans branch 4 times, most recently from 4d05c78 to de807a0 Compare November 25, 2024 09:17
@mrinalwadhwa
Copy link
Member

@adrianbenavides some notes:

New space is created using the subscription flow

    Getting available Spaces accessible to your account.                                                                                                                                                                                         
    No Spaces are accessible to your account.                                                                                                                                                                                                    
                                                                                                                                                                                                                                                 
    Please go to https://orchestrator.ockam.io and subscribe to create a new Space.         
                                                                                                                                    
    Press  ENTER ↵  to open https://orchestrator.ockam.io in your browser.                                                                                                                                                                       
    Opening your browser...                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                 
  ⠴ Waiting for you to subscribe using your browser...                                                                                                                                                                                                                                              
  ✔ Marked aspiring-goosefish as your default Space, on this machine.                                                                                                                                                                            
                                                                                                                                                                                                                                                 
    This Space has a Basic Subscription attached to it.    

@mrinalwadhwa
Copy link
Member

mrinalwadhwa commented Nov 25, 2024

Enroll with an existing space with valid trial

    Getting available Spaces accessible to your account.                                                                                                                                                                                         
    Found existing Space touching-swift.                                                                                                                                                                                                         
                                                                                                                                                                                                                                                 
  ✔ Marked touching-swift as your default Space, on this machine.                                                                                                                                                                                
                                                                                                                                                                                                                                                 
    This Space has a Trial of the Basic Subscription attached to it.
    Your trial started on 12, Nov 2024 and will end in 7 days.

    Please go to https://orchestrator.ockam.io and subscribe before the trial ends to avoid any service interruptions.
    If you don't subscribe in that time, your Space and all associated Projects will be permanently deleted.

@mrinalwadhwa
Copy link
Member

mrinalwadhwa commented Nov 25, 2024

Enroll with an existing space with expired trial

    Getting available Spaces accessible to your account.                                                                                                                                                                                         
    Found existing Space touching-swift.                                                                                                                                                                                                         
                                                                                                                                                                                                                                                 
    Your Trial of the Basic Subscription on the Space touching-swift has ended.
    Please go to https://orchestrator.ockam.io and subscribe to one of our paid plans to use your Space.
    All Projects in this Space will be deleted on 10, Dec 2024.

    Press  ENTER ↵  to open https://orchestrator.ockam.io in your browser.                                                                                                                                                                       
    Opening your browser...      
                                                                                                                                                                                                                
  ⠴ Waiting for you to subscribe using your browser...                                                                                                                                                                                                                                                 
  ✔ Marked touching-swift as your default Space, on this machine.                                                                                                                                                                                
                                                                                                                                                                                                                                                 
    This Space has a Gold Subscription attached to it. 

We will have a few days of grace period after trial expires and before projects are deleted. Assume 3 days for now. If that date has passed:

replace

All Projects in this Space will be deleted on 10, Dec 2024.

with

All Projects in this Space were deleted on 10, Dec 2024.

@mrinalwadhwa
Copy link
Member

Enroll with an existing space without a subscription

    Getting available Spaces accessible to your account.                                                                                                                                                                                         
    Found existing Space touching-swift.                                                                                                                                                                                                         
                                                                                                                                                                                                                                                 
    Your Space touching-swift doesn't have Subscription attached to it.                                                                                                                                                                   
    Please go to https://orchestrator.ockam.io and subscribe to use the Space.
                                                                                                                                                
    Press  ENTER ↵  to open https://orchestrator.ockam.io in your browser.                                                                                                                                                                       
    Opening your browser...                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                 
  ⠧ Waiting for you to subscribe using your browser... 
  ✔ Marked touching-swift as your default Space, on this machine.                                                                                                                                                                                
                                                                                                                                                                                                                                                 
    This Space has a Gold Subscription attached to it. 

@adrianbenavides
Copy link
Member Author

adrianbenavides commented Nov 25, 2024

Done. I've attached some screenshots with the dates formatting changes.

Enroll with an existing space with valid trial

image

Enroll with an existing space with expired trial; within period grace

image

Enroll with an existing space with expired trial; expired period grace

image

@adrianbenavides adrianbenavides force-pushed the adrian/enroll-changes-for-subscription-plans branch 2 times, most recently from 4c4e8f3 to d7c9f1e Compare November 25, 2024 18:48
@adrianbenavides adrianbenavides marked this pull request as ready for review November 25, 2024 18:49
@adrianbenavides adrianbenavides requested a review from a team as a code owner November 25, 2024 18:49
@adrianbenavides adrianbenavides force-pushed the adrian/enroll-changes-for-subscription-plans branch 6 times, most recently from 2655e4e to 0801a4c Compare November 26, 2024 18:42
@adrianbenavides adrianbenavides force-pushed the adrian/enroll-changes-for-subscription-plans branch from 0801a4c to 2277f45 Compare November 26, 2024 18:52
@adrianbenavides adrianbenavides added this pull request to the merge queue Nov 26, 2024
Merged via the queue into develop with commit d11b610 Nov 26, 2024
43 checks passed
@adrianbenavides adrianbenavides deleted the adrian/enroll-changes-for-subscription-plans branch November 26, 2024 22:00
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.

3 participants