Merge pull request #226 from JupiterOne/APP-15799

APP-15799 - Add resourceGroupId to integration and dashboard resources
JupiterOne · Nov 27, 2024 · 4f7e61b · 4f7e61b
2 parents 5e05be1 + f67ada9
commit 4f7e61b
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -339,6 +339,10 @@ scripts/get_current_schema.bash
 make generate-client
 ```
 
+**NOTE**: If you are getting errors like this: `for is only applicable to operations and arguments`, check whether formatting has changed in the gql file in question. If the formatting has changed, you may be running into the issue documented in this thread: https://github.com/Khan/genqlient/issues/149#issuecomment-958150171
+
+---
+
 ### Testing
 
 In order to test the provider, you can simply run `make testacc`. Pre-recorded

diff --git a/docs/resources/dashboard.md b/docs/resources/dashboard.md
@@ -95,6 +95,10 @@ resource "jupiterone_widget" "plot-compliance-per-control" {
 - `name` (String) The name of the dashboard.
 - `type` (String) The type of the dashboard.
 
+### Optional
+
+- `resource_group_id` (String) The ID of the resource group that the dashboard belongs to.
+
 ### Read-Only
 
 - `id` (String) The ID of this resource.

diff --git a/docs/resources/integration.md b/docs/resources/integration.md
@@ -76,6 +76,7 @@ resource "jupiterone_integration" "example_custom_integration" {
 - `description` (String) The description of the integration instance.
 - `ingestion_sources_overrides` (List of Object) Overrides for ingestion sources. (see [below for nested schema](#nestedatt--ingestion_sources_overrides))
 - `polling_interval_cron_expression` (String) The cron expression for the polling interval as a JSON string.
+- `resource_group_id` (String) The ID of the resource group to which the integration instance belongs.
 - `source_integration_instance_id` (String) The ID of the source integration instance.
 
 ### Read-Only

diff --git a/jupiterone/cassettes/TestDashboard_Basic.yaml b/jupiterone/cassettes/TestDashboard_Basic.yaml
@@ -6,13 +6,13 @@ interactions:
         proto: HTTP/1.1
         proto_major: 1
         proto_minor: 1
-        content_length: 380
+        content_length: 410
         transfer_encoding: []
         trailer: {}
         host: graphql.us.jupiterone.io
         remote_addr: ""
         request_uri: ""
-        body: '{"query":"\nmutation CreateDashboard ($input: CreateInsightsDashboardInput!) {\n\tcreateDashboard(input: $input) {\n\t\tname\n\t\tid\n\t}\n}\n","variables":{"input":{"name":"tf-provider-test-dashboard","type":"Account","userIds":null,"groupIds":null,"widgets":null,"published":false,"publishedToUserIds":null,"publishedToGroupIds":null,"ttd":0}},"operationName":"CreateDashboard"}'
+        body: '{"query":"\nmutation CreateDashboard ($input: CreateInsightsDashboardInput!) {\n\tcreateDashboard(input: $input) {\n\t\tname\n\t\tid\n\t}\n}\n","variables":{"input":{"name":"tf-provider-test-dashboard","type":"Account","userIds":null,"groupIds":null,"widgets":null,"published":false,"publishedToUserIds":null,"publishedToGroupIds":null,"ttd":0,"resourceGroupId":"rg-123456"}},"operationName":"CreateDashboard"}'
         form: {}
         headers:
             Cache-Control:
@@ -30,7 +30,7 @@ interactions:
         content_length: 111
         uncompressed: false
         body: |
-            {"data":{"createDashboard":{"name":"tf-provider-test-dashboard","id":"86a338a3-7783-4fdb-8c68-347aa4d811fb"}}}
+            {"data":{"createDashboard":{"name":"tf-provider-test-dashboard","id":"bed628b8-6c68-4f0d-9f6d-b8bbb4580ef3"}}}
         headers:
             Access-Control-Allow-Credentials:
                 - "true"
@@ -78,19 +78,19 @@ interactions:
                 - "0"
         status: 200 OK
         code: 200
-        duration: 662.687334ms
+        duration: 714.17575ms
     - id: 1
       request:
         proto: HTTP/1.1
         proto_major: 1
         proto_minor: 1
-        content_length: 229
+        content_length: 250
         transfer_encoding: []
         trailer: {}
         host: graphql.us.jupiterone.io
         remote_addr: ""
         request_uri: ""
-        body: '{"query":"\nquery GetDashboard ($dashboardId: String!) {\n\tgetDashboard(dashboardId: $dashboardId) {\n\t\tid\n\t\tname\n\t}\n}\n","variables":{"dashboardId":"86a338a3-7783-4fdb-8c68-347aa4d811fb"},"operationName":"GetDashboard"}'
+        body: '{"query":"\nquery GetDashboard ($dashboardId: String!) {\n\tgetDashboard(dashboardId: $dashboardId) {\n\t\tid\n\t\tname\n\t\tresourceGroupId\n\t}\n}\n","variables":{"dashboardId":"bed628b8-6c68-4f0d-9f6d-b8bbb4580ef3"},"operationName":"GetDashboard"}'
         form: {}
         headers:
             Cache-Control:
@@ -105,15 +105,15 @@ interactions:
         proto_minor: 0
         transfer_encoding: []
         trailer: {}
-        content_length: 108
+        content_length: 138
         uncompressed: false
         body: |
-            {"data":{"getDashboard":{"id":"86a338a3-7783-4fdb-8c68-347aa4d811fb","name":"tf-provider-test-dashboard"}}}
+            {"data":{"getDashboard":{"id":"bed628b8-6c68-4f0d-9f6d-b8bbb4580ef3","name":"tf-provider-test-dashboard","resourceGroupId":"rg-123456"}}}
         headers:
             Access-Control-Allow-Credentials:
                 - "true"
             Content-Length:
-                - "108"
+                - "138"
             Content-Security-Policy:
                 - 'default-src ''self'';base-uri ''self'';block-all-mixed-content;font-src ''self'' https: data:;form-action ''self'';frame-ancestors ''self'';img-src ''self'' data:;object-src ''none'';script-src ''self'';script-src-attr ''none'';style-src ''self'' https: ''unsafe-inline'';upgrade-insecure-requests'
             Content-Type:
@@ -156,7 +156,7 @@ interactions:
                 - "0"
         status: 200 OK
         code: 200
-        duration: 662.471625ms
+        duration: 408.778792ms
     - id: 2
       request:
         proto: HTTP/1.1
@@ -168,7 +168,7 @@ interactions:
         host: graphql.us.jupiterone.io
         remote_addr: ""
         request_uri: ""
-        body: '{"query":"\nmutation DeleteDashboard ($dashboardId: String!) {\n\tdeleteDashboard(dashboardId: $dashboardId) {\n\t\tsuccess\n\t}\n}\n","variables":{"dashboardId":"86a338a3-7783-4fdb-8c68-347aa4d811fb"},"operationName":"DeleteDashboard"}'
+        body: '{"query":"\nmutation DeleteDashboard ($dashboardId: String!) {\n\tdeleteDashboard(dashboardId: $dashboardId) {\n\t\tsuccess\n\t}\n}\n","variables":{"dashboardId":"bed628b8-6c68-4f0d-9f6d-b8bbb4580ef3"},"operationName":"DeleteDashboard"}'
         form: {}
         headers:
             Cache-Control:
@@ -234,4 +234,4 @@ interactions:
                 - "0"
         status: 200 OK
         code: 200
-        duration: 729.556542ms
+        duration: 455.243375ms
diff --git a/jupiterone/internal/client/dashboard.graphql b/jupiterone/internal/client/dashboard.graphql
@@ -2,21 +2,21 @@ query GetDashboard($dashboardId: String!) {
   getDashboard(dashboardId: $dashboardId) {
     id
     name
+    resourceGroupId
   }
 }
 
 # @genqlient(for: "CreateInsightsDashboardInput.layouts", omitempty: true, pointer:true)
 # @genqlient(for: "CreateInsightsDashboardInput.category", omitempty: true)
 # @genqlient(for: "CreateInsightsDashboardInput.dashboardId", omitempty: true)
+# @genqlient(for: "CreateInsightsDashboardInput.resourceGroupId", omitempty: true)
 mutation CreateDashboard(
-    $input: CreateInsightsDashboardInput!
-) {
-    createDashboard(
-        input: $input
-    ) {
-        name
-        id
-    }
+  $input: CreateInsightsDashboardInput!
+  ) {
+  createDashboard(input: $input) {
+    name
+    id
+  }
 }
 
 mutation DeleteDashboard($dashboardId: String!) {
@@ -28,10 +28,10 @@ mutation DeleteDashboard($dashboardId: String!) {
 # @genqlient(for: "PatchInsightsDashboardInput.layouts", omitempty: true, pointer:true)
 # @genqlient(for: "PatchInsightsDashboardInput.category", omitempty: true)
 mutation UpdateDashboard(
-    $input: PatchInsightsDashboardInput!
-) {
+  $input: PatchInsightsDashboardInput!
+  ) {
   patchDashboard(input: $input) {
     id
     name
   }
-}
+}
diff --git a/jupiterone/internal/client/generated.go b/jupiterone/internal/client/generated.go
diff --git a/jupiterone/internal/client/integration.graphql b/jupiterone/internal/client/integration.graphql
@@ -12,6 +12,7 @@ query GetIntegrationInstance($id: String!) {
     }
     sourceIntegrationInstanceId
     collectorPoolId
+    resourceGroupId
     pollingIntervalCronExpression {
       hour
       dayOfWeek
@@ -26,7 +27,8 @@ query GetIntegrationInstance($id: String!) {
 # @genqlient(for: "CreateIntegrationInstanceInput.offsiteComplete", omitempty: true)
 # @genqlient(for: "CreateIntegrationInstanceInput.ingestionSourcesOverrides", omitempty: true)
 mutation CreateIntegrationInstance(
-  $instance: CreateIntegrationInstanceInput!) {
+  $instance: CreateIntegrationInstanceInput!
+  ) {
   createIntegrationInstance(instance: $instance) {
     id
     name
@@ -54,8 +56,9 @@ mutation CreateIntegrationInstance(
 # @genqlient(for: "UpdateIntegrationInstanceInput.offsiteComplete", omitempty: true)
 # @genqlient(for: "UpdateIntegrationInstanceInput.ingestionSourcesOverrides", omitempty: true)
 mutation UpdateIntegrationInstance(
-  $id: String!, 
-  $update: UpdateIntegrationInstanceInput!) {
+  $id: String!
+  $update: UpdateIntegrationInstanceInput!
+) {
   updateIntegrationInstance(id: $id, update: $update) {
     id
     name
@@ -82,5 +85,3 @@ mutation DeleteIntegrationInstance($id: String!) {
     success
   }
 }
-
-
diff --git a/jupiterone/resource_dashboard.go b/jupiterone/resource_dashboard.go
@@ -35,9 +35,10 @@ func NewDashboard() resource.Resource {
 }
 
 type DashboardModel struct {
-	Id   types.String `json:"id,omitempty" tfsdk:"id"`
-	Name types.String `json:"name,omitempty" tfsdk:"name"`
-	Type types.String `json:"type,omitempty" tfsdk:"type"`
+	Id              types.String `json:"id,omitempty" tfsdk:"id"`
+	Name            types.String `json:"name,omitempty" tfsdk:"name"`
+	Type            types.String `json:"type,omitempty" tfsdk:"type"`
+	ResourceGroupId types.String `json:"resource_group_id" tfsdk:"resource_group_id"`
 }
 
 func NewDashboardResource() resource.Resource {
@@ -176,6 +177,10 @@ func (*DashboardResource) Schema(ctx context.Context, req resource.SchemaRequest
 					stringvalidator.OneOf(DashboardTypes...),
 				},
 			},
+			"resource_group_id": schema.StringAttribute{
+				Optional:    true,
+				Description: "The ID of the resource group that the dashboard belongs to.",
+			},
 		},
 	}
 }
@@ -216,17 +221,19 @@ func (r *DashboardResource) Update(ctx context.Context, req resource.UpdateReque
 
 func (r *DashboardModel) BuildCreateInsightsDashboardInput() (client.CreateInsightsDashboardInput, error) {
 	dashboard := client.CreateInsightsDashboardInput{
-		Name: r.Name.ValueString(),
-		Type: client.BoardType(r.Type.ValueString()),
+		Name:            r.Name.ValueString(),
+		Type:            client.BoardType(r.Type.ValueString()),
+		ResourceGroupId: r.ResourceGroupId.ValueString(),
 	}
 
 	return dashboard, nil
 }
 
 func (r *DashboardModel) BuildPatchInsightsDashboardInput() (client.PatchInsightsDashboardInput, error) {
 	dashboard := client.PatchInsightsDashboardInput{
-		Name:        r.Name.ValueString(),
-		DashboardId: r.Id.ValueString(),
+		Name:            r.Name.ValueString(),
+		DashboardId:     r.Id.ValueString(),
+		ResourceGroupId: r.ResourceGroupId.ValueString(),
 	}
 
 	return dashboard, nil

diff --git a/jupiterone/resource_dashboard_test.go b/jupiterone/resource_dashboard_test.go
@@ -66,6 +66,7 @@ func TestDashboard_BasicImport(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "name", dashboardName),
 					resource.TestCheckResourceAttr(resourceName, "type", string(dashboardType)),
+					resource.TestCheckResourceAttr(resourceName, "resource_group_id", "rg-123456"),
 				),
 			},
 		},
@@ -172,6 +173,7 @@ func testDashboardBasicConfig(rName string) string {
 		resource "jupiterone_dashboard" "test" {
 			name = %q
 			type = "Account"
+			resource_group_id = "rg-123456"
 		}
 	`, rName)
 }