From 391b9c497c29d6c9c020f6da56ff8dd9b5d4ec74 Mon Sep 17 00:00:00 2001 From: Brandon Croft Date: Thu, 6 Jan 2022 09:28:29 -0700 Subject: [PATCH] update go-tfe go-tfe is pinned to branch run-tasks-integration pending API changes until run tasks support in the CLI is closer to release --- go.mod | 7 +------ go.sum | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 3a4c802648..9e9dc9b15a 100644 --- a/go.mod +++ b/go.mod @@ -41,12 +41,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-plugin v1.4.3 github.com/hashicorp/go-retryablehttp v0.7.0 -<<<<<<< HEAD - github.com/hashicorp/go-tfe v0.21.0 - github.com/hashicorp/go-safetemp v1.0.0 -======= - github.com/hashicorp/go-tfe v0.20.1-0.20211215223223-3057a43c4f5c ->>>>>>> fd151e0fc (run go mod tidy) + github.com/hashicorp/go-tfe v0.22.1-0.20220106162344-481afccea193 github.com/hashicorp/go-uuid v1.0.2 github.com/hashicorp/go-version v1.3.0 github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f diff --git a/go.sum b/go.sum index cdb215df8d..5bebf9ac66 100644 --- a/go.sum +++ b/go.sum @@ -407,8 +407,8 @@ github.com/hashicorp/go-slug v0.7.0/go.mod h1:Ib+IWBYfEfJGI1ZyXMGNbu2BU+aa3Dzu41 github.com/hashicorp/go-sockaddr v1.0.0 h1:GeH6tui99pF4NJgfnhp+L6+FfobzVW3Ah46sLo0ICXs= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-tfe v0.20.1-0.20211215223223-3057a43c4f5c h1:S35GDGdpbcmTFDZj+JQDO84CANiYdUMs++JxBXwJyvU= -github.com/hashicorp/go-tfe v0.20.1-0.20211215223223-3057a43c4f5c/go.mod h1:gyXLXbpBVxA2F/6opah8XBsOkZJxHYQmghl0OWi8keI= +github.com/hashicorp/go-tfe v0.22.1-0.20220106162344-481afccea193 h1:qS5VXxtPFVbghgCjs8nLv54MNaUOPMWU9ZKKGNfhKwM= +github.com/hashicorp/go-tfe v0.22.1-0.20220106162344-481afccea193/go.mod h1:gyXLXbpBVxA2F/6opah8XBsOkZJxHYQmghl0OWi8keI= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=