Skip to content

Commit

Permalink
Fix merge conflict from two PRs
Browse files Browse the repository at this point in the history
Tests are failing due to:
- #1764
- #1763

The `go.mod` update is needed for Go 1.23 due to grafana/pyroscope-go#118
  • Loading branch information
julienduchesne committed Aug 26, 2024
1 parent f58157e commit b023e6c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ require (
github.com/gorilla/mux v1.8.1 // indirect
github.com/grafana/grafana-plugin-sdk-go v0.235.0 // indirect
github.com/grafana/otel-profiling-go v0.5.1 // indirect
github.com/grafana/pyroscope-go/godeltaprof v0.1.7 // indirect
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
Expand All @@ -104,7 +104,7 @@ require (
github.com/invopop/yaml v0.2.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.3 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/magefile/mage v1.15.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ github.com/grafana/machine-learning-go-client v0.8.0 h1:N8+0f5aFM/umVJWvlJkJy9Mc
github.com/grafana/machine-learning-go-client v0.8.0/go.mod h1:9xRIoH6Y6RubuCPNjLfpckE/fLVe9dazg3HSLI1ARAU=
github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8=
github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls=
github.com/grafana/pyroscope-go/godeltaprof v0.1.7 h1:C11j63y7gymiW8VugJ9ZW0pWfxTZugdSJyC48olk5KY=
github.com/grafana/pyroscope-go/godeltaprof v0.1.7/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
github.com/grafana/slo-openapi-client/go/slo v0.0.0-20240807172758-1b7d00838fc7 h1:t7zAFX0rMu868n85zRHLgmAjLJgWbkxUekGquZmovjA=
github.com/grafana/slo-openapi-client/go/slo v0.0.0-20240807172758-1b7d00838fc7/go.mod h1:MVsmQi3lkhNnRExmke6Ug6HFG4Dycd+oRgzC3Rz+vOs=
github.com/grafana/synthetic-monitoring-agent v0.25.2 h1:9D81dzJJBnfy00dZ6wOwD8c0jaOuzYQLBDcHI9m8sGU=
Expand Down Expand Up @@ -240,8 +240,8 @@ github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA=
github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
Expand Down
8 changes: 4 additions & 4 deletions pkg/generate/testdata/generate/dashboard-large/imports.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {
to = grafana_dashboard._1_large-dashboard-test
id = "1:large-dashboard-test"
to = grafana_dashboard.large-dashboard-test
id = "large-dashboard-test"
}

import {
to = grafana_folder._1_folder-with-large-dashboard
id = "1:folder-with-large-dashboard"
to = grafana_folder.folder-with-large-dashboard
id = "folder-with-large-dashboard"
}
12 changes: 6 additions & 6 deletions pkg/generate/testdata/generate/dashboard-large/resources.tf
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# __generated__ by Terraform
# Please review these resources and move them into your main configuration files.

# __generated__ by Terraform from "1:large-dashboard-test"
resource "grafana_dashboard" "_1_large-dashboard-test" {
config_json = file("${path.module}/dashboards/_1_large-dashboard-test.json")
folder = grafana_folder._1_folder-with-large-dashboard.uid
# __generated__ by Terraform from "large-dashboard-test"
resource "grafana_dashboard" "large-dashboard-test" {
config_json = file("${path.module}/dashboards/large-dashboard-test.json")
folder = grafana_folder.folder-with-large-dashboard.uid
}

# __generated__ by Terraform from "1:folder-with-large-dashboard"
resource "grafana_folder" "_1_folder-with-large-dashboard" {
# __generated__ by Terraform from "folder-with-large-dashboard"
resource "grafana_folder" "folder-with-large-dashboard" {
title = "Folder with Large Dashboard"
uid = "folder-with-large-dashboard"
}

0 comments on commit b023e6c

Please sign in to comment.