Skip to content

Commit

Permalink
Called Read after Creating/Updating the ACL resources
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnSharpe committed Jul 18, 2023
1 parent cf7345f commit 7e80e8b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
6 changes: 2 additions & 4 deletions provider/resource_rediscloud_acl_role.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ func resourceRedisCloudAclRole() *schema.Resource {

func resourceRedisCloudAclRoleCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
api := meta.(*apiClient)
var diags diag.Diagnostics

name := d.Get("name").(string)
associateWithRules := extractRules(d)
Expand All @@ -110,7 +109,7 @@ func resourceRedisCloudAclRoleCreate(ctx context.Context, d *schema.ResourceData
return diag.FromErr(err)
}

return diags
return resourceRedisCloudAclRoleRead(ctx, d, meta)
}

func resourceRedisCloudAclRoleRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand Down Expand Up @@ -138,7 +137,6 @@ func resourceRedisCloudAclRoleRead(ctx context.Context, d *schema.ResourceData,

func resourceRedisCloudAclRoleUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
api := meta.(*apiClient)
var diags diag.Diagnostics

id, err := strconv.Atoi(d.Id())
if err != nil {
Expand All @@ -164,7 +162,7 @@ func resourceRedisCloudAclRoleUpdate(ctx context.Context, d *schema.ResourceData
}
}

return diags
return resourceRedisCloudAclRoleRead(ctx, d, meta)
}

func resourceRedisCloudAclRoleDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand Down
6 changes: 2 additions & 4 deletions provider/resource_rediscloud_acl_rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ func resourceRedisCloudAclRule() *schema.Resource {

func resourceRedisCloudAclRuleCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
api := meta.(*apiClient)
var diags diag.Diagnostics

name := d.Get("name").(string)
rule := d.Get("rule").(string)
Expand All @@ -71,7 +70,7 @@ func resourceRedisCloudAclRuleCreate(ctx context.Context, d *schema.ResourceData
return diag.FromErr(err)
}

return diags
return resourceRedisCloudAclRuleRead(ctx, d, meta)
}

func resourceRedisCloudAclRuleRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand Down Expand Up @@ -100,7 +99,6 @@ func resourceRedisCloudAclRuleRead(ctx context.Context, d *schema.ResourceData,

func resourceRedisCloudAclRuleUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
api := meta.(*apiClient)
var diags diag.Diagnostics

id, err := strconv.Atoi(d.Id())
if err != nil {
Expand All @@ -126,7 +124,7 @@ func resourceRedisCloudAclRuleUpdate(ctx context.Context, d *schema.ResourceData
}
}

return diags
return resourceRedisCloudAclRuleRead(ctx, d, meta)
}

func resourceRedisCloudAclRuleDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand Down
6 changes: 2 additions & 4 deletions provider/resource_rediscloud_acl_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ func resourceRedisCloudAclUser() *schema.Resource {

func resourceRedisCloudAclUserCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
api := meta.(*apiClient)
var diags diag.Diagnostics

name := d.Get("name").(string)
role := d.Get("role").(string)
Expand All @@ -75,7 +74,7 @@ func resourceRedisCloudAclUserCreate(ctx context.Context, d *schema.ResourceData

d.SetId(strconv.Itoa(id))

return diags
return resourceRedisCloudAclUserRead(ctx, d, meta)
}

func resourceRedisCloudAclUserRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand Down Expand Up @@ -104,7 +103,6 @@ func resourceRedisCloudAclUserRead(ctx context.Context, d *schema.ResourceData,

func resourceRedisCloudAclUserUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
api := meta.(*apiClient)
var diags diag.Diagnostics

id, err := strconv.Atoi(d.Id())
if err != nil {
Expand All @@ -125,7 +123,7 @@ func resourceRedisCloudAclUserUpdate(ctx context.Context, d *schema.ResourceData
}
}

return diags
return resourceRedisCloudAclUserRead(ctx, d, meta)
}

func resourceRedisCloudAclUserDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
Expand Down

0 comments on commit 7e80e8b

Please sign in to comment.