From 774ee639e6476a49820ebbc8d2c41479bfc29e32 Mon Sep 17 00:00:00 2001 From: Heng Lu Date: Fri, 15 Nov 2024 15:19:29 +0800 Subject: [PATCH 1/6] go mod vendor --- .../Azure/aztfmigrate/tf/terraform.go | 8 +- .../Azure/aztfmigrate/types/azapi_resource.go | 11 ++- .../types/azapi_update_resource.go | 12 +-- .../Azure/aztfmigrate/types/azure_resource.go | 3 +- .../aztfmigrate/types/azurerm_resource.go | 75 ++++++++++--------- .../github.com/Azure/aztfmigrate/types/hcl.go | 2 +- vendor/modules.txt | 2 +- 7 files changed, 66 insertions(+), 47 deletions(-) diff --git a/vendor/github.com/Azure/aztfmigrate/tf/terraform.go b/vendor/github.com/Azure/aztfmigrate/tf/terraform.go index c7953480..290701d2 100644 --- a/vendor/github.com/Azure/aztfmigrate/tf/terraform.go +++ b/vendor/github.com/Azure/aztfmigrate/tf/terraform.go @@ -69,8 +69,12 @@ func (t *Terraform) Show() (*tfjson.State, error) { return t.exec.Show(context.TODO()) } -func (t *Terraform) Plan() (*tfjson.Plan, error) { - _, err := t.exec.Plan(context.TODO(), tfexec.Out(planfile)) +func (t *Terraform) Plan(varFile *string) (*tfjson.Plan, error) { + planOptions := []tfexec.PlanOption{tfexec.Out(planfile)} + if varFile != nil && *varFile != "" { + planOptions = append(planOptions, tfexec.VarFile(*varFile)) + } + _, err := t.exec.Plan(context.TODO(), planOptions...) if err != nil { return nil, err } diff --git a/vendor/github.com/Azure/aztfmigrate/types/azapi_resource.go b/vendor/github.com/Azure/aztfmigrate/types/azapi_resource.go index 68acd1b6..af5f1442 100644 --- a/vendor/github.com/Azure/aztfmigrate/types/azapi_resource.go +++ b/vendor/github.com/Azure/aztfmigrate/types/azapi_resource.go @@ -29,6 +29,13 @@ type AzapiResource struct { Migrated bool } +func (r *AzapiResource) StateUpdateBlocks() []*hclwrite.Block { + blocks := make([]*hclwrite.Block, 0) + blocks = append(blocks, r.removedBlock()) + blocks = append(blocks, r.importBlock()) + return blocks +} + func (r *AzapiResource) Outputs() []Output { res := make([]Output, 0) for _, instance := range r.Instances { @@ -49,7 +56,7 @@ func (r *AzapiResource) IsMigrated() bool { return r.Migrated } -func (r *AzapiResource) ImportBlock() *hclwrite.Block { +func (r *AzapiResource) importBlock() *hclwrite.Block { importBlock := hclwrite.NewBlock("import", nil) if r.IsMultipleResources() { forEachMap := make(map[string]cty.Value) @@ -72,7 +79,7 @@ func (r *AzapiResource) ImportBlock() *hclwrite.Block { return importBlock } -func (r *AzapiResource) RemovedBlock() *hclwrite.Block { +func (r *AzapiResource) removedBlock() *hclwrite.Block { removedBlock := hclwrite.NewBlock("removed", nil) removedBlock.Body().SetAttributeTraversal("from", hcl.Traversal{hcl.TraverseRoot{Name: "azapi_resource"}, hcl.TraverseAttr{Name: r.Label}}) removedLifecycleBlock := hclwrite.NewBlock("lifecycle", nil) diff --git a/vendor/github.com/Azure/aztfmigrate/types/azapi_update_resource.go b/vendor/github.com/Azure/aztfmigrate/types/azapi_update_resource.go index 912b6f86..25315719 100644 --- a/vendor/github.com/Azure/aztfmigrate/types/azapi_update_resource.go +++ b/vendor/github.com/Azure/aztfmigrate/types/azapi_update_resource.go @@ -30,6 +30,12 @@ type AzapiUpdateResource struct { OutputProperties []string } +func (r *AzapiUpdateResource) StateUpdateBlocks() []*hclwrite.Block { + blocks := make([]*hclwrite.Block, 0) + blocks = append(blocks, r.removedBlock()) + return blocks +} + func (r *AzapiUpdateResource) Outputs() []Output { res := make([]Output, 0) res = append(res, r.outputs...) @@ -63,11 +69,7 @@ func (r *AzapiUpdateResource) GenerateNewConfig(terraform *tf.Terraform) error { return nil } -func (r *AzapiUpdateResource) ImportBlock() *hclwrite.Block { - return nil -} - -func (r *AzapiUpdateResource) RemovedBlock() *hclwrite.Block { +func (r *AzapiUpdateResource) removedBlock() *hclwrite.Block { removedBlock := hclwrite.NewBlock("removed", nil) removedBlock.Body().SetAttributeTraversal("from", hcl.Traversal{hcl.TraverseRoot{Name: "azapi_update_resource"}, hcl.TraverseAttr{Name: r.OldLabel}}) removedLifecycleBlock := hclwrite.NewBlock("lifecycle", nil) diff --git a/vendor/github.com/Azure/aztfmigrate/types/azure_resource.go b/vendor/github.com/Azure/aztfmigrate/types/azure_resource.go index c518c0a2..450c9174 100644 --- a/vendor/github.com/Azure/aztfmigrate/types/azure_resource.go +++ b/vendor/github.com/Azure/aztfmigrate/types/azure_resource.go @@ -16,8 +16,7 @@ type AzureResource interface { GenerateNewConfig(terraform *tf.Terraform) error EmptyImportConfig() string - ImportBlock() *hclwrite.Block - RemovedBlock() *hclwrite.Block + StateUpdateBlocks() []*hclwrite.Block MigratedBlock() *hclwrite.Block IsMigrated() bool diff --git a/vendor/github.com/Azure/aztfmigrate/types/azurerm_resource.go b/vendor/github.com/Azure/aztfmigrate/types/azurerm_resource.go index 35874b6d..07e50f8e 100644 --- a/vendor/github.com/Azure/aztfmigrate/types/azurerm_resource.go +++ b/vendor/github.com/Azure/aztfmigrate/types/azurerm_resource.go @@ -4,7 +4,6 @@ import ( "fmt" "log" "net/url" - "strconv" "strings" "github.com/Azure/aztfmigrate/helper" @@ -14,7 +13,6 @@ import ( _ "github.com/gertd/go-pluralize" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclwrite" - "github.com/zclconf/go-cty/cty" ) var _ AzureResource = &AzurermResource{} @@ -30,6 +28,15 @@ type AzurermResource struct { Migrated bool } +func (r *AzurermResource) StateUpdateBlocks() []*hclwrite.Block { + movedBlock := hclwrite.NewBlock("moved", nil) + movedBlock.Body().SetAttributeTraversal("from", hcl.Traversal{hcl.TraverseRoot{Name: r.OldResourceType}, hcl.TraverseAttr{Name: r.OldLabel}}) + movedBlock.Body().SetAttributeTraversal("to", hcl.Traversal{hcl.TraverseRoot{Name: r.NewResourceType}, hcl.TraverseAttr{Name: r.NewLabel}}) + blocks := make([]*hclwrite.Block, 0) + blocks = append(blocks, movedBlock) + return blocks +} + func (r *AzurermResource) Outputs() []Output { res := make([]Output, 0) for _, instance := range r.Instances { @@ -109,42 +116,12 @@ func (r *AzurermResource) GenerateNewConfig(terraform *tf.Terraform) error { } r.Block = InjectReference(r.Block, r.References) } + + r.Block = sortAttributes(r.Block) r.Migrated = true return nil } -func (r *AzurermResource) ImportBlock() *hclwrite.Block { - importBlock := hclwrite.NewBlock("import", nil) - if r.IsMultipleResources() { - forEachMap := make(map[string]cty.Value) - for _, instance := range r.Instances { - switch v := instance.Index.(type) { - case string: - forEachMap[instance.ResourceId] = cty.StringVal(v) - default: - value, _ := strconv.ParseInt(fmt.Sprintf("%v", v), 10, 64) - forEachMap[instance.ResourceId] = cty.NumberIntVal(value) - } - } - importBlock.Body().SetAttributeValue("for_each", cty.MapVal(forEachMap)) - importBlock.Body().SetAttributeTraversal("id", hcl.Traversal{hcl.TraverseRoot{Name: "each"}, hcl.TraverseAttr{Name: "key"}}) - importBlock.Body().SetAttributeTraversal("to", hcl.Traversal{hcl.TraverseRoot{Name: r.NewResourceType}, hcl.TraverseAttr{Name: fmt.Sprintf("%s[each.value]", r.NewLabel)}}) - } else { - importBlock.Body().SetAttributeValue("id", cty.StringVal(r.Instances[0].ResourceId)) - importBlock.Body().SetAttributeTraversal("to", hcl.Traversal{hcl.TraverseRoot{Name: r.NewResourceType}, hcl.TraverseAttr{Name: r.NewLabel}}) - } - return importBlock -} - -func (r *AzurermResource) RemovedBlock() *hclwrite.Block { - removedBlock := hclwrite.NewBlock("removed", nil) - removedBlock.Body().SetAttributeTraversal("from", hcl.Traversal{hcl.TraverseRoot{Name: r.OldResourceType}, hcl.TraverseAttr{Name: r.OldLabel}}) - removedLifecycleBlock := hclwrite.NewBlock("lifecycle", nil) - removedLifecycleBlock.Body().SetAttributeValue("destroy", cty.BoolVal(false)) - removedBlock.Body().AppendBlock(removedLifecycleBlock) - return removedBlock -} - func (r *AzurermResource) TargetProvider() string { return "azapi" } @@ -270,3 +247,33 @@ func ResourceTypeOfResourceId(input string) string { } return resourceType } + +func sortAttributes(input *hclwrite.Block) *hclwrite.Block { + output := hclwrite.NewBlock(input.Type(), input.Labels()) + attrList := []string{"count", "for_each", "type", "parent_id", "name", "location", "identity", "body", "tags"} + usedAttr := make(map[string]bool) + for _, attr := range attrList { + if attribute := input.Body().GetAttribute(attr); attribute != nil { + output.Body().SetAttributeRaw(attr, attribute.Expr().BuildTokens(nil)) + usedAttr[attr] = true + } else { + for _, block := range input.Body().Blocks() { + if block.Type() == attr { + output.Body().AppendBlock(block) + usedAttr[attr] = true + } + } + } + } + for attrName, attribute := range input.Body().Attributes() { + if _, ok := usedAttr[attrName]; !ok { + output.Body().SetAttributeRaw(attrName, attribute.Expr().BuildTokens(nil)) + } + } + for _, block := range input.Body().Blocks() { + if _, ok := usedAttr[block.Type()]; !ok { + output.Body().AppendBlock(block) + } + } + return output +} diff --git a/vendor/github.com/Azure/aztfmigrate/types/hcl.go b/vendor/github.com/Azure/aztfmigrate/types/hcl.go index f92b104b..bd65ade5 100644 --- a/vendor/github.com/Azure/aztfmigrate/types/hcl.go +++ b/vendor/github.com/Azure/aztfmigrate/types/hcl.go @@ -96,7 +96,7 @@ func ReplaceGenericOutputs(workingDirectory string, outputs []Output) error { continue } for _, block := range f.Body().Blocks() { - if block.Type() == "removed" || block.Type() == "import" { + if block.Type() == "removed" || block.Type() == "import" || block.Type() == "moved" { continue } if block != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index bd39a793..19662260 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,7 +1,7 @@ # dario.cat/mergo v1.0.1 ## explicit; go 1.13 dario.cat/mergo -# github.com/Azure/aztfmigrate v1.15.1-0.20241017071650-067a517e275f +# github.com/Azure/aztfmigrate v1.15.1-0.20241111062752-fe732ae54b0f ## explicit; go 1.22.0 github.com/Azure/aztfmigrate/azurerm github.com/Azure/aztfmigrate/azurerm/coverage From 8d38d6f7e4c92e30ee0b70f3134a110fe286eecc Mon Sep 17 00:00:00 2001 From: Heng Lu Date: Fri, 15 Nov 2024 15:20:22 +0800 Subject: [PATCH 2/6] update aztfmigrate to support `moved` block --- go.mod | 2 +- go.sum | 4 ++++ .../handlers/command/aztfmigrate_command.go | 11 +++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index e59f9564..ead8e627 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/Azure/azapi-lsp go 1.22.0 require ( - github.com/Azure/aztfmigrate v1.15.1-0.20241017071650-067a517e275f + github.com/Azure/aztfmigrate v1.15.1-0.20241113022352-4681ae5d18c0 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 github.com/apparentlymart/go-textseg v1.0.0 github.com/creachadair/jrpc2 v0.32.0 diff --git a/go.sum b/go.sum index 49e1ab86..0793a886 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,10 @@ github.com/Azure/aztfmigrate v1.15.1-0.20241017064424-2fbe8d4d45ab h1:MP6GbC7MVZ github.com/Azure/aztfmigrate v1.15.1-0.20241017064424-2fbe8d4d45ab/go.mod h1:gITltwxgnRx5ByF4Xx0aJYbkE9pD8c1mH1gKFAV/nl0= github.com/Azure/aztfmigrate v1.15.1-0.20241017071650-067a517e275f h1:Hm8Tf4qwQ54/cU9yrWLGNIuUUMPKAY+HMVTGnLl+oBg= github.com/Azure/aztfmigrate v1.15.1-0.20241017071650-067a517e275f/go.mod h1:gITltwxgnRx5ByF4Xx0aJYbkE9pD8c1mH1gKFAV/nl0= +github.com/Azure/aztfmigrate v1.15.1-0.20241111062752-fe732ae54b0f h1:3oD42LSzI0T3Urvx8mq+5ophlMfsLyIuFsDhLn40iTw= +github.com/Azure/aztfmigrate v1.15.1-0.20241111062752-fe732ae54b0f/go.mod h1:gITltwxgnRx5ByF4Xx0aJYbkE9pD8c1mH1gKFAV/nl0= +github.com/Azure/aztfmigrate v1.15.1-0.20241113022352-4681ae5d18c0 h1:QyBOJ3ZArhtWOmcuStXjkOi4ncpi/ZTbFuHHY2gcUzY= +github.com/Azure/aztfmigrate v1.15.1-0.20241113022352-4681ae5d18c0/go.mod h1:gITltwxgnRx5ByF4Xx0aJYbkE9pD8c1mH1gKFAV/nl0= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 h1:nyQWyZvwGTvunIMxi1Y9uXkcyr+I7TeNrr/foo4Kpk8= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc= diff --git a/internal/langserver/handlers/command/aztfmigrate_command.go b/internal/langserver/handlers/command/aztfmigrate_command.go index 6b02c7bb..3913de49 100644 --- a/internal/langserver/handlers/command/aztfmigrate_command.go +++ b/internal/langserver/handlers/command/aztfmigrate_command.go @@ -271,12 +271,11 @@ func (c AztfMigrateCommand) Handle(ctx context.Context, arguments []json.RawMess emptyFile.Body().AppendUnstructuredTokens(types.CommentOutBlock(writeBlockMap[r.OldAddress(nil)])) emptyFile.Body().AppendNewline() - if removedBlock := r.RemovedBlock(); removedBlock != nil { - emptyFile.Body().AppendBlock(removedBlock) - emptyFile.Body().AppendNewline() - } - if importBlock := r.ImportBlock(); importBlock != nil { - emptyFile.Body().AppendBlock(importBlock) + for _, blockToAdd := range r.StateUpdateBlocks() { + if blockToAdd == nil { + continue + } + emptyFile.Body().AppendBlock(blockToAdd) emptyFile.Body().AppendNewline() } if migratedBlock := r.MigratedBlock(); migratedBlock != nil { From b004d31bb4f8df0fe42ab30b352d9f3efeb2e696 Mon Sep 17 00:00:00 2001 From: Heng Lu Date: Fri, 15 Nov 2024 15:25:56 +0800 Subject: [PATCH 3/6] fix modules.txt --- vendor/modules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index 19662260..bf8a7dac 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,7 +1,7 @@ # dario.cat/mergo v1.0.1 ## explicit; go 1.13 dario.cat/mergo -# github.com/Azure/aztfmigrate v1.15.1-0.20241111062752-fe732ae54b0f +# github.com/Azure/aztfmigrate v1.15.1-0.20241113022352-4681ae5d18c0 ## explicit; go 1.22.0 github.com/Azure/aztfmigrate/azurerm github.com/Azure/aztfmigrate/azurerm/coverage From 3c6c3f8bd9613b1ffb5205404be6f2fed568b1d2 Mon Sep 17 00:00:00 2001 From: Heng Lu Date: Fri, 15 Nov 2024 15:36:12 +0800 Subject: [PATCH 4/6] fix go sum --- go.sum | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/go.sum b/go.sum index 0793a886..945001c6 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,5 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -github.com/Azure/aztfmigrate v1.15.1-0.20241008023126-5d1f089351ad h1:b09oirToebQnsRu7APjdWel1XZ9WbdH60NG7NppESaM= -github.com/Azure/aztfmigrate v1.15.1-0.20241008023126-5d1f089351ad/go.mod h1:XqyslKnttA4clKBJ837VOTSAsj0nBvr6MUIOnvrIRIQ= -github.com/Azure/aztfmigrate v1.15.1-0.20241010052938-f55ac2833cd3 h1:ou4lFpnCzxTCtEtwCvIPRIYS+iRS4yXKGUQj/hpsnX0= -github.com/Azure/aztfmigrate v1.15.1-0.20241010052938-f55ac2833cd3/go.mod h1:bQOrvrR/2/X6rtJDGH7ARJXZT3cmTMGC6QXIDb4rMxE= -github.com/Azure/aztfmigrate v1.15.1-0.20241010074100-daaa4f34b510 h1:ncxS1gQGJWL2ki1WUWfYe9rU61pv9kjKBNGgmTPGQKc= -github.com/Azure/aztfmigrate v1.15.1-0.20241010074100-daaa4f34b510/go.mod h1:bQOrvrR/2/X6rtJDGH7ARJXZT3cmTMGC6QXIDb4rMxE= -github.com/Azure/aztfmigrate v1.15.1-0.20241010081637-fcc6b9d0f7dc h1:xh3lnKKz2irii5amvw3endArzp5tylwOv2AGnjYu8os= -github.com/Azure/aztfmigrate v1.15.1-0.20241010081637-fcc6b9d0f7dc/go.mod h1:bQOrvrR/2/X6rtJDGH7ARJXZT3cmTMGC6QXIDb4rMxE= -github.com/Azure/aztfmigrate v1.15.1-0.20241017054915-54b97e908e10 h1:Yp41LLMnhRZkXRSAdbTXuAYPyCRMa8pXPJ4mahMCJfk= -github.com/Azure/aztfmigrate v1.15.1-0.20241017054915-54b97e908e10/go.mod h1:gITltwxgnRx5ByF4Xx0aJYbkE9pD8c1mH1gKFAV/nl0= -github.com/Azure/aztfmigrate v1.15.1-0.20241017064424-2fbe8d4d45ab h1:MP6GbC7MVZ2CEFV4kQnnKyNu9sn5eiXDSVoDMswUmz0= -github.com/Azure/aztfmigrate v1.15.1-0.20241017064424-2fbe8d4d45ab/go.mod h1:gITltwxgnRx5ByF4Xx0aJYbkE9pD8c1mH1gKFAV/nl0= -github.com/Azure/aztfmigrate v1.15.1-0.20241017071650-067a517e275f h1:Hm8Tf4qwQ54/cU9yrWLGNIuUUMPKAY+HMVTGnLl+oBg= -github.com/Azure/aztfmigrate v1.15.1-0.20241017071650-067a517e275f/go.mod h1:gITltwxgnRx5ByF4Xx0aJYbkE9pD8c1mH1gKFAV/nl0= -github.com/Azure/aztfmigrate v1.15.1-0.20241111062752-fe732ae54b0f h1:3oD42LSzI0T3Urvx8mq+5ophlMfsLyIuFsDhLn40iTw= -github.com/Azure/aztfmigrate v1.15.1-0.20241111062752-fe732ae54b0f/go.mod h1:gITltwxgnRx5ByF4Xx0aJYbkE9pD8c1mH1gKFAV/nl0= github.com/Azure/aztfmigrate v1.15.1-0.20241113022352-4681ae5d18c0 h1:QyBOJ3ZArhtWOmcuStXjkOi4ncpi/ZTbFuHHY2gcUzY= github.com/Azure/aztfmigrate v1.15.1-0.20241113022352-4681ae5d18c0/go.mod h1:gITltwxgnRx5ByF4Xx0aJYbkE9pD8c1mH1gKFAV/nl0= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 h1:nyQWyZvwGTvunIMxi1Y9uXkcyr+I7TeNrr/foo4Kpk8= @@ -34,8 +18,6 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/applicationinsights/armapp github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/applicationinsights/armapplicationinsights v1.2.0/go.mod h1:S7Ss6Rm0nlKDRHKrO9eL2Be5EnX29Z09CNPWgK7o4+I= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appplatform/armappplatform v1.1.0-beta.1 h1:hQJe8H6ZruSIWEzoNCB/GH9gGa7ntRDqaebxj8UeguI= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appplatform/armappplatform v1.1.0-beta.1/go.mod h1:yGK8WOLcIMXyT84rwf1EL3y5QU4XYYwczK70uWfBFmQ= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appplatform/armappplatform v1.2.0 h1:7qfyoCIjzoD5R8U1W9Pca0f7MCEFP4fedmffJ6Sibx4= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appplatform/armappplatform v1.2.0/go.mod h1:Pdj19nzvUdwj9wS1Ahdp/VNZyrFzV+rPSd/X4kdMq2c= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice v1.0.0 h1:kRX8I0dWAcpW6Vq0m90CgV+qw4O1vXodgwrhoPr1RWs= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appservice/armappservice v1.0.0/go.mod h1:avvc5/7qR4taCvAhOM7KFXuEHhAU0Wek9YX7sh9H3EM= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/automation/armautomation v0.9.0 h1:pzgp0VZDAnmgAkUPeedW1dTd7v3kSrwxFNabFAzB158= @@ -86,8 +68,6 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachine github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/machinelearning/armmachinelearning/v3 v3.2.0/go.mod h1:p8dwLhouzC7neB2e/5TKZ732Zhu1ydfvOpimPfE9K5w= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.7.0 h1:U6aSmNaC/WWDlHnL0e+SxQlvYmcjdoBLFjNir8AZBe0= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.7.0/go.mod h1:qDMzzI3qK0Oi9wpbRIaBoYyRYg+1UJZ0I2/Y4VxoVU4= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0 h1:Ds0KRF8ggpEGg4Vo42oX1cIt/IfOhHWJBikksZbVxeg= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0/go.mod h1:jj6P8ybImR+5topJ+eH6fgcemSFBmU6/6bFF8KkwuDI= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v0.6.0 h1:zSHpZY39hfFpVNixDoFOUeLwBBX0SIRe32HaWg03R8k= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v0.6.0/go.mod h1:Yu9z4VU4VeNRoZQMjAKwzXJpNAZ8SlyVg+yHyDVqvi8= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/netapp/armnetapp v1.0.0 h1:06Xuh5qDiIaR+5IQNWz8K9ZV4banx4SOx1DsQiJOqqA= @@ -128,11 +108,9 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mx github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= -github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig/v3 v3.2.1/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk= github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs= github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0= @@ -269,16 +247,12 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magodo/armid v0.0.0-20240524082432-7ce06ae46c33 h1:KmQ16pNsI7DaELU+CbqZKXVdvkE/YXqMH6LLkp6rw/Y= github.com/magodo/armid v0.0.0-20240524082432-7ce06ae46c33/go.mod h1:rR8E7zfGMbmfnSQvrkFiWYdhrfTqsVSltelnZB09BwA= -github.com/magodo/aztft v0.3.1-0.20240802001407-2834614c6d9c h1:6H0Rxt63ep2TlQVbevMfOId7cojsp9FzKkNDFR0rnco= -github.com/magodo/aztft v0.3.1-0.20240802001407-2834614c6d9c/go.mod h1:CHeYYR+/RTjUry+0bpkI49PvQ/1sTe7itA+9BqKE1/8= github.com/magodo/aztft v0.3.1-0.20241011060757-310738ca90dd h1:6UcyxroC+nV2KcalwYWrkD011QXTHyEwEF2JcoYeRjU= github.com/magodo/aztft v0.3.1-0.20241011060757-310738ca90dd/go.mod h1:KQixUbCSpXiFkjLyy0lrtZY+2doHvJ1EIdtyhmVs3KQ= github.com/magodo/tfadd v0.10.1-0.20240902124619-bd18a56f410d h1:dmS4jSfNIfshWkh43yK4n1Qx0BsaKrfxMiqRg0fKKYw= github.com/magodo/tfadd v0.10.1-0.20240902124619-bd18a56f410d/go.mod h1:G2Hc13YaLGHa+CPEP/HZzj9sIGyKDM5ZXInzQ8Dp86s= github.com/magodo/tfpluginschema v0.0.0-20240902090353-0525d7d8c1c2 h1:Unxx8WLxzSxINnq7hItp4cXD7drihgfPltTd91efoBo= github.com/magodo/tfpluginschema v0.0.0-20240902090353-0525d7d8c1c2/go.mod h1:mh3baLIzKdhegfmLrAX+mpXQBvs4sqiDRTGx5Z5FGo0= -github.com/magodo/tfstate v0.0.0-20240829105815-03d52976fa13 h1:HhTCs5IKRuJxqx3NDI5gWfAD4WCNXiYGXM1dKyPp9rA= -github.com/magodo/tfstate v0.0.0-20240829105815-03d52976fa13/go.mod h1:cm1odSE6eUeMQRjYRARg1sWLP3HPsWjwvmk/+T4eQxs= github.com/magodo/tfstate v0.0.0-20241016043929-2c95177bf0e6 h1:Uy+WlvEHfZEVTs1Xf5N+177FTdPHx+mWUvsXHR4tGM4= github.com/magodo/tfstate v0.0.0-20241016043929-2c95177bf0e6/go.mod h1:cm1odSE6eUeMQRjYRARg1sWLP3HPsWjwvmk/+T4eQxs= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= From 1a4306398a707ef70e4b24a4264d280f5296a029 Mon Sep 17 00:00:00 2001 From: Heng Lu Date: Fri, 15 Nov 2024 15:40:38 +0800 Subject: [PATCH 5/6] fix golint --- .github/workflows/golint.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/golint.yaml b/.github/workflows/golint.yaml index 75675e10..827cd260 100644 --- a/.github/workflows/golint.yaml +++ b/.github/workflows/golint.yaml @@ -14,11 +14,11 @@ jobs: strategy: fail-fast: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version-file: 'go.mod' - - uses: golangci/golangci-lint-action@v2 + - uses: golangci/golangci-lint-action@v6 with: version: 'v1.54' args: -v --timeout=10m From f17f8ebf76ec00262ac9a468c9c94e0a3fe02c14 Mon Sep 17 00:00:00 2001 From: Heng Lu Date: Fri, 15 Nov 2024 15:43:41 +0800 Subject: [PATCH 6/6] fix golint issues --- internal/langserver/handlers/tfschema/candidates.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/langserver/handlers/tfschema/candidates.go b/internal/langserver/handlers/tfschema/candidates.go index 6d0bf0ff..04344fee 100644 --- a/internal/langserver/handlers/tfschema/candidates.go +++ b/internal/langserver/handlers/tfschema/candidates.go @@ -63,7 +63,7 @@ func valueCandidates(values []string, r lsp.Range, isOrdered bool) []lsp.Complet func typeCandidates(prefix *string, r lsp.Range) []lsp.CompletionItem { candidates := make([]lsp.CompletionItem, 0) if prefix == nil || !strings.Contains(*prefix, "@") { - for resourceType, _ := range azure.GetAzureSchema().Resources { + for resourceType := range azure.GetAzureSchema().Resources { candidates = append(candidates, lsp.CompletionItem{ Label: fmt.Sprintf(`"%s"`, resourceType), Kind: lsp.ValueCompletion,