Sync bitbucket and GitHub

Author: carchi8py

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 22.8.1
+BUG FIXES:
+* resource/storage_pool: Fix creation error with shared vpc. ([#69](https://github.com/NetApp/terraform-provider-netapp-gcp/issues/69))
+
 ## 22.8.0
 BUG FIXES:
 * resource/volume: update the create and delete volume error message verification.

gcp/resource_netapp_gcp_storage_pool.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"regexp"
+	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
@@ -116,6 +117,10 @@ func resourceGCPStoragePoolCreate(d *schema.ResourceData, meta interface{}) erro
 		}
 	}
 
+	if v, ok := d.GetOk("shared_vpc_project_number"); ok {
+		pool.SharedVpcProjectNumber = v.(string)
+	}
+
 	res, err := client.createStoragePool(&pool)
 	if err != nil {
 		log.Printf("Error creating storage pool: %#v", err)
@@ -139,6 +144,10 @@ func resourceGCPStoragePoolRead(d *schema.ResourceData, meta interface{}) error
 	if err != nil {
 		return err
 	}
+	if strings.ToLower(res.State) == "deleted" {
+		d.SetId("")
+		return nil
+	}
 	if res.PoolID != id {
 		return fmt.Errorf("Expected storage pool with id: %v, Response contained storage pool with id: %v",
 			d.Id(), res.PoolID)
@@ -161,6 +170,28 @@ func resourceGCPStoragePoolRead(d *schema.ResourceData, meta interface{}) error
 			return fmt.Errorf("Error reading storage pool billing_label: %s", err)
 		}
 	}
+	// res.Network either contains simple network name or
+	// projects/${HOST_PROJECT_ID}/global/networks/${SHARED_VPC_NAME}, usually (but not exclusively) for shared VPC
+	nws := strings.Split(res.Network, "/")
+	var network string
+	if len(nws) == 1 {
+		// standalone project network
+		network = nws[0]
+	} else if len(nws) == 5 {
+		// long network path
+		network = nws[4]
+		// if network path contains different projectId than our project, it is shared-VPC
+		if nws[1] != client.Project {
+			if err := d.Set("shared_vpc_project_number", nws[1]); err != nil {
+				return fmt.Errorf("Error reading shared_vpc_project_number: %s", err)
+			}
+		}
+	} else {
+		return fmt.Errorf("Network path %s is invalid", res.Network)
+	}
+	if err := d.Set("network", network); err != nil {
+		return fmt.Errorf("Error reading volume network: %s", err)
+	}
 
 	return nil
 }

gcp/storage_pool.go

@@ -21,6 +21,7 @@ type storagePool struct {
 	StorageClass           string         `json:"storageClass"`
 	Jobs                   []job          `json:"jobs"`
 	BillingLabels          []billingLabel `json:"billingLabels"`
+	State                  string         `json:"state"`
 	SharedVpcProjectNumber string
 }
 

go.mod

@@ -8,7 +8,68 @@ require (
 	github.com/hashicorp/terraform v0.12.28
 	github.com/sirupsen/logrus v1.6.0
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect
 	google.golang.org/api v0.9.0
 	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
 )
+
+require (
+	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/apparentlymart/go-cidr v1.0.1 // indirect
+	github.com/apparentlymart/go-textseg v1.0.0 // indirect
+	github.com/armon/go-radix v1.0.0 // indirect
+	github.com/aws/aws-sdk-go v1.30.12 // indirect
+	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
+	github.com/bgentry/speakeasy v0.1.0 // indirect
+	github.com/blang/semver v3.5.1+incompatible // indirect
+	github.com/bmatcuk/doublestar v1.1.5 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.7.0 // indirect
+	github.com/golang/protobuf v1.3.4 // indirect
+	github.com/google/go-cmp v0.3.1 // indirect
+	github.com/google/uuid v1.1.1 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+	github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 // indirect
+	github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f // indirect
+	github.com/hashicorp/go-multierror v1.0.0 // indirect
+	github.com/hashicorp/go-plugin v1.3.0 // indirect
+	github.com/hashicorp/go-retryablehttp v0.5.2 // indirect
+	github.com/hashicorp/go-safetemp v1.0.0 // indirect
+	github.com/hashicorp/go-uuid v1.0.1 // indirect
+	github.com/hashicorp/go-version v1.2.0 // indirect
+	github.com/hashicorp/golang-lru v0.5.1 // indirect
+	github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect
+	github.com/hashicorp/hcl/v2 v2.3.0 // indirect
+	github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590 // indirect
+	github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect
+	github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 // indirect
+	github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
+	github.com/jmespath/go-jmespath v0.3.0 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
+	github.com/mattn/go-colorable v0.1.1 // indirect
+	github.com/mattn/go-isatty v0.0.5 // indirect
+	github.com/mitchellh/cli v1.0.0 // indirect
+	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
+	github.com/mitchellh/copystructure v1.0.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+	github.com/mitchellh/hashstructure v1.0.0 // indirect
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/mitchellh/reflectwalk v1.0.0 // indirect
+	github.com/oklog/run v1.0.0 // indirect
+	github.com/posener/complete v1.2.1 // indirect
+	github.com/spf13/afero v1.2.1 // indirect
+	github.com/ulikunitz/xz v0.5.5 // indirect
+	github.com/vmihailenco/msgpack v4.0.1+incompatible // indirect
+	github.com/zclconf/go-cty v1.2.1 // indirect
+	github.com/zclconf/go-cty-yaml v1.0.1 // indirect
+	go.opencensus.io v0.22.0 // indirect
+	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 // indirect
+	golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect
+	golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect
+	golang.org/x/text v0.3.2 // indirect
+	google.golang.org/appengine v1.6.1 // indirect
+	google.golang.org/grpc v1.27.1 // indirect
+)