fixed overwriting the token value during read

komminarlabs · Aug 23, 2024 · 2914560 · 2914560
1 parent 8b54a2c
commit 2914560
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 11 deletions.
diff --git a/docs/resources/authorization.md b/docs/resources/authorization.md
@@ -48,13 +48,13 @@ Required:
 
 Required:
 
+- `org_id` (String) An organization ID. Identifies the organization that owns the resource.
 - `type` (String) A resource type. Identifies the API resource's type (or kind).
 
 Optional:
 
 - `id` (String) A resource ID. Identifies a specific resource.
 - `org` (String) An organization name. The organization that owns the resource.
-- `org_id` (String) An organization ID. Identifies the organization that owns the resource.
 
 Read-Only:
 

diff --git a/examples/resources/authorization/resource.tf b/examples/resources/authorization/resource.tf
@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    influxdb = {
+      source = "komminarlabs/influxdb"
+    }
+  }
+}
+
 provider "influxdb" {}
 
 data "influxdb_organization" "iot" {
@@ -15,15 +23,17 @@ resource "influxdb_authorization" "signals" {
   permissions = [{
     action = "read"
     resource = {
-      id   = data.influxdb_bucket.signals.id
-      type = "buckets"
+      id     = data.influxdb_bucket.signals.id
+      org_id = data.influxdb_organization.iot.id
+      type   = "buckets"
     }
     },
     {
       action = "write"
       resource = {
-        id   = data.influxdb_bucket.signals.id
-        type = "buckets"
+        id     = data.influxdb_bucket.signals.id
+        org_id = data.influxdb_organization.iot.id
+        type   = "buckets"
       }
   }]
 }

diff --git a/examples/resources/bucket/resource.tf b/examples/resources/bucket/resource.tf
@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    influxdb = {
+      source = "komminarlabs/influxdb"
+    }
+  }
+}
+
 provider "influxdb" {}
 
 data "influxdb_organization" "iot" {

diff --git a/examples/resources/organization/resource.tf b/examples/resources/organization/resource.tf
@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    influxdb = {
+      source = "komminarlabs/influxdb"
+    }
+  }
+}
+
 provider "influxdb" {}
 
 resource "influxdb_organization" "iot" {

diff --git a/internal/provider/authorization_resource.go b/internal/provider/authorization_resource.go
@@ -59,6 +59,9 @@ func (r *AuthorizationResource) Schema(ctx context.Context, req resource.SchemaR
 				Computed:    true,
 				Description: "The API token.",
 				Sensitive:   true,
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.UseStateForUnknown(),
+				},
 			},
 			"status": schema.StringAttribute{
 				Optional:    true,
@@ -142,12 +145,8 @@ func (r *AuthorizationResource) Schema(ctx context.Context, req resource.SchemaR
 									},
 								},
 								"org_id": schema.StringAttribute{
-									Computed:    true,
-									Optional:    true,
+									Required:    true,
 									Description: "An organization ID. Identifies the organization that owns the resource.",
-									PlanModifiers: []planmodifier.String{
-										stringplanmodifier.UseStateForUnknown(),
-									},
 								},
 								"type": schema.StringAttribute{
 									Required:    true,
@@ -300,7 +299,6 @@ func (r *AuthorizationResource) Read(ctx context.Context, req resource.ReadReque
 	state.Id = types.StringPointerValue(authorization.Id)
 	state.Org = types.StringPointerValue(authorization.Org)
 	state.OrgID = types.StringPointerValue(authorization.OrgID)
-	state.Token = types.StringPointerValue(authorization.Token)
 	state.CreatedAt = types.StringValue(authorization.CreatedAt.String())
 	state.UpdatedAt = types.StringValue(authorization.UpdatedAt.String())
 	state.Description = types.StringValue(*authorization.AuthorizationUpdateRequest.Description)