Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cli/azd/grpc/proto/models.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions cli/azd/pkg/azapi/permissions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -78,7 +77,7 @@ func (s *PermissionsService) HasRequiredPermissions(
pager := roleAssignmentsClient.NewListForScopePager(
subscriptionScope,
&armauthorization.RoleAssignmentsClientListForScopeOptions{
Filter: to.Ptr(filter),
Filter: new(filter),
},
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
Expand Down
Loading