Skip to content

Handle no reg code #1339

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

Merged
merged 4 commits into from
Jul 2, 2025
Merged

Handle no reg code #1339

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
247fa57
Handle not PAYG system without public cloud registration code
jesusbv Jun 23, 2025
d6ee0f8
Add test to check this case
jesusbv Jun 23, 2025
d8a48f9
Fix linter
jesusbv Jun 23, 2025
6d331f6
simpler check
jesusbv Jun 23, 2025
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
5 changes: 4 additions & 1 deletion engines/instance_verification/lib/instance_verification/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ def self.verify_instance(request, logger, system)
cache_params = {}
# we are checking the base product so we pick the first registration code
# PAYG instances have no registration code
cache_params = { token: Base64.decode64(system.pubcloud_reg_code.split(',')[0]), instance_data: decoded_instance_data } unless system.payg?
unless system.payg? || system.pubcloud_reg_code.blank?
cache_params = { token: Base64.decode64(system.pubcloud_reg_code.split(',')[0]),
instance_data: decoded_instance_data }
end
cache_key = InstanceVerification.build_cache_entry(
request.remote_ip, system.login, cache_params, system.proxy_byos_mode, base_product
)
Expand Down
7 changes: 6 additions & 1 deletion engines/zypper_auth/spec/requests/services_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
repo_items.map { |r| r.attr(:url) }
end

let(:system) { FactoryBot.create(:system, :with_activated_product) }
let(:system) { FactoryBot.create(:system, :byos, :with_activated_product) }
let(:service) { system.products.first.service }

context 'without X-Instance-Data header' do
Expand Down Expand Up @@ -58,6 +58,11 @@

context 'when instance verification returns false' do
before do
stub_request(:get, 'https://scc.suse.com/connect/systems/activations')
.to_return(status: 200, body: '', headers: {})
expect(InstanceVerification).to receive(:build_cache_entry).with(
'127.0.0.1', system.login, {}, system.proxy_byos_mode, system.products.find_by(product_type: 'base')
)
get "/services/#{service.id}", headers: headers
end

Expand Down