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

Feature/1307 check for business plan before uffizzi install #419

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
94d848c
Merge branch 'develop'
moklidia Jul 21, 2023
0306426
Merge branch 'develop'
moklidia Jul 24, 2023
6cc3e6b
Merge branch 'develop'
zipofar Jul 27, 2023
deabccb
Merge branch 'develop'
moklidia Jul 31, 2023
57d76ec
Merge branch 'develop'
moklidia Jul 31, 2023
201251f
Merge branch 'develop'
moklidia Aug 1, 2023
50c5eba
Merge branch 'develop'
zipofar Aug 2, 2023
1967752
Merge branch 'develop'
moklidia Aug 2, 2023
09719dc
Merge branch 'develop'
moklidia Aug 7, 2023
b37c284
Merge branch 'develop'
moklidia Aug 9, 2023
213f1f6
Merge branch 'develop'
zipofar Aug 14, 2023
23f6d2e
Merge branch 'develop'
zipofar Aug 14, 2023
df05d7a
Merge branch 'develop'
moklidia Aug 15, 2023
64ab8e5
Merge branch 'develop'
moklidia Aug 22, 2023
d5cabe2
Merge branch 'develop'
moklidia Aug 22, 2023
e8d04a9
Merge branch 'develop'
moklidia Aug 23, 2023
533a8fb
Merge branch 'develop'
moklidia Aug 28, 2023
fc37046
Merge branch 'develop'
moklidia Sep 4, 2023
4de151e
Merge branch 'develop'
zipofar Sep 6, 2023
4c45bef
Merge branch 'develop'
moklidia Sep 7, 2023
8c61bd1
Merge branch 'develop'
moklidia Sep 7, 2023
d32f319
Merge branch 'develop'
moklidia Sep 7, 2023
8dcf8e1
Merge branch 'develop'
moklidia Sep 7, 2023
e9a709d
Merge branch 'develop'
moklidia Sep 7, 2023
bcef621
Merge branch 'develop'
moklidia Sep 8, 2023
73a76f5
Merge branch 'develop'
moklidia Sep 8, 2023
f1bf142
Merge branch 'develop'
moklidia Sep 8, 2023
2221a4e
Merge branch 'develop'
zipofar Sep 11, 2023
955a984
Merge branch 'develop'
zipofar Sep 19, 2023
8995b43
Merge branch 'develop'
zipofar Sep 29, 2023
d700a46
Merge branch 'develop'
zipofar Oct 9, 2023
712afee
Merge branch 'develop'
zipofar Oct 9, 2023
7b2cadc
Merge branch 'develop'
moklidia Oct 16, 2023
62b9942
Merge branch 'develop'
moklidia Oct 16, 2023
17eafc2
Merge branch 'develop'
moklidia Oct 19, 2023
68ed4bb
Merge branch 'develop'
zipofar Oct 23, 2023
1722724
Merge branch 'develop'
zipofar Oct 25, 2023
7882d54
Merge branch 'develop'
moklidia Oct 30, 2023
4f4d3a9
Merge branch 'develop'
moklidia Oct 30, 2023
1986338
Merge branch 'develop'
moklidia Oct 30, 2023
ba5d5ce
Merge branch 'develop'
moklidia Nov 2, 2023
ca24f08
Merge branch 'develop'
zipofar Nov 28, 2023
24abe56
Merge branch 'develop'
moklidia Dec 18, 2023
e074040
Merge branch 'develop'
moklidia Dec 18, 2023
4cc525d
Merge branch 'develop'
moklidia Dec 19, 2023
8deeb0c
Merge branch 'develop'
zipofar Dec 21, 2023
e64d371
Merge branch 'develop'
zipofar Dec 29, 2023
bf5b408
Merge branch 'develop'
lidiamokevnina Feb 13, 2024
a090404
Merge branch 'develop'
lidiamokevnina Feb 20, 2024
441fdf1
Merge branch 'develop'
lidiamokevnina Mar 2, 2024
0eccfe0
Merge branch 'develop'
lidiamokevnina Mar 15, 2024
da4e9db
Merge branch 'develop'
lidiamokevnina Apr 2, 2024
bca51b5
Merge branch 'develop'
lidiamokevnina Jun 26, 2024
c74a266
[#1307] added check for account plan
lidiamokevnina Jul 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions lib/uffizzi/cli/install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ class Cli::Install < Thor
method_option :'node-selector-template', required: false, type: :string
def controller(hostname)
Uffizzi::AuthHelper.check_login
check_account_can_install

# InstallService.kubectl_exists?
# InstallService.helm_exists?
InstallService.kubectl_exists?
InstallService.helm_exists?

if options[:context].present? && options[:context] != InstallService.kubeconfig_current_context
InstallService.set_current_context(options[:context])
Expand Down Expand Up @@ -182,7 +183,18 @@ def update_controller_settings(controller_setting_id, params)

def create_controller_settings(params)
response = create_account_controller_settings(server, account_id, params)
Uffizzi::ResponseHelper.handle_failed_response(response) unless Uffizzi::ResponseHelper.created?(response)
unless Uffizzi::ResponseHelper.created?(response)
Uffizzi::ResponseHelper.handle_failed_response(response)
raise Uffizzi::Error.new
end
end

def check_account_can_install
response = check_can_install(server, account_id)
unless Uffizzi::ResponseHelper.ok?(response)
Uffizzi::ResponseHelper.handle_failed_response(response)
raise Uffizzi::Error.new
end
end

def build_controller_setting_params(uri, installation_options)
Expand Down
8 changes: 8 additions & 0 deletions lib/uffizzi/clients/api/api_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ def fetch_accounts(server)
build_response(response)
end

def check_can_install(server, account_id)
uri = account_can_install_uri(server, account_id)

response = http_client.make_get_request(uri)

build_response(response)
end

def fetch_projects(server)
uri = projects_uri(server)
response = http_client.make_get_request(uri)
Expand Down
4 changes: 4 additions & 0 deletions lib/uffizzi/clients/api/api_routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ def account_uri(server, account_name)
"#{server}/api/cli/v1/accounts/#{account_name}"
end

def account_can_install_uri(server, account_id)
"#{server}/api/cli/v1/accounts/#{account_id}/check_can_install"
end

def compose_file_uri(server, project_slug)
"#{server}/api/cli/v1/projects/#{project_slug}/compose_file"
end
Expand Down
6 changes: 6 additions & 0 deletions test/support/uffizzi_stub_support.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ def stub_uffizzi_accounts_success(body)
stub_request(:get, url).to_return(status: 200, body: body.to_json)
end

def stub_uffizzi_check_can_install_success(account_id)
url = account_can_install_uri(Uffizzi.configuration.server, account_id)

stub_request(:get, url).to_return(status: 200)
end

def stub_uffizzi_account_success(body, account_name)
url = account_uri(Uffizzi.configuration.server, account_name)

Expand Down
2 changes: 2 additions & 0 deletions test/uffizzi/cli/install_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ def test_install
stub_get_account_controller_settings_request(empty_controller_settings_body, account_id)
stub_create_account_controller_settings_request({}, account_id)
stub_update_account_success(account_body, account_name)
stub_uffizzi_check_can_install_success(account_id)

@install.options = command_options(email: '[email protected]')
@install.controller(host)
Expand Down Expand Up @@ -116,6 +117,7 @@ def test_install_if_settgins_exists
stub_get_account_controller_settings_request(account_controller_settings_body, account_id)
stub_update_account_controller_settings_request(account_controller_settings_body, account_id,
account_controller_settings_body[:controller_settings][0][:id])
stub_uffizzi_check_can_install_success(account_id)

@install.options = command_options(email: '[email protected]')
@install.controller(host)
Expand Down
Loading