Fix some remaining metadata deltas (#12450) (#20511)

[upstream:ef87ee21000f93077b3787d91b427fa6d4122bd9]

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

Author: modular-magician

.changelog/12450.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google/services/apigee/resource_apigee_env_keystore_alias_pkcs12_meta.yaml

@@ -1,4 +1,4 @@
-resource: 'google_apigee_env_keystore_alias_pkcs12'
+resource: 'google_apigee_keystores_aliases_pkcs12'
 generation_type: 'handwritten'
 api_service_name: 'apigee.googleapis.com'
 api_version: 'v1'

google/services/compute/resource_compute_disk_async_replication_meta.yaml

@@ -0,0 +1,5 @@
+resource: 'google_compute_disk_async_replication'
+generation_type: 'handwritten'
+api_service_name: 'compute.googleapis.com'
+api_version: 'v1'
+api_resource_type_kind: 'Disk'

google/services/compute/resource_compute_firewall_policy_association_meta.yaml

@@ -2,4 +2,4 @@ resource: 'google_compute_firewall_policy_association'
 generation_type: 'dcl'
 api_service_name: 'compute.googleapis.com'
 api_version: 'beta'
-api_resource_type_kind: 'FirewallPolicyAssociation'
+api_resource_type_kind: 'FirewallPolicy'

google/services/compute/resource_compute_firewall_policy_rule_generated_meta.yaml

@@ -2,4 +2,4 @@ resource: 'google_compute_firewall_policy_rule'
 generation_type: 'mmv1'
 api_service_name: 'compute.googleapis.com'
 api_version: 'v1'
-api_resource_type_kind: 'FirewallPolicyRule'
+api_resource_type_kind: 'FirewallPolicy'

google/services/compute/resource_compute_network_firewall_policy_association_generated_meta.yaml

@@ -2,4 +2,4 @@ resource: 'google_compute_network_firewall_policy_association'
 generation_type: 'mmv1'
 api_service_name: 'compute.googleapis.com'
 api_version: 'v1'
-api_resource_type_kind: 'NetworkFirewallPolicyAssociation'
+api_resource_type_kind: 'FirewallPolicy'

google/services/compute/resource_compute_region_disk_resource_policy_attachment_generated_meta.yaml

@@ -2,4 +2,4 @@ resource: 'google_compute_region_disk_resource_policy_attachment'
 generation_type: 'mmv1'
 api_service_name: 'compute.googleapis.com'
 api_version: 'v1'
-api_resource_type_kind: 'Disk'
+api_resource_type_kind: 'RegionDisk'

google/services/compute/resource_compute_region_network_firewall_policy_association_generated_meta.yaml

@@ -2,4 +2,4 @@ resource: 'google_compute_region_network_firewall_policy_association'
 generation_type: 'mmv1'
 api_service_name: 'compute.googleapis.com'
 api_version: 'v1'
-api_resource_type_kind: 'RegionNetworkFirewallPolicyAssociation'
+api_resource_type_kind: 'FirewallPolicy'

google/services/netapp/resource_netapp_volume_replication_generated_meta.yaml

@@ -2,4 +2,4 @@ resource: 'google_netapp_volume_replication'
 generation_type: 'mmv1'
 api_service_name: 'netapp.googleapis.com'
 api_version: 'v1'
-api_resource_type_kind: 'VolumeReplication'
+api_resource_type_kind: 'Replication'