Update apigee keystore resource names to be consistent (#7665) (#5454)

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

Author: modular-magician

.changelog/7665.txt

@@ -0,0 +1,3 @@
+```release-note:none
+No changelog entry- this will be cherry-picked to `4.61.0` and affects unreleased resources. The changelog will need to be amended, though.
+```

google-beta/provider.go

@@ -835,7 +835,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_apigee_addons_config":                                  ResourceApigeeAddonsConfig(),
 			"google_apigee_endpoint_attachment":                            ResourceApigeeEndpointAttachment(),
 			"google_apigee_env_keystore":                                   ResourceApigeeEnvKeystore(),
-			"google_apigee_env_keystore_alias_self_signed_cert":            ResourceApigeeEnvKeystoreAliasSelfSignedCert(),
 			"google_apigee_env_references":                                 ResourceApigeeEnvReferences(),
 			"google_apigee_envgroup":                                       ResourceApigeeEnvgroup(),
 			"google_apigee_envgroup_attachment":                            ResourceApigeeEnvgroupAttachment(),
@@ -845,6 +844,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_apigee_environment_iam_policy":                         ResourceIamPolicy(ApigeeEnvironmentIamSchema, ApigeeEnvironmentIamUpdaterProducer, ApigeeEnvironmentIdParseFunc),
 			"google_apigee_instance":                                       ResourceApigeeInstance(),
 			"google_apigee_instance_attachment":                            ResourceApigeeInstanceAttachment(),
+			"google_apigee_keystores_aliases_self_signed_cert":             ResourceApigeeKeystoresAliasesSelfSignedCert(),
 			"google_apigee_nat_address":                                    ResourceApigeeNatAddress(),
 			"google_apigee_organization":                                   ResourceApigeeOrganization(),
 			"google_apigee_sync_authorization":                             ResourceApigeeSyncAuthorization(),
@@ -1336,7 +1336,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_apigee_sharedflow":                      ResourceApigeeSharedFlow(),
 			"google_apigee_sharedflow_deployment":           ResourceApigeeSharedFlowDeployment(),
 			"google_apigee_flowhook":                        ResourceApigeeFlowhook(),
-			"google_apigee_env_keystore_alias_pkcs12":       ResourceApigeeEnvKeystoreAliasPkcs12(),
+			"google_apigee_keystores_aliases_pkcs12":        ResourceApigeeKeystoresAliasesPkcs12(),
 			"google_apigee_keystores_aliases_key_cert_file": ResourceApigeeKeystoresAliasesKeyCertFile(),
 			"google_bigquery_table":                         ResourceBigQueryTable(),
 			"google_bigtable_gc_policy":                     ResourceBigtableGCPolicy(),

google-beta/resource_apigee_env_keystore_alias_pkcs12.go

@@ -13,14 +13,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func ResourceApigeeEnvKeystoreAliasPkcs12() *schema.Resource {
+func ResourceApigeeKeystoresAliasesPkcs12() *schema.Resource {
 	return &schema.Resource{
-		Create: resourceApigeeEnvKeystoreAliasPkcs12Create,
-		Read:   resourceApigeeEnvKeystoreAliasPkcs12Read,
-		Delete: resourceApigeeEnvKeystoreAliasPkcs12Delete,
+		Create: ResourceApigeeKeystoresAliasesPkcs12Create,
+		Read:   ResourceApigeeKeystoresAliasesPkcs12Read,
+		Delete: ResourceApigeeKeystoresAliasesPkcs12Delete,
 
 		Importer: &schema.ResourceImporter{
-			State: resourceApigeeEnvKeystoreAliasPkcs12Import,
+			State: ResourceApigeeKeystoresAliasesPkcs12Import,
 		},
 
 		Timeouts: &schema.ResourceTimeout{
@@ -158,7 +158,7 @@ Flag is set to Yes if the certificate is valid, No if expired, or Not yet if not
 	}
 }
 
-func resourceApigeeEnvKeystoreAliasPkcs12Create(d *schema.ResourceData, meta interface{}) error {
+func ResourceApigeeKeystoresAliasesPkcs12Create(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 	userAgent, err := generateUserAgentString(d, config.UserAgent)
 	if err != nil {
@@ -207,10 +207,10 @@ func resourceApigeeEnvKeystoreAliasPkcs12Create(d *schema.ResourceData, meta int
 
 	log.Printf("[DEBUG] Finished creating KeystoreAliasesPkcs %q: %#v", d.Id(), res)
 
-	return resourceApigeeEnvKeystoreAliasPkcs12Read(d, meta)
+	return ResourceApigeeKeystoresAliasesPkcs12Read(d, meta)
 }
 
-func resourceApigeeEnvKeystoreAliasPkcs12Read(d *schema.ResourceData, meta interface{}) error {
+func ResourceApigeeKeystoresAliasesPkcs12Read(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 	userAgent, err := generateUserAgentString(d, config.UserAgent)
 	if err != nil {
@@ -249,7 +249,7 @@ func resourceApigeeEnvKeystoreAliasPkcs12Read(d *schema.ResourceData, meta inter
 	return nil
 }
 
-func resourceApigeeEnvKeystoreAliasPkcs12Delete(d *schema.ResourceData, meta interface{}) error {
+func ResourceApigeeKeystoresAliasesPkcs12Delete(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 	userAgent, err := generateUserAgentString(d, config.UserAgent)
 	if err != nil {
@@ -280,7 +280,7 @@ func resourceApigeeEnvKeystoreAliasPkcs12Delete(d *schema.ResourceData, meta int
 	return nil
 }
 
-func resourceApigeeEnvKeystoreAliasPkcs12Import(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+func ResourceApigeeKeystoresAliasesPkcs12Import(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
 	if err := parseImportId([]string{
 		"organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/keystores/(?P<keystore>[^/]+)/aliases/(?P<alias>[^/]+)",

google-beta/resource_apigee_env_keystore_alias_pkcs12_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func TestAccApigeeEnvKeystoreAliasPkcs12_apigeeEnvKeystoreAliasPkcs12Example(t *testing.T) {
+func TestAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
@@ -21,13 +21,13 @@ func TestAccApigeeEnvKeystoreAliasPkcs12_apigeeEnvKeystoreAliasPkcs12Example(t *
 	VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { testAccPreCheck(t) },
 		ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckApigeeEnvKeystoreAliasPkcs12DestroyProducer(t),
+		CheckDestroy:             testAccCheckApigeeKeystoresAliasesPkcs12DestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccApigeeEnvKeystoreAliasPkcs12_apigeeEnvKeystoreAliasPkcs12Example(context),
+				Config: testAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example(context),
 			},
 			{
-				ResourceName:            "google_apigee_env_keystore_alias_pkcs12.apigee_environment_keystore_aliases_pkcs",
+				ResourceName:            "google_apigee_keystores_aliases_pkcs12.apigee_environment_keystore_aliases_pkcs",
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"file", "filehash", "password", "org_id", "environment"},
@@ -36,7 +36,7 @@ func TestAccApigeeEnvKeystoreAliasPkcs12_apigeeEnvKeystoreAliasPkcs12Example(t *
 	})
 }
 
-func testAccApigeeEnvKeystoreAliasPkcs12_apigeeEnvKeystoreAliasPkcs12Example(context map[string]interface{}) string {
+func testAccApigeeKeystoresAliasesPkcs12_ApigeeKeystoresAliasesPkcs12Example(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_project" "project" {
   project_id      = "tf-test%{random_suffix}"
@@ -106,7 +106,7 @@ resource "google_apigee_env_keystore" "apigee_environment_keystore_alias" {
   env_id     = google_apigee_environment.apigee_environment_keystore.id
 }
 
-resource "google_apigee_env_keystore_alias_pkcs12" "apigee_environment_keystore_aliases_pkcs" {
+resource "google_apigee_keystores_aliases_pkcs12" "apigee_environment_keystore_aliases_pkcs" {
   environment 			= google_apigee_environment.apigee_environment_keystore.name
   org_id				= google_apigee_organization.apigee_org.name
   keystore				= google_apigee_env_keystore.apigee_environment_keystore_alias.name
@@ -118,7 +118,7 @@ resource "google_apigee_env_keystore_alias_pkcs12" "apigee_environment_keystore_
 `, context)
 }
 
-func testAccCheckApigeeEnvKeystoreAliasPkcs12DestroyProducer(t *testing.T) func(s *terraform.State) error {
+func testAccCheckApigeeKeystoresAliasesPkcs12DestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {
 			if rs.Type != "google_apigee_env_keystore_aliases_pkcs" {