Skip to content

fix reading global credentials file #1810

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
imobachgs merged 3 commits into from
Dec 5, 2024
Merged

fix reading global credentials file #1810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
945b00f
fix reading global credentials file
jreidinger Dec 5, 2024
8a886df
Merge remote-tracking branch 'origin/product-registration' into produ…
jreidinger Dec 5, 2024
f385dda
adapt tests for workaround
jreidinger Dec 5, 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
4 changes: 3 additions & 1 deletion service/lib/agama/registration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ class Registration
TARGET_DIR = "/run/agama/zypp"
private_constant :TARGET_DIR

GLOBAL_CREDENTIALS_PATH = File.join(TARGET_DIR,
# FIXME: it should use TARGET_DIR instead of "/", but connect failed to read it even
# if fs_root passed as client params. Check with SCC guys why.
GLOBAL_CREDENTIALS_PATH = File.join("/",
SUSE::Connect::YaST::GLOBAL_CREDENTIALS_FILE)
private_constant :GLOBAL_CREDENTIALS_PATH

Expand Down
4 changes: 3 additions & 1 deletion service/test/agama/registration_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@

it "creates credentials file" do
expect(SUSE::Connect::YaST).to receive(:create_credentials_file)
.with("test-user", "12345", "/run/agama/zypp/etc/zypp/credentials.d/SCCcredentials")
.with("test-user", "12345", "/etc/zypp/credentials.d/SCCcredentials")
# TODO: when fixing suse-connect read of fsroot
# .with("test-user", "12345", "/run/agama/zypp/etc/zypp/credentials.d/SCCcredentials")

subject.register("11112222", email: "test@test.com")
end
Expand Down