diff --git a/cli/azd/grpc/proto/models.proto b/cli/azd/grpc/proto/models.proto index fe78339d488..f3c292ad983 100644 --- a/cli/azd/grpc/proto/models.proto +++ b/cli/azd/grpc/proto/models.proto @@ -117,8 +117,6 @@ message DockerProjectOptions { string tag = 7; bool remote_build = 8; repeated string build_args = 9; - reserved 10; - reserved "local_fallback"; } // ServiceContext defines the shared pipeline state across all phases of the service lifecycle diff --git a/cli/azd/pkg/azapi/permissions.go b/cli/azd/pkg/azapi/permissions.go index 9f02b3097fa..867439c1481 100644 --- a/cli/azd/pkg/azapi/permissions.go +++ b/cli/azd/pkg/azapi/permissions.go @@ -9,7 +9,6 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2" "github.com/azure/azure-dev/cli/azd/pkg/account" ) @@ -78,7 +77,7 @@ func (s *PermissionsService) HasRequiredPermissions( pager := roleAssignmentsClient.NewListForScopePager( subscriptionScope, &armauthorization.RoleAssignmentsClientListForScopeOptions{ - Filter: to.Ptr(filter), + Filter: new(filter), }, ) diff --git a/cli/azd/pkg/infra/provisioning/bicep/local_preflight_test.go b/cli/azd/pkg/infra/provisioning/bicep/local_preflight_test.go index 97a26921789..10de576b213 100644 --- a/cli/azd/pkg/infra/provisioning/bicep/local_preflight_test.go +++ b/cli/azd/pkg/infra/provisioning/bicep/local_preflight_test.go @@ -45,10 +45,10 @@ func TestParseTemplate_MissingSchema(t *testing.T) { func TestParseTemplate_MissingContentVersion(t *testing.T) { schema := "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" - raw := []byte(fmt.Sprintf( + raw := fmt.Appendf(nil, `{"$schema": "%s", "resources": [{"type": "Microsoft.Resources/resourceGroups"}]}`, schema, - )) + ) preflight := &localArmPreflight{} _, err := preflight.parseTemplate(azure.RawArmTemplate(raw)) @@ -59,10 +59,10 @@ func TestParseTemplate_MissingContentVersion(t *testing.T) { func TestParseTemplate_NoResources(t *testing.T) { schema := "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#" - raw := []byte(fmt.Sprintf( + raw := fmt.Appendf(nil, `{"$schema": "%s", "contentVersion": "1.0.0.0", "resources": []}`, schema, - )) + ) preflight := &localArmPreflight{} _, err := preflight.parseTemplate(azure.RawArmTemplate(raw))