Task/3303 driver new field LoginSshKey with annotation of type: file-to-field-aliases

ci_tools/fsas_nodedriver_template.yml

@@ -5,14 +5,15 @@ metadata:
     passwordFields: credentialsPassword,slesRegistrationCode
     privateCredentialFields: credentialsPassword,slesRegistrationCode
     publicCredentialFields: credentialsUsername,tenantUuid,apiUrl,ntpUrl,dnsIp,slesRegistrationEmail
+    nodedriver.cattle.io/file-to-field-aliases: firstLoginSshKey:firstLoginSshKey
   name: fsas
 spec:
   active: true
   addCloudCredential: true
   builtin: false
   checksum: <sha256_checksum>
   description: ''
-  displayName: fsas
+  displayName: 'Fsas'
   externalId: ''
   uiUrl: ''
   url: <fsas_nodedriver_binary_url>

pkg/drivers/fsas/fsas.go

@@ -69,6 +69,7 @@ type Driver struct {
 	Keycloak                  keycloak.Keycloak   `json:"-"`
 	SshManager                sshutils.SshManager `json:"-"`
 	CfgManager                cfgutils.CfgManager `json:"-"`
+	FirstLoginSshKey          string              `json:"firstLoginSshKey"` // Matches the name used in annotations
 }
 
 // NewDriver creates and returns a new instance of the FSAS CDI driver
@@ -249,6 +250,11 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 			Usage:  "Warning: this field should remain empty as custom userdata are not supported!",
 			EnvVar: "FSAS_USERDATA",
 		},
+		mcnflag.StringFlag{
+			Name:   "fsas-first-login-ssh-key",
+			Usage:  "SSH private key for first log in",
+			EnvVar: "FSAS_FIRST_LOGIN_SSH_KEY",
+		},
 	}
 }
 
@@ -398,6 +404,9 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
 	d.SlesRegistrationEmail = strings.TrimSpace(flags.String("fsas-sles-registration-email"))
 	slog.Debug("Driver", "FSAS SLES registration email", d.SlesRegistrationEmail)
 
+	d.FirstLoginSshKey = strings.TrimSpace(flags.String("fsas-first-login-ssh-key"))
+	slog.Debug("Driver ", "FSAS first login SSH key", d.FirstLoginSshKey)
+
 	return d.checkConfig()
 }
 
@@ -520,6 +529,10 @@ func (d *Driver) checkConfig() error {
 		return fmt.Errorf(errorMandatoryOption, "OS image name", "--fsas-os-image-name")
 	}
 
+	if d.FirstLoginSshKey == "" {
+		return fmt.Errorf(errorMandatoryOption, "First login SSH key", "--fsas-first-login-ssh-key")
+	}
+
 	if err := d.FabricManager.ValidateTenant(d.TenantUuid, d.Keycloak.GetToken()); err != nil {
 		slog.Error("tenant_uuid validation unsuccessful", "err", err)
 		return err

pkg/drivers/fsas/fsas_test.go

@@ -107,6 +107,7 @@ func TestSetConfigFromFlagsTrimsWhitespace(t *testing.T) {
 			"fsas-image-os-ssh-host-pub-key":    "  " + hostPublicKey + "  ",
 			"fsas-sles-registration-code":       "",
 			"fsas-sles-registration-email":      "",
+			"fsas-first-login-ssh-key":          "111-222-333",
 		},
 	}
 
@@ -291,6 +292,7 @@ func TestCheckConfigTenantSuccess(t *testing.T) {
 		OsImageName:               "Ubuntu",
 		UserDataFile:              "userData.json",
 		OsImageSshHostPubKey:      hostPublicKey,
+		FirstLoginSshKey:          "111-222-333",
 	}
 	driver.SSHUser = "user"
 
@@ -325,6 +327,7 @@ func TestCheckConfigEmptySshHostPubKey(t *testing.T) {
 		OsImageName:               "Ubuntu",
 		UserDataFile:              "userData.json",
 		OsImageSshHostPubKey:      "",
+		FirstLoginSshKey:          "111-222-333",
 	}
 	driver.SSHUser = "user"
 
@@ -358,6 +361,7 @@ func TestCheckConfigInvalidSshHostPubKey(t *testing.T) {
 		OsImageName:               "Ubuntu",
 		UserDataFile:              "userData.json",
 		OsImageSshHostPubKey:      "not-a-valid ssh-key",
+		FirstLoginSshKey:          "111-222-333",
 	}
 	driver.SSHUser = "user"
 
@@ -393,6 +397,7 @@ func TestCheckConfig_SlesParamsFail(t *testing.T) {
 		UserDataFile:              "userData.json",
 		OsImageSshHostPubKey:      hostPublicKey,
 		SlesRegistrationCode:      "123",
+		FirstLoginSshKey:          "111-222-333",
 	}
 	driver.SSHUser = "user"
 
@@ -460,6 +465,7 @@ func TestCheckConfigTenantFailed(t *testing.T) {
 		TenantUuid:                "cdi-test",
 		OsImageName:               "Ubuntu",
 		UserDataFile:              "userData.json",
+		FirstLoginSshKey:          "111-222-333",
 	}
 	driver.SSHUser = "user"