From 355489d9b454facb0f5a7392dd6f6b9c8c3713b9 Mon Sep 17 00:00:00 2001
From: Sarah Zinger <sarah.zinger@grafana.com>
Date: Wed, 20 Jul 2022 12:33:57 -0400
Subject: [PATCH] Upgrade grafana-aws-sdk from core, and remove it from
 @grafana/ui (#52420)

---
 go.mod                               |  2 +-
 go.sum                               |  2 ++
 package.json                         |  2 +-
 packages/grafana-ui/package.json     |  1 -
 packages/grafana-ui/rollup.config.ts |  1 -
 yarn.lock                            | 11 +++++------
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/go.mod b/go.mod
index 22207b9a3db..ba0ecb9d75a 100644
--- a/go.mod
+++ b/go.mod
@@ -52,7 +52,7 @@ require (
 	github.com/gorilla/websocket v1.4.2
 	github.com/gosimple/slug v1.12.0
 	github.com/grafana/cuetsy v0.0.3
-	github.com/grafana/grafana-aws-sdk v0.10.7
+	github.com/grafana/grafana-aws-sdk v0.10.8
 	github.com/grafana/grafana-azure-sdk-go v1.3.0
 	github.com/grafana/grafana-plugin-sdk-go v0.139.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
diff --git a/go.sum b/go.sum
index 6a54f0b2011..c19259ad9fd 100644
--- a/go.sum
+++ b/go.sum
@@ -1336,6 +1336,8 @@ github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036 h1:GplhUk6Xes5J
 github.com/grafana/go-mssqldb v0.0.0-20210326084033-d0ce3c521036/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/grafana/grafana-aws-sdk v0.10.7 h1:kXOuWCI+fV561/9sOU0DnzlFwqblfW36XptJLv78l8s=
 github.com/grafana/grafana-aws-sdk v0.10.7/go.mod h1:5Iw3xY7iXJfNaYHrRHMXa/kaB2lWoyntg71PPLGvSs8=
+github.com/grafana/grafana-aws-sdk v0.10.8 h1:6MGlWlQD4E0aI+Vp4Cfgzsj9V3U7kSQ1wCye9D1NMoU=
+github.com/grafana/grafana-aws-sdk v0.10.8/go.mod h1:5Iw3xY7iXJfNaYHrRHMXa/kaB2lWoyntg71PPLGvSs8=
 github.com/grafana/grafana-azure-sdk-go v1.2.0 h1:f/7BjCHGIU0JYOsLIt4oJztDy0fOPBRHB5R0Xe9++ew=
 github.com/grafana/grafana-azure-sdk-go v1.2.0/go.mod h1:rgrnK9m6CgKlgx4rH3FFP/6dTdyRO6LYC2mVZov35yo=
 github.com/grafana/grafana-azure-sdk-go v1.3.0 h1:zboQpq/ljBjqHo/6UQNZAUwqGTtnEGRYSEnqIQvLuAo=
diff --git a/package.json b/package.json
index de2d102b412..7e9819bb609 100644
--- a/package.json
+++ b/package.json
@@ -251,7 +251,7 @@
     "@emotion/react": "11.9.0",
     "@grafana/agent-core": "^0.3.0",
     "@grafana/agent-web": "^0.3.0",
-    "@grafana/aws-sdk": "0.0.36",
+    "@grafana/aws-sdk": "0.0.37",
     "@grafana/data": "workspace:*",
     "@grafana/e2e-selectors": "workspace:*",
     "@grafana/experimental": "^0.0.2-canary.32",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index cf86b71249f..7c926abc888 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -32,7 +32,6 @@
   "dependencies": {
     "@emotion/css": "11.9.0",
     "@emotion/react": "11.9.0",
-    "@grafana/aws-sdk": "0.0.36",
     "@grafana/data": "9.1.0-pre",
     "@grafana/e2e-selectors": "9.1.0-pre",
     "@grafana/schema": "9.1.0-pre",
diff --git a/packages/grafana-ui/rollup.config.ts b/packages/grafana-ui/rollup.config.ts
index b5751895103..58aa09961ca 100644
--- a/packages/grafana-ui/rollup.config.ts
+++ b/packages/grafana-ui/rollup.config.ts
@@ -29,7 +29,6 @@ const buildCjsPackage = ({ env }) => {
     external: [
       'react',
       'react-dom',
-      '@grafana/aws-sdk',
       '@grafana/data',
       '@grafana/schema',
       '@grafana/e2e-selectors',
diff --git a/yarn.lock b/yarn.lock
index 5027648df0d..df9d340177d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4657,10 +4657,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/aws-sdk@npm:0.0.36":
-  version: 0.0.36
-  resolution: "@grafana/aws-sdk@npm:0.0.36"
-  checksum: c243f7c900551e98fd23ef805e983d7db3180992e652ef9ad656acc74ac1c1e779e9b500db08a39d5cd0bc02fdb584e4c7dd89be8546e115ae12c085773cd212
+"@grafana/aws-sdk@npm:0.0.37":
+  version: 0.0.37
+  resolution: "@grafana/aws-sdk@npm:0.0.37"
+  checksum: 3994e78182dc181c9ba1b0595551480eb699c34531f582c52badec8da1d930a3198530145ef58a9543f77e424026c6a70a213097e0b56534f44894165db9c4d2
   languageName: node
   linkType: hard
 
@@ -5024,7 +5024,6 @@ __metadata:
     "@babel/core": 7.18.2
     "@emotion/css": 11.9.0
     "@emotion/react": 11.9.0
-    "@grafana/aws-sdk": 0.0.36
     "@grafana/data": 9.1.0-pre
     "@grafana/e2e-selectors": 9.1.0-pre
     "@grafana/schema": 9.1.0-pre
@@ -20976,7 +20975,7 @@ __metadata:
     "@grafana/agent-core": ^0.3.0
     "@grafana/agent-web": ^0.3.0
     "@grafana/api-documenter": 7.11.2
-    "@grafana/aws-sdk": 0.0.36
+    "@grafana/aws-sdk": 0.0.37
     "@grafana/data": "workspace:*"
     "@grafana/e2e": "workspace:*"
     "@grafana/e2e-selectors": "workspace:*"