Merge pull request #4 from bytesourceoss/fix_runtime_issue

fix share datasource value mapping error

Author: christian-hackl

.github/workflows/test_lint_build.yml

@@ -20,6 +20,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: 1.23.0
+          passphrase: ${{ secrets.PASSPHRASE }}
       - name: Test, Lint, & Build # Everything should pass normally before building with GoReleaser
         run: |
           curl --proto '=https' --tlsv1.2 -fsSL https://static.pantsbuild.org/setup/get-pants.sh | bash

docs/data-sources/share.md

@@ -27,23 +27,21 @@ output "share" {
 
 ### Read-Only
 
-- `share` (Attributes List) (see [below for nested schema](#nestedatt--share))
+- `id` (String) The ID of this resource.
+- `shares` (Attributes List) (see [below for nested schema](#nestedatt--shares))
 
-<a id="nestedatt--share"></a>
-### Nested Schema for `share`
+<a id="nestedatt--shares"></a>
+### Nested Schema for `shares`
 
-Required:
+Read-Only:
 
+- `active` (Boolean)
 - `created` (String)
 - `created_by` (String)
-- `id` (String)
-- `modified` (String)
-
-Optional:
-
-- `active` (Boolean)
 - `deleted` (Boolean)
 - `folder_parent_id` (String)
+- `id` (String)
+- `modified` (String)
 - `modified_by` (String)
 - `name` (String)
 - `role_id` (String)

internal/provider/share_data_source.go

@@ -27,6 +27,7 @@ type shareDataSource struct {
 }
 
 type shareDataSourceModel struct {
+	ID     types.String `tfsdk:"id"`
 	Shares []shareModel `tfsdk:"shares"`
 }
 
@@ -70,42 +71,45 @@ func (d *shareDataSource) Metadata(_ context.Context, req datasource.MetadataReq
 func (d *shareDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) {
 	resp.Schema = schema.Schema{
 		Attributes: map[string]schema.Attribute{
-			"share": schema.ListNestedAttribute{
+			"id": schema.StringAttribute{
+				Optional: true,
+			},
+			"shares": schema.ListNestedAttribute{
 				Computed: true,
 				NestedObject: schema.NestedAttributeObject{
 					Attributes: map[string]schema.Attribute{
 						"id": schema.StringAttribute{
-							Required: true,
+							Computed: true,
 						},
 						"role_id": schema.StringAttribute{
-							Optional: true,
+							Computed: true,
 						},
 						"name": schema.StringAttribute{
-							Optional: true,
+							Computed: true,
 						},
 						"username": schema.StringAttribute{
-							Optional: true,
+							Computed: true,
 						},
 						"active": schema.BoolAttribute{
-							Optional: true,
+							Computed: true,
 						},
 						"deleted": schema.BoolAttribute{
-							Optional: true,
+							Computed: true,
 						},
 						"created": schema.StringAttribute{
-							Required: true,
+							Computed: true,
 						},
 						"modified": schema.StringAttribute{
-							Required: true,
+							Computed: true,
 						},
 						"created_by": schema.StringAttribute{
-							Required: true,
+							Computed: true,
 						},
 						"modified_by": schema.StringAttribute{
-							Optional: true,
+							Computed: true,
 						},
 						"folder_parent_id": schema.StringAttribute{
-							Optional: true,
+							Computed: true,
 						},
 					},
 				},
@@ -117,11 +121,14 @@ func (d *shareDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
 // Read refreshes the Terraform state with the latest data.
 func (d *shareDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
 	var state shareDataSourceModel
-	var data shareModel
-	diag := req.Config.Get(ctx, &data)
-	resp.Diagnostics.Append(diag...)
 
-	shares, err := d.client.Client.SearchAROs(d.client.Context, api.SearchAROsOptions{FilterSearch: data.ID.String()})
+	resp.Diagnostics.Append(req.Config.Get(ctx, &state)...)
+
+	var opts api.SearchAROsOptions
+	if state.ID.String() != "" {
+		opts = api.SearchAROsOptions{FilterSearch: state.ID.String()}
+	}
+	shares, err := d.client.Client.SearchAROs(d.client.Context, opts)
 	if err != nil {
 		resp.Diagnostics.AddError(
 			"Unable to Read shares", "",
@@ -130,6 +137,7 @@ func (d *shareDataSource) Read(ctx context.Context, req datasource.ReadRequest,
 	}
 
 	// Map response body to model
+	state.Shares = make([]shareModel, 0)
 	for _, share := range shares {
 		shareState := shareModel{
 			ID:         types.StringValue(share.User.ID),

internal/provider/share_resource.go

@@ -132,7 +132,9 @@ func (r *shareResource) Read(ctx context.Context, req resource.ReadRequest, resp
 		resp.Diagnostics.AddError(fmt.Sprintf("failed to lookup permission, folder: %s, share-target: %s, share-value: %s", data.Name.ValueString(), data.ShareTargetType.ValueString(), data.ShareTargetValue.ValueString()), err.Error())
 		return
 	}
-	data.SharePermission = types.StringValue(fmt.Sprintf("%d", pem.Type))
+	if pem != nil {
+		data.SharePermission = types.StringValue(fmt.Sprintf("%d", pem.Type))
+	}
 
 	diags = resp.State.Set(ctx, &data)
 	resp.Diagnostics.Append(diags...)

tf-test/.gitignore

@@ -1 +1,5 @@
 .envrc
+.terraform
+.terraform.lock.hcl
+.terraform.tfstate
+.terraform.tfstate.backup

tf-test/main.tf

@@ -36,3 +36,11 @@ resource "passbolt_share" "share-folder-with-group-open" {
   share_target_value = "group-open"
   share_permission   = "1"
 }
+
+
+data "passbolt_share" "all" {}
+
+output "share" {
+  # `value` will be a list of all available share
+  value = data.passbolt_share.all
+}