diff --git a/apps/provisioning/go.mod b/apps/provisioning/go.mod index 80a98f86697..f230246eed0 100644 --- a/apps/provisioning/go.mod +++ b/apps/provisioning/go.mod @@ -72,7 +72,3 @@ require ( sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/yaml v1.5.0 // indirect ) - -// transitive dependencies that need replaced -// TODO: stop depending on grafana core -replace github.com/grafana/grafana => ../.. diff --git a/go.mod b/go.mod index f53a3b67e39..25dc4debeda 100644 --- a/go.mod +++ b/go.mod @@ -230,20 +230,20 @@ require ( ) require ( - github.com/grafana/grafana/apps/advisor v0.0.0-20250804150913-990f1c69ecc2 // @grafana/plugins-platform-backend - github.com/grafana/grafana/apps/alerting/notifications v0.0.0-20250804150913-990f1c69ecc2 // @grafana/alerting-backend - github.com/grafana/grafana/apps/dashboard v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-app-platform-squad @grafana/dashboards-squad - github.com/grafana/grafana/apps/folder v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-search-and-storage - github.com/grafana/grafana/apps/iam v0.0.0-20250804150913-990f1c69ecc2 // @grafana/identity-access-team - github.com/grafana/grafana/apps/investigations v0.0.0-20250804150913-990f1c69ecc2 // @fcjack @matryer - github.com/grafana/grafana/apps/playlist v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-app-platform-squad - github.com/grafana/grafana/apps/preferences v0.0.0-20250805123034-066163d71001 // @grafana/grafana-app-platform-squad - github.com/grafana/grafana/apps/provisioning v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-app-platform-squad - github.com/grafana/grafana/apps/secret v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-operator-experience-squad - github.com/grafana/grafana/apps/shorturl v0.0.0-20250804150913-990f1c69ecc2 // @grafana/sharing-squad - github.com/grafana/grafana/pkg/aggregator v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-app-platform-squad - github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-app-platform-squad - github.com/grafana/grafana/pkg/apiserver v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-app-platform-squad + github.com/grafana/grafana/apps/advisor v0.0.0 // @grafana/plugins-platform-backend + github.com/grafana/grafana/apps/alerting/notifications v0.0.0 // @grafana/alerting-backend + github.com/grafana/grafana/apps/dashboard v0.0.0 // @grafana/grafana-app-platform-squad @grafana/dashboards-squad + github.com/grafana/grafana/apps/folder v0.0.0 // @grafana/grafana-search-and-storage + github.com/grafana/grafana/apps/iam v0.0.0 // @grafana/identity-access-team + github.com/grafana/grafana/apps/investigations v0.0.0 // @fcjack @matryer + github.com/grafana/grafana/apps/playlist v0.0.0 // @grafana/grafana-app-platform-squad + github.com/grafana/grafana/apps/preferences v0.0.0 // @grafana/grafana-app-platform-squad + github.com/grafana/grafana/apps/provisioning v0.0.0 // @grafana/grafana-app-platform-squad + github.com/grafana/grafana/apps/secret v0.0.0 // @grafana/grafana-operator-experience-squad + github.com/grafana/grafana/apps/shorturl v0.0.0 // @grafana/sharing-squad + github.com/grafana/grafana/pkg/aggregator v0.0.0 // @grafana/grafana-app-platform-squad + github.com/grafana/grafana/pkg/apimachinery v0.0.0 // @grafana/grafana-app-platform-squad + github.com/grafana/grafana/pkg/apiserver v0.0.0 // @grafana/grafana-app-platform-squad // This needs to be here for other projects that import grafana/grafana // For local development grafana/grafana will always use the local files @@ -252,6 +252,26 @@ require ( github.com/grafana/grafana/pkg/semconv v0.0.0-20250804150913-990f1c69ecc2 // @grafana/grafana-app-platform-squad ) +// Replace the workspace versions +replace ( + github.com/grafana/grafana/apps/advisor => ./apps/advisor + github.com/grafana/grafana/apps/alerting/notifications => ./apps/alerting/notifications + github.com/grafana/grafana/apps/dashboard => ./apps/dashboard + github.com/grafana/grafana/apps/folder => ./apps/folder + github.com/grafana/grafana/apps/iam => ./apps/iam + github.com/grafana/grafana/apps/investigations => ./apps/investigations + github.com/grafana/grafana/apps/playlist => ./apps/playlist + github.com/grafana/grafana/apps/preferences => ./apps/preferences + github.com/grafana/grafana/apps/provisioning => ./apps/provisioning + github.com/grafana/grafana/apps/secret => ./apps/secret + github.com/grafana/grafana/apps/shorturl => ./apps/shorturl + + // Packages + github.com/grafana/grafana/pkg/aggregator => ./pkg/aggregator + github.com/grafana/grafana/pkg/apimachinery => ./pkg/apimachinery + github.com/grafana/grafana/pkg/apiserver => ./pkg/apiserver +) + require ( cel.dev/expr v0.24.0 // indirect cloud.google.com/go v0.121.1 // indirect diff --git a/go.sum b/go.sum index b06980b340e..822b4771825 100644 --- a/go.sum +++ b/go.sum @@ -1616,34 +1616,6 @@ github.com/grafana/grafana-openapi-client-go v0.0.0-20231213163343-bd475d63fb79 github.com/grafana/grafana-openapi-client-go v0.0.0-20231213163343-bd475d63fb79/go.mod h1:wc6Hbh3K2TgCUSfBC/BOzabItujtHMESZeFk5ZhdxhQ= github.com/grafana/grafana-plugin-sdk-go v0.278.0 h1:5/rIYparLi02pofdaag8wnjspMMVNCi8cZhC4cdC3Ho= github.com/grafana/grafana-plugin-sdk-go v0.278.0/go.mod h1:+8NXT/XUJ/89GV6FxGQ366NZ3nU+cAXDMd0OUESF9H4= -github.com/grafana/grafana/apps/advisor v0.0.0-20250804150913-990f1c69ecc2 h1:APintn9iX4pIRrDBGmxGf+d8PekMNtt36zb4rACGQgY= -github.com/grafana/grafana/apps/advisor v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:5qLtZ9W2PlDZa2Wxq3YaK1v35GIZmPNP0m8u8HhTYfI= -github.com/grafana/grafana/apps/alerting/notifications v0.0.0-20250804150913-990f1c69ecc2 h1:bZ61Ik/7FQaF5c97u5PSJ+SJLSjQ6Q9zBO3GRDuzajI= -github.com/grafana/grafana/apps/alerting/notifications v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:SR1zEHjyL30eZIuwxXLr9ubUKzidQrNEtFNn6wW4ZxE= -github.com/grafana/grafana/apps/dashboard v0.0.0-20250804150913-990f1c69ecc2 h1:M5kMQVRjcjtnGuw0RM9/iab5VpmJyBwpEDbSfS6IQV4= -github.com/grafana/grafana/apps/dashboard v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:Ik6PLuCNceqTeOesGeQLn4hVL5wCbfscuAEhBEdq8js= -github.com/grafana/grafana/apps/folder v0.0.0-20250804150913-990f1c69ecc2 h1:tubqrwcZaJzS3DM2bLJxK6OCUsmBK0Vs95HiBuhCQcU= -github.com/grafana/grafana/apps/folder v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:la6q+Qvy0JGzBu/yyjC+e7xPefPM7CEfEgD574R2QMU= -github.com/grafana/grafana/apps/iam v0.0.0-20250804150913-990f1c69ecc2 h1:T55BYKx/s2cWfGRtBqYAlqqgE+rQIEV56OxYEhtCXH8= -github.com/grafana/grafana/apps/iam v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:6dF/R8xe/zkVIlbKCRjXsfhxA3ZsNiQf46S9/ezEEKI= -github.com/grafana/grafana/apps/investigations v0.0.0-20250804150913-990f1c69ecc2 h1:2xEMvfEqgYc/gunmHmsw51ZMVCdEvsqJTg3qaaqh8nw= -github.com/grafana/grafana/apps/investigations v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:IOpGVuSwFWE7EMrooI8I6OIU+rOmJinOaxK3pVMl7No= -github.com/grafana/grafana/apps/playlist v0.0.0-20250804150913-990f1c69ecc2 h1:Bt9EQkYdYq+xumbEnNxbbz0in7JRJkK9lVFs49WEetE= -github.com/grafana/grafana/apps/playlist v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:M1ily25xZS7sZlQ5yK1HV0UjRme6lpOl6I3dcfyqqRo= -github.com/grafana/grafana/apps/preferences v0.0.0-20250805123034-066163d71001 h1:y2AHkdji2I+zXv8rsSC8OjWEzJJjqW5OlmCsZR5+RuU= -github.com/grafana/grafana/apps/preferences v0.0.0-20250805123034-066163d71001/go.mod h1:NQlHMO5fHhjexw71wVjv522532NRvFg5F4tcjUEktjs= -github.com/grafana/grafana/apps/provisioning v0.0.0-20250804150913-990f1c69ecc2 h1:83OGBndFNYijNjgQpSf4y1bSNlscVDq8ru97Q6PyU6o= -github.com/grafana/grafana/apps/provisioning v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:qzFUVwLI1b5UIbVFxFydUYAsnOK27AgtA5so3EW8jM0= -github.com/grafana/grafana/apps/secret v0.0.0-20250804150913-990f1c69ecc2 h1:r5oGyvRVxljzKHTQYHtpmK2Et+BVhWQVw7aXo+FUygk= -github.com/grafana/grafana/apps/secret v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:pS2M5ILsHx9VNTM96glLtCjCVXHWyfGcT34WHvbbMtM= -github.com/grafana/grafana/apps/shorturl v0.0.0-20250804150913-990f1c69ecc2 h1:n+PKetgDEzRYaenMmz5gXXrQMLScORlO+ZCnriZucQw= -github.com/grafana/grafana/apps/shorturl v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:6F043DPw1shYLpIAAlbww4BMDtRtVX5MetfUf0s2zoA= -github.com/grafana/grafana/pkg/aggregator v0.0.0-20250804150913-990f1c69ecc2 h1:1AdHE94bYfEG7cuFb92wFlBaVPeexF21l9zCFmN8im0= -github.com/grafana/grafana/pkg/aggregator v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:wU4CoDIHuOOL7ZnchyvfER5UAcEz94A+ZkY+Xt+Ks/8= -github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250804150913-990f1c69ecc2 h1:X0cnaFdR+iz+sDSuoZmkryFSjOirchHe2MdKSRwBWgM= -github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:RRvSjHH12/PnQaXraMO65jUhVu8n59mzvhfIMBETnV4= -github.com/grafana/grafana/pkg/apiserver v0.0.0-20250804150913-990f1c69ecc2 h1:oUINBBiA25EwjOFXJVa4rmU8jHlOGn5EdPCmqpIqy4Q= -github.com/grafana/grafana/pkg/apiserver v0.0.0-20250804150913-990f1c69ecc2/go.mod h1:BA9Rvm6co9tbrZ0lS8ScqLFvAnDQ4lZOyplJgB+yMQQ= github.com/grafana/grafana/pkg/promlib v0.0.8 h1:VUWsqttdf0wMI4j9OX9oNrykguQpZcruudDAFpJJVw0= github.com/grafana/grafana/pkg/promlib v0.0.8/go.mod h1:U1ezG/MGaEPoThqsr3lymMPN5yIPdVTJnDZ+wcXT+ao= github.com/grafana/grafana/pkg/semconv v0.0.0-20250804150913-990f1c69ecc2 h1:A65jWgLk4Re28gIuZcpC0aTh71JZ0ey89hKGE9h543s=