Merge branch 'release/v0.1.2'

costradar-obsolete · Oct 8, 2021 · 65f8770 · 65f8770
2 parents 56843d6 + 59933ff
commit 65f8770
Show file tree

Hide file tree

Showing 10 changed files with 177 additions and 122 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@ examples/.terraform
 examples/terraform.tfstate*
 examples/crash.log
 .terraform
-.terraform*
+.terraform*
+terraform-provider-costradar_*
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 TEST?=$$(go list ./... | grep -v 'vendor')
 NAME=costradar
 BINARY=terraform-provider-${NAME}_${VERSION}
-VERSION=0.2
+VERSION=0.2.1
 HOSTNAME=localhost
 NAMESPACE=local
 GOARCH = amd64

diff --git a/costradar/client.go b/costradar/client.go
@@ -26,16 +26,18 @@ type CostAndUsageReportSubscription struct {
 	BucketRegion     string       `json:"bucketRegion"`
 	BucketPathPrefix string       `json:"bucketPathPrefix"`
 	TimeUnit         string       `json:"timeUnit"`
+	SourceTopicArn   string       `json:"sourceTopicArn"`
 	AccessConfig     AccessConfig `json:"accessConfig"`
 }
 
 type CloudTrailSubscription struct {
-	ID              string       `json:"id"`
-	SourceArn       string       `json:"sourceArn"`
-	SubscriptionArn string       `json:"subscriptionArn"`
-	BucketName      string       `json:"bucketName"`
-	AccountId       string       `json:"accountId"`
-	AccessConfig    AccessConfig `json:"accessConfig"`
+	ID                         string `json:"id"`
+	TrailName                  string `json:"trailName"`
+	BucketName                 string `json:"bucketName"`
+	BucketRegion               string `json:"bucketRegion"`
+	BucketPathPrefix           string `json:"bucketPathPrefix"`
+	SourceTopicArn             string `json:"sourceTopicArn"`
+	AccessConfig     AccessConfig     `json:"accessConfig"`
 }
 
 type CloudTrailSubscriptionPayload struct {
@@ -135,6 +137,7 @@ func (c *ClientGraphql) CreateCostAndUsageReportSubscription(subscription CostAn
 
 	query := CreateCostAndUsageReportSubscriptionQuery
 	variables := map[string]interface{}{
+		"sourceTopicArn":        subscription.SourceTopicArn,
 		"bucketName":            subscription.BucketName,
 		"bucketRegion":          subscription.BucketRegion,
 		"bucketPathPrefix":      subscription.BucketPathPrefix,
@@ -166,6 +169,7 @@ func (c *ClientGraphql) UpdateCostAndUsageReportSubscription(subscription CostAn
 		"bucketPathPrefix":      subscription.BucketPathPrefix,
 		"reportName":            subscription.ReportName,
 		"timeUnit":              subscription.TimeUnit,
+		"sourceTopicArn":        subscription.SourceTopicArn,
 		"readerMode":            subscription.AccessConfig.ReaderMode,
 		"assumeRoleArn":         subscription.AccessConfig.AssumeRoleArn,
 		"assumeRoleExternalId":  subscription.AccessConfig.AssumeRoleExternalId,
@@ -217,10 +221,12 @@ func (c *ClientGraphql) CreateCloudTrailSubscription(subscription CloudTrailSubs
 
 	query := CreateCloudTrailSubscriptionQuery
 	variables := map[string]interface{}{
-		"sourceArn":             subscription.SourceArn,
-		"subscriptionArn":       subscription.SubscriptionArn,
+		"id":                    subscription.ID,
 		"bucketName":            subscription.BucketName,
-		"accountId":             subscription.AccountId,
+		"bucketRegion":          subscription.BucketRegion,
+		"bucketPathPrefix":      subscription.BucketPathPrefix,
+		"trailName":             subscription.TrailName,
+		"sourceTopicArn":        subscription.SourceTopicArn,
 		"readerMode":            subscription.AccessConfig.ReaderMode,
 		"assumeRoleArn":         subscription.AccessConfig.AssumeRoleArn,
 		"assumeRoleExternalId":  subscription.AccessConfig.AssumeRoleExternalId,
@@ -242,10 +248,11 @@ func (c *ClientGraphql) UpdateCloudTrailSubscription(subscription CloudTrailSubs
 	query := UpdateCloudTrailSubscriptionQuery
 	variables := map[string]interface{}{
 		"id":                    subscription.ID,
-		"sourceArn":             subscription.SourceArn,
-		"subscriptionArn":       subscription.SubscriptionArn,
 		"bucketName":            subscription.BucketName,
-		"accountId":             subscription.AccountId,
+		"bucketRegion":          subscription.BucketRegion,
+		"bucketPathPrefix":      subscription.BucketPathPrefix,
+		"trailName":             subscription.TrailName,
+		"sourceTopicArn":        subscription.SourceTopicArn,
 		"readerMode":            subscription.AccessConfig.ReaderMode,
 		"assumeRoleArn":         subscription.AccessConfig.AssumeRoleArn,
 		"assumeRoleExternalId":  subscription.AccessConfig.AssumeRoleExternalId,

diff --git a/costradar/client_test.go b/costradar/client_test.go
@@ -14,7 +14,7 @@ var _ = Describe("Costradar http client", func() {
 
 	BeforeEach(func() {
 		server = ghttp.NewServer()
-		costradarClient = NewCostRadarClient(server.URL()+"/graphql", "api_bsyz9nkv2G7l9NFCFepghgo7xrGHtFpZ")
+		costradarClient = NewCostRadarClient(server.URL() + "/graphql", "api_Uu94jTpg7UOw5vDFcHUsqFo0pkYoZiL8")
 	})
 
 	AfterEach(func() {
@@ -140,10 +140,10 @@ var _ = Describe("Costradar http client", func() {
 			ghttp.RespondWith(http.StatusOK, createCloudTrailSubscriptionSuccess()),
 		))
 		createSubscription := CloudTrailSubscription{
-			SourceArn:       "source_arn",
-			SubscriptionArn: "subscription_arn",
-			BucketName:      "bucket_name",
-			AccountId:       "123",
+			TrailName:      "trail-name",
+			SourceTopicArn: "topic-arn",
+			BucketName:     "bucket",
+			BucketRegion:   "region",
 			AccessConfig: AccessConfig{
 				ReaderMode:            "assumeRole",
 				AssumeRoleArn:         "ARN",
@@ -155,10 +155,10 @@ var _ = Describe("Costradar http client", func() {
 		Expect(err).To(BeNil())
 		Expect(subscription).ToNot(BeNil())
 		Expect(subscription.Payload.ID).To(Equal("614ae6fc151407505898f1af"))
-		Expect(subscription.Payload.SourceArn).To(Equal("source_arn"))
-		Expect(subscription.Payload.SubscriptionArn).To(Equal("subscription_arn"))
-		Expect(subscription.Payload.BucketName).To(Equal("bucket_name"))
-		Expect(subscription.Payload.AccountId).To(Equal("123"))
+		Expect(subscription.Payload.TrailName).To(Equal("trail"))
+		Expect(subscription.Payload.SourceTopicArn).To(Equal("topic-arn"))
+		Expect(subscription.Payload.BucketName).To(Equal("bucket"))
+		Expect(subscription.Payload.BucketRegion).To(Equal("region"))
 		Expect(subscription.Payload.AccessConfig.ReaderMode).To(Equal("assumeRole"))
 		Expect(subscription.Payload.AccessConfig.AssumeRoleArn).To(Equal("ARN"))
 		Expect(subscription.Payload.AccessConfig.AssumeRoleExternalId).To(Equal("ID"))
@@ -175,10 +175,8 @@ var _ = Describe("Costradar http client", func() {
 		Expect(err).To(BeNil())
 		Expect(subscription).ToNot(BeNil())
 		Expect(subscription.Payload.ID).To(Equal("614ae6fc151407505898f1af"))
-		Expect(subscription.Payload.SourceArn).To(Equal("source_arn"))
-		Expect(subscription.Payload.SubscriptionArn).To(Equal("subscription_arn"))
-		Expect(subscription.Payload.BucketName).To(Equal("bucket_name"))
-		Expect(subscription.Payload.AccountId).To(Equal("123"))
+		Expect(subscription.Payload.SourceTopicArn).To(Equal("topic-arn"))
+		Expect(subscription.Payload.BucketName).To(Equal("bucket"))
 		Expect(subscription.Payload.AccessConfig.ReaderMode).To(Equal("assumeRole"))
 		Expect(subscription.Payload.AccessConfig.AssumeRoleArn).To(Equal("ARN"))
 		Expect(subscription.Payload.AccessConfig.AssumeRoleExternalId).To(Equal("ID"))
@@ -192,21 +190,21 @@ var _ = Describe("Costradar http client", func() {
 		))
 
 		updateSubscription := CloudTrailSubscription{
-			SourceArn:       "source_arn_x",
-			SubscriptionArn: "subscription_arn_x",
-			BucketName:      "bucket_name_x",
-			AccountId:       "123_x",
+			TrailName:      "trail-name",
+			SourceTopicArn: "topic-arn",
+			BucketName:     "bucket",
+			BucketRegion:   "region",
 			AccessConfig: AccessConfig{
 				ReaderMode: "direct",
 			},
 		}
 		subscription, err := costradarClient.UpdateCloudTrailSubscription(updateSubscription)
 		Expect(err).To(BeNil())
 		Expect(subscription.Payload.ID).To(Equal("614ae6fc151407505898f1af"))
-		Expect(subscription.Payload.SourceArn).To(Equal("source_arn_x"))
-		Expect(subscription.Payload.SubscriptionArn).To(Equal("subscription_arn_x"))
-		Expect(subscription.Payload.BucketName).To(Equal("bucket_name_x"))
-		Expect(subscription.Payload.AccountId).To(Equal("123_x"))
+		Expect(subscription.Payload.TrailName).To(Equal("trail-u"))
+		Expect(subscription.Payload.SourceTopicArn).To(Equal("topic-arn-u"))
+		Expect(subscription.Payload.BucketRegion).To(Equal("region-u"))
+		Expect(subscription.Payload.BucketName).To(Equal("bucket-u"))
 		Expect(subscription.Payload.AccessConfig.ReaderMode).To(Equal("direct"))
 	})
 
@@ -361,10 +359,11 @@ func getCloudTrailSubscriptionSuccess() string {
 	  "data": {
 		"awsCloudTrailSubscription": {
 		  "id": "614ae6fc151407505898f1af",
-		  "sourceArn": "source_arn",
-		  "subscriptionArn": "subscription_arn",
-		  "bucketName": "bucket_name",
-		  "accountId": "123",
+		  "sourceTopicArn": "topic-arn",
+          "trailName": "trail",
+		  "bucketName": "bucket",
+		  "bucketRegion": "region",
+		  "bucketPathPrefix": "prefix",
 		  "accessConfig": {
 			"readerMode": "assumeRole",
 			"assumeRoleArn": "ARN",
@@ -384,10 +383,11 @@ func createCloudTrailSubscriptionSuccess() string {
 		  "error": null,
 		  "payload": {
 			"id": "614ae6fc151407505898f1af",
-			"sourceArn": "source_arn",
-			"subscriptionArn": "subscription_arn",
-			"bucketName": "bucket_name",
-			"accountId": "123",
+			"sourceTopicArn": "topic-arn",
+            "trailName": "trail",
+		    "bucketName": "bucket",
+		    "bucketRegion": "region",
+		    "bucketPathPrefix": "prefix",
 			"accessConfig": {
 			  "readerMode": "assumeRole",
 			  "assumeRoleArn": "ARN",
@@ -408,10 +408,11 @@ func updateCloudTrailSubscriptionSuccess() string {
 		  "error": null,
 		  "payload": {
 			"id": "614ae6fc151407505898f1af",
-			"sourceArn": "source_arn_x",
-			"subscriptionArn": "subscription_arn_x",
-			"bucketName": "bucket_name_x",
-			"accountId": "123_x",
+			"sourceTopicArn": "topic-arn-u",
+		    "trailName": "trail-u",
+		    "bucketName": "bucket-u",
+		    "bucketRegion": "region-u",
+		    "bucketPathPrefix": "prefix-u",
 			"accessConfig": {
 			  "readerMode": "direct",
 			  "assumeRoleArn": null,