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

feat: Always use the newest validation scratch org during Validate #1428

Merged
azlam-abdulsalam merged 2 commits into from
Nov 8, 2023
Merged

feat: Always use the newest validation scratch org during Validate #1428

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb39030
feat: Always use the newest validation scratch org during Validate
alanjaouen Oct 20, 2023
0d67a71
chore: add spaces to queries
alanjaouen Oct 20, 2023
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
12 changes: 6 additions & 6 deletions packages/core/src/scratchorg/pool/services/fetchers/ScratchOrgInfoFetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import SFPLogger, { LoggerLevel } from '@dxatscale/sfp-logger';
import { Org } from '@salesforce/core';
import ScratchOrg from '../../../ScratchOrg';
const retry = require('async-retry');
const ORDER_BY_FILTER = ' ORDER BY CreatedDate ASC';
const ORDER_BY_FILTER = ' ORDER BY CreatedDate DESC';

export default class ScratchOrgInfoFetcher {
constructor(private hubOrg: Org) {}
Expand Down Expand Up @@ -47,9 +47,9 @@ export default class ScratchOrgInfoFetcher {
let query;

if (tag)
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' `;
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' `;
else
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' `;
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' `;

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

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

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