From 310331bdc6b747b68b2e2dd6be257dfc78677973 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 11 Mar 2024 09:30:58 -0700 Subject: [PATCH] backend/consul: go.mod updates from a merge conflict Two changes landed concurrently and caused these dependencies to get out of sync. --- internal/backend/remote-state/consul/go.mod | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/backend/remote-state/consul/go.mod b/internal/backend/remote-state/consul/go.mod index a800b4c0a0..2b5b8f80f2 100644 --- a/internal/backend/remote-state/consul/go.mod +++ b/internal/backend/remote-state/consul/go.mod @@ -6,7 +6,7 @@ require ( github.com/hashicorp/consul/api v1.13.0 github.com/hashicorp/consul/sdk v0.8.0 github.com/hashicorp/terraform v0.0.0-00010101000000-000000000000 - github.com/hashicorp/terraform/internal/legacy v0.0.0-00010101000000-000000000000 + github.com/zclconf/go-cty v1.14.3 ) require ( @@ -90,7 +90,6 @@ require ( github.com/ulikunitz/xz v0.5.10 // indirect github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect - github.com/zclconf/go-cty v1.14.3 // indirect github.com/zclconf/go-cty-yaml v1.0.3 // indirect go.opencensus.io v0.24.0 // indirect golang.org/x/crypto v0.19.0 // indirect