Adding IPv6 Access Type to PAP (#15548)

Author: dhruv-23101998

mmv1/products/compute/PublicAdvertisedPrefix.yaml

@@ -54,6 +54,15 @@ examples:
     # PAPs have very low quota limits and a shared testing range so serialized tests exist in:
     # resource_compute_public_advertised_prefix_test.go
     exclude_test: true
+  - name: 'public_advertised_prefixes_ipv6_access_type'
+    primary_resource_id: 'prefixes'
+    vars:
+      prefixes_name: 'my-pap'
+    test_env_vars:
+      desc: 'PAP_DESCRIPTION'
+    # PAPs have very low quota limits and a shared testing range so serialized tests exist in:
+    # resource_compute_public_advertised_prefix_test.go
+    exclude_test: true
 parameters:
 properties:
   - name: 'description'
@@ -72,7 +81,6 @@ properties:
   - name: 'dnsVerificationIp'
     type: String
     description: The IPv4 address to be used for reverse DNS verification.
-    required: true
   - name: 'ipCidrRange'
     type: String
     description:
@@ -91,6 +99,20 @@ properties:
     enum_values:
       - 'GLOBAL'
       - 'REGIONAL'
+  - name: 'ipv6AccessType'
+    type: Enum
+    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.
+    default_from_api: true
+    enum_values:
+      - 'EXTERNAL'
+      - 'INTERNAL'
   - name: 'sharedSecret'
     type: String
     description: |

mmv1/templates/terraform/examples/public_advertised_prefixes_ipv6_access_type.tf.tmpl

@@ -0,0 +1,7 @@
+resource "google_compute_public_advertised_prefix" "{{$.PrimaryResourceId}}" {
+  name = "{{index $.Vars "prefixes_name"}}"
+  description = "{{index $.TestEnvVars "desc"}}"
+  ip_cidr_range = "2001:db8::/32"
+  pdp_scope = "REGIONAL"
+  ipv6_access_type = "INTERNAL"
+}

mmv1/third_party/terraform/services/compute/resource_compute_public_advertised_prefix_test.go

@@ -16,12 +16,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 {
@@ -36,8 +37,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"