Skip to content

Commit 5870936

Browse files
modular-magicianmodular-magician
authored
Migrate Network Firewall Policy Association (global and region) resource from DCL to MMv1 (#11366) (#8489)
[upstream:9a1402bf3fa39860cad1fb258010cbf01450e8d8] Signed-off-by: Modular Magician <[email protected]>
1 parent fffb4a4 commit 5870936

12 files changed

+823
-460
lines changed

‎.changelog/11366.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
```release-note:enhancement
2+
compute: `google_compute_network_firewall_policy_association` now uses MMv1 engine instead of DCL.
3+
```
4+
```release-note:enhancement
5+
compute: `google_compute_region_network_firewall_policy_association` now uses MMv1 engine instead of DCL.
6+
```

‎google-beta/provider/provider_dcl_resources.go‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,28 @@ import (
3636
)
3737

3838
var dclResources = map[string]*schema.Resource{
39-
"google_apikeys_key": apikeys.ResourceApikeysKey(),
40-
"google_assured_workloads_workload": assuredworkloads.ResourceAssuredWorkloadsWorkload(),
41-
"google_cloudbuild_worker_pool": cloudbuild.ResourceCloudbuildWorkerPool(),
42-
"google_clouddeploy_delivery_pipeline": clouddeploy.ResourceClouddeployDeliveryPipeline(),
43-
"google_clouddeploy_target": clouddeploy.ResourceClouddeployTarget(),
44-
"google_compute_firewall_policy": compute.ResourceComputeFirewallPolicy(),
45-
"google_compute_firewall_policy_association": compute.ResourceComputeFirewallPolicyAssociation(),
46-
"google_compute_firewall_policy_rule": compute.ResourceComputeFirewallPolicyRule(),
47-
"google_compute_network_firewall_policy_association": compute.ResourceComputeNetworkFirewallPolicyAssociation(),
48-
"google_compute_region_network_firewall_policy_association": compute.ResourceComputeRegionNetworkFirewallPolicyAssociation(),
49-
"google_container_aws_cluster": containeraws.ResourceContainerAwsCluster(),
50-
"google_container_aws_node_pool": containeraws.ResourceContainerAwsNodePool(),
51-
"google_container_azure_client": containerazure.ResourceContainerAzureClient(),
52-
"google_container_azure_cluster": containerazure.ResourceContainerAzureCluster(),
53-
"google_container_azure_node_pool": containerazure.ResourceContainerAzureNodePool(),
54-
"google_dataplex_asset": dataplex.ResourceDataplexAsset(),
55-
"google_dataplex_lake": dataplex.ResourceDataplexLake(),
56-
"google_dataplex_zone": dataplex.ResourceDataplexZone(),
57-
"google_dataproc_workflow_template": dataproc.ResourceDataprocWorkflowTemplate(),
58-
"google_eventarc_channel": eventarc.ResourceEventarcChannel(),
59-
"google_eventarc_google_channel_config": eventarc.ResourceEventarcGoogleChannelConfig(),
60-
"google_eventarc_trigger": eventarc.ResourceEventarcTrigger(),
61-
"google_firebaserules_release": firebaserules.ResourceFirebaserulesRelease(),
62-
"google_firebaserules_ruleset": firebaserules.ResourceFirebaserulesRuleset(),
63-
"google_gke_hub_feature_membership": gkehub.ResourceGkeHubFeatureMembership(),
64-
"google_recaptcha_enterprise_key": recaptchaenterprise.ResourceRecaptchaEnterpriseKey(),
39+
"google_apikeys_key": apikeys.ResourceApikeysKey(),
40+
"google_assured_workloads_workload": assuredworkloads.ResourceAssuredWorkloadsWorkload(),
41+
"google_cloudbuild_worker_pool": cloudbuild.ResourceCloudbuildWorkerPool(),
42+
"google_clouddeploy_delivery_pipeline": clouddeploy.ResourceClouddeployDeliveryPipeline(),
43+
"google_clouddeploy_target": clouddeploy.ResourceClouddeployTarget(),
44+
"google_compute_firewall_policy": compute.ResourceComputeFirewallPolicy(),
45+
"google_compute_firewall_policy_association": compute.ResourceComputeFirewallPolicyAssociation(),
46+
"google_compute_firewall_policy_rule": compute.ResourceComputeFirewallPolicyRule(),
47+
"google_container_aws_cluster": containeraws.ResourceContainerAwsCluster(),
48+
"google_container_aws_node_pool": containeraws.ResourceContainerAwsNodePool(),
49+
"google_container_azure_client": containerazure.ResourceContainerAzureClient(),
50+
"google_container_azure_cluster": containerazure.ResourceContainerAzureCluster(),
51+
"google_container_azure_node_pool": containerazure.ResourceContainerAzureNodePool(),
52+
"google_dataplex_asset": dataplex.ResourceDataplexAsset(),
53+
"google_dataplex_lake": dataplex.ResourceDataplexLake(),
54+
"google_dataplex_zone": dataplex.ResourceDataplexZone(),
55+
"google_dataproc_workflow_template": dataproc.ResourceDataprocWorkflowTemplate(),
56+
"google_eventarc_channel": eventarc.ResourceEventarcChannel(),
57+
"google_eventarc_google_channel_config": eventarc.ResourceEventarcGoogleChannelConfig(),
58+
"google_eventarc_trigger": eventarc.ResourceEventarcTrigger(),
59+
"google_firebaserules_release": firebaserules.ResourceFirebaserulesRelease(),
60+
"google_firebaserules_ruleset": firebaserules.ResourceFirebaserulesRuleset(),
61+
"google_gke_hub_feature_membership": gkehub.ResourceGkeHubFeatureMembership(),
62+
"google_recaptcha_enterprise_key": recaptchaenterprise.ResourceRecaptchaEnterpriseKey(),
6563
}

‎google-beta/provider/provider_mmv1_resources.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,9 +496,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
496496
}
497497

498498
// Resources
499-
// Generated resources: 542
499+
// Generated resources: 544
500500
// Generated IAM resources: 291
501-
// Total generated resources: 833
501+
// Total generated resources: 835
502502
var generatedResources = map[string]*schema.Resource{
503503
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
504504
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -733,6 +733,7 @@ var generatedResources = map[string]*schema.Resource{
733733
"google_compute_network_endpoint_group": compute.ResourceComputeNetworkEndpointGroup(),
734734
"google_compute_network_endpoints": compute.ResourceComputeNetworkEndpoints(),
735735
"google_compute_network_firewall_policy": compute.ResourceComputeNetworkFirewallPolicy(),
736+
"google_compute_network_firewall_policy_association": compute.ResourceComputeNetworkFirewallPolicyAssociation(),
736737
"google_compute_network_firewall_policy_rule": compute.ResourceComputeNetworkFirewallPolicyRule(),
737738
"google_compute_network_firewall_policy_with_rules": compute.ResourceComputeNetworkFirewallPolicyWithRules(),
738739
"google_compute_network_peering_routes_config": compute.ResourceComputeNetworkPeeringRoutesConfig(),
@@ -761,6 +762,7 @@ var generatedResources = map[string]*schema.Resource{
761762
"google_compute_region_network_endpoint": compute.ResourceComputeRegionNetworkEndpoint(),
762763
"google_compute_region_network_endpoint_group": compute.ResourceComputeRegionNetworkEndpointGroup(),
763764
"google_compute_region_network_firewall_policy": compute.ResourceComputeRegionNetworkFirewallPolicy(),
765+
"google_compute_region_network_firewall_policy_association": compute.ResourceComputeRegionNetworkFirewallPolicyAssociation(),
764766
"google_compute_region_network_firewall_policy_rule": compute.ResourceComputeRegionNetworkFirewallPolicyRule(),
765767
"google_compute_region_network_firewall_policy_with_rules": compute.ResourceComputeRegionNetworkFirewallPolicyWithRules(),
766768
"google_compute_region_per_instance_config": compute.ResourceComputeRegionPerInstanceConfig(),

0 commit comments

Comments
 (0)