Merge pull request #276 from hashicorp/oslogin-fix

tanmay-hc · web-flow · commit b8edd1f5aef3 · 2025-05-27T19:38:33.000+05:30
FIX: Fixed a bug in OSLogin flow
diff --git a/builder/googlecompute/step_import_os_login_ssh_key.go b/builder/googlecompute/step_import_os_login_ssh_key.go
@@ -45,7 +45,8 @@ func (s *StepImportOSLoginSSHKey) Run(ctx context.Context, state multistep.State
 		log.Printf("failed to get project metadata: %s", err)
 	}
 
-	if config.UseOSLogin.False() || (config.UseOSLogin.ToBoolPointer() == nil && strings.EqualFold(osLoginEnabledAtProject, "false")) {
+	if config.UseOSLogin.False() || (config.UseOSLogin.ToBoolPointer() == nil && (err != nil || strings.EqualFold(osLoginEnabledAtProject, "false"))) {
+		config.loginProfileUsername = config.Comm.SSHUsername
 		return multistep.ActionContinue
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ func (s *StepImportOSLoginSSHKey) Run(ctx context.Context, state multistep.State`
`45`	`45`	`log.Printf("failed to get project metadata: %s", err)`
`46`	`46`	`}`
`47`	`47`
`48`		`- if config.UseOSLogin.False() \|\| (config.UseOSLogin.ToBoolPointer() == nil && strings.EqualFold(osLoginEnabledAtProject, "false")) {`
	`48`	`+ if config.UseOSLogin.False() \|\| (config.UseOSLogin.ToBoolPointer() == nil && (err != nil \|\| strings.EqualFold(osLoginEnabledAtProject, "false"))) {`
	`49`	`+ config.loginProfileUsername = config.Comm.SSHUsername`
`49`	`50`	`return multistep.ActionContinue`
`50`	`51`	`}`
`51`	`52`