From 2dd7a69de36179889fd9796e124d8f2403470677 Mon Sep 17 00:00:00 2001
From: Dave Wrede <dave@pulumi.com>
Date: Wed, 14 Apr 2021 07:12:11 -0700
Subject: [PATCH 01/11] Updated Go and provider versions for 3.0 release

---
 .../docs/get-started/aws/review-project.md    |  4 +--
 .../docs/get-started/azure/review-project.md  |  2 +-
 .../docs/get-started/gcp/review-project.md    |  4 +--
 .../get-started/kubernetes/modify-program.md  | 10 +++----
 .../get-started/kubernetes/review-project.md  |  8 +++---
 .../docs/guides/adopting/from_azure.md        | 10 +++----
 .../docs/guides/adopting/from_kubernetes.md   | 28 +++++++++----------
 .../docs/guides/adopting/from_terraform.md    | 12 ++++----
 .../content/docs/guides/adopting/import.md    |  8 +++---
 .../pulumi-kubernetes-operator.md             | 12 ++++----
 .../content/docs/guides/testing/unit.md       | 12 ++++----
 .../intro/cloud-providers/aiven/_index.md     |  4 +--
 .../intro/cloud-providers/akamai/_index.md    |  2 +-
 .../intro/cloud-providers/alicloud/_index.md  |  2 +-
 .../intro/cloud-providers/auth0/_index.md     |  2 +-
 .../intro/cloud-providers/azure/_index.md     |  2 +-
 .../intro/cloud-providers/azuread/_index.md   |  6 ++--
 .../cloud-providers/azuredevops/_index.md     |  2 +-
 .../docs/intro/cloud-providers/civo/_index.md |  2 +-
 .../intro/cloud-providers/cloudamqp/_index.md |  2 +-
 .../cloud-providers/cloudflare/_index.md      |  2 +-
 .../intro/cloud-providers/cloudinit/_index.md |  2 +-
 .../intro/cloud-providers/consul/_index.md    |  2 +-
 .../intro/cloud-providers/datadog/_index.md   |  2 +-
 .../cloud-providers/digitalocean/_index.md    |  4 +--
 .../intro/cloud-providers/dnsimple/_index.md  |  2 +-
 .../intro/cloud-providers/docker/_index.md    |  4 +--
 .../cloud-providers/equinix-metal/_index.md   |  4 +--
 .../intro/cloud-providers/f5bigip/_index.md   |  2 +-
 .../intro/cloud-providers/fastly/_index.md    |  2 +-
 .../intro/cloud-providers/github/_index.md    |  2 +-
 .../intro/cloud-providers/gitlab/_index.md    |  4 +--
 .../intro/cloud-providers/hcloud/_index.md    |  2 +-
 .../intro/cloud-providers/kafka/_index.md     |  2 +-
 .../cloud-providers/kubernetes/_index.md      |  4 +--
 .../intro/cloud-providers/linode/_index.md    |  2 +-
 .../intro/cloud-providers/mailgun/_index.md   |  2 +-
 .../cloud-providers/mongodbatlas/_index.md    |  4 +--
 .../intro/cloud-providers/mysql/_index.md     |  2 +-
 .../intro/cloud-providers/newrelic/_index.md  |  4 +--
 .../docs/intro/cloud-providers/ns1/_index.md  |  2 +-
 .../docs/intro/cloud-providers/okta/_index.md |  2 +-
 .../intro/cloud-providers/openstack/_index.md |  2 +-
 .../intro/cloud-providers/opsgenie/_index.md  |  2 +-
 .../intro/cloud-providers/pagerduty/_index.md |  2 +-
 .../cloud-providers/postgresql/_index.md      |  2 +-
 .../intro/cloud-providers/rabbitmq/_index.md  |  2 +-
 .../intro/cloud-providers/rancher2/_index.md  |  2 +-
 .../intro/cloud-providers/random/_index.md    |  4 +--
 .../intro/cloud-providers/signalfx/_index.md  |  4 +--
 .../intro/cloud-providers/splunk/_index.md    |  2 +-
 .../intro/cloud-providers/spotinst/_index.md  |  2 +-
 .../docs/intro/cloud-providers/tls/_index.md  |  4 +--
 .../intro/cloud-providers/vault/_index.md     |  4 +--
 .../intro/cloud-providers/venafi/_index.md    |  2 +-
 .../intro/cloud-providers/vsphere/_index.md   |  2 +-
 .../intro/cloud-providers/wavefront/_index.md |  2 +-
 .../content/docs/intro/concepts/_index.md     |  4 +--
 .../content/docs/intro/concepts/config.md     |  8 +++---
 .../content/docs/intro/concepts/resources.md  |  2 +-
 .../content/docs/intro/concepts/secrets.md    | 10 +++----
 .../content/docs/reference/pkg/_index.md      |  2 +-
 .../docs/tutorials/kubernetes/guestbook.md    | 10 +++----
 themes/default/content/partner/azure.md       |  2 +-
 .../resources/hacktoberfest-2020/index.md     |  4 +--
 themes/default/content/topics/kubernetes.md   |  8 +++---
 66 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/themes/default/content/docs/get-started/aws/review-project.md b/themes/default/content/docs/get-started/aws/review-project.md
index 1a87c295cc8..a4b040eaa8d 100644
--- a/themes/default/content/docs/get-started/aws/review-project.md
+++ b/themes/default/content/docs/get-started/aws/review-project.md
@@ -81,8 +81,8 @@ pulumi.export('bucket_name',  bucket.id)
 package main
 
 import (
-    "github.com/pulumi/pulumi-aws/sdk/v3/go/aws/s3"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/s3"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/get-started/azure/review-project.md b/themes/default/content/docs/get-started/azure/review-project.md
index ba9ffa9663a..fd637074a74 100644
--- a/themes/default/content/docs/get-started/azure/review-project.md
+++ b/themes/default/content/docs/get-started/azure/review-project.md
@@ -90,7 +90,7 @@ package main
 import (
     "github.com/pulumi/pulumi-azure-native/sdk/go/azure/resources"
 	"github.com/pulumi/pulumi-azure-native/sdk/go/azure/storage"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/get-started/gcp/review-project.md b/themes/default/content/docs/get-started/gcp/review-project.md
index 65625dc5daa..f5d23cb102a 100644
--- a/themes/default/content/docs/get-started/gcp/review-project.md
+++ b/themes/default/content/docs/get-started/gcp/review-project.md
@@ -79,8 +79,8 @@ pulumi.export('bucket_name',  bucket.url)
 package main
 
 import (
-    "github.com/pulumi/pulumi-gcp/sdk/v4/go/gcp/storage"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    "github.com/pulumi/pulumi-gcp/sdk/v5/go/gcp/storage"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/get-started/kubernetes/modify-program.md b/themes/default/content/docs/get-started/kubernetes/modify-program.md
index c42d04e0f41..57f3b1f2f05 100644
--- a/themes/default/content/docs/get-started/kubernetes/modify-program.md
+++ b/themes/default/content/docs/get-started/kubernetes/modify-program.md
@@ -165,11 +165,11 @@ pulumi.export("ip", result)
 package main
 
 import (
-    appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/apps/v1"
-    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/core/v1"
-    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/meta/v1"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+    appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/apps/v1"
+    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
+    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/meta/v1"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 
 func main() {
diff --git a/themes/default/content/docs/get-started/kubernetes/review-project.md b/themes/default/content/docs/get-started/kubernetes/review-project.md
index 2182796be33..4f3aaa49d13 100644
--- a/themes/default/content/docs/get-started/kubernetes/review-project.md
+++ b/themes/default/content/docs/get-started/kubernetes/review-project.md
@@ -100,10 +100,10 @@ pulumi.export("name", deployment.metadata["name"])
 package main
 
 import (
-    appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/apps/v1"
-    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/core/v1"
-    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/meta/v1"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/apps/v1"
+    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
+    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/meta/v1"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/guides/adopting/from_azure.md b/themes/default/content/docs/guides/adopting/from_azure.md
index cbb97d00f19..137dd2f4974 100644
--- a/themes/default/content/docs/guides/adopting/from_azure.md
+++ b/themes/default/content/docs/guides/adopting/from_azure.md
@@ -89,7 +89,7 @@ package main
 import (
     resources "github.com/pulumi/pulumi-azure-native/sdk/go/azure/resources"
 	  storage "github.com/pulumi/pulumi-azure-native/sdk/go/azure/storage"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
@@ -265,8 +265,8 @@ package main
 
 import (
 	"github.com/pulumi/pulumi-azure-native/sdk/go/azure/storage"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 
 func main() {
@@ -377,8 +377,8 @@ package main
 
 import (
 	"github.com/pulumi/pulumi-azure-native/sdk/go/azure/storage"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 
 func main() {
diff --git a/themes/default/content/docs/guides/adopting/from_kubernetes.md b/themes/default/content/docs/guides/adopting/from_kubernetes.md
index 1cb83398679..9248f466618 100644
--- a/themes/default/content/docs/guides/adopting/from_kubernetes.md
+++ b/themes/default/content/docs/guides/adopting/from_kubernetes.md
@@ -94,9 +94,9 @@ pulumi.export('private_ip', frontend.spec['cluster_ip'])
 package main
 
 import (
-    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/core/v1"
-    "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/yaml"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
+    "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/yaml"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
@@ -261,9 +261,9 @@ package main
 import (
     "path/filepath"
 
-    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/core/v1"
-    "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/yaml"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
+    "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/yaml"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
@@ -448,9 +448,9 @@ pulumi.export('frontend_ip', frontend.status.load_balancer.ingress[0].ip)
 package main
 
 import (
-    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/core/v1"
-    helmv2 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/helm/v2"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
+    helmv2 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/helm/v2"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
@@ -676,11 +676,11 @@ svc = Service('nginx-svc',
 package main
 
 import (
-    "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes"
-    appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/apps/v1"
-    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/core/v1"
-    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/meta/v1"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes"
+    appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/apps/v1"
+    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
+    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/meta/v1"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/guides/adopting/from_terraform.md b/themes/default/content/docs/guides/adopting/from_terraform.md
index 5c60eca4695..c40659008e8 100644
--- a/themes/default/content/docs/guides/adopting/from_terraform.md
+++ b/themes/default/content/docs/guides/adopting/from_terraform.md
@@ -49,7 +49,7 @@ $ pip3 install pulumi_terraform
 {{% choosable language go %}}
 
 ```bash
-$ go get github.com/pulumi/pulumi-terraform/sdk/v2
+$ go get github.com/pulumi/pulumi-terraform/sdk/v4
 ```
 
 {{% /choosable %}}
@@ -153,8 +153,8 @@ package main
 import (
     "os"
 
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-    "github.com/pulumi/pulumi-terraform/sdk/v2/go/state"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+    "github.com/pulumi/pulumi-terraform/sdk/v4/go/state"
 )
 
 func main() {
@@ -330,10 +330,10 @@ network_state = terraform.state.RemoteStateReference('network',
 package main
 
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 
-	"github.com/pulumi/pulumi-terraform/sdk/v2/go/state"
+	"github.com/pulumi/pulumi-terraform/sdk/v4/go/state"
 )
 
 func main() {
diff --git a/themes/default/content/docs/guides/adopting/import.md b/themes/default/content/docs/guides/adopting/import.md
index 34714e1d28e..8ff63a4af5c 100644
--- a/themes/default/content/docs/guides/adopting/import.md
+++ b/themes/default/content/docs/guides/adopting/import.md
@@ -98,8 +98,8 @@ demo = aws.s3.Bucket("infra-logs",
 package main
 
 import (
-	"github.com/pulumi/pulumi-aws/sdk/v3/go/aws/s3"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi-aws/sdk/v4/go/aws/s3"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
@@ -471,8 +471,8 @@ private_1 = aws.ec2.Subnet("private-1",
 package main
 
 import (
-	"github.com/pulumi/pulumi-aws/sdk/v3/go/aws/ec2"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ec2"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/guides/continuous-delivery/pulumi-kubernetes-operator.md b/themes/default/content/docs/guides/continuous-delivery/pulumi-kubernetes-operator.md
index 980c6e0451c..4427eaf7ed9 100644
--- a/themes/default/content/docs/guides/continuous-delivery/pulumi-kubernetes-operator.md
+++ b/themes/default/content/docs/guides/continuous-delivery/pulumi-kubernetes-operator.md
@@ -220,12 +220,12 @@ class MyStack : Stack
 package main
 
 import (
-    "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes"
-    apiextensions "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/apiextensions"
-    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/core/v1"
-    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/meta/v1"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+    "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes"
+    apiextensions "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/apiextensions"
+    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
+    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/meta/v1"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 
 func main() {
diff --git a/themes/default/content/docs/guides/testing/unit.md b/themes/default/content/docs/guides/testing/unit.md
index 7ef3a7670fb..9dfcbc21dc4 100644
--- a/themes/default/content/docs/guides/testing/unit.md
+++ b/themes/default/content/docs/guides/testing/unit.md
@@ -96,8 +96,8 @@ main.go:
 package main
 
 import (
-    "github.com/pulumi/pulumi-aws/sdk/v2/go/aws/ec2"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ec2"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 type infrastructure struct {
@@ -278,7 +278,7 @@ main_test.go:
 
 ```go
 import (
-   "github.com/pulumi/pulumi/sdk/v2/go/common/resource"
+   "github.com/pulumi/pulumi/sdk/v3/go/common/resource"
 )
 
 type mocks int
@@ -388,9 +388,9 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/pulumi/pulumi-aws/sdk/v2/go/aws/ec2"
-	"github.com/pulumi/pulumi/sdk/v2/go/common/resource"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ec2"
+	"github.com/pulumi/pulumi/sdk/v3/go/common/resource"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/aiven/_index.md b/themes/default/content/docs/intro/cloud-providers/aiven/_index.md
index 4fc8bc796ad..a8456dde0b7 100644
--- a/themes/default/content/docs/intro/cloud-providers/aiven/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/aiven/_index.md
@@ -72,8 +72,8 @@ service = aiven.Service("my-service",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	aiven "github.com/pulumi/pulumi-aiven/sdk/v2/go/aiven"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	aiven "github.com/pulumi/pulumi-aiven/sdk/v3/go/aiven"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/akamai/_index.md b/themes/default/content/docs/intro/cloud-providers/akamai/_index.md
index 5374aa1c8b7..7bfde2166df 100644
--- a/themes/default/content/docs/intro/cloud-providers/akamai/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/akamai/_index.md
@@ -80,7 +80,7 @@ pydomain = akamai.properties.EdgeHostName("test",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	"github.com/pulumi/pulumi-akamai/sdk/go/akamai"
 	"github.com/pulumi/pulumi-akamai/sdk/go/akam/properties"
 )
diff --git a/themes/default/content/docs/intro/cloud-providers/alicloud/_index.md b/themes/default/content/docs/intro/cloud-providers/alicloud/_index.md
index 0d5bd606b79..f6660fdf487 100644
--- a/themes/default/content/docs/intro/cloud-providers/alicloud/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/alicloud/_index.md
@@ -58,7 +58,7 @@ vpc = alicloud.vpc.Network("my-vpc",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	vpc "github.com/pulumi/pulumi-alicloud/sdk/v2/go/alicloud/vpc"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/auth0/_index.md b/themes/default/content/docs/intro/cloud-providers/auth0/_index.md
index ac031f6550d..10383ec9baa 100644
--- a/themes/default/content/docs/intro/cloud-providers/auth0/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/auth0/_index.md
@@ -69,7 +69,7 @@ user = auth0.User("my-demo-user",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	auth0 "github.com/pulumi/pulumi-auth0/sdk/go/auth0"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/azure/_index.md b/themes/default/content/docs/intro/cloud-providers/azure/_index.md
index 8ef8c2aad02..58682f28677 100644
--- a/themes/default/content/docs/intro/cloud-providers/azure/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/azure/_index.md
@@ -90,7 +90,7 @@ package main
 
 import (
     "github.com/pulumi/pulumi-azure-native/sdk/go/azure/resources"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/azuread/_index.md b/themes/default/content/docs/intro/cloud-providers/azuread/_index.md
index 62ed452f395..5462978ce0a 100644
--- a/themes/default/content/docs/intro/cloud-providers/azuread/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/azuread/_index.md
@@ -59,8 +59,8 @@ group = azad.Group("my-group",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	azad "github.com/pulumi/pulumi-azuread/sdk/v2/go/azuread"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	azad "github.com/pulumi/pulumi-azuread/sdk/v4/go/azuread"
 )
 
 func main() {
@@ -109,7 +109,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/azuread`](https://www.npmjs.com/package/@pulumi/azuread)
 * Python: [`pulumi-azuread`](https://pypi.org/project/pulumi-azuread/)
-* Go: [`github.com/pulumi/pulumi-azuread/sdk/v2/go/azuread`](https://github.com/pulumi/pulumi-azuread)
+* Go: [`github.com/pulumi/pulumi-azuread/sdk/v4/go/azuread`](https://github.com/pulumi/pulumi-azuread)
 * .NET: [`Pulumi.AzureAD`](https://www.nuget.org/packages/Pulumi.AzureAD)
 
 The AzureAD provider is open source and available in the [pulumi/pulumi-azuread](https://github.com/pulumi/pulumi-azuread) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/azuredevops/_index.md b/themes/default/content/docs/intro/cloud-providers/azuredevops/_index.md
index da0b09598aa..27ce20d76e3 100644
--- a/themes/default/content/docs/intro/cloud-providers/azuredevops/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/azuredevops/_index.md
@@ -59,7 +59,7 @@ project = ado.core.Project("demo-project",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	ado "github.com/pulumi/pulumi-azuredevops/sdk/go/azuredevops"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/civo/_index.md b/themes/default/content/docs/intro/cloud-providers/civo/_index.md
index d52f0b10033..903b769c271 100644
--- a/themes/default/content/docs/intro/cloud-providers/civo/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/civo/_index.md
@@ -60,7 +60,7 @@ network = civo.Network("demo",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	"github.com/pulumi/pulumi-civo/sdk/go/civo"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/cloudamqp/_index.md b/themes/default/content/docs/intro/cloud-providers/cloudamqp/_index.md
index c1653dde8ff..ec5fe3319d9 100644
--- a/themes/default/content/docs/intro/cloud-providers/cloudamqp/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/cloudamqp/_index.md
@@ -61,7 +61,7 @@ instance = cloudamqp.Instance("demo-instance",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	cloudamqp "github.com/pulumi/pulumi-cloudamqp/sdk/v2/go/cloudamqp"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/cloudflare/_index.md b/themes/default/content/docs/intro/cloud-providers/cloudflare/_index.md
index 6efaa195f74..7a13ec4853c 100644
--- a/themes/default/content/docs/intro/cloud-providers/cloudflare/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/cloudflare/_index.md
@@ -71,7 +71,7 @@ record = cloudflare.Record("sample-record",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	cloudflare "github.com/pulumi/pulumi-cloudflare/sdk/v2/go/cloudflare"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/cloudinit/_index.md b/themes/default/content/docs/intro/cloud-providers/cloudinit/_index.md
index d1e7062911c..4188c9b1e34 100644
--- a/themes/default/content/docs/intro/cloud-providers/cloudinit/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/cloudinit/_index.md
@@ -70,7 +70,7 @@ resource_config = cloudinit.Config("resource", base64_encode=False,
 ```go
 import (
   "github.com/pulumi/pulumi-cloudinit/sdk/go/cloudinit"
-  "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+  "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/consul/_index.md b/themes/default/content/docs/intro/cloud-providers/consul/_index.md
index 8fbea389d29..ab0d86c422d 100644
--- a/themes/default/content/docs/intro/cloud-providers/consul/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/consul/_index.md
@@ -59,7 +59,7 @@ node = consul.Node("compute",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	consul "github.com/pulumi/pulumi-consul/sdk/v2/go/consul"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/datadog/_index.md b/themes/default/content/docs/intro/cloud-providers/datadog/_index.md
index 9c404cbe8d8..f52fcf262ac 100644
--- a/themes/default/content/docs/intro/cloud-providers/datadog/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/datadog/_index.md
@@ -66,7 +66,7 @@ user = datadog.User("my-policy",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	datadog "github.com/pulumi/pulumi-datadog/sdk/v2/go/datadog"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/digitalocean/_index.md b/themes/default/content/docs/intro/cloud-providers/digitalocean/_index.md
index b882ebb4fca..61b0858f079 100644
--- a/themes/default/content/docs/intro/cloud-providers/digitalocean/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/digitalocean/_index.md
@@ -65,8 +65,8 @@ instance = do.Domain("test",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	do "github.com/pulumi/pulumi-digitalocean/sdk/v2/go/digitalocean"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	do "github.com/pulumi/pulumi-digitalocean/sdk/v4/go/digitalocean"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/dnsimple/_index.md b/themes/default/content/docs/intro/cloud-providers/dnsimple/_index.md
index 7cfb8c2e520..d54a528c96e 100644
--- a/themes/default/content/docs/intro/cloud-providers/dnsimple/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/dnsimple/_index.md
@@ -69,7 +69,7 @@ record = dnsimple.Record("test",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	dnsimple "github.com/pulumi/pulumi-dnsimple/sdk/v2/go/dnsimple"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/docker/_index.md b/themes/default/content/docs/intro/cloud-providers/docker/_index.md
index 62b6ddf0cb2..2d49dc2ad33 100644
--- a/themes/default/content/docs/intro/cloud-providers/docker/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/docker/_index.md
@@ -71,8 +71,8 @@ container = docker.Container("ubuntu",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	do "github.com/pulumi/pulumi-docker/sdk/v2/go/docker"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	do "github.com/pulumi/pulumi-docker/sdk/v3/go/docker"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/equinix-metal/_index.md b/themes/default/content/docs/intro/cloud-providers/equinix-metal/_index.md
index 77507d5df0a..e8f3666f01b 100644
--- a/themes/default/content/docs/intro/cloud-providers/equinix-metal/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/equinix-metal/_index.md
@@ -7,7 +7,7 @@ menu:
     identifier: clouds-equinix-metal
     weight: 2
 
-aliases: 
+aliases:
   - "/docs/reference/clouds/packet/"
   - "/docs/intro/cloud-providers/packet/"
 ---
@@ -64,7 +64,7 @@ project = metal.Project("my-project",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	metal "github.com/pulumi/pulumi-equinix-metal/sdk/v2/go/equinix"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/f5bigip/_index.md b/themes/default/content/docs/intro/cloud-providers/f5bigip/_index.md
index 3a4746e9365..c40692c3987 100644
--- a/themes/default/content/docs/intro/cloud-providers/f5bigip/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/f5bigip/_index.md
@@ -72,7 +72,7 @@ monitor = f5bigip.ltm.Monitor("backend",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	ltm "github.com/pulumi/pulumi-f5bigip/sdk/v2/go/f5bigip/ltm"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/fastly/_index.md b/themes/default/content/docs/intro/cloud-providers/fastly/_index.md
index 7869b8b299b..aedf4bc4ccb 100644
--- a/themes/default/content/docs/intro/cloud-providers/fastly/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/fastly/_index.md
@@ -87,7 +87,7 @@ service = fastly.Servicev1("my-service",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	fastly "github.com/pulumi/pulumi-fastly/sdk/v2/go/fastly"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/github/_index.md b/themes/default/content/docs/intro/cloud-providers/github/_index.md
index 13996b1ab7f..7fa2dccced7 100644
--- a/themes/default/content/docs/intro/cloud-providers/github/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/github/_index.md
@@ -63,7 +63,7 @@ repo = github.Repository("demo-repo",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	github "github.com/pulumi/pulumi-github/sdk/go/github"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/gitlab/_index.md b/themes/default/content/docs/intro/cloud-providers/gitlab/_index.md
index 2598daf7b5e..83b9466c973 100644
--- a/themes/default/content/docs/intro/cloud-providers/gitlab/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/gitlab/_index.md
@@ -63,8 +63,8 @@ project = gitlab.Project("my-project",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	gitlab "github.com/pulumi/pulumi-gitlab/sdk/v2/go/gitlab"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	gitlab "github.com/pulumi/pulumi-gitlab/sdk/v3/go/gitlab"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/hcloud/_index.md b/themes/default/content/docs/intro/cloud-providers/hcloud/_index.md
index 82b69fad53c..8e342043933 100644
--- a/themes/default/content/docs/intro/cloud-providers/hcloud/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/hcloud/_index.md
@@ -60,7 +60,7 @@ network = hcloud.Network("demo-network",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	hcloud "github.com/pulumi/pulumi-hcloud/sdk/go/hcloud"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/kafka/_index.md b/themes/default/content/docs/intro/cloud-providers/kafka/_index.md
index 159764f2fdf..5347301480e 100644
--- a/themes/default/content/docs/intro/cloud-providers/kafka/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/kafka/_index.md
@@ -66,7 +66,7 @@ topic = kafka.Topic("topic",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	kafka "github.com/pulumi/pulumi-kafka/sdk/v2/go/kafka"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/kubernetes/_index.md b/themes/default/content/docs/intro/cloud-providers/kubernetes/_index.md
index 3d998b92da6..5d6d127048f 100644
--- a/themes/default/content/docs/intro/cloud-providers/kubernetes/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/kubernetes/_index.md
@@ -50,7 +50,7 @@ The Kubernetes provider supports several options for providing access to a Kuber
 
 ### Getting Started
 
-The quickest way to get started with Kubernetes is to follow the [Get Started]({{< relref "/docs/get-started/kubernetes" >}}) guide.  
+The quickest way to get started with Kubernetes is to follow the [Get Started]({{< relref "/docs/get-started/kubernetes" >}}) guide.
 
 Additional Kubernetes tutorials are available covering:
 
@@ -120,7 +120,7 @@ The [`pulumi/kubernetes`](https://github.com/pulumi/pulumi-kubernetes) SDK is av
 - JavaScript/TypeScript: [npm](https://www.npmjs.com/package/@pulumi/kubernetes)
 - Python: [PyPI](https://pypi.org/project/pulumi-kubernetes/)
 - Go:
-  - Import package: `github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes`
+  - Import package: `github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes`
   - [GitHub](https://github.com/pulumi/pulumi-kubernetes/tree/master/sdk/go/kubernetes)
 - .NET: [`Pulumi.Kubernetes`](https://www.nuget.org/packages/Pulumi.Kubernetes)
 
diff --git a/themes/default/content/docs/intro/cloud-providers/linode/_index.md b/themes/default/content/docs/intro/cloud-providers/linode/_index.md
index b2935aab53f..27b6c1d1be6 100644
--- a/themes/default/content/docs/intro/cloud-providers/linode/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/linode/_index.md
@@ -65,7 +65,7 @@ domain = linode.Domain("my-domain",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	linode "github.com/pulumi/pulumi-linode/sdk/v2/go/linode"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/mailgun/_index.md b/themes/default/content/docs/intro/cloud-providers/mailgun/_index.md
index 500db1e9d72..46cdc10cc1c 100644
--- a/themes/default/content/docs/intro/cloud-providers/mailgun/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/mailgun/_index.md
@@ -77,7 +77,7 @@ route = mailgun.Route("test-route",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	mailgun "github.com/pulumi/pulumi-mailgun/sdk/v2/go/mailgun"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/mongodbatlas/_index.md b/themes/default/content/docs/intro/cloud-providers/mongodbatlas/_index.md
index df43900e69d..3fcdf86fd89 100644
--- a/themes/default/content/docs/intro/cloud-providers/mongodbatlas/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/mongodbatlas/_index.md
@@ -58,7 +58,7 @@ project = mongodbatlas.Project("my-demo-project", org_id="12345")
 
 ```go
 import (
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
     mongodbatlas "github.com/pulumi/pulumi-mongodbatlas/sdk/go/mongodbatlas"
 )
 
@@ -70,7 +70,7 @@ func main() {
     if err != nil {
         return err
     }
-  
+
     return nil
   })
 }
diff --git a/themes/default/content/docs/intro/cloud-providers/mysql/_index.md b/themes/default/content/docs/intro/cloud-providers/mysql/_index.md
index bb2589991b1..54387da8759 100644
--- a/themes/default/content/docs/intro/cloud-providers/mysql/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/mysql/_index.md
@@ -54,7 +54,7 @@ my_db = mysql.Database("my-database")
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	mysql "github.com/pulumi/pulumi-mysql/sdk/v2/go/mysql"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/newrelic/_index.md b/themes/default/content/docs/intro/cloud-providers/newrelic/_index.md
index fa792c44cec..55940c32583 100644
--- a/themes/default/content/docs/intro/cloud-providers/newrelic/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/newrelic/_index.md
@@ -54,8 +54,8 @@ policy = newrelic.AlertPolicy("my-policy")
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	newrelic "github.com/pulumi/pulumi-newrelic/sdk/v2/go/newrelic"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	newrelic "github.com/pulumi/pulumi-newrelic/sdk/v3/go/newrelic"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/ns1/_index.md b/themes/default/content/docs/intro/cloud-providers/ns1/_index.md
index 6767a0a36f6..7d6738ba865 100644
--- a/themes/default/content/docs/intro/cloud-providers/ns1/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/ns1/_index.md
@@ -60,7 +60,7 @@ zone = ns1.Zone("demo-zone",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	ns1 "github.com/pulumi/pulumi-ns1/sdk/go/ns1"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/okta/_index.md b/themes/default/content/docs/intro/cloud-providers/okta/_index.md
index 084c1ed5099..c07e22cbf13 100644
--- a/themes/default/content/docs/intro/cloud-providers/okta/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/okta/_index.md
@@ -68,7 +68,7 @@ last_name="user",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	user "github.com/pulumi/pulumi-okta/sdk/v2/go/okta/user"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/openstack/_index.md b/themes/default/content/docs/intro/cloud-providers/openstack/_index.md
index 683ca5ac4fd..f54000d01fd 100644
--- a/themes/default/content/docs/intro/cloud-providers/openstack/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/openstack/_index.md
@@ -64,7 +64,7 @@ instance = compute.Instance("test",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	compute "github.com/pulumi/pulumi-openstack/sdk/v2/go/openstack/compute"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/opsgenie/_index.md b/themes/default/content/docs/intro/cloud-providers/opsgenie/_index.md
index b9d6ad26e18..d85f1ae6869 100644
--- a/themes/default/content/docs/intro/cloud-providers/opsgenie/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/opsgenie/_index.md
@@ -54,7 +54,7 @@ team = opsgenie.Team("test")
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	"github.com/pulumi/pulumi-opsgenie/sdk/go/opsgenie"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/pagerduty/_index.md b/themes/default/content/docs/intro/cloud-providers/pagerduty/_index.md
index 0789f8462bc..657a297e27a 100644
--- a/themes/default/content/docs/intro/cloud-providers/pagerduty/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/pagerduty/_index.md
@@ -59,7 +59,7 @@ demo_team = pagerduty.Team("demo-team",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	pagerduty "github.com/pulumi/pulumi-pagerduty/sdk/go/pagerduty"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/postgresql/_index.md b/themes/default/content/docs/intro/cloud-providers/postgresql/_index.md
index 305a7580734..40f64dfac04 100644
--- a/themes/default/content/docs/intro/cloud-providers/postgresql/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/postgresql/_index.md
@@ -54,7 +54,7 @@ my_db = postgresql.Database("my-database")
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	postgresql "github.com/pulumi/pulumi-postgresql/sdk/v2/go/postgresql"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/rabbitmq/_index.md b/themes/default/content/docs/intro/cloud-providers/rabbitmq/_index.md
index ce45df87a88..3f85dfc6f85 100644
--- a/themes/default/content/docs/intro/cloud-providers/rabbitmq/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/rabbitmq/_index.md
@@ -60,7 +60,7 @@ user = rabbitmq.User("user",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	rabbitmq "github.com/pulumi/pulumi-rabbitmq/sdk/v2/go/rabbitmq"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/rancher2/_index.md b/themes/default/content/docs/intro/cloud-providers/rancher2/_index.md
index 1739e44f49d..8e10d362bb1 100644
--- a/themes/default/content/docs/intro/cloud-providers/rancher2/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/rancher2/_index.md
@@ -69,7 +69,7 @@ user = rancher2.User("my-user",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	rancher2 "github.com/pulumi/pulumi-rancher2/sdk/v2/go/rancher2"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/random/_index.md b/themes/default/content/docs/intro/cloud-providers/random/_index.md
index fd228d35058..7dba93f4b75 100644
--- a/themes/default/content/docs/intro/cloud-providers/random/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/random/_index.md
@@ -47,8 +47,8 @@ username = random.RandomPet("my-user-name")
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	random "github.com/pulumi/pulumi-random/sdk/v2/go/random"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	random "github.com/pulumi/pulumi-random/sdk/v4/go/random"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/signalfx/_index.md b/themes/default/content/docs/intro/cloud-providers/signalfx/_index.md
index a44ac2beb0f..be5aaf2b068 100644
--- a/themes/default/content/docs/intro/cloud-providers/signalfx/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/signalfx/_index.md
@@ -60,8 +60,8 @@ group = signalfx.DashboardGroup("my-group",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	signalfx "github.com/pulumi/pulumi-signalfx/sdk/v2/go/signalfx"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	signalfx "github.com/pulumi/pulumi-signalfx/sdk/v4/go/signalfx"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/splunk/_index.md b/themes/default/content/docs/intro/cloud-providers/splunk/_index.md
index 644207017ee..c65366dd1f3 100644
--- a/themes/default/content/docs/intro/cloud-providers/splunk/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/splunk/_index.md
@@ -62,7 +62,7 @@ saml_group = splunk.AdminSamlGroups("demo-py-group", roles=[
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	"github.com/pulumi/pulumi-splunk/sdk/go/splunk"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/spotinst/_index.md b/themes/default/content/docs/intro/cloud-providers/spotinst/_index.md
index 9b8fbed27e2..b9ef331167b 100644
--- a/themes/default/content/docs/intro/cloud-providers/spotinst/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/spotinst/_index.md
@@ -53,7 +53,7 @@ deployment = spotinst.multai.Deployment("my_deployment")
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	multai "github.com/pulumi/pulumi-spotinst/sdk/v2/go/spotinst/multai"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/tls/_index.md b/themes/default/content/docs/intro/cloud-providers/tls/_index.md
index ff3b66e010d..976e68d6c19 100644
--- a/themes/default/content/docs/intro/cloud-providers/tls/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/tls/_index.md
@@ -56,8 +56,8 @@ key = tls.PrivateKey("my-private-key",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	tls "github.com/pulumi/pulumi-tls/sdk/v2/go/tls"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	tls "github.com/pulumi/pulumi-tls/sdk/v3/go/tls"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/vault/_index.md b/themes/default/content/docs/intro/cloud-providers/vault/_index.md
index 37f0a11d85b..7509da47014 100644
--- a/themes/default/content/docs/intro/cloud-providers/vault/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/vault/_index.md
@@ -59,8 +59,8 @@ be = vault.AuthBackend("example",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-	vault "github.com/pulumi/pulumi-vault/sdk/v2/go/vault"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+	vault "github.com/pulumi/pulumi-vault/sdk/v3/go/vault"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/venafi/_index.md b/themes/default/content/docs/intro/cloud-providers/venafi/_index.md
index 3031223d6b0..47d1ef319ec 100644
--- a/themes/default/content/docs/intro/cloud-providers/venafi/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/venafi/_index.md
@@ -89,7 +89,7 @@ webserver = venafi.Certificate("webserver",
 ```go
 import (
 	"github.com/pulumi/pulumi-venafi/sdk/go/venafi"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/vsphere/_index.md b/themes/default/content/docs/intro/cloud-providers/vsphere/_index.md
index a4c6a629b0b..d2e6cf122b7 100644
--- a/themes/default/content/docs/intro/cloud-providers/vsphere/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/vsphere/_index.md
@@ -57,7 +57,7 @@ dc = vsphere.Datacenter("my-dc",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	vsphere "github.com/pulumi/pulumi-vsphere/sdk/v2/go/vsphere"
 )
 
diff --git a/themes/default/content/docs/intro/cloud-providers/wavefront/_index.md b/themes/default/content/docs/intro/cloud-providers/wavefront/_index.md
index ad66ba2fcde..79a4a697735 100644
--- a/themes/default/content/docs/intro/cloud-providers/wavefront/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/wavefront/_index.md
@@ -60,7 +60,7 @@ user = wavefront.User("demo-py",
 
 ```go
 import (
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	"github.com/pulumi/pulumi-wavefront/sdk/go/wavefront"
 )
 
diff --git a/themes/default/content/docs/intro/concepts/_index.md b/themes/default/content/docs/intro/concepts/_index.md
index 7bf3174347b..a181a2b6efd 100644
--- a/themes/default/content/docs/intro/concepts/_index.md
+++ b/themes/default/content/docs/intro/concepts/_index.md
@@ -107,8 +107,8 @@ pulumi.export('public_dns', server.public_dns)
 package main
 
 import (
-	"github.com/pulumi/pulumi-aws/sdk/v3/go/aws/ec2"
-	"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+	"github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ec2"
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/concepts/config.md b/themes/default/content/docs/intro/concepts/config.md
index a3c80349d7a..4936fa88781 100644
--- a/themes/default/content/docs/intro/concepts/config.md
+++ b/themes/default/content/docs/intro/concepts/config.md
@@ -108,8 +108,8 @@ print(f'Hello, {name} -- I see your lucky number is {lucky}!')
 package main
 
 import (
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 func main() {
     pulumi.Run(func(ctx *pulumi.Context) error {
@@ -208,8 +208,8 @@ print("Active:", data.get("active"))
 package main
 
 import (
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 
 type Data struct {
diff --git a/themes/default/content/docs/intro/concepts/resources.md b/themes/default/content/docs/intro/concepts/resources.md
index f7ec51498c7..c5cafe6b529 100644
--- a/themes/default/content/docs/intro/concepts/resources.md
+++ b/themes/default/content/docs/intro/concepts/resources.md
@@ -1228,7 +1228,7 @@ server = aws.ec2.Instance('web-server',
 
 ```go
 import (
-    "github.com/pulumi/pulumi-aws/sdk/v3/go/aws/ec2"
+    "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ec2"
     "github.com/pulumi/pulumi/sdk/go/pulumi"
 )
 
diff --git a/themes/default/content/docs/intro/concepts/secrets.md b/themes/default/content/docs/intro/concepts/secrets.md
index f64e9af6b77..0a6cea48c71 100644
--- a/themes/default/content/docs/intro/concepts/secrets.md
+++ b/themes/default/content/docs/intro/concepts/secrets.md
@@ -105,9 +105,9 @@ param = ssm.Parameter("a-secret-param",
 package main
 
 import (
-    "github.com/pulumi/pulumi-aws/sdk/v3/go/aws/ssm"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+    "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ssm"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 
 func main() {
@@ -304,8 +304,8 @@ print(config.require_secret('dbPassword'))
 package main
 
 import (
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 func main() {
     pulumi.Run(func(ctx *pulumi.Context) error {
diff --git a/themes/default/content/docs/reference/pkg/_index.md b/themes/default/content/docs/reference/pkg/_index.md
index 7e3b1d16a93..910ddf2e619 100644
--- a/themes/default/content/docs/reference/pkg/_index.md
+++ b/themes/default/content/docs/reference/pkg/_index.md
@@ -87,7 +87,7 @@ SDK reference documentation, organized by language.
 {{% choosable language go %}}
 <dl class="tabular">
     <dt>Pulumi SDK</dt>
-    <dd><a href="https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v2/go/pulumi">pulumi</a></dd>
+    <dd><a href="https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v3/go/pulumi">pulumi</a></dd>
 </dl>
 {{% /choosable %}}
 
diff --git a/themes/default/content/docs/tutorials/kubernetes/guestbook.md b/themes/default/content/docs/tutorials/kubernetes/guestbook.md
index 42339825650..392d810c142 100644
--- a/themes/default/content/docs/tutorials/kubernetes/guestbook.md
+++ b/themes/default/content/docs/tutorials/kubernetes/guestbook.md
@@ -421,11 +421,11 @@ pulumi.export("frontend_ip", frontend_ip)
 package main
 
 import (
-    appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/apps/v1"
-    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/core/v1"
-    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/meta/v1"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
-    "github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
+    appsv1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/apps/v1"
+    corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
+    metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/meta/v1"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi/config"
 )
 
 func main() {
diff --git a/themes/default/content/partner/azure.md b/themes/default/content/partner/azure.md
index 5798c882eab..10fc81a9a62 100644
--- a/themes/default/content/partner/azure.md
+++ b/themes/default/content/partner/azure.md
@@ -50,7 +50,7 @@ hero:
                 import (
                     "github.com/pulumi/pulumi-azure-native/sdk/go/azure/resources"
                     "github.com/pulumi/pulumi-azure-native/sdk/go/azure/storage"
-                    "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+                    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
                 )
 
                 func main() {
diff --git a/themes/default/content/resources/hacktoberfest-2020/index.md b/themes/default/content/resources/hacktoberfest-2020/index.md
index 5d9baef6b5e..d3838a82b1d 100644
--- a/themes/default/content/resources/hacktoberfest-2020/index.md
+++ b/themes/default/content/resources/hacktoberfest-2020/index.md
@@ -50,8 +50,8 @@ We've already seen the Automation API being used in incredibly creative ways, an
 
 Here are some helpful links to get you started with the Automation API:
 
-* [Go Documentation](https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v2/go/x/auto) - Go documentation for the Automation API.
-* [TypeScript/JavaScript Documentation](https://www.pulumi.com/docs/reference/pkg/nodejs/pulumi/pulumi/x/automation/) - Typescript documentation for the Automation API.
+* [Go Documentation](https://pkg.go.dev/github.com/pulumi/pulumi/sdk/v3/go/auto) - Go documentation for the Automation API.
+* [TypeScript/JavaScript Documentation](https://www.pulumi.com/docs/reference/pkg/nodejs/pulumi/pulumi/automation/) - Typescript documentation for the Automation API.
 * [Automation API examples](https://github.com/pulumi/automation-api-examples) - Examples of different Automation API use cases.
 
 ### Reusable Infrastructure Libraries
diff --git a/themes/default/content/topics/kubernetes.md b/themes/default/content/topics/kubernetes.md
index d01dc0166ef..01948753196 100644
--- a/themes/default/content/topics/kubernetes.md
+++ b/themes/default/content/topics/kubernetes.md
@@ -81,10 +81,10 @@ kubernetes_overview:
                     package main
 
                     import (
-                        corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/core/v1"
-                        "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/helm/v3"
-                        metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v2/go/kubernetes/meta/v1"
-                        "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
+                        corev1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/core/v1"
+                        "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/helm/v3"
+                        metav1 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/meta/v1"
+                        "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
                     )
 
                     func main() {

From 987aef237ec042ceb914fbba5bbe9eed4e3872af Mon Sep 17 00:00:00 2001
From: Dave Wrede <dave@pulumi.com>
Date: Wed, 14 Apr 2021 09:22:38 -0700
Subject: [PATCH 02/11] Applied ApplyT changes + provider version bump

---
 .../docs/get-started/kubernetes/modify-program.md  |  8 ++++----
 .../content/docs/guides/adopting/from_aws.md       | 14 +++++++-------
 .../docs/intro/cloud-providers/akamai/_index.md    |  6 +++---
 .../content/docs/intro/concepts/inputs-outputs.md  | 14 +++++++-------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/themes/default/content/docs/get-started/kubernetes/modify-program.md b/themes/default/content/docs/get-started/kubernetes/modify-program.md
index 57f3b1f2f05..c3c065a0cec 100644
--- a/themes/default/content/docs/get-started/kubernetes/modify-program.md
+++ b/themes/default/content/docs/get-started/kubernetes/modify-program.md
@@ -232,16 +232,16 @@ func main() {
         var ip pulumi.StringOutput
 
         if isMinikube {
-            ip = frontend.Spec.ApplyString(func(val *corev1.ServiceSpec) string {
+            ip = frontend.Spec.ApplyT(func(val *corev1.ServiceSpec) string {
                 return *val.ClusterIP
-            })
+            }).(pulumi.StringOputput)
         } else {
-            ip = frontend.Status.ApplyString(func(val *corev1.ServiceStatus) string {
+            ip = frontend.Status.Apply(func(val *corev1.ServiceStatus) string {
                 if val.LoadBalancer.Ingress[0].Ip != nil {
                     return *val.LoadBalancer.Ingress[0].Ip
                 }
                 return *val.LoadBalancer.Ingress[0].Hostname
-            })
+            }).(pulumi.StringOutput)
         }
 
         ctx.Export("ip", ip)
diff --git a/themes/default/content/docs/guides/adopting/from_aws.md b/themes/default/content/docs/guides/adopting/from_aws.md
index 927b565eea5..0faa4b4546b 100644
--- a/themes/default/content/docs/guides/adopting/from_aws.md
+++ b/themes/default/content/docs/guides/adopting/from_aws.md
@@ -88,9 +88,9 @@ web = aws.ec2.Instance('web',
 package main
 
 import (
-    "github.com/pulumi/pulumi-aws/sdk/go/aws/cloudformation"
-    "github.com/pulumi/pulumi-aws/sdk/go/aws/ec2"
-    "github.com/pulumi/pulumi/sdk/go/pulumi"
+    "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/cloudformation"
+    "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ec2"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
@@ -319,8 +319,8 @@ pulumi.export('vpc_id', network.outputs["VpcId"])
 package main
 
 import (
-    "github.com/pulumi/pulumi-aws/sdk/go/aws/cloudformation"
-    "github.com/pulumi/pulumi/sdk/go/pulumi"
+    "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/cloudformation"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 const (
@@ -550,8 +550,8 @@ pulumi.export('vpc_id', vpc.id)
 package main
 
 import (
-    "github.com/pulumi/pulumi-aws/sdk/go/aws/ec2"
-    "github.com/pulumi/pulumi/sdk/go/pulumi"
+    "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ec2"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/cloud-providers/akamai/_index.md b/themes/default/content/docs/intro/cloud-providers/akamai/_index.md
index 7bfde2166df..3d15c1eec13 100644
--- a/themes/default/content/docs/intro/cloud-providers/akamai/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/akamai/_index.md
@@ -81,8 +81,8 @@ pydomain = akamai.properties.EdgeHostName("test",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	"github.com/pulumi/pulumi-akamai/sdk/go/akamai"
-	"github.com/pulumi/pulumi-akamai/sdk/go/akam/properties"
+	"github.com/pulumi/pulumi-akamai/sdk/v2/go/akamai"
+	"github.com/pulumi/pulumi-akamai/sdk/v2/go/akam/properties"
 )
 
 func main() {
@@ -154,7 +154,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/akamai`](https://www.npmjs.com/package/@pulumi/akamai)
 * Python: [`pulumi-akamai`](https://pypi.org/project/pulumi-akamai/)
-* Go: [`github.com/pulumi/pulumi-akamai/sdk/go/akamai`](https://github.com/pulumi/pulumi-akamai)
+* Go: [`github.com/pulumi/pulumi-akamai/sdk/v2/go/akamai`](https://github.com/pulumi/pulumi-akamai)
 * .NET: [`Pulumi.Akamai`](https://www.nuget.org/packages/Pulumi.Akamai)
 
 The Akamai provider is open source and available in the [pulumi/pulumi-akamai](https://github.com/pulumi/pulumi-akamai) repo.
diff --git a/themes/default/content/docs/intro/concepts/inputs-outputs.md b/themes/default/content/docs/intro/concepts/inputs-outputs.md
index a88c33650d3..74c2aaf41eb 100644
--- a/themes/default/content/docs/intro/concepts/inputs-outputs.md
+++ b/themes/default/content/docs/intro/concepts/inputs-outputs.md
@@ -63,9 +63,9 @@ url = virtual_machine.dns_name.apply(
 {{% choosable language go %}}
 
 ```go
-url := vpc.DnsName.ApplyString(func(dnsName string) string {
+url := vpc.DnsName.ApplyT(func(dnsName string) string {
     return "https://" + dnsName
-})
+}).(pulumi.StringOutput)
 ```
 
 {{% /choosable %}}
@@ -238,9 +238,9 @@ if err != nil {
 
 record, err := route53.NewRecord(ctx, "validation", &route53.RecordArgs{
     Records: pulumi.StringArray{
-        cert.DomainValidationOptions.ApplyString(func(opts []acm.CertificateDomainValidationOption) string {
+        cert.DomainValidationOptions.ApplyT(func(opts []acm.CertificateDomainValidationOption) string {
             return *opts[0].ResourceRecordValue
-        }),
+        }).(pulumi.StringOutput),
     },
     ...
 })
@@ -450,7 +450,7 @@ var hostname pulumi.StringOutput
 var port pulumi.NumberOutput
 
 // Would like to produce a string equivalent to: http://${hostname}:${port}/
-url := pulumi.All(hostname, port).ApplyString(func (args []interface{}) string {
+url := pulumi.All(hostname, port).ApplyT(func (args []interface{}) string {
     return fmt.Sprintf("http://%s:%d/", args[0], args[1])
 })
 ```
@@ -558,9 +558,9 @@ def split(input):
 
 ```go
 func split(input pulumi.StringInput) pulumi.StringArrayOutput {
-    return input.ToStringOutput().ApplyStringArray(func(s string) []string {
+    return input.ToStringOutput().ApplyT(func(s string) []string {
         return strings.Split(s, ",")
-    })
+    }).(pulumi.StringArrayOutput)
 }
 ```
 

From 58d616ad641d6d9084f0a484523fed36dfe0b881 Mon Sep 17 00:00:00 2001
From: stack72 <public@paulstack.co.uk>
Date: Wed, 14 Apr 2021 10:55:32 +0100
Subject: [PATCH 03/11] Ensure provider major version bumps are reflected in
 cloud-providers pages

---
 .../content/docs/intro/cloud-providers/aiven/_index.md     | 4 ++--
 .../content/docs/intro/cloud-providers/alicloud/_index.md  | 4 ++--
 .../content/docs/intro/cloud-providers/auth0/_index.md     | 4 ++--
 .../content/docs/intro/cloud-providers/aws/_index.md       | 2 +-
 .../docs/intro/cloud-providers/azure-classic/_index.md     | 2 +-
 .../docs/intro/cloud-providers/azuredevops/_index.md       | 4 ++--
 .../content/docs/intro/cloud-providers/cloudamqp/_index.md | 4 ++--
 .../docs/intro/cloud-providers/cloudflare/_index.md        | 4 ++--
 .../content/docs/intro/cloud-providers/consul/_index.md    | 4 ++--
 .../content/docs/intro/cloud-providers/datadog/_index.md   | 4 ++--
 .../docs/intro/cloud-providers/digitalocean/_index.md      | 2 +-
 .../content/docs/intro/cloud-providers/dnsimple/_index.md  | 4 ++--
 .../content/docs/intro/cloud-providers/docker/_index.md    | 2 +-
 .../docs/intro/cloud-providers/equinix-metal/_index.md     | 2 +-
 .../content/docs/intro/cloud-providers/f5bigip/_index.md   | 4 ++--
 .../content/docs/intro/cloud-providers/fastly/_index.md    | 4 ++--
 .../content/docs/intro/cloud-providers/gcp/_index.md       | 7 +++++--
 .../content/docs/intro/cloud-providers/github/_index.md    | 4 ++--
 .../content/docs/intro/cloud-providers/gitlab/_index.md    | 2 +-
 .../content/docs/intro/cloud-providers/kafka/_index.md     | 4 ++--
 .../content/docs/intro/cloud-providers/linode/_index.md    | 4 ++--
 .../content/docs/intro/cloud-providers/mailgun/_index.md   | 4 ++--
 .../docs/intro/cloud-providers/mongodbatlas/_index.md      | 4 ++--
 .../content/docs/intro/cloud-providers/mysql/_index.md     | 4 ++--
 .../content/docs/intro/cloud-providers/newrelic/_index.md  | 4 ++--
 .../content/docs/intro/cloud-providers/ns1/_index.md       | 4 ++--
 .../content/docs/intro/cloud-providers/okta/_index.md      | 4 ++--
 .../content/docs/intro/cloud-providers/openstack/_index.md | 4 ++--
 .../content/docs/intro/cloud-providers/pagerduty/_index.md | 4 ++--
 .../docs/intro/cloud-providers/postgresql/_index.md        | 4 ++--
 .../content/docs/intro/cloud-providers/rabbitmq/_index.md  | 4 ++--
 .../content/docs/intro/cloud-providers/rancher2/_index.md  | 4 ++--
 .../content/docs/intro/cloud-providers/random/_index.md    | 2 +-
 .../content/docs/intro/cloud-providers/signalfx/_index.md  | 4 ++--
 .../content/docs/intro/cloud-providers/spotinst/_index.md  | 4 ++--
 .../content/docs/intro/cloud-providers/tls/_index.md       | 4 ++--
 .../content/docs/intro/cloud-providers/vault/_index.md     | 4 ++--
 .../content/docs/intro/cloud-providers/vsphere/_index.md   | 4 ++--
 38 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/themes/default/content/docs/intro/cloud-providers/aiven/_index.md b/themes/default/content/docs/intro/cloud-providers/aiven/_index.md
index a8456dde0b7..f6a33f38f6e 100644
--- a/themes/default/content/docs/intro/cloud-providers/aiven/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/aiven/_index.md
@@ -73,7 +73,7 @@ service = aiven.Service("my-service",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	aiven "github.com/pulumi/pulumi-aiven/sdk/v3/go/aiven"
+	aiven "github.com/pulumi/pulumi-aiven/sdk/v4/go/aiven"
 )
 
 func main() {
@@ -130,7 +130,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/aiven`](https://www.npmjs.com/package/@pulumi/aiven)
 * Python: [`pulumi-aiven`](https://pypi.org/project/pulumi-aiven/)
-* Go: [`github.com/pulumi/pulumi-aiven/sdk/go/aiven`](https://github.com/pulumi/pulumi-aiven)
+* Go: [`github.com/pulumi/pulumi-aiven/sdk/v4/go/aiven`](https://github.com/pulumi/pulumi-aiven)
 * .NET: [`Pulumi.Aiven`](https://www.nuget.org/packages/Pulumi.Aiven)
 
 The Aiven provider is open source and available in the [pulumi/pulumi-aiven](https://github.com/pulumi/pulumi-aiven) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/alicloud/_index.md b/themes/default/content/docs/intro/cloud-providers/alicloud/_index.md
index f6660fdf487..507d3ef718e 100644
--- a/themes/default/content/docs/intro/cloud-providers/alicloud/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/alicloud/_index.md
@@ -59,7 +59,7 @@ vpc = alicloud.vpc.Network("my-vpc",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	vpc "github.com/pulumi/pulumi-alicloud/sdk/v2/go/alicloud/vpc"
+	vpc "github.com/pulumi/pulumi-alicloud/sdk/v3/go/alicloud/vpc"
 )
 
 func main() {
@@ -108,7 +108,7 @@ The following packages are available in package managers:
 
 * JavaScript/TypeScript: [`@pulumi/alicloud`](https://www.npmjs.com/package/@pulumi/alicloud)
 * Python: [`pulumi-alicloud`](https://pypi.org/project/pulumi-alicloud/)
-* Go: [`github.com/pulumi/pulumi-alicloud/sdk/go/alicloud`](https://github.com/pulumi/pulumi-alicloud)
+* Go: [`github.com/pulumi/pulumi-alicloud/sdk/v3/go/alicloud`](https://github.com/pulumi/pulumi-alicloud)
 * .NET: [`Pulumi.Alicloud`](https://www.nuget.org/packages/Pulumi.Alicloud)
 
 The Alibaba Cloud provider is open source and available in the [pulumi/pulumi-alicloud](https://github.com/pulumi/pulumi-alicloud) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/auth0/_index.md b/themes/default/content/docs/intro/cloud-providers/auth0/_index.md
index 10383ec9baa..a4d964109ec 100644
--- a/themes/default/content/docs/intro/cloud-providers/auth0/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/auth0/_index.md
@@ -70,7 +70,7 @@ user = auth0.User("my-demo-user",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	auth0 "github.com/pulumi/pulumi-auth0/sdk/go/auth0"
+	auth0 "github.com/pulumi/pulumi-auth0/sdk/v2/go/auth0"
 )
 
 func main() {
@@ -124,7 +124,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/auth0`](https://www.npmjs.com/package/@pulumi/auth0)
 * Python: [`pulumi-auth0`](https://pypi.org/project/pulumi-auth0/)
-* Go: [`github.com/pulumi/pulumi-auth0/sdk/go/auth0`](https://github.com/pulumi/pulumi-auth0)
+* Go: [`github.com/pulumi/pulumi-auth0/sdk/v2/go/auth0`](https://github.com/pulumi/pulumi-auth0)
 * .NET: [`Pulumi.Auth0`](https://www.nuget.org/packages/Pulumi.Auth0)
 
 The Auth0 provider is open source and available in the [pulumi/pulumi-auth0](https://github.com/pulumi/pulumi-auth0) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/aws/_index.md b/themes/default/content/docs/intro/cloud-providers/aws/_index.md
index 9dc5dfdd724..8e823fda023 100644
--- a/themes/default/content/docs/intro/cloud-providers/aws/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/aws/_index.md
@@ -73,7 +73,7 @@ The following packages are available in package managers:
 
 * JavaScript/TypeScript: [`@pulumi/aws`](https://www.npmjs.com/package/@pulumi/aws)
 * Python: [`pulumi-aws`](https://pypi.org/project/pulumi-aws/)
-* Go: [`github.com/pulumi/pulumi-aws/sdk/go/aws`](https://github.com/pulumi/pulumi-aws)
+* Go: [`github.com/pulumi/pulumi-aws/sdk/v4/go/aws`](https://github.com/pulumi/pulumi-aws)
 * .NET: [`Pulumi.Aws`](https://www.nuget.org/packages/Pulumi.Aws)
 
 The AWS provider is open source and available in the [pulumi/pulumi-aws](https://github.com/pulumi/pulumi-aws) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/azure-classic/_index.md b/themes/default/content/docs/intro/cloud-providers/azure-classic/_index.md
index 31e6fda35ca..3a2f8b78713 100644
--- a/themes/default/content/docs/intro/cloud-providers/azure-classic/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/azure-classic/_index.md
@@ -40,7 +40,7 @@ The following packages are available in package managers:
 
 * JavaScript/TypeScript: [`@pulumi/azure`](https://www.npmjs.com/package/@pulumi/azure)
 * Python: [`pulumi-azure`](https://pypi.org/project/pulumi-azure/)
-* Go: [`github.com/pulumi/pulumi-azure/sdk/go/azure`](https://github.com/pulumi/pulumi-azure)
+* Go: [`github.com/pulumi/pulumi-azure/sdk/v4/go/azure`](https://github.com/pulumi/pulumi-azure)
 * .NET: [`Pulumi.Azure`](https://www.nuget.org/packages/Pulumi.Azure)
 
 The classic Azure provider is open source and available in the [pulumi/pulumi-azure](https://github.com/pulumi/pulumi-azure) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/azuredevops/_index.md b/themes/default/content/docs/intro/cloud-providers/azuredevops/_index.md
index 27ce20d76e3..f7d19c478e1 100644
--- a/themes/default/content/docs/intro/cloud-providers/azuredevops/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/azuredevops/_index.md
@@ -60,7 +60,7 @@ project = ado.core.Project("demo-project",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	ado "github.com/pulumi/pulumi-azuredevops/sdk/go/azuredevops"
+	ado "github.com/pulumi/pulumi-azuredevops/sdk/v2/go/azuredevops"
 )
 
 func main() {
@@ -109,7 +109,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/azuredevops`](https://www.npmjs.com/package/@pulumi/azuredevops)
 * Python: [`pulumi-azuredevops`](https://pypi.org/project/pulumi-azuredevops/)
-* Go: [`github.com/pulumi/pulumi-azuredevops/sdk/go/azuredevops`](https://github.com/pulumi/pulumi-azuredevops)
+* Go: [`github.com/pulumi/pulumi-azuredevops/sdk/v2/go/azuredevops`](https://github.com/pulumi/pulumi-azuredevops)
 * .NET: [`Pulumi.AzureDevOps`](https://www.nuget.org/packages/Pulumi.AzureDevOps)
 
 The AzureDevOps provider is open source and available in the [pulumi/pulumi-azuredevops](https://github.com/pulumi/pulumi-azuredevops) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/cloudamqp/_index.md b/themes/default/content/docs/intro/cloud-providers/cloudamqp/_index.md
index ec5fe3319d9..01962c16ff1 100644
--- a/themes/default/content/docs/intro/cloud-providers/cloudamqp/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/cloudamqp/_index.md
@@ -62,7 +62,7 @@ instance = cloudamqp.Instance("demo-instance",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	cloudamqp "github.com/pulumi/pulumi-cloudamqp/sdk/v2/go/cloudamqp"
+	cloudamqp "github.com/pulumi/pulumi-cloudamqp/sdk/v3/go/cloudamqp"
 )
 
 func main() {
@@ -113,7 +113,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/cloudamqp`](https://www.npmjs.com/package/@pulumi/cloudamqp)
 * Python: [`pulumi-cloudamqp`](https://pypi.org/project/pulumi-cloudamqp/)
-* Go: [`github.com/pulumi/pulumi-cloudamqp/sdk/go/cloudamqp`](https://github.com/pulumi/pulumi-cloudamqp)
+* Go: [`github.com/pulumi/pulumi-cloudamqp/sdk/v3/go/cloudamqp`](https://github.com/pulumi/pulumi-cloudamqp)
 * .NET: [`Pulumi.Cloudamqp`](https://www.nuget.org/packages/Pulumi.Cloudamqp)
 
 The Fastly provider is open source and available in the [pulumi/pulumi-cloudamqp](https://github.com/pulumi/pulumi-cloudamqp) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/cloudflare/_index.md b/themes/default/content/docs/intro/cloud-providers/cloudflare/_index.md
index 7a13ec4853c..cf4c5fac542 100644
--- a/themes/default/content/docs/intro/cloud-providers/cloudflare/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/cloudflare/_index.md
@@ -72,7 +72,7 @@ record = cloudflare.Record("sample-record",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	cloudflare "github.com/pulumi/pulumi-cloudflare/sdk/v2/go/cloudflare"
+	cloudflare "github.com/pulumi/pulumi-cloudflare/sdk/v3/go/cloudflare"
 )
 
 func main() {
@@ -129,7 +129,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/cloudflare`](https://www.npmjs.com/package/@pulumi/cloudflare)
 * Python: [`pulumi-cloudflare`](https://pypi.org/project/pulumi-cloudflare/)
-* Go: [`github.com/pulumi/pulumi-cloudflare/sdk/go/cloudflare`](https://github.com/pulumi/pulumi-cloudflare)
+* Go: [`github.com/pulumi/pulumi-cloudflare/sdk/v3/go/cloudflare`](https://github.com/pulumi/pulumi-cloudflare)
 * .NET: [`Pulumi.Cloudflare`](https://www.nuget.org/packages/Pulumi.Cloudflare)
 
 The Cloudflare provider is open source and available in the [pulumi/pulumi-cloudflare](https://github.com/pulumi/pulumi-cloudflare) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/consul/_index.md b/themes/default/content/docs/intro/cloud-providers/consul/_index.md
index ab0d86c422d..b0fdc67acac 100644
--- a/themes/default/content/docs/intro/cloud-providers/consul/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/consul/_index.md
@@ -60,7 +60,7 @@ node = consul.Node("compute",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	consul "github.com/pulumi/pulumi-consul/sdk/v2/go/consul"
+	consul "github.com/pulumi/pulumi-consul/sdk/v3/go/consul"
 )
 
 func main() {
@@ -109,7 +109,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/consul`](https://www.npmjs.com/package/@pulumi/consul)
 * Python: [`pulumi-consul`](https://pypi.org/project/pulumi-consul/)
-* Go: [`github.com/pulumi/pulumi-consul/sdk/go/consul`](https://github.com/pulumi/pulumi-consul)
+* Go: [`github.com/pulumi/pulumi-consul/sdk/v3/go/consul`](https://github.com/pulumi/pulumi-consul)
 * .NET: [`Pulumi.Consul`](https://www.nuget.org/packages/Pulumi.Consul)
 
 The HashiCorp Consul provider is open source and available in the [pulumi/pulumi-consul](https://github.com/pulumi/pulumi-consul) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/datadog/_index.md b/themes/default/content/docs/intro/cloud-providers/datadog/_index.md
index f52fcf262ac..118cf796c0b 100644
--- a/themes/default/content/docs/intro/cloud-providers/datadog/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/datadog/_index.md
@@ -67,7 +67,7 @@ user = datadog.User("my-policy",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	datadog "github.com/pulumi/pulumi-datadog/sdk/v2/go/datadog"
+	datadog "github.com/pulumi/pulumi-datadog/sdk/v3/go/datadog"
 )
 
 func main() {
@@ -120,7 +120,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/datadog`](https://www.npmjs.com/package/@pulumi/datadog)
 * Python: [`pulumi-datadog`](https://pypi.org/project/pulumi-datadog/)
-* Go: [`github.com/pulumi/pulumi-datadog/sdk/go/datadog`](https://github.com/pulumi/pulumi-datadog)
+* Go: [`github.com/pulumi/pulumi-datadog/sdk/v3/go/datadog`](https://github.com/pulumi/pulumi-datadog)
 * .NET: [`Pulumi.Datadog`](https://www.nuget.org/packages/Pulumi.Datadog)
 
 The Datadog provider is open source and available in the [pulumi/pulumi-datadog](https://github.com/pulumi/pulumi-datadog) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/digitalocean/_index.md b/themes/default/content/docs/intro/cloud-providers/digitalocean/_index.md
index 61b0858f079..1de65ffc94f 100644
--- a/themes/default/content/docs/intro/cloud-providers/digitalocean/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/digitalocean/_index.md
@@ -117,7 +117,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/digitalocean`](https://www.npmjs.com/package/@pulumi/digitalocean)
 * Python: [`pulumi-digitalocean`](https://pypi.org/project/pulumi-digitalocean/)
-* Go: [`github.com/pulumi/pulumi-digitalocean/sdk/go/digitalocean`](https://github.com/pulumi/pulumi-digitalocean)
+* Go: [`github.com/pulumi/pulumi-digitalocean/sdk/v4/go/digitalocean`](https://github.com/pulumi/pulumi-digitalocean)
 * .NET: [`Pulumi.DigitalOcean`](https://www.nuget.org/packages/Pulumi.DigitalOcean)
 
 The DigitalOcean provider is open source and available in the [pulumi/pulumi-digitalocean](https://github.com/pulumi/pulumi-digitalocean) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/dnsimple/_index.md b/themes/default/content/docs/intro/cloud-providers/dnsimple/_index.md
index d54a528c96e..124f86cb87b 100644
--- a/themes/default/content/docs/intro/cloud-providers/dnsimple/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/dnsimple/_index.md
@@ -70,7 +70,7 @@ record = dnsimple.Record("test",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	dnsimple "github.com/pulumi/pulumi-dnsimple/sdk/v2/go/dnsimple"
+	dnsimple "github.com/pulumi/pulumi-dnsimple/sdk/v3/go/dnsimple"
 )
 
 func main() {
@@ -125,7 +125,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/dnsimple`](https://www.npmjs.com/package/@pulumi/dnsimple)
 * Python: [`pulumi-dnsimple`](https://pypi.org/project/pulumi-dnsimple/)
-* Go: [`github.com/pulumi/pulumi-dnsimple/sdk/go/dnsimple`](https://github.com/pulumi/pulumi-dnsimple)
+* Go: [`github.com/pulumi/pulumi-dnsimple/sdk/v3/go/dnsimple`](https://github.com/pulumi/pulumi-dnsimple)
 * .NET: [`Pulumi.Dnsimple`](https://www.nuget.org/packages/Pulumi.Dnsimple)
 
 The DNSimple provider is open source and available in the [pulumi/pulumi-dnsimple](https://github.com/pulumi/pulumi-dnsimple) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/docker/_index.md b/themes/default/content/docs/intro/cloud-providers/docker/_index.md
index 2d49dc2ad33..27e2ca27737 100644
--- a/themes/default/content/docs/intro/cloud-providers/docker/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/docker/_index.md
@@ -133,7 +133,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/docker`](https://www.npmjs.com/package/@pulumi/docker)
 * Python: [`pulumi-docker`](https://pypi.org/project/pulumi-docker/)
-* Go: [`github.com/pulumi/pulumi-docker/sdk/go/docker`](https://github.com/pulumi/pulumi-docker)
+* Go: [`github.com/pulumi/pulumi-docker/sdk/v3/go/docker`](https://github.com/pulumi/pulumi-docker)
 * .NET: [`Pulumi.Docker`](https://www.nuget.org/packages/Pulumi.Docker)
 
 The Docker provider is open source and available in the [pulumi/pulumi-docker](https://github.com/pulumi/pulumi-docker) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/equinix-metal/_index.md b/themes/default/content/docs/intro/cloud-providers/equinix-metal/_index.md
index e8f3666f01b..6926071a354 100644
--- a/themes/default/content/docs/intro/cloud-providers/equinix-metal/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/equinix-metal/_index.md
@@ -112,7 +112,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/equinix-metal`](https://www.npmjs.com/package/@pulumi/equinix-metal)
 * Python: [`pulumi-equinix-metal`](https://pypi.org/project/pulumi-equinix-metal/)
-* Go: [`github.com/pulumi/pulumi-equinix-metal/sdk/go/equinix`](https://github.com/pulumi/pulumi-equinix-metal)
+* Go: [`github.com/pulumi/pulumi-equinix-metal/sdk/v2/go/equinix`](https://github.com/pulumi/pulumi-equinix-metal)
 * .NET: [`Pulumi.EquinixMetal`](https://www.nuget.org/packages/Pulumi.EquinixMetal)
 
 The Equinix Metal provider is open source and available in the [pulumi/pulumi-equinix-metal](https://github.com/pulumi/pulumi-equinix-metal) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/f5bigip/_index.md b/themes/default/content/docs/intro/cloud-providers/f5bigip/_index.md
index c40692c3987..e759e7916b5 100644
--- a/themes/default/content/docs/intro/cloud-providers/f5bigip/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/f5bigip/_index.md
@@ -73,7 +73,7 @@ monitor = f5bigip.ltm.Monitor("backend",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	ltm "github.com/pulumi/pulumi-f5bigip/sdk/v2/go/f5bigip/ltm"
+	ltm "github.com/pulumi/pulumi-f5bigip/sdk/v3/go/f5bigip/ltm"
 )
 
 func main() {
@@ -130,7 +130,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/f5bigip`](https://www.npmjs.com/package/@pulumi/f5bigip)
 * Python: [`pulumi-f5bigip`](https://pypi.org/project/pulumi-f5bigip/)
-* Go: [`github.com/pulumi/pulumi-f5bigip/sdk/go/f5bigip`](https://github.com/pulumi/pulumi-f5bigip)
+* Go: [`github.com/pulumi/pulumi-f5bigip/sdk/v3/go/f5bigip`](https://github.com/pulumi/pulumi-f5bigip)
 * .NET: [`Pulumi.F5bigip`](https://www.nuget.org/packages/Pulumi.F5bigip)
 
 The F5 BIG-IP provider is open source and available in the [pulumi/pulumi-f5bigip](https://github.com/pulumi/pulumi-f5bigip) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/fastly/_index.md b/themes/default/content/docs/intro/cloud-providers/fastly/_index.md
index aedf4bc4ccb..c5d7ddcb851 100644
--- a/themes/default/content/docs/intro/cloud-providers/fastly/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/fastly/_index.md
@@ -88,7 +88,7 @@ service = fastly.Servicev1("my-service",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	fastly "github.com/pulumi/pulumi-fastly/sdk/v2/go/fastly"
+	fastly "github.com/pulumi/pulumi-fastly/sdk/v3/go/fastly"
 )
 
 func main() {
@@ -163,7 +163,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/fastly`](https://www.npmjs.com/package/@pulumi/fastly)
 * Python: [`pulumi-fastly`](https://pypi.org/project/pulumi-fastly/)
-* Go: [`github.com/pulumi/pulumi-fastly/sdk/go/fastly`](https://github.com/pulumi/pulumi-fastly)
+* Go: [`github.com/pulumi/pulumi-fastly/sdk/v3/go/fastly`](https://github.com/pulumi/pulumi-fastly)
 * .NET: [`Pulumi.Fastly`](https://www.nuget.org/packages/Pulumi.Fastly)
 
 The Fastly provider is open source and available in the [pulumi/pulumi-fastly](https://github.com/pulumi/pulumi-fastly) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/gcp/_index.md b/themes/default/content/docs/intro/cloud-providers/gcp/_index.md
index 8b9fafca9a3..283e68b6f98 100644
--- a/themes/default/content/docs/intro/cloud-providers/gcp/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/gcp/_index.md
@@ -68,7 +68,10 @@ bucket = storage.Bucket('my-bucket')
 {{% choosable language go %}}
 
 ```go
-import "github.com/pulumi/pulumi-gcp/sdk/v3/go/gcp/storage"
+import (
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+    "github.com/pulumi/pulumi-gcp/sdk/v5/go/gcp/storage"
+)
 
 func main() {
 	pulumi.Run(func(ctx *pulumi.Context) error {
@@ -112,7 +115,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/gcp`](https://www.npmjs.com/package/@pulumi/gcp)
 * Python: [`pulumi-gcp`](https://pypi.org/project/pulumi-gcp/)
-* Go: [`github.com/pulumi/pulumi-gcp/sdk/go/gcp`](https://github.com/pulumi/pulumi-gcp)
+* Go: [`github.com/pulumi/pulumi-gcp/sdk/v5/go/gcp`](https://github.com/pulumi/pulumi-gcp)
 * .NET: [`Pulumi.Gcp`](https://www.nuget.org/packages/Pulumi.Gcp)
 
 The GCP provider is open source and available in the [pulumi/pulumi-gcp](https://github.com/pulumi/pulumi-gcp) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/github/_index.md b/themes/default/content/docs/intro/cloud-providers/github/_index.md
index 7fa2dccced7..b1611d9061e 100644
--- a/themes/default/content/docs/intro/cloud-providers/github/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/github/_index.md
@@ -64,7 +64,7 @@ repo = github.Repository("demo-repo",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	github "github.com/pulumi/pulumi-github/sdk/go/github"
+	github "github.com/pulumi/pulumi-github/sdk/v4/go/github"
 )
 
 func main() {
@@ -115,7 +115,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/github`](https://www.npmjs.com/package/@pulumi/github)
 * Python: [`pulumi-github`](https://pypi.org/project/pulumi-github/)
-* Go: [`github.com/pulumi/pulumi-github/sdk/go/github`](https://github.com/pulumi/pulumi-github)
+* Go: [`github.com/pulumi/pulumi-github/sdk/v4/go/github`](https://github.com/pulumi/pulumi-github)
 * .NET: [`Pulumi.Github`](https://www.nuget.org/packages/Pulumi.Github)
 
 The GitHub provider is open source and available in the [pulumi/pulumi-github](https://github.com/pulumi/pulumi-github) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/gitlab/_index.md b/themes/default/content/docs/intro/cloud-providers/gitlab/_index.md
index 83b9466c973..faa05cbd502 100644
--- a/themes/default/content/docs/intro/cloud-providers/gitlab/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/gitlab/_index.md
@@ -114,7 +114,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/gitlab`](https://www.npmjs.com/package/@pulumi/gitlab)
 * Python: [`pulumi-gitlab`](https://pypi.org/project/pulumi-gitlab/)
-* Go: [`github.com/pulumi/pulumi-gitlab/sdk/go/gitlab`](https://github.com/pulumi/pulumi-gitlab)
+* Go: [`github.com/pulumi/pulumi-gitlab/sdk/v3/go/gitlab`](https://github.com/pulumi/pulumi-gitlab)
 * .NET: [`Pulumi.Gitlab`](https://www.nuget.org/packages/Pulumi.Gitlab)
 
 The GitLab provider is open source and available in the [pulumi/pulumi-gitlab](https://github.com/pulumi/pulumi-gitlab) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/kafka/_index.md b/themes/default/content/docs/intro/cloud-providers/kafka/_index.md
index 5347301480e..11e052293b3 100644
--- a/themes/default/content/docs/intro/cloud-providers/kafka/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/kafka/_index.md
@@ -67,7 +67,7 @@ topic = kafka.Topic("topic",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	kafka "github.com/pulumi/pulumi-kafka/sdk/v2/go/kafka"
+	kafka "github.com/pulumi/pulumi-kafka/sdk/v3/go/kafka"
 )
 
 func main() {
@@ -120,7 +120,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/kafka`](https://www.npmjs.com/package/@pulumi/kafka)
 * Python: [`pulumi-kafka`](https://pypi.org/project/pulumi-kafka/)
-* Go: [`github.com/pulumi/pulumi-kafka/sdk/go/kafka`](https://github.com/pulumi/pulumi-kafka)
+* Go: [`github.com/pulumi/pulumi-kafka/sdk/v3/go/kafka`](https://github.com/pulumi/pulumi-kafka)
 * .NET: [`Pulumi.Kafka`](https://www.nuget.org/packages/Pulumi.Kafka)
 
 The Kafka provider is open source and available in the [pulumi/pulumi-kafka](https://github.com/pulumi/pulumi-kafka) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/linode/_index.md b/themes/default/content/docs/intro/cloud-providers/linode/_index.md
index 27b6c1d1be6..a5f2ea91343 100644
--- a/themes/default/content/docs/intro/cloud-providers/linode/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/linode/_index.md
@@ -66,7 +66,7 @@ domain = linode.Domain("my-domain",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	linode "github.com/pulumi/pulumi-linode/sdk/v2/go/linode"
+	linode "github.com/pulumi/pulumi-linode/sdk/v3/go/linode"
 )
 
 func main() {
@@ -118,7 +118,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/linode`](https://www.npmjs.com/package/@pulumi/linode)
 * Python: [`pulumi-linode`](https://pypi.org/project/pulumi-linode/)
-* Go: [`github.com/pulumi/pulumi-linode/sdk/go/linode`](https://github.com/pulumi/pulumi-linode)
+* Go: [`github.com/pulumi/pulumi-linode/sdk/v3/go/linode`](https://github.com/pulumi/pulumi-linode)
 * .NET: [`Pulumi.Linode`](https://www.nuget.org/packages/Pulumi.Linode)
 
 The Linode provider is open source and available in the [pulumi/pulumi-linode](https://github.com/pulumi/pulumi-linode) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/mailgun/_index.md b/themes/default/content/docs/intro/cloud-providers/mailgun/_index.md
index 46cdc10cc1c..41a379caaed 100644
--- a/themes/default/content/docs/intro/cloud-providers/mailgun/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/mailgun/_index.md
@@ -78,7 +78,7 @@ route = mailgun.Route("test-route",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	mailgun "github.com/pulumi/pulumi-mailgun/sdk/v2/go/mailgun"
+	mailgun "github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun"
 )
 
 func main() {
@@ -139,7 +139,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/mailgun`](https://www.npmjs.com/package/@pulumi/mailgun)
 * Python: [`pulumi-mailgun`](https://pypi.org/project/pulumi-mailgun/)
-* Go: [`github.com/pulumi/pulumi-mailgun/sdk/go/mailgun`](https://github.com/pulumi/pulumi-mailgun)
+* Go: [`github.com/pulumi/pulumi-mailgun/sdk/v3/go/mailgun`](https://github.com/pulumi/pulumi-mailgun)
 * .NET: [`Pulumi.Mailgun`](https://www.nuget.org/packages/Pulumi.Mailgun)
 
 The Mailgun provider is open source and available in the [pulumi/pulumi-mailgun](https://github.com/pulumi/pulumi-mailgun) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/mongodbatlas/_index.md b/themes/default/content/docs/intro/cloud-providers/mongodbatlas/_index.md
index 3fcdf86fd89..cb1d6923a72 100644
--- a/themes/default/content/docs/intro/cloud-providers/mongodbatlas/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/mongodbatlas/_index.md
@@ -59,7 +59,7 @@ project = mongodbatlas.Project("my-demo-project", org_id="12345")
 ```go
 import (
     "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-    mongodbatlas "github.com/pulumi/pulumi-mongodbatlas/sdk/go/mongodbatlas"
+    mongodbatlas "github.com/pulumi/pulumi-mongodbatlas/sdk/v2/go/mongodbatlas"
 )
 
 func main() {
@@ -106,7 +106,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/mongodbatlas`](https://www.npmjs.com/package/@pulumi/mongodbatlas)
 * Python: [`pulumi-mongodbatlas`](https://pypi.org/project/pulumi-mongodbatlas/)
-* Go: [`github.com/pulumi/pulumi-mongodbatlas/sdk/go/mongodbatlas`](https://github.com/pulumi/pulumi-mongodbatlas)
+* Go: [`github.com/pulumi/pulumi-mongodbatlas/sdk/v2/go/mongodbatlas`](https://github.com/pulumi/pulumi-mongodbatlas)
 * .NET: [`Pulumi.Mongodbatlas`](https://www.nuget.org/packages/Pulumi.Mongodbatlas)
 
 The MongoDB Atlas provider is open source and available in the [pulumi/pulumi-mongodbatlas](https://github.com/pulumi/pulumi-mongodbatlas) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/mysql/_index.md b/themes/default/content/docs/intro/cloud-providers/mysql/_index.md
index 54387da8759..eb4b55d9d90 100644
--- a/themes/default/content/docs/intro/cloud-providers/mysql/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/mysql/_index.md
@@ -55,7 +55,7 @@ my_db = mysql.Database("my-database")
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	mysql "github.com/pulumi/pulumi-mysql/sdk/v2/go/mysql"
+	mysql "github.com/pulumi/pulumi-mysql/sdk/v3/go/mysql"
 )
 
 func main() {
@@ -99,7 +99,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/mysql`](https://www.npmjs.com/package/@pulumi/mysql)
 * Python: [`pulumi-mysql`](https://pypi.org/project/pulumi-mysql/)
-* Go: [`github.com/pulumi/pulumi-mysql/sdk/go/mysql`](https://github.com/pulumi/pulumi-mysql)
+* Go: [`github.com/pulumi/pulumi-mysql/sdk/v3/go/mysql`](https://github.com/pulumi/pulumi-mysql)
 * .NET: [`Pulumi.Mysql`](https://www.nuget.org/packages/Pulumi.Mysql)
 
 The MySQL provider is open source and available in the [pulumi/pulumi-mysql](https://github.com/pulumi/pulumi-mysql) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/newrelic/_index.md b/themes/default/content/docs/intro/cloud-providers/newrelic/_index.md
index 55940c32583..fc32e1e13c9 100644
--- a/themes/default/content/docs/intro/cloud-providers/newrelic/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/newrelic/_index.md
@@ -55,7 +55,7 @@ policy = newrelic.AlertPolicy("my-policy")
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	newrelic "github.com/pulumi/pulumi-newrelic/sdk/v3/go/newrelic"
+	newrelic "github.com/pulumi/pulumi-newrelic/sdk/v4/go/newrelic"
 )
 
 func main() {
@@ -99,7 +99,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/newrelic`](https://www.npmjs.com/package/@pulumi/newrelic)
 * Python: [`pulumi-newrelic`](https://pypi.org/project/pulumi-newrelic/)
-* Go: [`github.com/pulumi/pulumi-newrelic/sdk/go/newrelic`](https://github.com/pulumi/pulumi-newrelic)
+* Go: [`github.com/pulumi/pulumi-newrelic/sdk/v4/go/newrelic`](https://github.com/pulumi/pulumi-newrelic)
 * .NET: [`Pulumi.Newrelic`](https://www.nuget.org/packages/Pulumi.Newrelic)
 
 The New Relic provider is open source and available in the [pulumi/pulumi-newrelic](https://github.com/pulumi/pulumi-newrelic) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/ns1/_index.md b/themes/default/content/docs/intro/cloud-providers/ns1/_index.md
index 7d6738ba865..2ae9d913442 100644
--- a/themes/default/content/docs/intro/cloud-providers/ns1/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/ns1/_index.md
@@ -61,7 +61,7 @@ zone = ns1.Zone("demo-zone",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	ns1 "github.com/pulumi/pulumi-ns1/sdk/go/ns1"
+	ns1 "github.com/pulumi/pulumi-ns1/sdk/v2/go/ns1"
 )
 
 func main() {
@@ -110,7 +110,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/ns1`](https://www.npmjs.com/package/@pulumi/ns1)
 * Python: [`pulumi-ns1`](https://pypi.org/project/pulumi-ns1/)
-* Go: [`github.com/pulumi/pulumi-ns1/sdk/go/ns1`](https://github.com/pulumi/pulumi-ns1)
+* Go: [`github.com/pulumi/pulumi-ns1/sdk/v2/go/ns1`](https://github.com/pulumi/pulumi-ns1)
 * .NET: [`Pulumi.NS1`](https://www.nuget.org/packages/Pulumi.Ns1)
 
 The NS1 provider is open source and available in the [pulumi/pulumi-ns1](https://github.com/pulumi/pulumi-ns1) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/okta/_index.md b/themes/default/content/docs/intro/cloud-providers/okta/_index.md
index c07e22cbf13..1ea7105d0b4 100644
--- a/themes/default/content/docs/intro/cloud-providers/okta/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/okta/_index.md
@@ -69,7 +69,7 @@ last_name="user",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	user "github.com/pulumi/pulumi-okta/sdk/v2/go/okta/user"
+	user "github.com/pulumi/pulumi-okta/sdk/v3/go/okta/user"
 )
 
 func main() {
@@ -124,7 +124,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/okta`](https://www.npmjs.com/package/@pulumi/okta)
 * Python: [`pulumi-okta`](https://pypi.org/project/pulumi-okta/)
-* Go: [`github.com/pulumi/pulumi-okta/sdk/go/okta`](https://github.com/pulumi/pulumi-okta)
+* Go: [`github.com/pulumi/pulumi-okta/sdk/v3/go/okta`](https://github.com/pulumi/pulumi-okta)
 * .NET: [`Pulumi.Okta`](https://www.nuget.org/packages/Pulumi.Okta)
 
 The Okta provider is open source and available in the [pulumi/pulumi-okta](https://github.com/pulumi/pulumi-okta) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/openstack/_index.md b/themes/default/content/docs/intro/cloud-providers/openstack/_index.md
index f54000d01fd..889c2506e27 100644
--- a/themes/default/content/docs/intro/cloud-providers/openstack/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/openstack/_index.md
@@ -65,7 +65,7 @@ instance = compute.Instance("test",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	compute "github.com/pulumi/pulumi-openstack/sdk/v2/go/openstack/compute"
+	compute "github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack/compute"
 )
 
 func main() {
@@ -114,7 +114,7 @@ The following packages are available in package managers:
 
 * JavaScript/TypeScript: [`@pulumi/openstack`](https://www.npmjs.com/package/@pulumi/openstack)
 * Python: [`pulumi-openstack`](https://pypi.org/project/pulumi-openstack/)
-* Go: [`github.com/pulumi/pulumi-openstack/sdk/go/openstack`](https://github.com/pulumi/pulumi-openstack)
+* Go: [`github.com/pulumi/pulumi-openstack/sdk/v3/go/openstack`](https://github.com/pulumi/pulumi-openstack)
 * .NET: [`Pulumi.Openstack`](https://www.nuget.org/packages/Pulumi.Openstack)
 
 As with all Pulumi software solutions, the OpenStack provider is open source and available in the [pulumi/pulumi-openstack](https://github.com/pulumi/pulumi-openstack) repo. You can see all Pulumi infrastructure and cloud providers [here] ({{< relref "/docs/intro/cloud-providers" >}}).
diff --git a/themes/default/content/docs/intro/cloud-providers/pagerduty/_index.md b/themes/default/content/docs/intro/cloud-providers/pagerduty/_index.md
index 657a297e27a..57b2a0d833e 100644
--- a/themes/default/content/docs/intro/cloud-providers/pagerduty/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/pagerduty/_index.md
@@ -60,7 +60,7 @@ demo_team = pagerduty.Team("demo-team",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	pagerduty "github.com/pulumi/pulumi-pagerduty/sdk/go/pagerduty"
+	pagerduty "github.com/pulumi/pulumi-pagerduty/sdk/v2/go/pagerduty"
 )
 
 func main() {
@@ -108,7 +108,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/pagerduty`](https://www.npmjs.com/package/@pulumi/pagerduty)
 * Python: [`pulumi-pagerduty`](https://pypi.org/project/pulumi-pagerduty/)
-* Go: [`github.com/pulumi/pulumi-pagerduty/sdk/go/pagerduty`](https://github.com/pulumi/pulumi-pagerduty)
+* Go: [`github.com/pulumi/pulumi-pagerduty/sdk/v2/go/pagerduty`](https://github.com/pulumi/pulumi-pagerduty)
 * .NET: [`Pulumi.Pagerduty`](https://www.nuget.org/packages/Pulumi.Pagerduty)
 
 The PagerDuty provider is open source and available in the [pulumi/pulumi-pagerduty](https://github.com/pulumi/pulumi-pagerduty) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/postgresql/_index.md b/themes/default/content/docs/intro/cloud-providers/postgresql/_index.md
index 40f64dfac04..dba93ea6704 100644
--- a/themes/default/content/docs/intro/cloud-providers/postgresql/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/postgresql/_index.md
@@ -55,7 +55,7 @@ my_db = postgresql.Database("my-database")
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	postgresql "github.com/pulumi/pulumi-postgresql/sdk/v2/go/postgresql"
+	postgresql "github.com/pulumi/pulumi-postgresql/sdk/v3/go/postgresql"
 )
 
 func main() {
@@ -98,7 +98,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/postgresql`](https://www.npmjs.com/package/@pulumi/postgresql)
 * Python: [`pulumi-postgresql`](https://pypi.org/project/pulumi-postgresql/)
-* Go: [`github.com/pulumi/pulumi-postgresql/sdk/go/postgresql`](https://github.com/pulumi/pulumi-postgresql)
+* Go: [`github.com/pulumi/pulumi-postgresql/sdk/v3/go/postgresql`](https://github.com/pulumi/pulumi-postgresql)
 * .NET: [`Pulumi.Postgresql`](https://www.nuget.org/packages/Pulumi.Postgresql)
 
 The PostgreSQL provider is open source and available in the [pulumi/pulumi-postgresql](https://github.com/pulumi/pulumi-postgresql) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/rabbitmq/_index.md b/themes/default/content/docs/intro/cloud-providers/rabbitmq/_index.md
index 3f85dfc6f85..baf734e058a 100644
--- a/themes/default/content/docs/intro/cloud-providers/rabbitmq/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/rabbitmq/_index.md
@@ -61,7 +61,7 @@ user = rabbitmq.User("user",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	rabbitmq "github.com/pulumi/pulumi-rabbitmq/sdk/v2/go/rabbitmq"
+	rabbitmq "github.com/pulumi/pulumi-rabbitmq/sdk/v3/go/rabbitmq"
 )
 
 func main() {
@@ -109,7 +109,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/rabbitmq`](https://www.npmjs.com/package/@pulumi/rabbitmq)
 * Python: [`pulumi-rabbitmq`](https://pypi.org/project/pulumi-rabbitmq/)
-* Go: [`github.com/pulumi/pulumi-rabbitmq/sdk/go/rabbitmq`](https://github.com/pulumi/pulumi-rabbitmq)
+* Go: [`github.com/pulumi/pulumi-rabbitmq/sdk/v3/go/rabbitmq`](https://github.com/pulumi/pulumi-rabbitmq)
 * .NET: [`Pulumi.Rabbitmq`](https://www.nuget.org/packages/Pulumi.Rabbitmq)
 
 The RabbitMQ provider is open source and available in the [pulumi/pulumi-rabbitmq](https://github.com/pulumi/pulumi-rabbitmq) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/rancher2/_index.md b/themes/default/content/docs/intro/cloud-providers/rancher2/_index.md
index 8e10d362bb1..f9ad3c219aa 100644
--- a/themes/default/content/docs/intro/cloud-providers/rancher2/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/rancher2/_index.md
@@ -70,7 +70,7 @@ user = rancher2.User("my-user",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	rancher2 "github.com/pulumi/pulumi-rancher2/sdk/v2/go/rancher2"
+	rancher2 "github.com/pulumi/pulumi-rancher2/sdk/v3/go/rancher2"
 )
 
 func main() {
@@ -124,7 +124,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/rancher2`](https://www.npmjs.com/package/@pulumi/rancher2)
 * Python: [`pulumi-rancher2`](https://pypi.org/project/pulumi-rancher2/)
-* Go: [`github.com/pulumi/pulumi-rancher2/sdk/go/rancher2`](https://github.com/pulumi/pulumi-rancher2)
+* Go: [`github.com/pulumi/pulumi-rancher2/sdk/v3/go/rancher2`](https://github.com/pulumi/pulumi-rancher2)
 * .NET: [`Pulumi.Rancher2`](https://www.nuget.org/packages/Pulumi.Rancher2)
 
 The Rancher2 provider is open source and available in the [pulumi/pulumi-rancher2](https://github.com/pulumi/pulumi-rancher2) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/random/_index.md b/themes/default/content/docs/intro/cloud-providers/random/_index.md
index 7dba93f4b75..4054f213ce9 100644
--- a/themes/default/content/docs/intro/cloud-providers/random/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/random/_index.md
@@ -92,7 +92,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/random`](https://www.npmjs.com/package/@pulumi/random)
 * Python: [`pulumi-random`](https://pypi.org/project/pulumi-random/)
-* Go: [`github.com/pulumi/pulumi-random/sdk/go/random`](https://github.com/pulumi/pulumi-random)
+* Go: [`github.com/pulumi/pulumi-random/sdk/v4/go/random`](https://github.com/pulumi/pulumi-random)
 * .NET: [`Pulumi.Random`](https://www.nuget.org/packages/Pulumi.Random)
 
 The Random provider is open source and available in the [pulumi/pulumi-random](https://github.com/pulumi/pulumi-random) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/signalfx/_index.md b/themes/default/content/docs/intro/cloud-providers/signalfx/_index.md
index be5aaf2b068..169adba62c5 100644
--- a/themes/default/content/docs/intro/cloud-providers/signalfx/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/signalfx/_index.md
@@ -61,7 +61,7 @@ group = signalfx.DashboardGroup("my-group",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	signalfx "github.com/pulumi/pulumi-signalfx/sdk/v4/go/signalfx"
+	signalfx "github.com/pulumi/pulumi-signalfx/sdk/v5/go/signalfx"
 )
 
 func main() {
@@ -109,7 +109,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/signalfx`](https://www.npmjs.com/package/@pulumi/signalfx)
 * Python: [`pulumi-signalfx`](https://pypi.org/project/pulumi-signalfx/)
-* Go: [`github.com/pulumi/pulumi-signalfx/sdk/go/signalfx`](https://github.com/pulumi/pulumi-signalfx)
+* Go: [`github.com/pulumi/pulumi-signalfx/sdk/v5/go/signalfx`](https://github.com/pulumi/pulumi-signalfx)
 * .NET: [`Pulumi.Signalfx`](https://www.nuget.org/packages/Pulumi.Signalfx)
 
 The SignalFx provider is open source and available in the [pulumi/pulumi-signalfx](https://github.com/pulumi/pulumi-signalfx) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/spotinst/_index.md b/themes/default/content/docs/intro/cloud-providers/spotinst/_index.md
index b9ef331167b..bd1757dce3b 100644
--- a/themes/default/content/docs/intro/cloud-providers/spotinst/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/spotinst/_index.md
@@ -54,7 +54,7 @@ deployment = spotinst.multai.Deployment("my_deployment")
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	multai "github.com/pulumi/pulumi-spotinst/sdk/v2/go/spotinst/multai"
+	multai "github.com/pulumi/pulumi-spotinst/sdk/v3/go/spotinst/multai"
 )
 
 func main() {
@@ -97,7 +97,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/spotinst`](https://www.npmjs.com/package/@pulumi/spotinst)
 * Python: [`pulumi-spotinst`](https://pypi.org/project/pulumi-spotinst/)
-* Go: [`github.com/pulumi/pulumi-spotinst/sdk/go/spotinst`](https://github.com/pulumi/pulumi-spotinst)
+* Go: [`github.com/pulumi/pulumi-spotinst/sdk/v3/go/spotinst`](https://github.com/pulumi/pulumi-spotinst)
 * .NET: [`Pulumi.Spotinst`](https://www.nuget.org/packages/Pulumi.Spotinst)
 
 The Spotinst provider is open source and available in the [pulumi/pulumi-spotinst](https://github.com/pulumi/pulumi-spotinst) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/tls/_index.md b/themes/default/content/docs/intro/cloud-providers/tls/_index.md
index 976e68d6c19..37ac08083ca 100644
--- a/themes/default/content/docs/intro/cloud-providers/tls/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/tls/_index.md
@@ -57,7 +57,7 @@ key = tls.PrivateKey("my-private-key",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	tls "github.com/pulumi/pulumi-tls/sdk/v3/go/tls"
+	tls "github.com/pulumi/pulumi-tls/sdk/v4/go/tls"
 )
 
 func main() {
@@ -106,7 +106,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/tls`](https://www.npmjs.com/package/@pulumi/tls)
 * Python: [`pulumi-tls`](https://pypi.org/project/pulumi-tls/)
-* Go: [`github.com/pulumi/pulumi-tls/sdk/go/tls`](https://github.com/pulumi/pulumi-tls)
+* Go: [`github.com/pulumi/pulumi-tls/sdk/v4/go/tls`](https://github.com/pulumi/pulumi-tls)
 * .NET: [`Pulumi.Tls`](https://www.nuget.org/packages/Pulumi.Tls)
 
 The TLS provider is open source and available in the [pulumi/pulumi-tls](https://github.com/pulumi/pulumi-tls) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/vault/_index.md b/themes/default/content/docs/intro/cloud-providers/vault/_index.md
index 7509da47014..f2be1f03635 100644
--- a/themes/default/content/docs/intro/cloud-providers/vault/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/vault/_index.md
@@ -60,7 +60,7 @@ be = vault.AuthBackend("example",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	vault "github.com/pulumi/pulumi-vault/sdk/v3/go/vault"
+	vault "github.com/pulumi/pulumi-vault/sdk/v4/go/vault"
 )
 
 func main() {
@@ -108,7 +108,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/vault`](https://www.npmjs.com/package/@pulumi/vault)
 * Python: [`pulumi-vault`](https://pypi.org/project/pulumi-vault/)
-* Go: [`github.com/pulumi/pulumi-vault/sdk/go/vault`](https://github.com/pulumi/pulumi-vault)
+* Go: [`github.com/pulumi/pulumi-vault/sdk/v4/go/vault`](https://github.com/pulumi/pulumi-vault)
 * .NET: [`Pulumi.Vault`](https://www.nuget.org/packages/Pulumi.Vault)
 
 The HashiCorp Vault provider is open source and available in the [pulumi/pulumi-vault](https://github.com/pulumi/pulumi-vault) repo.
diff --git a/themes/default/content/docs/intro/cloud-providers/vsphere/_index.md b/themes/default/content/docs/intro/cloud-providers/vsphere/_index.md
index d2e6cf122b7..ffd97b7dabf 100644
--- a/themes/default/content/docs/intro/cloud-providers/vsphere/_index.md
+++ b/themes/default/content/docs/intro/cloud-providers/vsphere/_index.md
@@ -58,7 +58,7 @@ dc = vsphere.Datacenter("my-dc",
 ```go
 import (
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
-	vsphere "github.com/pulumi/pulumi-vsphere/sdk/v2/go/vsphere"
+	vsphere "github.com/pulumi/pulumi-vsphere/sdk/v3/go/vsphere"
 )
 
 func main() {
@@ -105,7 +105,7 @@ The following packages are available in packager managers:
 
 * JavaScript/TypeScript: [`@pulumi/vsphere`](https://www.npmjs.com/package/@pulumi/vsphere)
 * Python: [`pulumi-vsphere`](https://pypi.org/project/pulumi-vsphere/)
-* Go: [`github.com/pulumi/pulumi-vsphere/sdk/go/vsphere`](https://github.com/pulumi/pulumi-vsphere)
+* Go: [`github.com/pulumi/pulumi-vsphere/sdk/v3/go/vsphere`](https://github.com/pulumi/pulumi-vsphere)
 * .NET: [`Pulumi.Vsphere`](https://www.nuget.org/packages/Pulumi.Vsphere)
 
 The vSphere provider is open source and available in the [pulumi/pulumi-vsphere](https://github.com/pulumi/pulumi-vsphere) repo.

From f771c5af7c3d2e4e0ff4d3467ee8867070aec26d Mon Sep 17 00:00:00 2001
From: Dave Wrede <dave@pulumi.com>
Date: Wed, 14 Apr 2021 13:43:41 -0700
Subject: [PATCH 04/11] Updated Unit test guide with Mock changes

---
 .../content/docs/guides/testing/unit.md       | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/themes/default/content/docs/guides/testing/unit.md b/themes/default/content/docs/guides/testing/unit.md
index 9dfcbc21dc4..287fd889360 100644
--- a/themes/default/content/docs/guides/testing/unit.md
+++ b/themes/default/content/docs/guides/testing/unit.md
@@ -240,14 +240,14 @@ ec2tests.ts:
 import * as pulumi from "@pulumi/pulumi";
 
 pulumi.runtime.setMocks({
-    newResource: function(type: string, name: string, inputs: any): {id: string, state: any} {
+    newResource: function(args: pulumi.runtime.MockResourceArgs): {id: string, state: any} {
         return {
-            id: inputs.name + "_id",
-            state: inputs,
+            id: args.inputs.name + "_id",
+            state: args.inputs,
         };
     },
-    call: function(token: string, args: any, provider?: string) {
-        return args;
+    call: function(args: MockCallArgs) {
+        return args.inputs;
     },
 });
 ```
@@ -262,9 +262,9 @@ test_ec2.py:
 import pulumi
 
 class MyMocks(pulumi.runtime.Mocks):
-    def new_resource(self, type_, name, inputs, provider, id_):
-        return [name + '_id', inputs]
-    def call(self, token, args, provider):
+    def new_resource(self, args: pulumi.runtime.MockResourceArgs):
+        return [args.name + '_id', args.inputs]
+    def call(self, args: pulumi.runtime.MockCallArgs):
         return {}
 
 pulumi.runtime.set_mocks(MyMocks())
@@ -283,12 +283,12 @@ import (
 
 type mocks int
 
-func (mocks) NewResource(typeToken, name string, inputs resource.PropertyMap, provider, id string) (string, resource.PropertyMap, error) {
-	return name + "_id", inputs, nil
+func (mocks) NewResource(args MockResourceArgs) (string, resource.PropertyMap, error) {
+	return args.Name + "_id", args.Inputs, nil
 }
 
-func (mocks) Call(token string, args resource.PropertyMap, provider string) (resource.PropertyMap, error) {
-	return args, nil
+func (mocks) Call(args MockCallArgs) (resource.PropertyMap, error) {
+	return args.Inputs, nil
 }
 ```
 
@@ -304,11 +304,10 @@ public static class Testing
     public static Task<ImmutableArray<Resource>> RunAsync<T>() where T : Stack, new()
     {
         var mocks = new Mock<IMocks>();
-        mocks.Setup(m => m.NewResourceAsync(It.IsAny<string>(), It.IsAny<string>(),
-                It.IsAny<ImmutableDictionary<string, object>>(), It.IsAny<string>(), It.IsAny<string>()))
-            .ReturnsAsync((string type, string name, ImmutableDictionary<string, object> inputs, string? provider, string? id) => (id ?? "", inputs));
-        mocks.Setup(m => m.CallAsync(It.IsAny<string>(), It.IsAny<ImmutableDictionary<string, object>>(), It.IsAny<string>()))
-            .ReturnsAsync((string token, ImmutableDictionary<string, object> args, string? provider) => args);
+        mocks.Setup(m => m.NewResourceAsync(MockResourceArgs args)
+            .ReturnsAsync((args) => (args.Id ?? "", args.Inputs));
+        mocks.Setup(m => m.CallAsync(MockCallArgs args)
+            .ReturnsAsync((args) => args.Args);
         return Deployment.TestAsync<T>(mocks.Object, new TestOptions { IsPreview = false });
     }
 }
@@ -836,8 +835,8 @@ main.go:
 package main
 
 import (
-    "github.com/pulumi/pulumi-aws/sdk/go/aws/ec2"
-    "github.com/pulumi/pulumi/sdk/go/pulumi"
+    "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ec2"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 type infrastructure struct {

From 34bbffa12bf43b9eb8932e796e2e339e3802abb9 Mon Sep 17 00:00:00 2001
From: Dave Wrede <dave@pulumi.com>
Date: Wed, 14 Apr 2021 13:49:48 -0700
Subject: [PATCH 05/11] Bumped Pulumi Go SDK version for older references

---
 themes/default/content/docs/intro/concepts/resources.md         | 2 +-
 themes/default/content/docs/intro/concepts/stack.md             | 2 +-
 themes/default/layouts/shortcodes/pulumi-apply.html             | 2 +-
 .../shortcodes/pulumi-componentresource-registeroutputs.html    | 2 +-
 themes/default/layouts/shortcodes/pulumi-componentresource.html | 2 +-
 themes/default/layouts/shortcodes/pulumi-config-get.html        | 2 +-
 themes/default/layouts/shortcodes/pulumi-config-getnumber.html  | 2 +-
 themes/default/layouts/shortcodes/pulumi-config-getobject.html  | 2 +-
 themes/default/layouts/shortcodes/pulumi-config-getsecret.html  | 2 +-
 themes/default/layouts/shortcodes/pulumi-config-require.html    | 2 +-
 .../default/layouts/shortcodes/pulumi-config-requiresecret.html | 2 +-
 themes/default/layouts/shortcodes/pulumi-config.html            | 2 +-
 themes/default/layouts/shortcodes/pulumi-customresource.html    | 2 +-
 themes/default/layouts/shortcodes/pulumi-getproject.html        | 2 +-
 themes/default/layouts/shortcodes/pulumi-getstack.html          | 2 +-
 themes/default/layouts/shortcodes/pulumi-output.html            | 2 +-
 themes/default/layouts/shortcodes/pulumi-resource.html          | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/themes/default/content/docs/intro/concepts/resources.md b/themes/default/content/docs/intro/concepts/resources.md
index c5cafe6b529..f348665fb71 100644
--- a/themes/default/content/docs/intro/concepts/resources.md
+++ b/themes/default/content/docs/intro/concepts/resources.md
@@ -1229,7 +1229,7 @@ server = aws.ec2.Instance('web-server',
 ```go
 import (
     "github.com/pulumi/pulumi-aws/sdk/v4/go/aws/ec2"
-    "github.com/pulumi/pulumi/sdk/go/pulumi"
+    "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/content/docs/intro/concepts/stack.md b/themes/default/content/docs/intro/concepts/stack.md
index 3bf33fb7c90..98aff42c92e 100644
--- a/themes/default/content/docs/intro/concepts/stack.md
+++ b/themes/default/content/docs/intro/concepts/stack.md
@@ -487,7 +487,7 @@ service = core.v1.Service(..., ResourceOptions(provider=provider))
 import (
   "fmt"
 
-  "github.com/pulumi/pulumi/sdk/go/pulumi"
+  "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
 func main() {
diff --git a/themes/default/layouts/shortcodes/pulumi-apply.html b/themes/default/layouts/shortcodes/pulumi-apply.html
index 2a04e6de5f6..17ffe94b2bf 100644
--- a/themes/default/layouts/shortcodes/pulumi-apply.html
+++ b/themes/default/layouts/shortcodes/pulumi-apply.html
@@ -6,7 +6,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#outputs-and-inputs">apply</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi#Output.Apply">Apply</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi#Output.Apply">Apply</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Apply</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-componentresource-registeroutputs.html b/themes/default/layouts/shortcodes/pulumi-componentresource-registeroutputs.html
index e677edc3f3d..038a7d70c39 100644
--- a/themes/default/layouts/shortcodes/pulumi-componentresource-registeroutputs.html
+++ b/themes/default/layouts/shortcodes/pulumi-componentresource-registeroutputs.html
@@ -6,7 +6,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.ComponentResource.register_outputs">register_outputs</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi#ComponentResource">RegisterOutputs</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi#ComponentResource">RegisterOutputs</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">RegisterOutputs</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-componentresource.html b/themes/default/layouts/shortcodes/pulumi-componentresource.html
index 4f09680502d..c08a1db1c7d 100644
--- a/themes/default/layouts/shortcodes/pulumi-componentresource.html
+++ b/themes/default/layouts/shortcodes/pulumi-componentresource.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.ComponentResource">ComponentResource</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi#ComponentResource">ComponentResource</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi#ComponentResource">ComponentResource</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">ComponentResource</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-config-get.html b/themes/default/layouts/shortcodes/pulumi-config-get.html
index 8c84f46a5de..3851d7543fd 100644
--- a/themes/default/layouts/shortcodes/pulumi-config-get.html
+++ b/themes/default/layouts/shortcodes/pulumi-config-get.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.Config.get">Config.get</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi/config#Get">config.Get</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi/config#Get">config.Get</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Config.Get</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-config-getnumber.html b/themes/default/layouts/shortcodes/pulumi-config-getnumber.html
index 620e2a3f231..54f7111e399 100644
--- a/themes/default/layouts/shortcodes/pulumi-config-getnumber.html
+++ b/themes/default/layouts/shortcodes/pulumi-config-getnumber.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.Config.get_int">Config.get_int</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi/config#GetInt32">config.GetInt32</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi/config#GetInt32">config.GetInt32</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Config.GetInt32</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-config-getobject.html b/themes/default/layouts/shortcodes/pulumi-config-getobject.html
index 76dec8375d7..2c80c5bdfb6 100644
--- a/themes/default/layouts/shortcodes/pulumi-config-getobject.html
+++ b/themes/default/layouts/shortcodes/pulumi-config-getobject.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.Config.get_object">Config.get_object</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi/config#GetObject">config.GetObject</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi/config#GetObject">config.GetObject</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Config.GetObject</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-config-getsecret.html b/themes/default/layouts/shortcodes/pulumi-config-getsecret.html
index f9b7bc9a7e9..ef60c1a9bd3 100644
--- a/themes/default/layouts/shortcodes/pulumi-config-getsecret.html
+++ b/themes/default/layouts/shortcodes/pulumi-config-getsecret.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.Config.get_secret">Config.get_secret</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi/config#GetSecret">config.GetSecret</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi/config#GetSecret">config.GetSecret</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Config.GetSecret</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-config-require.html b/themes/default/layouts/shortcodes/pulumi-config-require.html
index b5deb7ab879..a8781044ee8 100644
--- a/themes/default/layouts/shortcodes/pulumi-config-require.html
+++ b/themes/default/layouts/shortcodes/pulumi-config-require.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.Config.require">Config.require</a></code></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi/config#Require">config.Require</a></code></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi/config#Require">config.Require</a></code></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Config.Require</code></code>
diff --git a/themes/default/layouts/shortcodes/pulumi-config-requiresecret.html b/themes/default/layouts/shortcodes/pulumi-config-requiresecret.html
index 358b6849c26..52c1a5acfc5 100644
--- a/themes/default/layouts/shortcodes/pulumi-config-requiresecret.html
+++ b/themes/default/layouts/shortcodes/pulumi-config-requiresecret.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.Config.require_secret">Config.require_secret</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi/config#RequireSecret">config.RequireSecret</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi/config#RequireSecret">config.RequireSecret</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Config.RequireSecret</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-config.html b/themes/default/layouts/shortcodes/pulumi-config.html
index 48de16f0b86..23065563220 100644
--- a/themes/default/layouts/shortcodes/pulumi-config.html
+++ b/themes/default/layouts/shortcodes/pulumi-config.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.Config">Config</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi/config">config</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi/config">config</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Config</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-customresource.html b/themes/default/layouts/shortcodes/pulumi-customresource.html
index e6ca47ac1e6..e3cb59d3225 100644
--- a/themes/default/layouts/shortcodes/pulumi-customresource.html
+++ b/themes/default/layouts/shortcodes/pulumi-customresource.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.CustomResource">CustomResource</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi#CustomResource">CustomResource</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi#CustomResource">CustomResource</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">CustomResource</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-getproject.html b/themes/default/layouts/shortcodes/pulumi-getproject.html
index 5a3602b4d9c..0fb941dba09 100644
--- a/themes/default/layouts/shortcodes/pulumi-getproject.html
+++ b/themes/default/layouts/shortcodes/pulumi-getproject.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.get_project">get_project</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi#Context.Project">context.Project</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi#Context.Project">context.Project</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Deployment.ProjectName</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-getstack.html b/themes/default/layouts/shortcodes/pulumi-getstack.html
index 3fa85986fc9..8514041257f 100644
--- a/themes/default/layouts/shortcodes/pulumi-getstack.html
+++ b/themes/default/layouts/shortcodes/pulumi-getstack.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.get_stack">get_stack</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi#Context.Stack">context.Stack</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi#Context.Stack">context.Stack</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Deployment.StackName</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-output.html b/themes/default/layouts/shortcodes/pulumi-output.html
index 3138c376c64..9b98705ae04 100644
--- a/themes/default/layouts/shortcodes/pulumi-output.html
+++ b/themes/default/layouts/shortcodes/pulumi-output.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#outputs-and-inputs">Output[T]</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi#Output">Output</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi#Output">Output</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Output&lt;T&gt;</code>
diff --git a/themes/default/layouts/shortcodes/pulumi-resource.html b/themes/default/layouts/shortcodes/pulumi-resource.html
index da03fd757dc..b71cb44b656 100644
--- a/themes/default/layouts/shortcodes/pulumi-resource.html
+++ b/themes/default/layouts/shortcodes/pulumi-resource.html
@@ -9,7 +9,7 @@
         <code class="language-python"><a href="/docs/reference/pkg/python/pulumi/#pulumi.Resource">Resource</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="go">
-        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/go/pulumi#Resource">Resource</a></code>
+        <code class="language-go"><a href="https://godoc.org/github.com/pulumi/pulumi/sdk/v3/go/pulumi#Resource">Resource</a></code>
     </pulumi-choosable>
     <pulumi-choosable class="highlight" type="language" value="csharp">
         <code class="language-csharp">Resource</code>

From 2b00d45f426295d1792c2bde4502c538e8ed1256 Mon Sep 17 00:00:00 2001
From: Dave Wrede <dave@pulumi.com>
Date: Wed, 14 Apr 2021 14:06:45 -0700
Subject: [PATCH 06/11] URemoved beta language from 3.0 migration guide

---
 .../docs/get-started/install/migrating-3.0.md | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/themes/default/content/docs/get-started/install/migrating-3.0.md b/themes/default/content/docs/get-started/install/migrating-3.0.md
index 8b6a31a6796..9aaaf42d724 100644
--- a/themes/default/content/docs/get-started/install/migrating-3.0.md
+++ b/themes/default/content/docs/get-started/install/migrating-3.0.md
@@ -4,11 +4,13 @@ meta_desc: This page provides instructions for upgrading to Pulumi 3.0
 no_on_this_page: true
 ---
 
-Pulumi 3.0 is currently in beta. If you'd like to try the beta and provide feedback, it's simple to upgrade:
+Upgrading to 2.0 is simple. First, you will [install the 2.0 CLI]({{< relref "/docs/get-started/install" >}}). Then, update each of your Pulumi programs to utilize the new SDK. If you're using JavaScript or TypeScript, you'll also need to ensure you're using invokes asynchronously. We provide detailed instructions on each of these steps below.
 
-1. [Install the 3.0 CLI]({{< relref "/docs/get-started/install#installing-betas-and-previous-versions" >}})
-2. Take note of the updated CLI behaviors listed below
-3. Update each of your Pulumi programs to utilize the new version of the SDK
+Upgrading to Pulumi 3.0 can be accomplished through the following steps:
+
+1. [Install or upgrade to the 3.0 CLI]({{< relref "/docs/get-started/install" >}}).
+2. Review the updated CLI behaviors listed below.
+3. Update each of your Pulumi programs to utilize the new version of the SDK.
 
 ## Updated CLI behavior in Pulumi 3.0
 
@@ -35,7 +37,7 @@ Previously, when using the `--stack` option on CLI commands, Pulumi would incons
 ### Update to the new SDK version
 
 ```bash
-npm install @pulumi/pulumi@^3.0.0-beta
+npm install @pulumi/pulumi@^3.0.0
 ```
 
 ### Changes to pulumi.runtime.Mocks
@@ -153,8 +155,8 @@ pulumi.runtime.setMocks({
 Modify your `requirements.txt` file to update the Pulumi SDK and any providers you use, like this:
 
 ```
-pulumi>=3.0.0b,<4.0.0
-pulumi-aws>=4.0.0b,<5.0.0
+pulumi>=3.0.0,<4.0.0
+pulumi-aws>=4.0.0,<5.0.0
 ```
 
 Then run `pip install`:
@@ -185,7 +187,7 @@ export("ip", instance.network_interfaces[0].access_configs[0].nat_ip)
 
 ### Changes to pulumi.runtime.Mocks
 
-The signature of the `setMocks` function has changed with the introduction of the `pulumi.runtime.MockResourceArgs` and `pulumi.runtime.MockCallArgs` types. If you use `setMocks` in your code, you'll need to update to these new types.
+The signatures of the `new_resource` and `call` methods have changed with the introduction of the `pulumi.runtime.MockResourceArgs` and `pulumi.runtime.MockCallArgs` types. If you use `new_resource` and `call` in your code, you'll need to update to these new types.
 
 ```python
 # before
@@ -240,8 +242,8 @@ Modify your `go.mod` file to update the Pulumi SDK and any providers you use, li
 
 ```
 require (
-    github.com/pulumi/pulumi/sdk/v3 v3.0.0-beta.2
-    github.com/pulumi/pulumi-aws/sdk/v4 v4.0.0-beta.2
+    github.com/pulumi/pulumi/sdk/v3 v3.0.0
+    github.com/pulumi/pulumi-aws/sdk/v4 v4.0.0
 )
 ```
 
@@ -276,7 +278,7 @@ containerDef := image.ImageName.ApplyT(func(name string) (string, error) {
 
 ### Changes to pulumi.runtime.Mocks
 
-The signature of the `setMocks` function has changed with the introduction of the `pulumi.runtime.MockResourceArgs` and `pulumi.runtime.MockCallArgs` types. If you use `setMocks` in your code, you'll need to update to these new types.
+The signatures of the `NewResource` and `Call` functions have changed with the introduction of the `pulumi.runtime.MockResourceArgs` and `pulumi.runtime.MockCallArgs` types. If you use `setMocks` in your code, you'll need to update to these new types.
 
 ```go
 //before
@@ -331,7 +333,7 @@ Modify your project file to update the Pulumi SDK and any providers you use, lik
 
 ### Changes to pulumi.runtime.Mocks
 
-The signature of the `setMocks` function has changed with the introduction of the `pulumi.runtime.MockResourceArgs` and `pulumi.runtime.MockCallArgs` types. If you use `setMocks` in your code, you'll need to update to these new types.
+The signatures of the `NewResourceAsync` and `CallAsync` methods have changed with the introduction of the `pulumi.runtime.MockResourceArgs` and `pulumi.runtime.MockCallArgs` types. If you use `setMocks` in your code, you'll need to update to these new types.
 
 ```csharp
 // before
@@ -407,7 +409,7 @@ public Task<object> CallAsync(MockCallArgs args)
 
 ## Required updates for automation API users
 
-The Pulumi 3.0 beta includes the final preview of the Automation API, which standardizes the namespace requirements for Automation API. You need to update programs that use automation API to use the following namespaces:
+If you used the preview release of Automation API, you need to update programs that use automation API to use the following namespaces:
 
 {{< chooser language "javascript,typescript,python,go,csharp" >}}
 
@@ -471,8 +473,3 @@ using Pulumi.Automation;
 {{% /choosable %}}
 
 {{< /chooser >}}
-
-## When you should upgrade to Pulumi 3.0
-
-Pulumi 3.0 is currently in beta and not recommended for existing production workloads. Once it is made generally available (GA), we will recommend switching to Pulumi 3.0 in the docs and in the CLI via the normal upgrade prompts.
-`pulumi new` will continue to use the stable versions of the templates. You can use the `3.x` version of the templates, which will use the 3.0 SDK, by running `pulumi new https://github.com/pulumi/templates/tree/3.x`.

From 6e93c041a2614a47401182d2768b2f9e871a8afe Mon Sep 17 00:00:00 2001
From: Dave Wrede <dave@pulumi.com>
Date: Wed, 14 Apr 2021 15:12:29 -0700
Subject: [PATCH 07/11] Updated package.json example to Node 12 and clarified
 shortcode

---
 themes/default/content/docs/intro/languages/javascript.md | 2 +-
 themes/default/layouts/shortcodes/install-node.html       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/default/content/docs/intro/languages/javascript.md b/themes/default/content/docs/intro/languages/javascript.md
index 569312ec6aa..2b9fe0a75e5 100644
--- a/themes/default/content/docs/intro/languages/javascript.md
+++ b/themes/default/content/docs/intro/languages/javascript.md
@@ -126,7 +126,7 @@ is what tells Node.js and NPM what packages you depend on, where to find your co
     "name": "my-package",
     "version": "1.0.0",
     "devDependencies": {
-        "@types/node": "^10.0.0"
+        "@types/node": "^12.0.0"
     },
     "dependencies": {
         ... as before ...
diff --git a/themes/default/layouts/shortcodes/install-node.html b/themes/default/layouts/shortcodes/install-node.html
index 7154a6207af..6521f8d43eb 100644
--- a/themes/default/layouts/shortcodes/install-node.html
+++ b/themes/default/layouts/shortcodes/install-node.html
@@ -1,5 +1,5 @@
 <p class="mt-4">
-    Install <strong><a href="https://nodejs.org/en/download/"
+    Install a current or LTS version of <strong><a href="https://nodejs.org/en/download/"
             target="_blank">Node.js</a></strong>.
 </p>
 

From e58b05cb6fe053ae863a35341463b9efa7559752 Mon Sep 17 00:00:00 2001
From: Dave Wrede <dave@pulumi.com>
Date: Fri, 16 Apr 2021 13:45:27 -0700
Subject: [PATCH 08/11] Remove copypasta text from 2.0 migration guide

---
 .../default/content/docs/get-started/install/migrating-3.0.md   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/themes/default/content/docs/get-started/install/migrating-3.0.md b/themes/default/content/docs/get-started/install/migrating-3.0.md
index 9aaaf42d724..ab1b94ae43c 100644
--- a/themes/default/content/docs/get-started/install/migrating-3.0.md
+++ b/themes/default/content/docs/get-started/install/migrating-3.0.md
@@ -4,8 +4,6 @@ meta_desc: This page provides instructions for upgrading to Pulumi 3.0
 no_on_this_page: true
 ---
 
-Upgrading to 2.0 is simple. First, you will [install the 2.0 CLI]({{< relref "/docs/get-started/install" >}}). Then, update each of your Pulumi programs to utilize the new SDK. If you're using JavaScript or TypeScript, you'll also need to ensure you're using invokes asynchronously. We provide detailed instructions on each of these steps below.
-
 Upgrading to Pulumi 3.0 can be accomplished through the following steps:
 
 1. [Install or upgrade to the 3.0 CLI]({{< relref "/docs/get-started/install" >}}).

From 19b8d882923efd7a13ef229d2091c58c329fa9f5 Mon Sep 17 00:00:00 2001
From: stack72 <public@paulstack.co.uk>
Date: Mon, 19 Apr 2021 21:16:49 +0100
Subject: [PATCH 09/11] Finalize migration guide

---
 .../docs/get-started/install/migrating-3.0.md   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/themes/default/content/docs/get-started/install/migrating-3.0.md b/themes/default/content/docs/get-started/install/migrating-3.0.md
index 1944ad83587..b9154e41710 100644
--- a/themes/default/content/docs/get-started/install/migrating-3.0.md
+++ b/themes/default/content/docs/get-started/install/migrating-3.0.md
@@ -4,7 +4,7 @@ meta_desc: This page provides instructions for upgrading to Pulumi 3.0
 no_on_this_page: true
 ---
 
-Upgrading to Pulumi 3.0 can be accomplished through the following steps:
+Pulumi 3.0 is generally available. It’s simple to upgrade:
 
 1. [Install or upgrade to the 3.0 CLI]({{< relref "/docs/get-started/install" >}}).
 2. Review the updated CLI behaviors listed below.
@@ -326,7 +326,7 @@ func (mocks) Call(args MockCallArgs) (resource.PropertyMap, error) {
 Modify your project file to update the Pulumi SDK and any providers you use, like this:
 
 ```csharp
-<PackageReference Include="Pulumi" Version="3.0.*-*" />
+<PackageReference Include="Pulumi" Version="3.0.*" />
 ```
 
 ### Changes to pulumi.runtime.Mocks
@@ -471,3 +471,16 @@ using Pulumi.Automation;
 {{% /choosable %}}
 
 {{< /chooser >}}
+
+
+## Remaining on Pulumi 2.0 
+
+We recommend switching to Pulumi 3.0 if possible. We will only push critical security and bug fixes into the 2.x branch.
+Other fixes, feature enhancements, and new functionality will not be supported in the 2.x branch. In addition, provider
+updates will only be built against Pulumi 3.0.
+
+If you wish to remain on the 2.x CLI, you can continue to download the CLI by referring to the manual installation
+instructions and choosing a specific version.
+
+`pulumi new` will attempt to use the latest versions of the templates, which pull in the 3.0 SDK. You can continue to 
+use the 2.x templates by running pulumi new https://github.com/pulumi/templates/tree/2.x.

From 3a245784e0b7853f879a857563f94178feb86f8b Mon Sep 17 00:00:00 2001
From: Dave Wrede <dave@pulumi.com>
Date: Mon, 19 Apr 2021 13:33:34 -0700
Subject: [PATCH 10/11] Fixed lint error and minor copyedits

---
 .../content/docs/get-started/install/migrating-3.0.md      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/themes/default/content/docs/get-started/install/migrating-3.0.md b/themes/default/content/docs/get-started/install/migrating-3.0.md
index b9154e41710..16070477def 100644
--- a/themes/default/content/docs/get-started/install/migrating-3.0.md
+++ b/themes/default/content/docs/get-started/install/migrating-3.0.md
@@ -472,8 +472,7 @@ using Pulumi.Automation;
 
 {{< /chooser >}}
 
-
-## Remaining on Pulumi 2.0 
+## Remaining on Pulumi 2.0
 
 We recommend switching to Pulumi 3.0 if possible. We will only push critical security and bug fixes into the 2.x branch.
 Other fixes, feature enhancements, and new functionality will not be supported in the 2.x branch. In addition, provider
@@ -482,5 +481,5 @@ updates will only be built against Pulumi 3.0.
 If you wish to remain on the 2.x CLI, you can continue to download the CLI by referring to the manual installation
 instructions and choosing a specific version.
 
-`pulumi new` will attempt to use the latest versions of the templates, which pull in the 3.0 SDK. You can continue to 
-use the 2.x templates by running pulumi new https://github.com/pulumi/templates/tree/2.x.
+Running `pulumi new` will attempt to use the latest versions of the project templates, which pull in the 3.0 SDK. You can continue to
+use the 2.x templates by running `pulumi new https://github.com/pulumi/templates/tree/2.x`.

From 8564a6c5d1f3d5ecafaae6afbb1aad3275b48fda Mon Sep 17 00:00:00 2001
From: Dave Wrede <dave@pulumi.com>
Date: Mon, 19 Apr 2021 15:50:14 -0700
Subject: [PATCH 11/11] Fixing errors in K8s getting started tutorial updates

---
 .../content/docs/get-started/kubernetes/modify-program.md     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/default/content/docs/get-started/kubernetes/modify-program.md b/themes/default/content/docs/get-started/kubernetes/modify-program.md
index c3c065a0cec..77fdaac9910 100644
--- a/themes/default/content/docs/get-started/kubernetes/modify-program.md
+++ b/themes/default/content/docs/get-started/kubernetes/modify-program.md
@@ -234,9 +234,9 @@ func main() {
         if isMinikube {
             ip = frontend.Spec.ApplyT(func(val *corev1.ServiceSpec) string {
                 return *val.ClusterIP
-            }).(pulumi.StringOputput)
+            }).(pulumi.StringOutput)
         } else {
-            ip = frontend.Status.Apply(func(val *corev1.ServiceStatus) string {
+            ip = frontend.Status.ApplyT(func(val *corev1.ServiceStatus) string {
                 if val.LoadBalancer.Ingress[0].Ip != nil {
                     return *val.LoadBalancer.Ingress[0].Ip
                 }