diff --git a/go.mod b/go.mod index e2845126aa1..2dda2cc05ec 100644 --- a/go.mod +++ b/go.mod @@ -111,7 +111,7 @@ require ( github.com/influxdata/influxql v1.4.0 // @grafana/partner-datasources github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // @grafana/grafana-app-platform-squad github.com/jmespath-community/go-jmespath v1.1.1 // @grafana/identity-access-team - github.com/jmespath/go-jmespath v0.4.0 // // @grafana/grafana-backend-group + github.com/jmespath/go-jmespath v0.4.0 // indirect; // @grafana/grafana-backend-group github.com/jmoiron/sqlx v1.3.5 // @grafana/grafana-backend-group github.com/json-iterator/go v1.1.12 // @grafana/grafana-backend-group github.com/lib/pq v1.10.9 // @grafana/grafana-backend-group diff --git a/pkg/registry/apis/provisioning/resources/parser.go b/pkg/registry/apis/provisioning/resources/parser.go index 201ea39f0d3..52147acddec 100644 --- a/pkg/registry/apis/provisioning/resources/parser.go +++ b/pkg/registry/apis/provisioning/resources/parser.go @@ -161,9 +161,7 @@ func (r *Parser) Parse(ctx context.Context, info *repository.FileInfo, validate }) objName, folderName := NamesFromHashedRepoPath(cfg.Name, info.Path) - if obj.GetName() == "" { - obj.SetName(objName) // use the name saved in config - } + obj.SetName(objName) obj.SetUID("") // clear identifiers obj.SetResourceVersion("") // clear identifiers parsed.Meta.SetFolder(folderName)