Skip to content
This repository was archived by the owner on Mar 18, 2024. It is now read-only.

Commit 8b93c2a

Browse files
authored
feat: Always use the newest validation scratch org during Validate (#1428)
* feat: Always use the newest validation scratch org during Validate * chore: add spaces to queries
1 parent de2e860 commit 8b93c2a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

packages/core/src/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
22
import { Org } from '@salesforce/core';
33
import ScratchOrg from '../../../ScratchOrg';
44
const retry = require('async-retry');
5-
const ORDER_BY_FILTER = ' ORDER BY CreatedDate ASC';
5+
const ORDER_BY_FILTER = ' ORDER BY CreatedDate DESC';
66

77
export default class ScratchOrgInfoFetcher {
88
constructor(private hubOrg: Org) {}
@@ -47,9 +47,9 @@ export default class ScratchOrgInfoFetcher {
4747
let query;
4848

4949
if (tag)
50-
query = `SELECT Pooltag__c, Id, CreatedDate, ScratchOrg, ExpirationDate, SignupUsername, SignupEmail, Password__c, Allocation_status__c,LoginUrl,SfdxAuthUrl__c FROM ScratchOrgInfo WHERE Pooltag__c = '${tag}' AND Status = 'Active' `;
50+
query = `SELECT Pooltag__c, Id, CreatedDate, ScratchOrg, ExpirationDate, SignupUsername, SignupEmail, Password__c, Allocation_status__c, LoginUrl, SfdxAuthUrl__c FROM ScratchOrgInfo WHERE Pooltag__c = '${tag}' AND Status = 'Active' `;
5151
else
52-
query = `SELECT Pooltag__c, Id, CreatedDate, ScratchOrg, ExpirationDate, SignupUsername, SignupEmail, Password__c, Allocation_status__c,LoginUrl,SfdxAuthUrl__c FROM ScratchOrgInfo WHERE Pooltag__c != null AND Status = 'Active' `;
52+
query = `SELECT Pooltag__c, Id, CreatedDate, ScratchOrg, ExpirationDate, SignupUsername, SignupEmail, Password__c, Allocation_status__c, LoginUrl, SfdxAuthUrl__c FROM ScratchOrgInfo WHERE Pooltag__c != null AND Status = 'Active' `;
5353

5454
if (isMyPool) {
5555
query = query + ` AND createdby.username = '${this.hubOrg.getUsername()}' `;
@@ -74,7 +74,7 @@ export default class ScratchOrgInfoFetcher {
7474
return retry(
7575
async (bail) => {
7676
let query;
77-
query = `SELECT Id, Pooltag__c,SignupUsername,Description,ScratchOrg FROM ScratchOrgInfo WHERE Pooltag__c = null AND Status = 'Active'`;
77+
query = `SELECT Id, Pooltag__c, SignupUsername, Description, ScratchOrg FROM ScratchOrgInfo WHERE Pooltag__c = null AND Status = 'Active'`;
7878
query = query + ORDER_BY_FILTER;
7979
SFPLogger.log('QUERY:' + query, LoggerLevel.TRACE);
8080
const results = (await hubConn.query(query)) as any;
@@ -104,7 +104,7 @@ export default class ScratchOrgInfoFetcher {
104104

105105
return retry(
106106
async (bail) => {
107-
let query = `SELECT Id, CreatedDate, ScratchOrg, ExpirationDate, SignupUsername, SignupEmail, Password__c, Allocation_status__c,LoginUrl FROM ScratchOrgInfo WHERE Pooltag__c = '${tag}' AND Status = 'Active' `;
107+
let query = `SELECT Id, CreatedDate, ScratchOrg, ExpirationDate, SignupUsername, SignupEmail, Password__c, Allocation_status__c, LoginUrl FROM ScratchOrgInfo WHERE Pooltag__c = '${tag}' AND Status = 'Active' `;
108108
SFPLogger.log('QUERY:' + query, LoggerLevel.TRACE);
109109
const results = (await hubConn.query(query)) as any;
110110
SFPLogger.log('RESULT:' + JSON.stringify(results), LoggerLevel.TRACE);
@@ -119,7 +119,7 @@ export default class ScratchOrgInfoFetcher {
119119

120120
return retry(
121121
async (bail) => {
122-
let query = `SELECT Id, CreatedDate, ScratchOrg, ExpirationDate, SignupUsername, SignupEmail, Password__c, Allocation_status__c,LoginUrl FROM ScratchOrgInfo WHERE Pooltag__c = '${tag}' AND Status = 'Active' `;
122+
let query = `SELECT Id, CreatedDate, ScratchOrg, ExpirationDate, SignupUsername, SignupEmail, Password__c, Allocation_status__c, LoginUrl FROM ScratchOrgInfo WHERE Pooltag__c = '${tag}' AND Status = 'Active' `;
123123
SFPLogger.log('QUERY:' + query, LoggerLevel.TRACE);
124124
const results = (await hubConn.query(query)) as any;
125125
return results.totalSize;

0 commit comments

Comments
 (0)