Bug fix in auth method krb5 resource

Author: tuvia-akeyless

akeyless/resource_auth_method_kerberos.go

@@ -3,6 +3,7 @@ package akeyless
 
 import (
 	"context"
+	"encoding/base64"
 	"strconv"
 	"strings"
 
@@ -125,21 +126,11 @@ func resourceAuthMethodKerberos() *schema.Resource {
 				Sensitive:   true,
 				Description: "Keytab file data (base64 encoded)",
 			},
-			"keytab_file_path": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Description: "Keytab file path",
-			},
 			"krb5_conf_data": {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Description: "Kerberos configuration file data (base64 encoded)",
 			},
-			"krb5_conf_path": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Description: "Kerberos configuration file path",
-			},
 			"ldap_anonymous_search": {
 				Type:        schema.TypeBool,
 				Optional:    true,
@@ -215,9 +206,7 @@ func resourceAuthMethodKerberosCreate(d *schema.ResourceData, m interface{}) err
 	groupDn := d.Get("group_dn").(string)
 	groupFilter := d.Get("group_filter").(string)
 	keytabFileData := d.Get("keytab_file_data").(string)
-	keytabFilePath := d.Get("keytab_file_path").(string)
 	krb5ConfData := d.Get("krb5_conf_data").(string)
-	krb5ConfPath := d.Get("krb5_conf_path").(string)
 	ldapAnonymousSearch := d.Get("ldap_anonymous_search").(bool)
 	ldapCaCert := d.Get("ldap_ca_cert").(string)
 	ldapUrl := d.Get("ldap_url").(string)
@@ -248,9 +237,7 @@ func resourceAuthMethodKerberosCreate(d *schema.ResourceData, m interface{}) err
 	common.GetAkeylessPtr(&body.GroupDn, groupDn)
 	common.GetAkeylessPtr(&body.GroupFilter, groupFilter)
 	common.GetAkeylessPtr(&body.KeytabFileData, keytabFileData)
-	common.GetAkeylessPtr(&body.KeytabFilePath, keytabFilePath)
 	common.GetAkeylessPtr(&body.Krb5ConfData, krb5ConfData)
-	common.GetAkeylessPtr(&body.Krb5ConfPath, krb5ConfPath)
 	common.GetAkeylessPtr(&body.LdapAnonymousSearch, ldapAnonymousSearch)
 	common.GetAkeylessPtr(&body.LdapCaCert, ldapCaCert)
 	common.GetAkeylessPtr(&body.LdapUrl, ldapUrl)
@@ -413,7 +400,7 @@ func resourceAuthMethodKerberosRead(d *schema.ResourceData, m interface{}) error
 			}
 		}
 		if kd.KerberosKrb5Conf != nil {
-			if err := d.Set("krb5_conf_data", *kd.KerberosKrb5Conf); err != nil {
+			if err := d.Set("krb5_conf_data", base64.StdEncoding.EncodeToString([]byte(*kd.KerberosKrb5Conf))); err != nil {
 				return err
 			}
 		}
@@ -506,9 +493,7 @@ func resourceAuthMethodKerberosUpdate(d *schema.ResourceData, m interface{}) err
 	groupDn := d.Get("group_dn").(string)
 	groupFilter := d.Get("group_filter").(string)
 	keytabFileData := d.Get("keytab_file_data").(string)
-	keytabFilePath := d.Get("keytab_file_path").(string)
 	krb5ConfData := d.Get("krb5_conf_data").(string)
-	krb5ConfPath := d.Get("krb5_conf_path").(string)
 	ldapAnonymousSearch := d.Get("ldap_anonymous_search").(bool)
 	ldapCaCert := d.Get("ldap_ca_cert").(string)
 	ldapUrl := d.Get("ldap_url").(string)
@@ -539,9 +524,7 @@ func resourceAuthMethodKerberosUpdate(d *schema.ResourceData, m interface{}) err
 	common.GetAkeylessPtr(&body.GroupDn, groupDn)
 	common.GetAkeylessPtr(&body.GroupFilter, groupFilter)
 	common.GetAkeylessPtr(&body.KeytabFileData, keytabFileData)
-	common.GetAkeylessPtr(&body.KeytabFilePath, keytabFilePath)
 	common.GetAkeylessPtr(&body.Krb5ConfData, krb5ConfData)
-	common.GetAkeylessPtr(&body.Krb5ConfPath, krb5ConfPath)
 	common.GetAkeylessPtr(&body.LdapAnonymousSearch, ldapAnonymousSearch)
 	common.GetAkeylessPtr(&body.LdapCaCert, ldapCaCert)
 	common.GetAkeylessPtr(&body.LdapUrl, ldapUrl)

akeyless/tests/gateway/auth_kerberos_test.go

@@ -10,8 +10,6 @@ import (
 
 func TestAuthMethodKerberosResource(t *testing.T) {
 
-	t.Skip("TODO: GW is broken. Need to skip dry run.")
-
 	testutils.SkipIfNoGateway(t)
 
 	name := "test_auth_method_kerberos"

docs/resources/auth_method_kerberos.md

@@ -37,9 +37,7 @@ Kerberos Auth Method Resource
 - `gw_bound_ips` (Set of String) A comma-separated CIDR block list as a trusted Gateway entity
 - `jwt_ttl` (Number) creds expiration time in minutes. If not set, use default according to account settings (see get-account-settings)
 - `keytab_file_data` (String, Sensitive) Keytab file data (base64 encoded)
-- `keytab_file_path` (String) Keytab file path
 - `krb5_conf_data` (String) Kerberos configuration file data (base64 encoded)
-- `krb5_conf_path` (String) Kerberos configuration file path
 - `ldap_anonymous_search` (Boolean) Enable LDAP anonymous search
 - `ldap_ca_cert` (String) LDAP CA certificate
 - `ldap_url` (String) LDAP URL