Skip to content

Commit 8ca1b58

Browse files
committed
Only process -backend-config flags for use with backend if the user has passed some through
1 parent d06b639 commit 8ca1b58

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

internal/command/init.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -573,15 +573,19 @@ func (c *InitCommand) initBackend(ctx context.Context, root *configs.Module, ext
573573
backendSchema := b.ConfigSchema()
574574
backendConfig := root.Backend
575575

576-
backendConfigOverride, overrideDiags := c.backendConfigOverrideBody(extraConfig, backendSchema)
577-
diags = diags.Append(overrideDiags)
578-
if overrideDiags.HasErrors() {
579-
return nil, true, diags
576+
var configOverride hcl.Body
577+
if len(*extraConfig.Items) > 0 {
578+
var overrideDiags tfdiags.Diagnostics
579+
configOverride, overrideDiags = c.backendConfigOverrideBody(extraConfig, backendSchema)
580+
diags = diags.Append(overrideDiags)
581+
if overrideDiags.HasErrors() {
582+
return nil, true, diags
583+
}
580584
}
581585

582586
opts = &BackendOpts{
583587
BackendConfig: backendConfig,
584-
ConfigOverride: backendConfigOverride,
588+
ConfigOverride: configOverride,
585589
Init: true,
586590
ViewType: viewType,
587591
}

0 commit comments

Comments
 (0)