Skip to content
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

Adding executionMode to Workspace Importer #734

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Adding executionMode to Workspace Importer #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions api/src/main/java/org/terrakube/api/plugin/importer/tfcloud/WorkspaceImport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ public static class WorkspaceAttributes {
private VcsRepo vcsRepo;
@JsonProperty("terraform-version")
private String terraformVersion;
@JsonProperty("execution-mode")
private String executionMode;
}

@Getter
Expand Down
1 change: 1 addition & 0 deletions api/src/main/java/org/terrakube/api/plugin/importer/tfcloud/WorkspaceImportRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ public class WorkspaceImportRequest {
private String name;
private String source;
private String description;
private String executionMode;
}
2 changes: 1 addition & 1 deletion api/src/main/java/org/terrakube/api/plugin/importer/tfcloud/services/WorkspaceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ private Workspace createWorkspaceFromRequest(WorkspaceImportRequest workspaceImp
workspace.setName(workspaceImportRequest.getName());
workspace.setDescription(workspaceImportRequest.getDescription());
workspace.setTerraformVersion(workspaceImportRequest.getTerraformVersion());
workspace.setExecutionMode("remote");
workspace.setExecutionMode(workspaceImportRequest.getExecutionMode().equals("local") ? "local" : "remote"); //Tfcloud supports agent execution mode, but Terrakkube not

// If the workspace has a VCS, set it
log.info("VCS ID: {}", workspaceImportRequest.getVcsId());
Expand Down
1 change: 1 addition & 0 deletions ui/src/domain/Workspaces/Import.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ export const ImportWorkspace = () => {
name: workspace.attributes.name,
terraformVersion: workspace.attributes["terraform-version"],
source: workspace.attributes["vcs-repo"]?.["repository-http-url"],
executionMode: workspace?.attributes["execution-mode"],
description: workspace.attributes.description,
},
{
Expand Down
Loading