Skip to content

Decrypt zone, cluster, storage details for configuration values #10237

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
DaanHoogland merged 4 commits into from
Feb 3, 2025
Merged

Decrypt zone, cluster, storage details for configuration values #10237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7093406
Fix retreiving decrypted values from details table for config values
harikrishna-patnala Jan 22, 2025
17c436e
use ResourceDetail interface
harikrishna-patnala Jan 22, 2025
7222779
Use resource Id
harikrishna-patnala Jan 23, 2025
6055ecf
Apply suggestions from code review
DaanHoogland Jan 28, 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
Prev Previous commit
Next Next commit
Use resource Id
  • Loading branch information
@harikrishna-patnala
harikrishna-patnala committed Jan 23, 2025
commit 722277952dc28bc2d1f5cd7f84db84a077229a07
4 changes: 2 additions & 2 deletions engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ public class ClusterDetailsDaoImpl extends ResourceDetailsDaoBase<ClusterDetails

protected ClusterDetailsDaoImpl() {
ClusterSearch = createSearchBuilder();
ClusterSearch.and("clusterId", ClusterSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
ClusterSearch.and("clusterId", ClusterSearch.entity().getResourceId(), SearchCriteria.Op.EQ);
ClusterSearch.done();

DetailSearch = createSearchBuilder();
DetailSearch.and("clusterId", DetailSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
DetailSearch.and("clusterId", DetailSearch.entity().getResourceId(), SearchCriteria.Op.EQ);
DetailSearch.and("name", DetailSearch.entity().getName(), SearchCriteria.Op.EQ);
DetailSearch.done();
}
Expand Down
10 changes: 3 additions & 7 deletions engine/schema/src/main/java/com/cloud/dc/ClusterDetailsVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class ClusterDetailsVO implements ResourceDetail {
private long id;

@Column(name = "cluster_id")
private long clusterId;
private long resourceId;

@Column(name = "name")
private String name;
Expand All @@ -47,18 +47,14 @@ protected ClusterDetailsVO() {
}

public ClusterDetailsVO(long clusterId, String name, String value) {
this.clusterId = clusterId;
this.resourceId = clusterId;
this.name = name;
this.value = value;
}

public long getClusterId() {
return clusterId;
}

@Override
public long getResourceId() {
return clusterId;
return resourceId;
}

public String getName() {
Expand Down
10 changes: 3 additions & 7 deletions engine/schema/src/main/java/com/cloud/domain/DomainDetailVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class DomainDetailVO implements ResourceDetail {
private long id;

@Column(name = "domain_id")
private long domainId;
private long resourceId;

@Column(name = "name")
private String name;
Expand All @@ -46,18 +46,14 @@ protected DomainDetailVO() {
}

public DomainDetailVO(long domainId, String name, String value) {
this.domainId = domainId;
this.resourceId = domainId;
this.name = name;
this.value = value;
}

public long getDomainId() {
return domainId;
}

@Override
public long getResourceId() {
return domainId;
return resourceId;
}

public String getName() {
Expand Down
6 changes: 3 additions & 3 deletions engine/schema/src/main/java/com/cloud/domain/dao/DomainDetailsDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ public class DomainDetailsDaoImpl extends ResourceDetailsDaoBase<DomainDetailVO>

protected DomainDetailsDaoImpl() {
domainSearch = createSearchBuilder();
domainSearch.and("domainId", domainSearch.entity().getDomainId(), Op.EQ);
domainSearch.and("domainId", domainSearch.entity().getResourceId(), Op.EQ);
domainSearch.done();
}

@Override
public Map<String, String> findDetails(long domainId) {
QueryBuilder<DomainDetailVO> sc = QueryBuilder.create(DomainDetailVO.class);
sc.and(sc.entity().getDomainId(), Op.EQ, domainId);
sc.and(sc.entity().getResourceId(), Op.EQ, domainId);
List<DomainDetailVO> results = sc.list();
Map<String, String> details = new HashMap<String, String>(results.size());
for (DomainDetailVO r : results) {
Expand All @@ -78,7 +78,7 @@ public void persist(long domainId, Map<String, String> details) {
@Override
public DomainDetailVO findDetail(long domainId, String name) {
QueryBuilder<DomainDetailVO> sc = QueryBuilder.create(DomainDetailVO.class);
sc.and(sc.entity().getDomainId(), Op.EQ, domainId);
sc.and(sc.entity().getResourceId(), Op.EQ, domainId);
sc.and(sc.entity().getName(), Op.EQ, name);
return sc.find();
}
Expand Down
10 changes: 3 additions & 7 deletions engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class AccountDetailVO implements ResourceDetail {
private long id;

@Column(name = "account_id")
private long accountId;
private long resourceId;

@Column(name = "name")
private String name;
Expand All @@ -46,18 +46,14 @@ protected AccountDetailVO() {
}

public AccountDetailVO(long accountId, String name, String value) {
this.accountId = accountId;
this.resourceId = accountId;
this.name = name;
this.value = value;
}

public long getAccountId() {
return accountId;
}

@Override
public long getResourceId() {
return accountId;
return resourceId;
}

public String getName() {
Expand Down
6 changes: 3 additions & 3 deletions engine/schema/src/main/java/com/cloud/user/AccountDetailsDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ public class AccountDetailsDaoImpl extends ResourceDetailsDaoBase<AccountDetailV

protected AccountDetailsDaoImpl() {
accountSearch = createSearchBuilder();
accountSearch.and("accountId", accountSearch.entity().getAccountId(), Op.EQ);
accountSearch.and("accountId", accountSearch.entity().getResourceId(), Op.EQ);
accountSearch.done();
}

@Override
public Map<String, String> findDetails(long accountId) {
QueryBuilder<AccountDetailVO> sc = QueryBuilder.create(AccountDetailVO.class);
sc.and(sc.entity().getAccountId(), Op.EQ, accountId);
sc.and(sc.entity().getResourceId(), Op.EQ, accountId);
List<AccountDetailVO> results = sc.list();
Map<String, String> details = new HashMap<String, String>(results.size());
for (AccountDetailVO r : results) {
Expand All @@ -88,7 +88,7 @@ public void persist(long accountId, Map<String, String> details) {
@Override
public AccountDetailVO findDetail(long accountId, String name) {
QueryBuilder<AccountDetailVO> sc = QueryBuilder.create(AccountDetailVO.class);
sc.and(sc.entity().getAccountId(), Op.EQ, accountId);
sc.and(sc.entity().getResourceId(), Op.EQ, accountId);
sc.and(sc.entity().getName(), Op.EQ, name);
return sc.find();
}
Expand Down