From 8c5f634167cd29e56a3447e9cbc7f3a40c35db56 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Thu, 10 Jun 2021 09:27:14 +0100 Subject: [PATCH] Bump hashicorp/terraform-schema to 8f289892 (#545) * Bump hashicorp/terraform-schema to 8f289892 * fix tests --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/langserver/handlers/complete_test.go | 20 +++++++++---------- internal/state/provider_schema_test.go | 12 +++++++---- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 6dfe21e43..ea5bf1547 100644 --- a/go.mod +++ b/go.mod @@ -12,12 +12,12 @@ require ( github.com/hashicorp/go-memdb v1.3.2 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-version v1.3.0 - github.com/hashicorp/hcl-lang v0.0.0-20210522074354-f7480edf31b5 + github.com/hashicorp/hcl-lang v0.0.0-20210609120759-c626a5e211fc github.com/hashicorp/hcl/v2 v2.10.0 github.com/hashicorp/terraform-exec v0.13.3 github.com/hashicorp/terraform-json v0.11.0 github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 - github.com/hashicorp/terraform-schema v0.0.0-20210601142728-f0b01c296a30 + github.com/hashicorp/terraform-schema v0.0.0-20210609161301-8f289892aa01 github.com/kylelemons/godebug v1.1.0 // indirect github.com/mh-cbon/go-fmt-fail v0.0.0-20160815164508-67765b3fbcb5 github.com/mitchellh/cli v1.1.2 diff --git a/go.sum b/go.sum index dbaedb944..0dad694e2 100644 --- a/go.sum +++ b/go.sum @@ -188,8 +188,8 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/hcl-lang v0.0.0-20210522074354-f7480edf31b5 h1:lgywSdFExtTcqjaenkU2xhnbmtYLJIW+Ch3qQW0z6Jg= -github.com/hashicorp/hcl-lang v0.0.0-20210522074354-f7480edf31b5/go.mod h1:yPc3ggegh0njWLfIBPbmTk6a5T/vJVsMm4z6IuEgePU= +github.com/hashicorp/hcl-lang v0.0.0-20210609120759-c626a5e211fc h1:Kuz00XoVdIcsZ4ak4xI1Tc/1waKqAISzgqgzWn0DE2Y= +github.com/hashicorp/hcl-lang v0.0.0-20210609120759-c626a5e211fc/go.mod h1:uMsq6wV8ZXEH8qndov4tncXlHDYnZ8aHsGmS4T74e2o= github.com/hashicorp/hcl/v2 v2.10.0 h1:1S1UnuhDGlv3gRFV4+0EdwB+znNP5HmcGbIqwnSCByg= github.com/hashicorp/hcl/v2 v2.10.0/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -203,8 +203,8 @@ github.com/hashicorp/terraform-json v0.11.0 h1:4zDqqW2F3kOysORIaYKFGgWDYIRA3hwqx github.com/hashicorp/terraform-json v0.11.0/go.mod h1:pmbq9o4EuL43db5+0ogX10Yofv1nozM+wskr/bGFJpI= github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 h1:1FGtlkJw87UsTMg5s8jrekrHmUPUJaMcu6ELiVhQrNw= github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896/go.mod h1:bzBPnUIkI0RxauU8Dqo+2KrZZ28Cf48s8V6IHt3p4co= -github.com/hashicorp/terraform-schema v0.0.0-20210601142728-f0b01c296a30 h1:gASv/NUeM0zNrg6hvV50Fb3+Pe/fQQDTHiagiC31GQw= -github.com/hashicorp/terraform-schema v0.0.0-20210601142728-f0b01c296a30/go.mod h1:8Zx/D3N5rNnk4SrNXQgdxq8+hkRdQtu67OT8Kxr8U60= +github.com/hashicorp/terraform-schema v0.0.0-20210609161301-8f289892aa01 h1:KStg5R8gHMqKLWViTkDZ6cSWnjaDzxv7SIRI0yeal2k= +github.com/hashicorp/terraform-schema v0.0.0-20210609161301-8f289892aa01/go.mod h1:O25hKjfevi+kkX6vfs0pe1AdkYTF3GIfr3P67yMOkmI= github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0= github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= diff --git a/internal/langserver/handlers/complete_test.go b/internal/langserver/handlers/complete_test.go index 71ca9cc53..d6fef5c50 100644 --- a/internal/langserver/handlers/complete_test.go +++ b/internal/langserver/handlers/complete_test.go @@ -122,7 +122,7 @@ func TestModuleCompletion_withValidData(t *testing.T) { { "label": "alias", "kind": 10, - "detail": "Optional, string", + "detail": "optional, string", "documentation": "Alias for using the same provider with different configurations for different resources, e.g. eu-west", "insertTextFormat": 1, "textEdit": { @@ -142,7 +142,7 @@ func TestModuleCompletion_withValidData(t *testing.T) { { "label": "anonymous", "kind": 10, - "detail": "Optional, number", + "detail": "optional, number", "documentation": "Desc 1", "insertTextFormat": 1, "textEdit": { @@ -162,7 +162,7 @@ func TestModuleCompletion_withValidData(t *testing.T) { { "label": "base_url", "kind": 10, - "detail": "Optional, string", + "detail": "optional, string", "documentation": "Desc 2", "insertTextFormat": 1, "textEdit": { @@ -182,7 +182,7 @@ func TestModuleCompletion_withValidData(t *testing.T) { { "label": "individual", "kind": 10, - "detail": "Optional, bool", + "detail": "optional, bool", "documentation": "Desc 3", "insertTextFormat": 1, "textEdit": { @@ -202,7 +202,7 @@ func TestModuleCompletion_withValidData(t *testing.T) { { "label": "version", "kind": 10, - "detail": "Optional, string", + "detail": "optional, string", "documentation": "Specifies a version constraint for the provider, e.g. ~\u003e 1.0", "insertTextFormat": 1, "textEdit": { @@ -323,7 +323,7 @@ func TestModuleCompletion_withValidDataAndSnippets(t *testing.T) { { "label": "alias", "kind": 10, - "detail": "Optional, string", + "detail": "optional, string", "documentation": "Alias for using the same provider with different configurations for different resources, e.g. eu-west", "insertTextFormat": 2, "textEdit": { @@ -343,7 +343,7 @@ func TestModuleCompletion_withValidDataAndSnippets(t *testing.T) { { "label": "anonymous", "kind": 10, - "detail": "Optional, number", + "detail": "optional, number", "documentation": "Desc 1", "insertTextFormat": 2, "textEdit": { @@ -367,7 +367,7 @@ func TestModuleCompletion_withValidDataAndSnippets(t *testing.T) { { "label": "base_url", "kind": 10, - "detail": "Optional, string", + "detail": "optional, string", "documentation": "Desc 2", "insertTextFormat": 2, "textEdit": { @@ -391,7 +391,7 @@ func TestModuleCompletion_withValidDataAndSnippets(t *testing.T) { { "label": "individual", "kind": 10, - "detail": "Optional, bool", + "detail": "optional, bool", "documentation": "Desc 3", "insertTextFormat": 2, "textEdit": { @@ -415,7 +415,7 @@ func TestModuleCompletion_withValidDataAndSnippets(t *testing.T) { { "label": "version", "kind": 10, - "detail": "Optional, string", + "detail": "optional, string", "documentation": "Specifies a version constraint for the provider, e.g. ~\u003e 1.0", "insertTextFormat": 2, "textEdit": { diff --git a/internal/state/provider_schema_test.go b/internal/state/provider_schema_test.go index c4f6f83df..c299bb4bb 100644 --- a/internal/state/provider_schema_test.go +++ b/internal/state/provider_schema_test.go @@ -733,7 +733,8 @@ func TestStateStore_ListSchemas(t *testing.T) { }, &tfschema.ProviderSchema{ Provider: &schema.BodySchema{ - Detail: "hashicorp/aws-local 0.9.0", + Detail: "hashicorp/aws-local 0.9.0", + HoverURL: "https://registry.terraform.io/providers/hashicorp/aws-local/0.9.0/docs", DocsLink: &schema.DocsLink{ URL: "https://registry.terraform.io/providers/hashicorp/aws-local/0.9.0/docs", Tooltip: "hashicorp/aws-local Documentation", @@ -755,7 +756,8 @@ func TestStateStore_ListSchemas(t *testing.T) { }, &tfschema.ProviderSchema{ Provider: &schema.BodySchema{ - Detail: "hashicorp/aws-local 1.0.0", + Detail: "hashicorp/aws-local 1.0.0", + HoverURL: "https://registry.terraform.io/providers/hashicorp/aws-local/1.0.0/docs", DocsLink: &schema.DocsLink{ URL: "https://registry.terraform.io/providers/hashicorp/aws-local/1.0.0/docs", Tooltip: "hashicorp/aws-local Documentation", @@ -777,7 +779,8 @@ func TestStateStore_ListSchemas(t *testing.T) { }, &tfschema.ProviderSchema{ Provider: &schema.BodySchema{ - Detail: "hashicorp/aws-local 1.3.0", + Detail: "hashicorp/aws-local 1.3.0", + HoverURL: "https://registry.terraform.io/providers/hashicorp/aws-local/1.3.0/docs", DocsLink: &schema.DocsLink{ URL: "https://registry.terraform.io/providers/hashicorp/aws-local/1.3.0/docs", Tooltip: "hashicorp/aws-local Documentation", @@ -799,7 +802,8 @@ func TestStateStore_ListSchemas(t *testing.T) { }, &tfschema.ProviderSchema{ Provider: &schema.BodySchema{ - Detail: "hashicorp/blah 1.0.0", + Detail: "hashicorp/blah 1.0.0", + HoverURL: "https://registry.terraform.io/providers/hashicorp/blah/1.0.0/docs", DocsLink: &schema.DocsLink{ URL: "https://registry.terraform.io/providers/hashicorp/blah/1.0.0/docs", Tooltip: "hashicorp/blah Documentation",