Skip to content

Commit 7136a32

Browse files
committed
remove all optout changes and apply simple config set
1 parent 01ba4d3 commit 7136a32

File tree

1 file changed

+30
-9
lines changed

1 file changed

+30
-9
lines changed

cli/azd/pkg/infra/provisioning/bicep/bicep_provider.go

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
2424
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
2525
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cognitiveservices/armcognitiveservices"
26+
"github.com/azure/azure-dev/cli/azd/internal"
2627
"github.com/azure/azure-dev/cli/azd/pkg/account"
2728
"github.com/azure/azure-dev/cli/azd/pkg/async"
2829
"github.com/azure/azure-dev/cli/azd/pkg/azapi"
@@ -77,6 +78,7 @@ type BicepProvider struct {
7778
portalUrlBase string
7879
subscriptionManager *account.SubscriptionsManager
7980
azureClient *azapi.AzureClient
81+
userConfigManager config.UserConfigManager
8082
}
8183

8284
// Name gets the name of the infra provider
@@ -611,16 +613,33 @@ func (p *BicepProvider) Deploy(ctx context.Context) (*provisioning.DeployResult,
611613
return nil, err
612614
}
613615

614-
err = p.validatePreflight(
615-
ctx,
616-
bicepDeploymentData.Target,
617-
bicepDeploymentData.CompiledBicep.RawArmTemplate,
618-
bicepDeploymentData.CompiledBicep.Parameters,
619-
deploymentTags,
620-
optionsMap,
621-
)
616+
userConfig, err := p.userConfigManager.Load()
622617
if err != nil {
623-
return nil, err
618+
return nil, fmt.Errorf("loading user configuration: %w", err)
619+
}
620+
621+
preflightDisableVar := "provision.disableValidation"
622+
preflightDisable, exists := userConfig.GetString(preflightDisableVar)
623+
if !(preflightDisable == "on" && exists) {
624+
err = p.validatePreflight(
625+
ctx,
626+
bicepDeploymentData.Target,
627+
bicepDeploymentData.CompiledBicep.RawArmTemplate,
628+
bicepDeploymentData.CompiledBicep.Parameters,
629+
deploymentTags,
630+
optionsMap,
631+
)
632+
if err != nil {
633+
return nil, &internal.ErrorWithSuggestion{
634+
Err: err,
635+
Suggestion: fmt.Sprintf("To disable provision validation, please run %s.",
636+
output.WithHighLightFormat("`azd config set %s on`", preflightDisableVar)),
637+
}
638+
}
639+
} else {
640+
warningMessage := fmt.Sprintf("WARNING: Provision validation is disabled. To enable it, please run `azd config set %s off`.\n",
641+
preflightDisableVar)
642+
p.console.Message(ctx, output.WithWarningFormat(warningMessage))
624643
}
625644

626645
cancelProgress := make(chan bool)
@@ -2164,6 +2183,7 @@ func NewBicepProvider(
21642183
cloud *cloud.Cloud,
21652184
subscriptionManager *account.SubscriptionsManager,
21662185
azureClient *azapi.AzureClient,
2186+
userConfigManager config.UserConfigManager,
21672187
) provisioning.Provider {
21682188
return &BicepProvider{
21692189
envManager: envManager,
@@ -2179,5 +2199,6 @@ func NewBicepProvider(
21792199
portalUrlBase: cloud.PortalUrlBase,
21802200
subscriptionManager: subscriptionManager,
21812201
azureClient: azureClient,
2202+
userConfigManager: userConfigManager,
21822203
}
21832204
}

0 commit comments

Comments
 (0)