Skip to content

fix: incorrect certificate flashing command string #2181

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
Aug 20, 2023
Merged

fix: incorrect certificate flashing command string #2181

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
ab9490d
fix: incorrect certificate flashing command string
Aug 20, 2023
9d1789f
fix: remove command flags from API
Aug 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
13 changes: 6 additions & 7 deletions arduino-ide-extension/src/browser/contributions/upload-certificate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ import {
arduinoCert,
certificateList,
} from '../dialogs/certificate-uploader/utils';
import { ArduinoFirmwareUploader } from '../../common/protocol/arduino-firmware-uploader';
import {
ArduinoFirmwareUploader,
UploadCertificateParams,
} from '../../common/protocol/arduino-firmware-uploader';
import { nls } from '@theia/core/lib/common';

@injectable()
Expand Down Expand Up @@ -74,12 +77,8 @@ export class UploadCertificate extends Contribution {
});

registry.registerCommand(UploadCertificate.Commands.UPLOAD_CERT, {
execute: async ({ fqbn, address, urls }) => {
return this.arduinoFirmwareUploader.uploadCertificates(
`-b ${fqbn} -a ${address} ${urls
.map((url: string) => `-u ${url}`)
.join(' ')}`
);
execute: async (params: UploadCertificateParams) => {
return this.arduinoFirmwareUploader.uploadCertificates(params);
},
});

Expand Down
13 changes: 9 additions & 4 deletions arduino-ide-extension/src/common/protocol/arduino-firmware-uploader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
import { Port } from "./boards-service";
import type { Port } from './boards-service';

export const ArduinoFirmwareUploaderPath =
'/services/arduino-firmware-uploader';
export const ArduinoFirmwareUploader = Symbol('ArduinoFirmwareUploader');
export type FirmwareInfo = {
export interface FirmwareInfo {
board_name: string;
board_fqbn: string;
module: string;
firmware_version: string;
Latest: boolean;
};
}
export interface UploadCertificateParams {
readonly fqbn: string;
readonly address: string;
readonly urls: readonly string[];
}
export interface ArduinoFirmwareUploader {
list(fqbn?: string): Promise<FirmwareInfo[]>;
flash(firmware: FirmwareInfo, port: Port): Promise<string>;
uploadCertificates(command: string): Promise<any>;
uploadCertificates(params: UploadCertificateParams): Promise<unknown>;
updatableBoards(): Promise<string[]>;
availableFirmwares(fqbn: string): Promise<FirmwareInfo[]>;
}
14 changes: 12 additions & 2 deletions arduino-ide-extension/src/node/arduino-firmware-uploader-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { Port } from '../common/protocol';
import {
ArduinoFirmwareUploader,
FirmwareInfo,
UploadCertificateParams,
} from '../common/protocol/arduino-firmware-uploader';
import { spawnCommand } from './exec-util';
import { MonitorManager } from './monitor-manager';
Expand All @@ -17,8 +18,17 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {
@inject(MonitorManager)
private readonly monitorManager: MonitorManager;

async uploadCertificates(command: string): Promise<string> {
return await this.runCommand(['certificates', 'flash', command]);
async uploadCertificates(params: UploadCertificateParams): Promise<string> {
const { fqbn, address, urls } = params;
return await this.runCommand([
'certificates',
'flash',
'-b',
fqbn,
'-a',
address,
...urls.flatMap((url) => ['-u', url]),
]);
}

async list(fqbn?: string): Promise<FirmwareInfo[]> {
Expand Down