Adding IPv6 Access Type to PAP (#15548) (#10978)

[upstream:4c714596c404ecc8e04f49dc310db18277fe0eab]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/15548.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: added `ipv6_access_type` field to `google_compute_public_advertised_prefix` resource
+```

google-beta/services/compute/resource_compute_public_advertised_prefix.go

@@ -54,12 +54,6 @@ func ResourceComputePublicAdvertisedPrefix() *schema.Resource {
 		),
 
 		Schema: map[string]*schema.Schema{
-			"dns_verification_ip": {
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
-				Description: `The IPv4 address to be used for reverse DNS verification.`,
-			},
 			"ip_cidr_range": {
 				Type:        schema.TypeString,
 				Required:    true,
@@ -83,6 +77,26 @@ except the last character, which cannot be a dash.`,
 				ForceNew:    true,
 				Description: `An optional description of this resource.`,
 			},
+			"dns_verification_ip": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				ForceNew:    true,
+				Description: `The IPv4 address to be used for reverse DNS verification.`,
+			},
+			"ipv6_access_type": {
+				Type:         schema.TypeString,
+				Computed:     true,
+				Optional:     true,
+				ForceNew:     true,
+				ValidateFunc: verify.ValidateEnum([]string{"EXTERNAL", "INTERNAL", ""}),
+				Description: `The internet access type for IPv6 Public Advertised Prefixes. It can be
+set to one of following:
+  * EXTERNAL: Default access type. The prefix will be announced to the
+  internet. All children PDPs will have access type as EXTERNAL.
+  * INTERNAL: The prefix won’t be announced to the internet. Prefix will
+  be used privately within Google Cloud. All children PDPs will have
+  access type as INTERNAL. Possible values: ["EXTERNAL", "INTERNAL"]`,
+			},
 			"pdp_scope": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -153,6 +167,12 @@ func resourceComputePublicAdvertisedPrefixCreate(d *schema.ResourceData, meta in
 	} else if v, ok := d.GetOkExists("pdp_scope"); !tpgresource.IsEmptyValue(reflect.ValueOf(pdpScopeProp)) && (ok || !reflect.DeepEqual(v, pdpScopeProp)) {
 		obj["pdpScope"] = pdpScopeProp
 	}
+	ipv6AccessTypeProp, err := expandComputePublicAdvertisedPrefixIpv6AccessType(d.Get("ipv6_access_type"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("ipv6_access_type"); !tpgresource.IsEmptyValue(reflect.ValueOf(ipv6AccessTypeProp)) && (ok || !reflect.DeepEqual(v, ipv6AccessTypeProp)) {
+		obj["ipv6AccessType"] = ipv6AccessTypeProp
+	}
 
 	url, err := tpgresource.ReplaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/global/publicAdvertisedPrefixes")
 	if err != nil {
@@ -267,6 +287,9 @@ func resourceComputePublicAdvertisedPrefixRead(d *schema.ResourceData, meta inte
 	if err := d.Set("pdp_scope", flattenComputePublicAdvertisedPrefixPdpScope(res["pdpScope"], d, config)); err != nil {
 		return fmt.Errorf("Error reading PublicAdvertisedPrefix: %s", err)
 	}
+	if err := d.Set("ipv6_access_type", flattenComputePublicAdvertisedPrefixIpv6AccessType(res["ipv6AccessType"], d, config)); err != nil {
+		return fmt.Errorf("Error reading PublicAdvertisedPrefix: %s", err)
+	}
 	if err := d.Set("shared_secret", flattenComputePublicAdvertisedPrefixSharedSecret(res["sharedSecret"], d, config)); err != nil {
 		return fmt.Errorf("Error reading PublicAdvertisedPrefix: %s", err)
 	}
@@ -373,6 +396,10 @@ func flattenComputePublicAdvertisedPrefixPdpScope(v interface{}, d *schema.Resou
 	return v
 }
 
+func flattenComputePublicAdvertisedPrefixIpv6AccessType(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenComputePublicAdvertisedPrefixSharedSecret(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -396,3 +423,7 @@ func expandComputePublicAdvertisedPrefixIpCidrRange(v interface{}, d tpgresource
 func expandComputePublicAdvertisedPrefixPdpScope(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
+
+func expandComputePublicAdvertisedPrefixIpv6AccessType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}

google-beta/services/compute/resource_compute_public_advertised_prefix_generated_meta.yaml

@@ -8,6 +8,7 @@ fields:
   - api_field: 'description'
   - api_field: 'dnsVerificationIp'
   - api_field: 'ipCidrRange'
+  - api_field: 'ipv6AccessType'
   - api_field: 'name'
   - api_field: 'pdpScope'
   - api_field: 'sharedSecret'

google-beta/services/compute/resource_compute_public_advertised_prefix_test.go

@@ -32,12 +32,13 @@ import (
 // Since we only have access to one test prefix range we cannot run tests in parallel
 func TestAccComputePublicPrefixes(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
-		"delegated_prefix":                         testAccComputePublicDelegatedPrefix_publicDelegatedPrefixesBasicTest,
-		"advertised_prefix":                        testAccComputePublicAdvertisedPrefix_publicAdvertisedPrefixesBasicTest,
-		"public_delegated_prefixes_ipv6":           testAccComputePublicDelegatedPrefix_publicDelegatedPrefixesIpv6Test,
-		"public_advertised_prefixes_pdp_scope":     testAccComputePublicAdvertisedPrefix_publicAdvertisedPrefixesPdpScopeTest,
-		"public_delegated_prefix_ipv6_subnet_mode": testAccComputePublicDelegatedPrefix_publicDelegatedPrefixIpv6SubnetModeTest,
-		"public_delgated_prefix_with_sub_prefix":   TestAccComputePublicDelegatedPrefix_computePublicDelegatedPrefixWithSubPrefixExample,
+		"delegated_prefix":                                testAccComputePublicDelegatedPrefix_publicDelegatedPrefixesBasicTest,
+		"advertised_prefix":                               testAccComputePublicAdvertisedPrefix_publicAdvertisedPrefixesBasicTest,
+		"public_delegated_prefixes_ipv6":                  testAccComputePublicDelegatedPrefix_publicDelegatedPrefixesIpv6Test,
+		"public_advertised_prefixes_pdp_scope":            testAccComputePublicAdvertisedPrefix_publicAdvertisedPrefixesPdpScopeTest,
+		"public_delegated_prefix_ipv6_subnet_mode":        testAccComputePublicDelegatedPrefix_publicDelegatedPrefixIpv6SubnetModeTest,
+		"public_delgated_prefix_with_sub_prefix":          TestAccComputePublicDelegatedPrefix_computePublicDelegatedPrefixWithSubPrefixExample,
+		"public_advertised_prefixes_internal_ipv6_access": testAccComputePublicAdvertisedPrefix_publicAdvertisedPrefixesInternalIpv6AccessTest,
 	}
 
 	for name, tc := range testCases {
@@ -52,8 +53,42 @@ func TestAccComputePublicPrefixes(t *testing.T) {
 	}
 }
 
+func testAccComputePublicAdvertisedPrefix_publicAdvertisedPrefixesInternalIpv6AccessTest(t *testing.T) {
+	context := map[string]interface{}{
+		"description":   envvar.GetTestPublicAdvertisedPrefixDescriptionFromEnv(t),
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputePublicAdvertisedPrefixDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputePublicAdvertisedPrefix_publicAdvertisedPrefixesInternalIpv6AccessExample(context),
+			},
+			{
+				ResourceName:      "google_compute_public_advertised_prefix.prefix",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccComputePublicAdvertisedPrefix_publicAdvertisedPrefixesInternalIpv6AccessExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_public_advertised_prefix" "prefix" {
+  name = "tf-test-my-prefix%{random_suffix}"
+  description = "%{description}"
+  ip_cidr_range = "2001:db8::/32"
+  pdp_scope = "REGIONAL"
+  ipv6_access_type = "INTERNAL"
+}
+`, context)
+}
+
 func TestAccComputePublicDelegatedPrefix_computePublicDelegatedPrefixWithSubPrefixExample(t *testing.T) {
-	t.Parallel()
 	subPrefixResourceName := "google_compute_public_delegated_prefix.subprefix"
 	parentProject := "tf-static-byoip"
 	parentRegion := "us-central1"

website/docs/r/compute_public_advertised_prefix.html.markdown

@@ -53,6 +53,18 @@ resource "google_compute_public_advertised_prefix" "prefixes" {
   pdp_scope = "REGIONAL"
 }
 ```
+## Example Usage - Public Advertised Prefixes Ipv6 Access Type
+
+
+```hcl
+resource "google_compute_public_advertised_prefix" "prefixes" {
+  name = "my-pap"
+  description = "description"
+  ip_cidr_range = "2001:db8::/32"
+  pdp_scope = "REGIONAL"
+  ipv6_access_type = "INTERNAL"
+}
+```
 
 ## Argument Reference
 
@@ -68,10 +80,6 @@ The following arguments are supported:
   following characters must be a dash, lowercase letter, or digit,
   except the last character, which cannot be a dash.
 
-* `dns_verification_ip` -
-  (Required)
-  The IPv4 address to be used for reverse DNS verification.
-
 * `ip_cidr_range` -
   (Required)
   The address range, in CIDR format, represented by this public advertised prefix.
@@ -81,6 +89,10 @@ The following arguments are supported:
   (Optional)
   An optional description of this resource.
 
+* `dns_verification_ip` -
+  (Optional)
+  The IPv4 address to be used for reverse DNS verification.
+
 * `pdp_scope` -
   (Optional)
   Specifies how child public delegated prefix will be scoped. pdpScope
@@ -91,6 +103,17 @@ The following arguments are supported:
   will take ~4 weeks.
   Possible values are: `GLOBAL`, `REGIONAL`.
 
+* `ipv6_access_type` -
+  (Optional)
+  The internet access type for IPv6 Public Advertised Prefixes. It can be
+  set to one of following:
+    * EXTERNAL: Default access type. The prefix will be announced to the
+    internet. All children PDPs will have access type as EXTERNAL.
+    * INTERNAL: The prefix won’t be announced to the internet. Prefix will
+    be used privately within Google Cloud. All children PDPs will have
+    access type as INTERNAL.
+  Possible values are: `EXTERNAL`, `INTERNAL`.
+
 * `project` - (Optional) The ID of the project in which the resource belongs.
     If it is not provided, the provider project is used.