feat: make project optional #771
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ import { Flags, loglevel, orgApiVersionFlagWithDeprecations, SfCommand } from '@ | |
| import { Messages } from '@salesforce/core/messages'; | ||
| import { Package, PackageSaveResult } from '@salesforce/packaging'; | ||
| import { requiredHubFlag } from '../../utils/hubFlag.js'; | ||
| import { maybeGetProject } from '../../utils/getProject.js'; | ||
|
|
||
| Messages.importMessagesDirectoryFromMetaUrl(import.meta.url); | ||
| const messages = Messages.loadMessages('@salesforce/plugin-packaging', 'package_update'); | ||
|
|
@@ -20,7 +21,6 @@ export class PackageUpdateCommand extends SfCommand<PackageSaveResult> { | |
| public static readonly examples = messages.getMessages('examples'); | ||
| public static readonly deprecateAliases = true; | ||
| public static readonly aliases = ['force:package:update']; | ||
|
There was a problem hiding this comment. same (I'd expect it to update the packageDirectories description/etc with my changes) There was a problem hiding this comment. @mshanemc - I tested something similar with I updated the |
||
| public static readonly flags = { | ||
| loglevel, | ||
| 'target-dev-hub': requiredHubFlag, | ||
|
|
@@ -54,10 +54,11 @@ export class PackageUpdateCommand extends SfCommand<PackageSaveResult> { | |
|
|
||
| public async run(): Promise<PackageSaveResult> { | ||
| const { flags } = await this.parse(PackageUpdateCommand); | ||
|
|
||
| const pkg = new Package({ | ||
| packageAliasOrId: flags.package, | ||
| connection: flags['target-dev-hub'].getConnection(flags['api-version']), | ||
| project: await maybeGetProject(), | ||
| }); | ||
|
|
||
| const result = await pkg.update({ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Copyright (c) 2022, salesforce.com, inc. | ||
| * All rights reserved. | ||
| * Licensed under the BSD 3-Clause license. | ||
| * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause | ||
| */ | ||
|
|
||
| import { SfProject } from '@salesforce/core'; | ||
|
|
||
| /* | ||
| * Get the sfdx project from the current dir. | ||
| * It will return `undefined` if there's no project. | ||
| * */ | ||
| export async function maybeGetProject(): Promise<SfProject | undefined> { | ||
| try { | ||
| return await SfProject.resolve(); | ||
| } catch (err) { | ||
| if (err instanceof Error && err.name === 'InvalidProjectWorkspaceError') { | ||
| return undefined; | ||
| } | ||
|
There was a problem hiding this comment. any swallow all other errors? There was a problem hiding this comment.
none, I think I was just following the error msg from |
||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,36 +15,46 @@ import { env } from '@salesforce/kit'; | |
| import { PackageVersionCreateCommand } from '../../../src/commands/package/version/create.js'; | ||
| import Package2VersionStatus = PackagingSObjects.Package2VersionStatus; | ||
|
|
||
| const pkgVersionCreateErrorResult: PackageVersionCreateRequestResult = { | ||
|
There was a problem hiding this comment. this type changed here: |
||
| Id: '08c3i000000fylXXXX', | ||
| Status: Package2VersionStatus.error, | ||
| Package2Id: '0Ho3i000000TNHXXXX', | ||
| Package2VersionId: '', | ||
| SubscriberPackageVersionId: '', | ||
| Tag: '', | ||
| Branch: '', | ||
| Error: [ | ||
| 'PropertyController: Invalid type: Schema.Property__c', | ||
| 'SampleDataController: Invalid type: Schema.Property__c', | ||
| 'SampleDataController: Invalid type: Schema.Broker__c', | ||
| ], | ||
| CreatedDate: '2022-11-03 09:21', | ||
| HasMetadataRemoved: null, | ||
| CreatedBy: '0053i000001ZIyXXXX', | ||
| Package2Name: null, | ||
| HasPassedCodeCoverageCheck: null, | ||
| CodeCoverage: null, | ||
| VersionNumber: null, | ||
| ConvertedFromVersionId: null, | ||
| }; | ||
|
|
||
| const pkgVersionCreateSuccessResult: PackageVersionCreateRequestResult = { | ||
| Id: '08c3i000000fylgAAA', | ||
| Status: Package2VersionStatus.success, | ||
| Package2Id: '0Ho3i000000TNHYCA4', | ||
| Package2VersionId: '05i3i000000fxw1AAA', | ||
| SubscriberPackageVersionId: '04t3i000002eya2AAA', | ||
| Tag: '', | ||
| Branch: '', | ||
| Error: [], | ||
| CreatedDate: '2022-11-03 09:46', | ||
| HasMetadataRemoved: false, | ||
| CreatedBy: '0053i000001ZIyGAAW', | ||
| Package2Name: null, | ||
| HasPassedCodeCoverageCheck: null, | ||
| CodeCoverage: null, | ||
| VersionNumber: null, | ||
| ConvertedFromVersionId: null, | ||
| }; | ||
|
|
||
| describe('package:version:create - tests', () => { | ||
|
|
@@ -84,7 +94,7 @@ describe('package:version:create - tests', () => { | |
| const res = await cmd.run(); | ||
| expect(envSpy.calledOnce).to.equal(true); | ||
| expect(res).to.deep.equal({ | ||
| Branch: '', | ||
| CreatedBy: '0053i000001ZIyGAAW', | ||
| CreatedDate: '2022-11-03 09:46', | ||
| Error: [], | ||
|
|
@@ -94,7 +104,12 @@ describe('package:version:create - tests', () => { | |
| Package2VersionId: '05i3i000000fxw1AAA', | ||
| Status: 'Success', | ||
| SubscriberPackageVersionId: '04t3i000002eya2AAA', | ||
| Tag: '', | ||
| Package2Name: null, | ||
| HasPassedCodeCoverageCheck: null, | ||
| CodeCoverage: null, | ||
| VersionNumber: null, | ||
| ConvertedFromVersionId: null, | ||
| }); | ||
| expect(logStub.callCount).to.equal(1); | ||
| expect(logStub.args[0]).to.deep.equal([ | ||
|
|
@@ -115,7 +130,7 @@ describe('package:version:create - tests', () => { | |
| const res = await cmd.run(); | ||
| expect(envSpy.calledOnce).to.equal(true); | ||
| expect(res).to.deep.equal({ | ||
| Branch: '', | ||
| CreatedBy: '0053i000001ZIyGAAW', | ||
| CreatedDate: '2022-11-03 09:46', | ||
| Error: [], | ||
|
|
@@ -125,7 +140,12 @@ describe('package:version:create - tests', () => { | |
| Package2VersionId: '05i3i000000fxw1AAA', | ||
| Status: 'Success', | ||
| SubscriberPackageVersionId: '04t3i000002eya2AAA', | ||
| Tag: '', | ||
| Package2Name: null, | ||
| HasPassedCodeCoverageCheck: null, | ||
| CodeCoverage: null, | ||
| VersionNumber: null, | ||
| ConvertedFromVersionId: null, | ||
| }); | ||
| expect(logStub.callCount).to.equal(1); | ||
| expect(logStub.args[0]).to.deep.equal([ | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also would have expected this to modify sfdx-project after deleting the pkg