Skip to content

fix: multiple plugin-config versions #78

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
merged 2 commits into from
May 31, 2022
Merged

fix: multiple plugin-config versions #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d61dc59
fix: multiple plugin-config versions
mshanemc May 31, 2022
86f7a1c
refactor: change fewer things I don't understand
mshanemc May 31, 2022
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
15 changes: 15 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "attach",
"name": "Attach",
"port": 9229,
"skipFiles": ["<node_internals>/**"]
},
]
}
20 changes: 13 additions & 7 deletions src/testkit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import * as fg from 'fast-glob';
import { exec, find, mv, rm, which } from 'shelljs';
import { TestSession, execCmd } from '@salesforce/cli-plugins-testkit';
import { AsyncCreatable, Env, set, parseJsonMap } from '@salesforce/kit';
import { AnyJson, Dictionary, ensureString, get, JsonMap, Nullable } from '@salesforce/ts-types';
import { AnyJson, Dictionary, ensureString, JsonMap, Nullable } from '@salesforce/ts-types';
import { AuthInfo, SfdxPropertyKeys, Connection, NamedPackageDir, SfdxProject } from '@salesforce/core';
import { debug, Debugger } from 'debug';
import { MetadataResolver } from '@salesforce/source-deploy-retrieve';
Expand Down Expand Up @@ -382,7 +382,7 @@ export class SourceTestkit extends AsyncCreatable<SourceTestkit.Options> {
}

/**
* Returns true if the executable being used belongs to a local pacakage
* Returns true if the executable being used belongs to a local package
*/
public isLocalExecutable(): boolean {
return (
Expand Down Expand Up @@ -537,11 +537,17 @@ export class SourceTestkit extends AsyncCreatable<SourceTestkit.Options> {
}

private async getDefaultUsername(): Promise<string> {
const configVar = this.executableName === Executable.SF ? 'target-org' : SfdxPropertyKeys.DEFAULT_USERNAME;
const configResult = execCmd(`config:get ${configVar} --json`).jsonOutput!;
const results = get(configResult, 'result', configResult) as Array<{ key?: string; name?: string; value: string }>;
const username = results.find((r) => r.key === configVar || r.name === configVar)!.value;
return username;
const configVar = 'target-org';
const configResult = execCmd<Array<{ key?: string; name?: string; value: string }>>(
`config:get ${configVar} --json`
).jsonOutput?.result;
// depending on which version of config:get the user has available, there may be a name or key
// eventually, drop the `key` option and the deprecated SfdxPropertyKeys
const possibleKeys = [configVar, SfdxPropertyKeys.DEFAULT_USERNAME];
const username = configResult?.find(
(r) => (r.key && possibleKeys.includes(r.key)) || (r.name && possibleKeys.includes(r.name))
)?.value;
return username!;
}

private async createConnection(): Promise<Nullable<Connection>> {
Expand Down