Merge pull request #129 from JupiterOne/int-5223-read-question-updates

feat: read updates to jupiterone_questions
JupiterOne · Dec 9, 2022 · 36f82db · 36f82db
2 parents b46cabc + 6a97575
commit 36f82db
Show file tree

Hide file tree

Showing 6 changed files with 480 additions and 123 deletions.
diff --git a/jupiterone/cassettes/TestQuestion_Basic.yaml b/jupiterone/cassettes/TestQuestion_Basic.yaml
diff --git a/jupiterone/internal/client/question.go b/jupiterone/internal/client/question.go
@@ -43,6 +43,7 @@ func (c *JupiterOneClient) GetQuestion(id string) (*Question, error) {
 				title
 				description
 				queries {
+					name
 					query
 					version
 				}
@@ -85,6 +86,7 @@ func (c *JupiterOneClient) CreateQuestion(properties QuestionProperties) (*Quest
 				title
 				description
 				queries {
+					name
 					query
 					version
 				}
@@ -130,6 +132,7 @@ func (c *JupiterOneClient) UpdateQuestion(id string, properties QuestionProperti
 				title
 				description
 				queries {
+					name
 					query
 					version
 				}

diff --git a/jupiterone/internal/client/rule.go b/jupiterone/internal/client/rule.go
@@ -17,11 +17,11 @@ type QuestionRuleInstance struct {
 	Deleted         bool                   `json:"deleted,omitempty"`
 	Type            string                 `json:"type,omitempty"`
 	PollingInterval string                 `json:"pollingInterval"`
-	Templates       interface{}            `json:"templates"`              // <Diff type - BaseQuestionRuleInstance
-	Question        map[string]interface{} `json:"question,omitempty"`     // Diff type - *RuleQuestion
-	QuestionId      string                 `json:"questionId,omitempty"`   // diff type - *string `json:"questionId"`
-	QuestionName    string                 `json:"questionName,omitempty"` // diff type  - *string `json:"questionName"`
-	Operations      []RuleOperation        `json:"operations"`             // < Diff type - string - BaseQuestionRuleInstance
+	Templates       interface{}            `json:"templates"`
+	Question        map[string]interface{} `json:"question,omitempty"`
+	QuestionId      string                 `json:"questionId,omitempty"`
+	QuestionName    string                 `json:"questionName,omitempty"`
+	Operations      []RuleOperation        `json:"operations"`
 	Outputs         []string               `json:"outputs"`
 	Tags            []string               `json:"tags"`
 }

diff --git a/jupiterone/resource_question.go b/jupiterone/resource_question.go
@@ -144,6 +144,39 @@ func resourceQuestionRead(_ context.Context, d *schema.ResourceData, m interface
 	if err != nil {
 		return diag.Errorf("failed to read existing question: %s", err.Error())
 	}
+	err = d.Set("title", question.Title)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	err = d.Set("description", question.Description)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	err = d.Set("tags", question.Tags)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	convertedQueries, err := queriesToMapStringInterface(question.Queries)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	err = d.Set("query", convertedQueries)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	/*
+		TODO @zemberdotnet: read updates once compliance is actually supported in the
+		internal client
+		err = d.Set("compliance", question.Compliance)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	*/
 
 	d.SetId(question.Id)
 	return nil

diff --git a/jupiterone/resource_question_test.go b/jupiterone/resource_question_test.go
@@ -7,7 +7,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
@@ -18,8 +17,8 @@ func TestQuestion_Basic(t *testing.T) {
 	accProviders, cleanup := testAccProviders(t)
 	defer cleanup(t)
 	accProvider := testAccProvider(t, accProviders)
-	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "jupiterone_question.test"
+	title := "tf-test-question"
 	ctx := context.Background()
 
 	resource.Test(t, resource.TestCase{
@@ -28,29 +27,29 @@ func TestQuestion_Basic(t *testing.T) {
 		CheckDestroy: testAccCheckQuestionDestroy(ctx, accProvider),
 		Steps: []resource.TestStep{
 			{
-				Config: testQuestionBasicConfigWithTags(rName, rName),
+				Config: testQuestionBasicConfigWithTags(title, "testing-tag-1"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckQuestionExists(ctx, accProvider),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "title", rName),
+					resource.TestCheckResourceAttr(resourceName, "title", title),
 					resource.TestCheckResourceAttr(resourceName, "description", "Test"),
 					resource.TestCheckResourceAttr(resourceName, "tags.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "tags.0", rName),
+					resource.TestCheckResourceAttr(resourceName, "tags.0", "testing-tag-1"),
 					resource.TestCheckResourceAttr(resourceName, "query.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "query.0.name", "query0"),
 					resource.TestCheckResourceAttr(resourceName, "query.0.version", "v1"),
 					resource.TestCheckResourceAttr(resourceName, "query.0.query", "Find DataStore with classification=('critical' or 'sensitive' or 'confidential' or 'restricted') and encrypted!=true"),
 				),
 			},
 			{
-				Config: testQuestionBasicConfigWithTags(rName, rName+"-1"),
+				Config: testQuestionBasicConfigWithTags(title, "testing-tag-2"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckQuestionExists(ctx, accProvider),
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
-					resource.TestCheckResourceAttr(resourceName, "title", rName),
+					resource.TestCheckResourceAttr(resourceName, "title", title),
 					resource.TestCheckResourceAttr(resourceName, "description", "Test"),
 					resource.TestCheckResourceAttr(resourceName, "tags.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "tags.0", rName+"-1"),
+					resource.TestCheckResourceAttr(resourceName, "tags.0", "testing-tag-2"),
 					resource.TestCheckResourceAttr(resourceName, "query.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "query.0.name", "query0"),
 					resource.TestCheckResourceAttr(resourceName, "query.0.version", "v1"),

diff --git a/jupiterone/util.go b/jupiterone/util.go
@@ -1,11 +1,13 @@
 package jupiterone
 
 import (
+	"bytes"
 	"encoding/json"
 	"reflect"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/jupiterone/terraform-provider-jupiterone/jupiterone/internal/client"
 )
 
 func removeCRFromString(s string) string {
@@ -39,3 +41,20 @@ func jsonDiffSuppressFunc(k, oldValue, newValue string, d *schema.ResourceData)
 
 	return reflect.DeepEqual(old, new)
 }
+
+func queriesToMapStringInterface(c []client.QuestionQuery) ([]map[string]interface{}, error) {
+	buf := new(bytes.Buffer)
+	enc := json.NewEncoder(buf)
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(c)
+	if err != nil {
+		return nil, err
+	}
+
+	msi := []map[string]interface{}{}
+	err = json.Unmarshal(buf.Bytes(), &msi)
+	if err != nil {
+		return nil, err
+	}
+	return msi, nil
+}