Skip to content

Commit

Permalink
Fix bug with prefix slash in name
Browse files Browse the repository at this point in the history
  • Loading branch information
amirmao authored Mar 18, 2024
1 parent fb96317 commit 44c72de
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
7 changes: 7 additions & 0 deletions akeyless/common/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -495,3 +495,10 @@ func ReadAndEncodeFile(fileName string) (string, error) {
}
return data, nil
}

func SetDataByPrefixSlash(d *schema.ResourceData, key, returnedValue, existValue string) error {
if "/"+returnedValue == existValue {
return d.Set(key, existValue)
}
return d.Set(key, returnedValue)
}
5 changes: 2 additions & 3 deletions akeyless/resource_assoc_role_am.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,8 @@ func resourceAssocRoleAmRead(d *schema.ResourceData, m interface{}) error {
if err != nil {
return err
}

if role.RoleName != nil {
err = d.Set("role_name", *role.RoleName)
err = common.SetDataByPrefixSlash(d, "role_name", *role.RoleName, roleName)
if err != nil {
return err
}
Expand All @@ -116,7 +115,7 @@ func resourceAssocRoleAmRead(d *schema.ResourceData, m interface{}) error {
for _, acc := range *role.RoleAuthMethodsAssoc {
if acc.AssocId != nil && *acc.AssocId == id {
if acc.AuthMethodName != nil {
err = d.Set("am_name", *acc.AuthMethodName)
err = common.SetDataByPrefixSlash(d, "am_name", *acc.AuthMethodName, d.Get("am_name").(string))
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion akeyless/resource_db_target.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ func resourceDbTargetRead(d *schema.ResourceData, m interface{}) error {
}
}
if rOut.Target.ProtectionKeyName != nil {
err := d.Set("key", *rOut.Target.ProtectionKeyName)
err := common.SetDataByPrefixSlash(d, "key", *rOut.Target.ProtectionKeyName, d.Get("key").(string))
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion akeyless/resource_gateway_rotated_secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func resourceRotatedSecretRead(d *schema.ResourceData, m interface{}) error {

if itemOut.ItemTargetsAssoc != nil {
targetName := common.GetTargetName(itemOut.ItemTargetsAssoc)
err = d.Set("target_name", targetName)
err = common.SetDataByPrefixSlash(d, "target_name", targetName, d.Get("target_name").(string))
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Use Semantic versioning only. Please update the version number before opening a pull request.
v1.4.2
v1.4.3

0 comments on commit 44c72de

Please sign in to comment.