Skip to content

Import command for components without context #1117

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 6 commits into from
Sep 6, 2019
Merged

Import command for components without context #1117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b4d89ef
Fix tslint error
dgolovin Aug 29, 2019
8df972c
Fix tslint errors
dgolovin Aug 29, 2019
5f90d3a
Provide Import command for Components without context
dgolovin Sep 4, 2019
c55ee82
Update link to wiki page
dgolovin Sep 4, 2019
354d706
Udate case statement
dgolovin Sep 4, 2019
3cdaa45
Rename 'More Info...' to 'Help'
dgolovin Sep 4, 2019
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
23 changes: 22 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vscode-openshift-connector",
"displayName": "OpenShift Connector",
"description": "Interacting with Red Hat OpenShift clusters and providing a streamlined developer experience using Visual Studio Code",
"version": "0.0.23",
"version": "0.1.0",
"license": "MIT",
"publisher": "redhat",
"author": "Red Hat",
Expand Down Expand Up @@ -52,6 +52,7 @@
"onCommand:openshift.app.describe",
"onCommand:openshift.app.create",
"onCommand:openshift.app.delete",
"onCommand:openshift.component.import",
"onCommand:openshift.component.create",
"onCommand:openshift.component.createFromLocal",
"onCommand:openshift.component.createFromGit",
Expand Down Expand Up @@ -211,6 +212,11 @@
"title": "Delete",
"category": "OpenShift"
},
{
"command": "openshift.component.import",
"title": "Import",
"category": "OpenShift"
},
{
"command": "openshift.component.create",
"title": "New Component",
Expand Down Expand Up @@ -524,6 +530,10 @@
"command": "openshift.project.delete",
"when": "view == openshiftProjectExplorer"
},
{
"command": "openshift.component.import",
"when": "view == openshiftProjectExplorer"
},
{
"command": "openshift.component.create",
"when": "view == openshiftProjectExplorer"
Expand Down Expand Up @@ -763,6 +773,11 @@
"when": "view == openshiftProjectExplorer && viewItem == component_no_context",
"group": "c2@1"
},
{
"command": "openshift.component.import",
"when": "view == openshiftProjectExplorer && viewItem == component_no_context",
"group": "c2@2"
},
{
"command": "openshift.component.log",
"when": "view == openshiftProjectExplorer && viewItem == component",
Expand Down Expand Up @@ -883,6 +898,12 @@
"type": "number",
"default": 0,
"description": "Output verbosity level (value between 0 and 9) for OpenShift Create, Push and Watch commands in output channel and integrated terminal."
},
"openshiftConnector.disableCheckForMigration": {
"title": "Disable check if migration required",
"type": "boolean",
"default": false,
"description": "Dsable check if migration is required for resources created with previous version of the extension and mirgation request message."
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export async function activate(context: vscode.ExtensionContext) {
vscode.commands.registerCommand('openshift.app.describe', (context) => execute(Application.describe, context)),
vscode.commands.registerCommand('openshift.app.describe.palette', (context) => execute(Application.describe, context)),
vscode.commands.registerCommand('openshift.app.delete', (context) => execute(Application.del, context)),
vscode.commands.registerCommand('openshift.component.import', (context) => execute(Component.import, context)),
vscode.commands.registerCommand('openshift.component.describe', (context) => execute(Component.describe, context)),
vscode.commands.registerCommand('openshift.component.describe.palette', (context) => execute(Component.describe, context)),
vscode.commands.registerCommand('openshift.component.create', (context) => execute(Component.create, context)),
Expand Down
52 changes: 36 additions & 16 deletions src/odo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ export enum ContextType {
COMPONENT_ROUTE = 'component_route'
}

export enum ComponentType {
LOCAL = 'local',
GIT = 'git',
BINARY = 'binary'
}

function verbose(_target: any, key: string, descriptor: any) {
let fnKey: string | undefined;
let fn: Function | undefined;
Expand Down Expand Up @@ -321,11 +327,11 @@ export class OpenShiftObjectImpl implements OpenShiftObject {

get iconPath(): Uri {
if (this.contextValue === ContextType.COMPONENT_PUSHED || this.contextValue === ContextType.COMPONENT || this.contextValue === ContextType.COMPONENT_NO_CONTEXT) {
if (this.compType === 'git') {
if (this.compType === ComponentType.GIT) {
return Uri.file(path.join(__dirname, "../../images/component", 'git.png'));
} else if (this.compType === 'local') {
} else if (this.compType === ComponentType.LOCAL) {
return Uri.file(path.join(__dirname, "../../images/component", 'workspace.png'));
} else if (this.compType === 'binary') {
} else if (this.compType === ComponentType.BINARY) {
return Uri.file(path.join(__dirname, "../../images/component", 'binary.png'));
}
} else {
Expand Down Expand Up @@ -382,6 +388,7 @@ export interface Odo {
getClusters(): Promise<OpenShiftObject[]>;
getProjects(): Promise<OpenShiftObject[]>;
loadWorkspaceComponents(event: WorkspaceFoldersChangeEvent): void;
addWorkspaceComponent(WorkspaceFolder: WorkspaceFolder, component: OpenShiftObject);
getApplications(project: OpenShiftObject): Promise<OpenShiftObject[]>;
getApplicationChildren(application: OpenShiftObject): Promise<OpenShiftObject[]>;
getComponents(application: OpenShiftObject, condition?: (value: OpenShiftObject) => boolean): Promise<OpenShiftObject[]>;
Expand Down Expand Up @@ -555,8 +562,10 @@ export class OdoImpl implements Odo {
clusters = await this.getClustersWithOc();
}
if (clusters.length > 0 && clusters[0].contextValue === ContextType.CLUSTER) {
// kick out migration
this.convertObjectsFromPreviousOdoReleases();
// kick out migration if enabled
if (!workspace.getConfiguration("openshiftConnector").get("disableCheckForMigration")) {
this.convertObjectsFromPreviousOdoReleases();
}
}
return clusters;
}
Expand Down Expand Up @@ -663,16 +672,16 @@ export class OdoImpl implements Odo {
let compSource: string = '';
try {
if (value.source.startsWith('https://')) {
compSource = 'git';
compSource = ComponentType.GIT;
} else if (statSync(Uri.parse(value.source).fsPath).isFile()) {
compSource = 'binary';
compSource = ComponentType.BINARY;
} else if (statSync(Uri.parse(value.source).fsPath).isDirectory()) {
compSource = 'local';
compSource = ComponentType.LOCAL;
}
} catch (ignore) {
// treat component as local in case of error when calling statSync
// for not existing file or folder
compSource = 'local';
compSource = ComponentType.LOCAL;
}
return new OpenShiftObjectImpl(application, value.name, ContextType.COMPONENT_NO_CONTEXT, true, this, Collapsed, undefined, compSource);
});
Expand Down Expand Up @@ -917,7 +926,7 @@ export class OdoImpl implements Odo {
if (!targetApplication) {
await this.insertAndReveal(application);
}
await this.insertAndReveal(new OpenShiftObjectImpl(application, name, ContextType.COMPONENT, false, this, Collapsed, context, 'git'));
await this.insertAndReveal(new OpenShiftObjectImpl(application, name, ContextType.COMPONENT, false, this, Collapsed, context, ComponentType.GIT));
}
workspace.updateWorkspaceFolders(workspace.workspaceFolders? workspace.workspaceFolders.length : 0 , null, { uri: context });
return null;
Expand All @@ -930,7 +939,7 @@ export class OdoImpl implements Odo {
if (!targetApplication) {
await this.insertAndReveal(application);
}
this.insertAndReveal(new OpenShiftObjectImpl(application, name, ContextType.COMPONENT, false, this, Collapsed, context, 'binary'));
this.insertAndReveal(new OpenShiftObjectImpl(application, name, ContextType.COMPONENT, false, this, Collapsed, context, ComponentType.BINARY));
}
workspace.updateWorkspaceFolders(workspace.workspaceFolders? workspace.workspaceFolders.length : 0 , null, { uri: context });
return null;
Expand Down Expand Up @@ -1017,6 +1026,11 @@ export class OdoImpl implements Odo {
OdoImpl.data.clearTreeData();
}

addWorkspaceComponent(folder: WorkspaceFolder, component: OpenShiftObject) {
OdoImpl.data.addContexts([folder]);
this.subject.next(new OdoEventImpl('changed', null));
}

loadWorkspaceComponents(event: WorkspaceFoldersChangeEvent): void {
if (event === null && workspace.workspaceFolders) {
OdoImpl.data.addContexts(workspace.workspaceFolders);
Expand Down Expand Up @@ -1089,13 +1103,15 @@ export class OdoImpl implements Odo {
const result2 = await this.execute(getPreviosOdoResourceNames('ServiceInstance'), __dirname, false);
const sis = result2.stdout.split('\n');
if ((result2.stdout !== '' && sis.length > 0) || (result1.stdout !== '' && dcs.length > 0)) {
const choice = await window.showWarningMessage(`Some of resources in cluster must be updated to work with latest release of OpenShift Connector Extension.`, 'Learn more...', 'Update', 'Cancel');
if (choice === 'Learn more...') {
open('https://github.com/redhat-developer/vscode-openshift-tools/wiki/Migration-to-v0.0.24');
const choice = await window.showWarningMessage(`Some of resources in cluster must be updated to work with latest release of OpenShift Connector Extension.`, 'Update', 'Don\'t show it again', 'Help', 'Cancel');
if (choice === 'Help') {
open('https://github.com/redhat-developer/vscode-openshift-tools/wiki/Migration-to-v0.1.0');
this.subject.next(new OdoEventImpl('changed', this.getClusters()[0]));
} else if (choice === 'Don\'t show it again') {
workspace.getConfiguration("openshiftConnector").update("disableCheckForMigration", true, true);
} else if (choice === 'Update') {
const errors = [];
Progress.execFunctionWithProgress('Updating cluster resources to work with latest OpenShift Connector release', async (progress) => {
await Progress.execFunctionWithProgress('Updating cluster resources to work with latest OpenShift Connector release', async (progress) => {
for (const resourceId of ['DeploymentConfig', 'Route', 'BuildConfig', 'ImageStream', 'Service', 'pvc', 'Secret', 'ServiceInstance']) {
progress.report({increment: 100/8, message: resourceId});
const cmd = getPreviosOdoResourceNames(resourceId);
Expand All @@ -1113,8 +1129,12 @@ export class OdoImpl implements Odo {
if (labels['app.kubernetes.io/component-version']) {
command = command + ` app.openshift.io/runtime-version=${labels['app.kubernetes.io/component-version']}`;
}
if (labels['app.kubernetes.io/url-name']) {
command = command + ` odo.openshift.io/url-name=${labels['app.kubernetes.io/url-name']}`;
}
await this.execute(command);
await this.execute(`oc label ${resourceId} ${resourceName} app.kubernetes.io/component-name-`);
await this.execute(`oc label ${resourceId} ${resourceName} odo.openshift.io/migrated=true`);
} catch (err) {
errors.push(err);
}
Expand All @@ -1123,7 +1143,7 @@ export class OdoImpl implements Odo {
this.subject.next(new OdoEventImpl('changed', this.getClusters()[0]));
});
if (errors.length) {
window.showErrorMessage('Not all resources were updates, please see log for details.');
window.showErrorMessage('Not all resources were updates, please see OpenShift output channel for details.');
} else {
window.showInformationMessage('Cluster resources have been successfuly updated.');
}
Expand Down
Loading