From 40442ed197d7339af0f39d6c8565be41b98af511 Mon Sep 17 00:00:00 2001 From: Benjamin Bennett Date: Fri, 3 Jun 2022 12:43:53 +0100 Subject: [PATCH] Updating dependencies --- go.mod | 16 ---------------- go.sum | 20 -------------------- 2 files changed, 36 deletions(-) diff --git a/go.mod b/go.mod index 95bc2cbb..f6617478 100644 --- a/go.mod +++ b/go.mod @@ -6,15 +6,9 @@ require ( github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0 github.com/google/go-cmp v0.5.8 github.com/hashicorp/go-uuid v1.0.3 -<<<<<<< HEAD github.com/hashicorp/terraform-plugin-docs v0.9.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.17.0 golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e -======= - github.com/hashicorp/terraform-plugin-docs v0.8.1 - github.com/hashicorp/terraform-plugin-sdk/v2 v2.17.0 - golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e ->>>>>>> 8bf6993 (Temporarily using sdk/v2 sha to use ExternalProviders in TestStep) ) require ( @@ -28,11 +22,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/fatih/color v1.13.0 // indirect github.com/golang/protobuf v1.5.2 // indirect -<<<<<<< HEAD github.com/google/uuid v1.3.0 // indirect -======= - github.com/google/uuid v1.1.2 // indirect ->>>>>>> 8bf6993 (Temporarily using sdk/v2 sha to use ExternalProviders in TestStep) github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-checkpoint v0.5.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect @@ -70,15 +60,9 @@ require ( github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect github.com/vmihailenco/tagparser v0.1.1 // indirect github.com/zclconf/go-cty v1.10.0 // indirect -<<<<<<< HEAD golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect golang.org/x/text v0.3.7 // indirect -======= - golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect - golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect - golang.org/x/text v0.3.5 // indirect ->>>>>>> 8bf6993 (Temporarily using sdk/v2 sha to use ExternalProviders in TestStep) google.golang.org/appengine v1.6.6 // indirect google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect google.golang.org/grpc v1.46.0 // indirect diff --git a/go.sum b/go.sum index f7d12069..8f688f80 100644 --- a/go.sum +++ b/go.sum @@ -150,34 +150,14 @@ github.com/hashicorp/terraform-exec v0.16.1/go.mod h1:aj0lVshy8l+MHhFNoijNHtqTJQ github.com/hashicorp/terraform-json v0.13.0/go.mod h1:y5OdLBCT+rxbwnpxZs9kGL7R9ExU76+cpdY8zHwoazk= github.com/hashicorp/terraform-json v0.14.0 h1:sh9iZ1Y8IFJLx+xQiKHGud6/TSUCM0N8e17dKDpqV7s= github.com/hashicorp/terraform-json v0.14.0/go.mod h1:5A9HIWPkk4e5aeeXIBbkcOvaZbIYnAIkEyqP2pNSckM= -<<<<<<< HEAD github.com/hashicorp/terraform-plugin-docs v0.9.0 h1:CEu7NToNWRR2os6DfT/Du2s+8qzXHyIcZQ10oiMdbJs= github.com/hashicorp/terraform-plugin-docs v0.9.0/go.mod h1:47ZcsxMUJxAjGzHf+dZ9q78oYf4PeJxO1N+i5XDtXBc= -======= -github.com/hashicorp/terraform-plugin-docs v0.8.1 h1:XJC/cDvmE7zJfDFCtOI1bURaencBQC0xYx3DZ5cWbhE= -github.com/hashicorp/terraform-plugin-docs v0.8.1/go.mod h1:p40z/69HYNUN/G2RDYp8XUCA5B1VzGTZl7/N9V+BWXU= ->>>>>>> 8bf6993 (Temporarily using sdk/v2 sha to use ExternalProviders in TestStep) github.com/hashicorp/terraform-plugin-go v0.9.1 h1:vXdHaQ6aqL+OF076nMSBV+JKPdmXlzG5mzVDD04WyPs= github.com/hashicorp/terraform-plugin-go v0.9.1/go.mod h1:ItjVSlQs70otlzcCwlPcU8FRXLdO973oYFRZwAOxy8M= github.com/hashicorp/terraform-plugin-log v0.4.0 h1:F3eVnm8r2EfQCe2k9blPIiF/r2TT01SHijXnS7bujvc= github.com/hashicorp/terraform-plugin-log v0.4.0/go.mod h1:9KclxdunFownr4pIm1jdmwKRmE4d6HVG2c9XDq47rpg= -<<<<<<< HEAD -<<<<<<< HEAD github.com/hashicorp/terraform-plugin-sdk/v2 v2.17.0 h1:Qr5fWNg1SPSfCRMtou67Y6Kcy9UnMYRNlIJTKRuUvXU= github.com/hashicorp/terraform-plugin-sdk/v2 v2.17.0/go.mod h1:b+LFg8WpYgFgvEBP/6Htk5H9/pJp1V1E8NJAekfH2Ws= -======= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.16.1-0.20220526194717-a8e255aecae2 h1:yuFvcxHuK6DI6nCzPN1Z+a5jedtIZA+14BFAEC5nY1w= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.16.1-0.20220526194717-a8e255aecae2/go.mod h1:b+LFg8WpYgFgvEBP/6Htk5H9/pJp1V1E8NJAekfH2Ws= -<<<<<<< HEAD ->>>>>>> 8bf6993 (Temporarily using sdk/v2 sha to use ExternalProviders in TestStep) -======= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.16.1-0.20220527155737-8a0031d0a59f h1:VXOO0M6G+Up71Meb8QaIiPYcO2nLU9OQwU+amxynwMQ= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.16.1-0.20220527155737-8a0031d0a59f/go.mod h1:b+LFg8WpYgFgvEBP/6Htk5H9/pJp1V1E8NJAekfH2Ws= ->>>>>>> 1ba96af (Bumping SDK version to use ExternalProviders in TestStep fix and adding test to verify behaviour) -======= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.17.0 h1:Qr5fWNg1SPSfCRMtou67Y6Kcy9UnMYRNlIJTKRuUvXU= -github.com/hashicorp/terraform-plugin-sdk/v2 v2.17.0/go.mod h1:b+LFg8WpYgFgvEBP/6Htk5H9/pJp1V1E8NJAekfH2Ws= ->>>>>>> 92a1322 (Using v2.17.0 of terraform-plugin-sdk/v2 for ExternalProviders in TestStep) 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-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0=