Skip to content

Merge to main to be able to release #10

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
fyrnaga merged 5 commits into from
Sep 10, 2025
Merged

Merge to main to be able to release #10

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
91c103f
MC-25873: Bump google.guava to 32.0.0-jre (#7)
joelplourde4 Jul 18, 2025
977d5fc
MC-30191: Keystone does not allow the type anymore for use/password auth
fyrnaga Sep 10, 2025
75e54b2
MC-30191: Properly fixed the serialization
fyrnaga Sep 10, 2025
e76fc38
Merge pull request #9 from cloudops/bug/MC-30191-OpenStackAuthenticat…
fyrnaga Sep 10, 2025
05e923e
Merge branch 'main' into devel
fyrnaga Sep 10, 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
4 changes: 2 additions & 2 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openstack4j-core</artifactId>
<version>co-3.12.1</version>
<version>co-3.12.3</version>
<name>OpenStack4j Core</name>
<description>OpenStack Java API</description>
<url>https://github.com/openstack4j/openstack4j/</url>
Expand Down Expand Up @@ -184,7 +184,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>29.0-jre</version>
<version>32.0.0-jre</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
Expand Down
24 changes: 14 additions & 10 deletions core/src/main/java/org/openstack4j/openstack/identity/v3/domain/KeystoneAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ protected KeystoneAuth(Type type) {
this.type = type;
}

@JsonIgnore
public Type getType() {
return type;
}
Expand Down Expand Up @@ -200,13 +201,15 @@ public AuthUser(String username, String password, Identifier domainIdentifier) {
this.password = password;
if (domainIdentifier != null) {
domain = new AuthDomain();
if (domainIdentifier.isTypeID())
domain.setId(domainIdentifier.getId());
else
domain.setName(domainIdentifier.getId());
if (domainIdentifier.isTypeID()) {
domain.setId(domainIdentifier.getId());
} else {
domain.setName(domainIdentifier.getId());
}
setName(username);
} else
setId(username);
} else {
setId(username);
}
}

@Override
Expand Down Expand Up @@ -342,10 +345,11 @@ public static final class AuthDomain extends BasicResourceEntity implements Doma
private String name;

public AuthDomain(Identifier domain) {
if (domain.isTypeID())
this.id = domain.getId();
else
this.name = domain.getId();
if (domain.isTypeID()) {
this.id = domain.getId();
} else {
this.name = domain.getId();
}
}

@Override
Expand Down