Ensuring the Go examples are under regular test (pulumi#667)

ctmcisco · Apr 28, 2020 · 81be87a · 81be87a
1 parent 7184fdf
commit 81be87a
Show file tree

Hide file tree

Showing 13 changed files with 233 additions and 667 deletions.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ only_test:
 
 specific_test_set:
  echo "running $(TestSet) Acceptance Tests"
- cd misc/test && go test ./... --timeout 4h -v -count=1 -short -parallel 40 --run=TestAcc$(TestSet)
+ cd misc/test && go test . --timeout 4h -v -count=1 -short -parallel 40 --run=TestAcc$(TestSet)
 
 # The travis_* targets are entrypoints for CI.
 .PHONY: travis_cron travis_push travis_pull_request travis_api

diff --git a/azure-go-aci/go.mod b/azure-go-aci/go.mod
@@ -4,6 +4,6 @@ go 1.13
 
 require (
  github.com/pulumi/pulumi-azure/sdk/v3 v3.0.0
- github.com/pulumi/pulumi-docker/v2 v2.0.0
+ github.com/pulumi/pulumi-docker/sdk/v2 v2.0.0
  github.com/pulumi/pulumi/sdk/v2 v2.0.0
 )
diff --git a/azure-go-aci/main.go b/azure-go-aci/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
- "github.com/pulumi/pulumi-azure/sdk/v2/go/azure/containerservice"
- "github.com/pulumi/pulumi-azure/sdk/v2/go/azure/core"
+ "github.com/pulumi/pulumi-azure/sdk/v3/go/azure/containerservice"
+ "github.com/pulumi/pulumi-azure/sdk/v3/go/azure/core"
  "github.com/pulumi/pulumi-docker/sdk/v2/go/docker"
  "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )

diff --git a/azure-go-aks/go.sum b/azure-go-aks/go.sum
diff --git a/azure-go-aks/main.go b/azure-go-aks/main.go
@@ -61,23 +61,18 @@ func main() {
  vnetArgs := network.VirtualNetworkArgs{
  ResourceGroupName: resourceGroup.Name,
  AddressSpaces: pulumi.StringArray{pulumi.String("10.2.0.0/16")},
+ Subnets: network.VirtualNetworkSubnetArray{
+ network.VirtualNetworkSubnetArgs{
+ Name: pulumi.String("subnet-1"),
+ AddressPrefix: pulumi.String("10.2.1.0/24"),
+ },
+ },
  }
  vnet, err := network.NewVirtualNetwork(ctx, "vnet", &vnetArgs)
  if err != nil {
  return err
  }
 
- // Create a subnet.
- subnetArgs := network.SubnetArgs{
- ResourceGroupName: resourceGroup.Name,
- VirtualNetworkName: vnet.Name,
- AddressPrefix: pulumi.String("10.2.1.0/24"),
- }
- subnet, err := network.NewSubnet(ctx, "subnet", &subnetArgs)
- if err != nil {
- return err
- }
-
  // Generate an SSH key.
  sshArgs := tls.PrivateKeyArgs{
  Algorithm: pulumi.String("RSA"),
@@ -94,7 +89,7 @@ func main() {
  NodeCount: pulumi.Int(3),
  VmSize: pulumi.String("Standard_B2s"),
  OsDiskSizeGb: pulumi.Int(30),
- VnetSubnetId: subnet.ID(),
+ VnetSubnetId: vnet.Subnets.Index(pulumi.Int(0)).Id(),
  }
 
  linuxProfileArgs := containerservice.KubernetesClusterLinuxProfileArgs{
@@ -141,7 +136,8 @@ func main() {
  RoleBasedAccessControl: roleArgs,
  NetworkProfile: networkArgs,
  }
- cluster, err := containerservice.NewKubernetesCluster(ctx, "aksCluster", &clusterArgs)
+ cluster, err := containerservice.NewKubernetesCluster(ctx, "aksCluster", &clusterArgs,
+ pulumi.DependsOn([]pulumi.Resource{vnet}))
  if err != nil {
  return err
  }

diff --git a/azure-go-appservice/go.sum b/azure-go-appservice/go.sum
@@ -143,10 +143,10 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/pulumi/pulumi-azure/sdk/v2 v2.3.1 h1:1SVR03Ea6LNEWRryRGE3ssgFP/RhcFlA/W3W7SbrSfo=
-github.com/pulumi/pulumi-azure/sdk/v2 v2.3.1/go.mod h1:VKY083gOURarNuPB+vv9ewNo164R/41QPrEnSNhNCG8=
-github.com/pulumi/pulumi/sdk v1.13.1 h1:BX0ttL/g5ofKxkK2VY/gp8SdBxJi4eIyIG34JRn9ENU=
-github.com/pulumi/pulumi/sdk v1.13.1/go.mod h1:0jjygtqEwLnjNEL3zIn3ynjT/37ZJ42DZE6k2+2NAUM=
+github.com/pulumi/pulumi-azure/sdk/v3 v3.0.0 h1:UK9og7uTSwXQrDbYJxGYKLIpTGF6ffQGQum8KiYmP4U=
+github.com/pulumi/pulumi-azure/sdk/v3 v3.0.0/go.mod h1:hZf4OGDeY+7Wbdq/3CbeuhbtRQw2UsRzs95f7mlCjfE=
+github.com/pulumi/pulumi/sdk/v2 v2.0.0 h1:3VMXbEo3bqeaU+YDt8ufVBLD0WhLYE3tG3t/nIZ3Iac=
+github.com/pulumi/pulumi/sdk/v2 v2.0.0/go.mod h1:W7k1UDYerc5o97mHnlHHp5iQZKEby+oQrQefWt+2RF4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
@@ -196,12 +196,14 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200317142112-1b76d66859c6 h1:TjszyFsQsyZNHwdVdZ5m7bjmreu0znc2kRYsEml9/Ww=
 golang.org/x/crypto v0.0.0-20200317142112-1b76d66859c6/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -245,6 +247,9 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

diff --git a/azure-go-appservice/main.go b/azure-go-appservice/main.go
@@ -4,11 +4,11 @@ import (
  "fmt"
  "strings"
 
- "github.com/pulumi/pulumi-azure/sdk/v2/go/azure/appinsights"
- "github.com/pulumi/pulumi-azure/sdk/v2/go/azure/appservice"
- "github.com/pulumi/pulumi-azure/sdk/v2/go/azure/core"
- "github.com/pulumi/pulumi-azure/sdk/v2/go/azure/sql"
- "github.com/pulumi/pulumi-azure/sdk/v2/go/azure/storage"
+ "github.com/pulumi/pulumi-azure/sdk/v3/go/azure/appinsights"
+ "github.com/pulumi/pulumi-azure/sdk/v3/go/azure/appservice"
+ "github.com/pulumi/pulumi-azure/sdk/v3/go/azure/core"
+ "github.com/pulumi/pulumi-azure/sdk/v3/go/azure/sql"
+ "github.com/pulumi/pulumi-azure/sdk/v3/go/azure/storage"
  "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
  "github.com/pulumi/pulumi/sdk/v2/go/pulumi/config"
 )
@@ -51,7 +51,7 @@ func main() {
  return err
  }
 
- storageContainer, err := storage.NewContainer(ctx, prefix+"-c", &storage.ContainerArgs{
+ storageContainer, err := storage.NewContainer(ctx, prefix+"c", &storage.ContainerArgs{
  StorageAccountName: storageAccount.Name,
  ContainerAccessType: pulumi.String("private"),
  })

diff --git a/gcp-go-functions-raw/main.go b/gcp-go-functions-raw/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
- "github.com/pulumi/pulumi-gcp/sdk/v2/go/gcp/cloudfunctions"
- "github.com/pulumi/pulumi-gcp/sdk/v2/go/gcp/storage"
+ "github.com/pulumi/pulumi-gcp/sdk/v3/go/gcp/cloudfunctions"
+ "github.com/pulumi/pulumi-gcp/sdk/v3/go/gcp/storage"
  "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
@@ -40,10 +40,10 @@ func main() {
  return err
  }
 
- invoker, err := cloudfunctions.NewFunctionsIamMember(ctx, "invoker", &cloudfunctions.FunctionsIamMemberArgs{
+ _, err = cloudfunctions.NewFunctionIamMember(ctx, "invoker", &cloudfunctions.FunctionIamMemberArgs{
  Project: function.Project,
  Region: function.Region,
- CloudFunction: function.Region,
+ CloudFunction: function.Name,
  Role: pulumi.String("roles/cloudfunctions.invoker"),
  Member: pulumi.String("allUsers"),
  })

diff --git a/gcp-go-functions/main.go b/gcp-go-functions/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
- "github.com/pulumi/pulumi-gcp/sdk/v2/go/gcp/cloudfunctions"
- "github.com/pulumi/pulumi-gcp/sdk/v2/go/gcp/storage"
+ "github.com/pulumi/pulumi-gcp/sdk/v3/go/gcp/cloudfunctions"
+ "github.com/pulumi/pulumi-gcp/sdk/v3/go/gcp/storage"
  "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
 
@@ -40,10 +40,10 @@ func main() {
  return err
  }
 
- invoker, err := cloudfunctions.NewFunctionsIamMember(ctx, "invoker", &cloudfunctions.FunctionsIamMemberArgs{
+ _, err = cloudfunctions.NewFunctionIamMember(ctx, "invoker", &cloudfunctions.FunctionIamMemberArgs{
  Project: function.Project,
  Region: function.Region,
- CloudFunction: function.Region,
+ CloudFunction: function.Name,
  Role: pulumi.String("roles/cloudfunctions.invoker"),
  Member: pulumi.String("allUsers"),
  })

diff --git a/gcp-go-gke/go.mod b/gcp-go-gke/go.mod
@@ -4,6 +4,6 @@ go 1.13
 
 require (
  github.com/pulumi/pulumi-gcp/sdk/v3 v3.0.1
- github.com/pulumi/pulumi-kubernetes/v2 v2.0.0
+ github.com/pulumi/pulumi-kubernetes/sdk/v2 v2.0.0
  github.com/pulumi/pulumi/sdk/v2 v2.0.0
 )
diff --git a/gcp-go-gke/main.go b/gcp-go-gke/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
- "github.com/pulumi/pulumi-gcp/sdk/v2/go/gcp/container"
+ "github.com/pulumi/pulumi-gcp/sdk/v3/go/gcp/container"
  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"

diff --git a/gcp-go-instance/Pulumi.yaml b/gcp-go-instance/Pulumi.yaml
@@ -0,0 +1,3 @@
+name: gcp-go-instance
+runtime: go
+description: A GCP Go Pulumi to create an instance