Merge branch 'gcp_partner_port'

megaport/data_source_megaport_partner_port.go

@@ -4,7 +4,9 @@ import (
 	"fmt"
 	"log"
 	"regexp"
+	"strings"
 
+	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/utilitywarehouse/terraform-provider-megaport/megaport/api"
@@ -135,7 +137,18 @@ func dataSourceMegaportPartnerPortRead(d *schema.ResourceData, m interface{}) er
 		return nil
 	}
 	if v, ok := d.GetOk("gcp"); ok {
-		ports, bandwidths, err := cfg.Client.GetMegaportsForGcpPairingKey(expandFilters(v)["pairing_key"].(string))
+		pk := expandFilters(v)["pairing_key"].(string)
+		// When looking up the available ports for a given GCP pairing key, the
+		// results will differ depending on whether the key has been consumed
+		// for a VXC or not. Instead of using same the pairing key that is used
+		// in a VXC, we can instead randomise the UUID part of the key. This
+		// achieves getting consistent results from the endpoint.
+		randomUUID, err := uuid.GenerateUUID()
+		if err != nil {
+			return err
+		}
+		pk = randomUUID + "/" + strings.SplitN(pk, "/", 2)[1]
+		ports, bandwidths, err := cfg.Client.GetMegaportsForGcpPairingKey(pk)
 		if err != nil {
 			return err
 		}