From ec4c054ee79a260c461d98d5afec04877bfede24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Brod=C3=A9n?= Date: Thu, 4 Apr 2024 16:31:41 +0200 Subject: [PATCH] Http client configuration fix for go-api v1.16.0 Changes made to include http client to support GO-VCR testing. Not yet ready to be merge: https://github.com/cloudamqp/terraform-provider-cloudamqp/pull/257 --- cloudamqp/provider.go | 3 ++- cloudamqp/provider_test.go | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cloudamqp/provider.go b/cloudamqp/provider.go index 6531cf05..0f653b2d 100644 --- a/cloudamqp/provider.go +++ b/cloudamqp/provider.go @@ -3,6 +3,7 @@ package cloudamqp import ( "fmt" "log" + "net/http" "github.com/84codes/go-api/api" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" @@ -81,5 +82,5 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { enableFasterInstanceDestroy = d.Get("enable_faster_instance_destroy").(bool) useragent := fmt.Sprintf("terraform-provider-cloudamqp_v%s", version) log.Printf("[DEBUG] cloudamqp::provider::configure useragent: %v", useragent) - return api.New(d.Get("baseurl").(string), d.Get("apikey").(string), useragent), nil + return api.New(d.Get("baseurl").(string), d.Get("apikey").(string), useragent, http.DefaultClient), nil } diff --git a/cloudamqp/provider_test.go b/cloudamqp/provider_test.go index 8cb7fc55..58fefb4a 100644 --- a/cloudamqp/provider_test.go +++ b/cloudamqp/provider_test.go @@ -12,20 +12,20 @@ var testAccProvider *schema.Provider var testAccProviders map[string]terraform.ResourceProvider func init() { - testAccProvider = Provider() + testAccProvider = Provider("1.0") testAccProviders = map[string]terraform.ResourceProvider{ "cloudamqp": testAccProvider, } } func TestProvider(t *testing.T) { - if err := Provider().InternalValidate(); err != nil { + if err := Provider("1.0").InternalValidate(); err != nil { t.Fatalf("err: %s", err) } } func TestProvider_impl(t *testing.T) { - var _ terraform.ResourceProvider = Provider() + var _ terraform.ResourceProvider = Provider("1.0") } func testAccPreCheck(t *testing.T) {