From 56843d6fe3490998ccfb73b408a237d683dfee62 Mon Sep 17 00:00:00 2001 From: Daniel van der Wel Date: Mon, 27 Sep 2021 14:45:21 +0200 Subject: [PATCH] add unauthorizated error message --- costradar/client.go | 6 ++++++ costradar/provider.go | 10 +++++----- ...est.go => resource_cloudtrail_subscription_test.go} | 0 ...ption_test.go => resource_cur_subscription_test.go} | 0 4 files changed, 11 insertions(+), 5 deletions(-) rename costradar/{cloudtrail_subscription_test.go => resource_cloudtrail_subscription_test.go} (100%) rename costradar/{cur_subscription_test.go => resource_cur_subscription_test.go} (100%) diff --git a/costradar/client.go b/costradar/client.go index 02b419a..a6255b7 100644 --- a/costradar/client.go +++ b/costradar/client.go @@ -9,6 +9,7 @@ import ( "github.com/tidwall/gjson" "io/ioutil" "net/http" + "strconv" ) type AccessConfig struct { @@ -95,6 +96,11 @@ func (c *ClientGraphql) graphql(query string, variables map[string]interface{}, body, err := ioutil.ReadAll(resp.Body) defer resp.Body.Close() + if resp.StatusCode != 200 { + err = errors.New("Status code: " + strconv.Itoa(resp.StatusCode) + ". Message: " + gjson.GetBytes(body, "error").String()) + return nil, err + } + errorMessage := getErrorFromBody(body, dataPath) if errorMessage != "" { diff --git a/costradar/provider.go b/costradar/provider.go index c8e8b27..9e8e255 100644 --- a/costradar/provider.go +++ b/costradar/provider.go @@ -38,11 +38,11 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{} // Warning or errors can be collected in a slice type var diags diag.Diagnostics - diags = append(diags, diag.Diagnostic{ - Severity: diag.Warning, - Summary: "Warning Message Summary", - Detail: "This is the detailed warning message from providerConfigure", - }) + //diags = append(diags, diag.Diagnostic{ + // Severity: diag.Warning, + // Summary: "Warning Message Summary", + // Detail: "This is the detailed warning message from providerConfigure", + //}) return NewCostRadarClient(endpoint, token), diags } diff --git a/costradar/cloudtrail_subscription_test.go b/costradar/resource_cloudtrail_subscription_test.go similarity index 100% rename from costradar/cloudtrail_subscription_test.go rename to costradar/resource_cloudtrail_subscription_test.go diff --git a/costradar/cur_subscription_test.go b/costradar/resource_cur_subscription_test.go similarity index 100% rename from costradar/cur_subscription_test.go rename to costradar/resource_cur_subscription_test.go