Merge pull request #19 from Kekenika/add-missing-read

Add `read` for every `create` or `update`
Kekenika · Jan 28, 2022 · f2d6334 · f2d6334
2 parents 32fbc60 + 006a012
commit f2d6334
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/typesense/resource_collection.go b/typesense/resource_collection.go
@@ -97,8 +97,6 @@ func resourceTypesenseCollection() *schema.Resource {
 func resourceTypesenseCollectionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*typesense.Client)
 
-	var diags diag.Diagnostics
-
 	schema := &api.CollectionSchema{}
 
 	if v := d.Get("name"); v != "" {
@@ -141,7 +139,7 @@ func resourceTypesenseCollectionCreate(ctx context.Context, d *schema.ResourceDa
 	}
 
 	d.SetId(collection.Name)
-	return diags
+	return resourceTypesenseCollectionRead(ctx, d, meta)
 }
 
 func resourceTypesenseCollectionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -183,8 +181,6 @@ func resourceTypesenseCollectionRead(ctx context.Context, d *schema.ResourceData
 func resourceTypesenseCollectionUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*typesense.Client)
 
-	var diags diag.Diagnostics
-
 	id := d.Id()
 
 	_, err := client.Collection(id).Delete()
@@ -235,7 +231,7 @@ func resourceTypesenseCollectionUpdate(ctx context.Context, d *schema.ResourceDa
 		return diag.FromErr(err)
 	}
 
-	return diags
+	return resourceTypesenseCurationRead(ctx, d, meta)
 }
 
 func resourceTypesenseCollectionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

diff --git a/typesense/resource_collection_alias.go b/typesense/resource_collection_alias.go
@@ -38,8 +38,6 @@ func resourceTypesenseCollectionAlias() *schema.Resource {
 func resourceTypesenseCollectionAliasUpsert(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*typesense.Client)
 
-	var diags diag.Diagnostics
-
 	name := d.Get("name").(string)
 	aliasSchema := &api.CollectionAliasSchema{
 		CollectionName: d.Get("collection_name").(string),
@@ -51,7 +49,7 @@ func resourceTypesenseCollectionAliasUpsert(ctx context.Context, d *schema.Resou
 	}
 
 	d.SetId(alias.Name)
-	return diags
+	return resourceTypesenseCollectionAliasRead(ctx, d, meta)
 }
 
 func resourceTypesenseCollectionAliasRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

diff --git a/typesense/resource_curation.go b/typesense/resource_curation.go
@@ -93,8 +93,6 @@ func resourceTypesenseCuration() *schema.Resource {
 func resourceTypesenseCurationUpsert(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*typesense.Client)
 
-	var diags diag.Diagnostics
-
 	name := d.Get("name").(string)
 	collectionName := d.Get("collection_name").(string)
 	overwriteSchema := &api.SearchOverrideSchema{}
@@ -147,7 +145,7 @@ func resourceTypesenseCurationUpsert(ctx context.Context, d *schema.ResourceData
 	}
 
 	d.SetId(fmt.Sprintf("%s.%s", collectionName, override.Id))
-	return diags
+	return resourceTypesenseCurationRead(ctx, d, meta)
 }
 
 func resourceTypesenseCurationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

diff --git a/typesense/resource_document.go b/typesense/resource_document.go
@@ -41,8 +41,6 @@ func resourceTypesenseDocument() *schema.Resource {
 func resourceTypesenseDocumentUpsert(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*typesense.Client)
 
-	var diags diag.Diagnostics
-
 	var collectionName string
 
 	if v, ok := d.GetOk("collection_name"); ok {
@@ -68,7 +66,7 @@ func resourceTypesenseDocumentUpsert(ctx context.Context, d *schema.ResourceData
 	}
 
 	d.SetId(fmt.Sprintf("%s.%s", collectionName, id))
-	return diags
+	return resourceTypesenseCurationRead(ctx, d, meta)
 }
 
 func resourceTypesenseDocumentRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {

diff --git a/typesense/resource_synonyms.go b/typesense/resource_synonyms.go
@@ -52,8 +52,6 @@ func resourceTypesenseSynonyms() *schema.Resource {
 func resourceTypesenseSynonymsUpsert(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client := meta.(*typesense.Client)
 
-	var diags diag.Diagnostics
-
 	name := d.Get("name").(string)
 	collectionName := d.Get("collection_name").(string)
 	synonymSchema := &api.SearchSynonymSchema{
@@ -70,7 +68,7 @@ func resourceTypesenseSynonymsUpsert(ctx context.Context, d *schema.ResourceData
 	}
 
 	d.SetId(fmt.Sprintf("%s.%s", collectionName, synonym.Id))
-	return diags
+	return resourceTypesenseCurationRead(ctx, d, meta)
 }
 
 func resourceTypesenseSynonymsRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {