forked from hashicorp/terraform-ls
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add terraform version command (hashicorp#1016)
This commit adds a new `module.terraform` command which returns the required and discovered version of Terraform in the current workspace.
- Loading branch information
Showing
8 changed files
with
203 additions
and
4 deletions.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
package command | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
|
||
"github.com/creachadair/jrpc2/code" | ||
"github.com/hashicorp/terraform-ls/internal/langserver/cmd" | ||
"github.com/hashicorp/terraform-ls/internal/langserver/progress" | ||
"github.com/hashicorp/terraform-ls/internal/uri" | ||
) | ||
|
||
const terraformVersionRequestVersion = 0 | ||
|
||
type terraformInfoResponse struct { | ||
FormatVersion int `json:"v"` | ||
RequiredVersion string `json:"required_version,omitempty"` | ||
DiscoveredVersion string `json:"discovered_version,omitempty"` | ||
} | ||
|
||
func (h *CmdHandler) TerraformVersionRequestHandler(ctx context.Context, args cmd.CommandArgs) (interface{}, error) { | ||
progress.Begin(ctx, "Initializing") | ||
defer func() { | ||
progress.End(ctx, "Finished") | ||
}() | ||
|
||
response := terraformInfoResponse{ | ||
FormatVersion: terraformVersionRequestVersion, | ||
} | ||
|
||
progress.Report(ctx, "Finding current module info ...") | ||
modUri, ok := args.GetString("uri") | ||
if !ok || modUri == "" { | ||
return response, fmt.Errorf("%w: expected module uri argument to be set", code.InvalidParams.Err()) | ||
} | ||
|
||
if !uri.IsURIValid(modUri) { | ||
return response, fmt.Errorf("URI %q is not valid", modUri) | ||
} | ||
|
||
modPath, err := uri.PathFromURI(modUri) | ||
if err != nil { | ||
return response, err | ||
} | ||
|
||
mod, _ := h.StateStore.Modules.ModuleByPath(modPath) | ||
if mod == nil { | ||
return response, nil | ||
} | ||
|
||
progress.Report(ctx, "Recording terraform version info ...") | ||
if mod.TerraformVersion != nil { | ||
response.DiscoveredVersion = mod.TerraformVersion.String() | ||
} | ||
if mod.Meta.CoreRequirements != nil { | ||
response.RequiredVersion = mod.Meta.CoreRequirements.String() | ||
} | ||
|
||
progress.Report(ctx, "Sending response ...") | ||
|
||
return response, nil | ||
} |
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
95 changes: 95 additions & 0 deletions
95
internal/langserver/handlers/execute_command_terraform_version_test.go
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,95 @@ | ||
package handlers | ||
|
||
import ( | ||
"fmt" | ||
"testing" | ||
|
||
"github.com/hashicorp/go-version" | ||
"github.com/hashicorp/terraform-ls/internal/document" | ||
"github.com/hashicorp/terraform-ls/internal/langserver" | ||
"github.com/hashicorp/terraform-ls/internal/langserver/cmd" | ||
"github.com/hashicorp/terraform-ls/internal/state" | ||
"github.com/hashicorp/terraform-ls/internal/terraform/exec" | ||
"github.com/hashicorp/terraform-ls/internal/uri" | ||
"github.com/hashicorp/terraform-ls/internal/walker" | ||
tfaddr "github.com/hashicorp/terraform-registry-address" | ||
tfmod "github.com/hashicorp/terraform-schema/module" | ||
"github.com/stretchr/testify/mock" | ||
) | ||
|
||
func TestLangServer_workspaceExecuteCommand_terraformVersion_basic(t *testing.T) { | ||
modDir := t.TempDir() | ||
modUri := uri.FromPath(modDir) | ||
|
||
s, err := state.NewStateStore() | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
err = s.Modules.Add(modDir) | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
metadata := &tfmod.Meta{ | ||
Path: modDir, | ||
CoreRequirements: testConstraint(t, "~> 0.15"), | ||
} | ||
|
||
err = s.Modules.UpdateMetadata(modDir, metadata, nil) | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
ver, err := version.NewVersion("1.1.0") | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
err = s.Modules.UpdateTerraformVersion(modDir, ver, map[tfaddr.Provider]*version.Version{}, nil) | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
wc := walker.NewWalkerCollector() | ||
|
||
ls := langserver.NewLangServerMock(t, NewMockSession(&MockSessionInput{ | ||
TerraformCalls: &exec.TerraformMockCalls{ | ||
PerWorkDir: map[string][]*mock.Call{ | ||
modDir: validTfMockCalls(), | ||
}, | ||
}, | ||
StateStore: s, | ||
WalkerCollector: wc, | ||
})) | ||
stop := ls.Start(t) | ||
defer stop() | ||
|
||
ls.Call(t, &langserver.CallRequest{ | ||
Method: "initialize", | ||
ReqParams: fmt.Sprintf(`{ | ||
"capabilities": {}, | ||
"rootUri": %q, | ||
"processId": 12345 | ||
}`, modUri)}) | ||
waitForWalkerPath(t, s, wc, document.DirHandleFromURI(modUri)) | ||
ls.Notify(t, &langserver.CallRequest{ | ||
Method: "initialized", | ||
ReqParams: "{}", | ||
}) | ||
|
||
ls.CallAndExpectResponse(t, &langserver.CallRequest{ | ||
Method: "workspace/executeCommand", | ||
ReqParams: fmt.Sprintf(`{ | ||
"command": %q, | ||
"arguments": ["uri=%s"] | ||
}`, cmd.Name("module.terraform"), modUri)}, `{ | ||
"jsonrpc": "2.0", | ||
"id": 2, | ||
"result": { | ||
"v": 0, | ||
"required_version": "~\u003e 0.15", | ||
"discovered_version": "1.1.0" | ||
} | ||
}`) | ||
} |
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