Shorting cur names and fixing refs

costradar-obsolete · Nov 11, 2021 · 7cb7856 · 7cb7856
1 parent 49b26ba
commit 7cb7856
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/costradar/client.go b/costradar/client.go
@@ -67,8 +67,8 @@ type CostAndUsageReportSubscriptionPayload struct {
 type IntegrationMeta struct {
 	CostAndUsageReportSqsArn string `json:"CostAndUsageReportSqsArn"`
 	CostAndUsageReportSqsUrl string `json:"CostAndUsageReportSqsUrl"`
-	CloudTrailSqsArn         string `json:"CloudTrailSqsArn"`
-	CloudTrailSqsUrn         string `json:"CloudTrailSqsUrl"`
+	CloudTrailSqsArn string `json:"CloudTrailSqsArn"`
+	CloudTrailSqsUrl string `json:"CloudTrailSqsUrl"`
 }
 
 type Client interface {

diff --git a/costradar/data_source_subscription_meta.go b/costradar/data_source_subscription_meta.go
@@ -9,19 +9,19 @@ import (
 )
 
 var subscriptionMetaSchema = map[string]*schema.Schema{
-	"cost_and_usage_report_sqs_arn": {
+	"cur_report_sqs_arn": {
 		Type:     schema.TypeString,
 		Computed: true,
 	},
-	"cost_and_usage_report_sqs_url": {
+	"cur_report_sqs_url": {
 		Type:     schema.TypeString,
 		Computed: true,
 	},
-	"cloud_trail_sqs_arn": {
+	"cloudtrail_sqs_arn": {
 		Type:     schema.TypeString,
 		Computed: true,
 	},
-	"cloud_trail_sqs_url": {
+	"cloudtrail_sqs_url": {
 		Type:     schema.TypeString,
 		Computed: true,
 	},
@@ -43,10 +43,10 @@ func dataSourceSubscriptionMetaRead(ctx context.Context, d *schema.ResourceData,
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	d.Set("cost_and_usage_report_sqs_arn", subscriptionMeta.CostAndUsageReportSqsArn)
-	d.Set("cost_and_usage_report_sqs_url", subscriptionMeta.CostAndUsageReportSqsUrl)
-	d.Set("cloud_trail_sqs_arn", subscriptionMeta.CostAndUsageReportSqsArn)
-	d.Set("cloud_trail_sqs_url", subscriptionMeta.CostAndUsageReportSqsUrl)
+	d.Set("cur_sqs_arn", subscriptionMeta.CostAndUsageReportSqsArn)
+	d.Set("cur_sqs_url", subscriptionMeta.CostAndUsageReportSqsUrl)
+	d.Set("cloudtrail_sqs_arn", subscriptionMeta.CloudTrailSqsArn)
+	d.Set("cloudtrail_sqs_url", subscriptionMeta.CloudTrailSqsUrl)
 	d.SetId(strconv.FormatInt(time.Now().Unix(), 10))
 	return diags
 }
diff --git a/costradar/data_source_subscription_meta_test.go b/costradar/data_source_subscription_meta_test.go
@@ -21,7 +21,7 @@ func TestAccSubscriptionMeta(t *testing.T) {
 			{
 				Config: testAccDataSubscriptionMetaTF(),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(resourceName, "cost_and_usage_report_sqs_arn", "arn:aws:sqs:eu-central-1:123456789012:cur_queue"),
+					resource.TestCheckResourceAttr(resourceName, "cur_sqs_arn", "arn:aws:sqs:eu-central-1:123456789012:cur_queue"),
 				),
 			},
 		},