Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move schema in own package #201

Merged
merged 1 commit into from
Dec 17, 2024
Merged

move schema in own package #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions internal/provider/attachment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,21 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/bitwarden"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/bitwarden/models"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func resourceCreateAttachment(ctx context.Context, d *schema.ResourceData, bwClient bitwarden.PasswordManager) diag.Diagnostics {
itemId := d.Get(attributeAttachmentItemID).(string)
itemId := d.Get(schema_definition.AttributeAttachmentItemID).(string)

existingAttachments, err := listExistingAttachments(ctx, bwClient, itemId)
if err != nil {
return diag.FromErr(err)
}

var obj *models.Object
filePath, fileSpecified := d.GetOk(attributeAttachmentFile)
content, contentSpecified := d.GetOk(attributeAttachmentContent)
fileName, fileNameSpecified := d.GetOk(attributeAttachmentFileName)
filePath, fileSpecified := d.GetOk(schema_definition.AttributeAttachmentFile)
content, contentSpecified := d.GetOk(schema_definition.AttributeAttachmentContent)
fileName, fileNameSpecified := d.GetOk(schema_definition.AttributeAttachmentFileName)
if fileSpecified {
obj, err = bwClient.CreateAttachmentFromFile(ctx, itemId, filePath.(string))
} else if contentSpecified && fileNameSpecified {
Expand All @@ -50,7 +51,7 @@ func resourceCreateAttachment(ctx context.Context, d *schema.ResourceData, bwCli
}

func resourceReadAttachment(ctx context.Context, d *schema.ResourceData, bwClient bitwarden.PasswordManager) diag.Diagnostics {
itemId := d.Get(attributeAttachmentItemID).(string)
itemId := d.Get(schema_definition.AttributeAttachmentItemID).(string)

obj, err := bwClient.GetObject(ctx, models.Object{ID: itemId, Object: models.ObjectTypeItem})
if err != nil {
Expand All @@ -74,29 +75,29 @@ func resourceReadAttachment(ctx context.Context, d *schema.ResourceData, bwClien
}

func resourceDeleteAttachment(ctx context.Context, d *schema.ResourceData, bwClient bitwarden.PasswordManager) diag.Diagnostics {
itemId := d.Get(attributeAttachmentItemID).(string)
itemId := d.Get(schema_definition.AttributeAttachmentItemID).(string)

return diag.FromErr(bwClient.DeleteAttachment(ctx, itemId, d.Id()))
}

func attachmentDataFromStruct(d *schema.ResourceData, attachment models.Attachment) error {
d.SetId(attachment.ID)

err := d.Set(attributeAttachmentFileName, attachment.FileName)
err := d.Set(schema_definition.AttributeAttachmentFileName, attachment.FileName)
if err != nil {
return err
}

err = d.Set(attributeAttachmentSize, attachment.Size)
err = d.Set(schema_definition.AttributeAttachmentSize, attachment.Size)
if err != nil {
return err
}
err = d.Set(attributeAttachmentSizeName, attachment.SizeName)
err = d.Set(schema_definition.AttributeAttachmentSizeName, attachment.SizeName)
if err != nil {
return err
}

err = d.Set(attributeAttachmentURL, attachment.Url)
err = d.Set(schema_definition.AttributeAttachmentURL, attachment.Url)
if err != nil {
return err
}
Expand All @@ -105,9 +106,9 @@ func attachmentDataFromStruct(d *schema.ResourceData, attachment models.Attachme
}

func resourceReadDataSourceAttachment(ctx context.Context, d *schema.ResourceData, bwClient bitwarden.PasswordManager) diag.Diagnostics {
itemId := d.Get(attributeAttachmentItemID).(string)
itemId := d.Get(schema_definition.AttributeAttachmentItemID).(string)

attachmentId := d.Get(attributeID).(string)
attachmentId := d.Get(schema_definition.AttributeID).(string)

content, err := bwClient.GetAttachment(ctx, itemId, attachmentId)
if err != nil {
Expand All @@ -116,7 +117,7 @@ func resourceReadDataSourceAttachment(ctx context.Context, d *schema.ResourceDat

d.SetId(attachmentId)

return diag.FromErr(d.Set(attributeAttachmentContent, string(content)))
return diag.FromErr(d.Set(schema_definition.AttributeAttachmentContent, string(content)))
}

func listExistingAttachments(ctx context.Context, client bitwarden.PasswordManager, itemId string) ([]models.Attachment, error) {
Expand Down
11 changes: 6 additions & 5 deletions internal/provider/data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/bitwarden"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/bitwarden/models"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func resourceReadDataSourceItem(attrObject models.ObjectType, attrType models.ItemType) passwordManagerOperation {
return func(ctx context.Context, d *schema.ResourceData, bwClient bitwarden.PasswordManager) diag.Diagnostics {
err := d.Set(attributeType, attrType)
err := d.Set(schema_definition.AttributeType, attrType)
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -21,8 +22,8 @@ func resourceReadDataSourceItem(attrObject models.ObjectType, attrType models.It

func resourceReadDataSourceObject(objType models.ObjectType) passwordManagerOperation {
return func(ctx context.Context, d *schema.ResourceData, bwClient bitwarden.PasswordManager) diag.Diagnostics {
d.SetId(d.Get(attributeID).(string))
err := d.Set(attributeObject, objType)
d.SetId(d.Get(schema_definition.AttributeID).(string))
err := d.Set(schema_definition.AttributeObject, objType)
if err != nil {
return diag.FromErr(err)
}
Expand All @@ -31,11 +32,11 @@ func resourceReadDataSourceObject(objType models.ObjectType) passwordManagerOper
}

func resourceReadDataSourceSecret(ctx context.Context, d *schema.ResourceData, bwsClient bitwarden.SecretsManager) diag.Diagnostics {
d.SetId(d.Get(attributeID).(string))
d.SetId(d.Get(schema_definition.AttributeID).(string))
return secretRead(ctx, d, bwsClient)
}

func resourceReadDataSourceProject(ctx context.Context, d *schema.ResourceData, bwsClient bitwarden.SecretsManager) diag.Diagnostics {
d.SetId(d.Get(attributeID).(string))
d.SetId(d.Get(schema_definition.AttributeID).(string))
return projectRead(ctx, d, bwsClient)
}
13 changes: 7 additions & 6 deletions internal/provider/data_source_attachment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@ package provider

import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func dataSourceAttachment() *schema.Resource {
return &schema.Resource{
Description: "Use this data source to get the content on an existing item's attachment.",
ReadContext: withPasswordManager(resourceReadDataSourceAttachment),
Schema: map[string]*schema.Schema{
attributeID: {
Description: descriptionIdentifier,
schema_definition.AttributeID: {
Description: schema_definition.DescriptionIdentifier,
Type: schema.TypeString,
Required: true,
},
attributeAttachmentItemID: {
Description: descriptionItemIdentifier,
schema_definition.AttributeAttachmentItemID: {
Description: schema_definition.DescriptionItemIdentifier,
Type: schema.TypeString,
Required: true,
},
attributeAttachmentContent: {
Description: descriptionItemAttachmentContent,
schema_definition.AttributeAttachmentContent: {
Description: schema_definition.DescriptionItemAttachmentContent,
Type: schema.TypeString,
Computed: true,
},
Expand Down
3 changes: 2 additions & 1 deletion internal/provider/data_source_attachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func TestAccDataSourceAttachment(t *testing.T) {
Expand All @@ -19,7 +20,7 @@ func TestAccDataSourceAttachment(t *testing.T) {
{
Config: tfConfigPasswordManagerProvider() + tfConfigResourceAttachment("fixtures/attachment1.txt") + tfConfigDataAttachment(),
Check: resource.TestMatchResourceAttr(
"data.bitwarden_attachment.foo_data", attributeAttachmentContent, regexp.MustCompile(`^Hello, I'm a text attachment$`),
"data.bitwarden_attachment.foo_data", schema_definition.AttributeAttachmentContent, regexp.MustCompile(`^Hello, I'm a text attachment$`),
),
},
{
Expand Down
3 changes: 2 additions & 1 deletion internal/provider/data_source_folder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package provider
import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/bitwarden/models"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func dataSourceFolder() *schema.Resource {
return &schema.Resource{
Description: "Use this data source to get information on an existing folder.",
ReadContext: withPasswordManager(resourceReadDataSourceObject(models.ObjectTypeFolder)),
Schema: folderSchema(DataSource),
Schema: schema_definition.FolderSchema(schema_definition.DataSource),
}
}
5 changes: 3 additions & 2 deletions internal/provider/data_source_item_login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package provider
import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/bitwarden/models"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func dataSourceItemLogin() *schema.Resource {
dataSourceItemLoginSchema := baseSchema(DataSource)
for k, v := range loginSchema(DataSource) {
dataSourceItemLoginSchema := schema_definition.BaseSchema(schema_definition.DataSource)
for k, v := range schema_definition.LoginSchema(schema_definition.DataSource) {
dataSourceItemLoginSchema[k] = v
}

Expand Down
3 changes: 2 additions & 1 deletion internal/provider/data_source_item_secure_note.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package provider
import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/bitwarden/models"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func dataSourceItemSecureNote() *schema.Resource {
dataSourceItemSecureNoteSchema := baseSchema(DataSource)
dataSourceItemSecureNoteSchema := schema_definition.BaseSchema(schema_definition.DataSource)

return &schema.Resource{
Description: "Use this data source to get information on an existing secure note item.",
Expand Down
3 changes: 2 additions & 1 deletion internal/provider/data_source_org_collection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package provider
import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/bitwarden/models"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func dataSourceOrgCollection() *schema.Resource {
return &schema.Resource{
Description: "Use this data source to get information on an existing organization collection.",
ReadContext: withPasswordManager(resourceReadDataSourceObject(models.ObjectTypeOrgCollection)),
Schema: orgCollectionSchema(DataSource),
Schema: schema_definition.OrgCollectionSchema(schema_definition.DataSource),
}
}
5 changes: 3 additions & 2 deletions internal/provider/data_source_org_collection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func TestAccDataSourceOrgCollection(t *testing.T) {
Expand All @@ -20,10 +21,10 @@ func TestAccDataSourceOrgCollection(t *testing.T) {
Config: tfConfigPasswordManagerProvider() + tfConfigDataOrgCollection(),
Check: resource.ComposeTestCheckFunc(
resource.TestMatchResourceAttr(
resourceName, attributeName, regexp.MustCompile("^coll-([0-9]{6})$"),
resourceName, schema_definition.AttributeName, regexp.MustCompile("^coll-([0-9]{6})$"),
),
resource.TestMatchResourceAttr(
resourceName, attributeID, regexp.MustCompile(regExpId),
resourceName, schema_definition.AttributeID, regexp.MustCompile(regExpId),
),
),
},
Expand Down
3 changes: 2 additions & 1 deletion internal/provider/data_source_organization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package provider
import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/bitwarden/models"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func dataSourceOrganization() *schema.Resource {
return &schema.Resource{
Description: "Use this data source to get information on an existing organization.",
ReadContext: withPasswordManager(resourceReadDataSourceObject(models.ObjectTypeOrganization)),
Schema: organizationSchema(),
Schema: schema_definition.OrganizationSchema(),
}
}
5 changes: 3 additions & 2 deletions internal/provider/data_source_organization_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func TestAccDataSourceOrganizationAttributes(t *testing.T) {
Expand All @@ -20,10 +21,10 @@ func TestAccDataSourceOrganizationAttributes(t *testing.T) {
Config: tfConfigPasswordManagerProvider() + tfConfigDataOrganization(),
Check: resource.ComposeTestCheckFunc(
resource.TestMatchResourceAttr(
resourceName, attributeName, regexp.MustCompile("^org-([0-9]{6})$"),
resourceName, schema_definition.AttributeName, regexp.MustCompile("^org-([0-9]{6})$"),
),
resource.TestMatchResourceAttr(
resourceName, attributeID, regexp.MustCompile(regExpId),
resourceName, schema_definition.AttributeID, regexp.MustCompile(regExpId),
),
),
},
Expand Down
3 changes: 2 additions & 1 deletion internal/provider/data_source_project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package provider

import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func dataSourceProject() *schema.Resource {
dataSourceProjectSchema := projectSchema(DataSource)
dataSourceProjectSchema := schema_definition.ProjectSchema(schema_definition.DataSource)

return &schema.Resource{
Description: "Use this data source to get information on an existing project.",
Expand Down
3 changes: 2 additions & 1 deletion internal/provider/data_source_secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package provider

import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/maxlaverse/terraform-provider-bitwarden/internal/schema_definition"
)

func dataSourceSecret() *schema.Resource {
dataSourceSecretSchema := secretSchema(DataSource)
dataSourceSecretSchema := schema_definition.SecretSchema(schema_definition.DataSource)

return &schema.Resource{
Description: "Use this data source to get information on an existing secret.",
Expand Down
Loading
Loading