Hierarchical firewall policies (#5090) (#3556)

* Send empty instead of nil array

* Adding hierarchical firewall rules

* Update firewall policy yamls

* Fix test:

* Add markdown for hierarchical firewall policies

* PR review

* Add auto id renaming

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

Author: modular-magician

.changelog/5090.txt

@@ -0,0 +1,9 @@
+```release-note:new-resource
+google_compute_firewall_policy_rule
+```
+```release-note:new-resource
+google_compute_firewall_policy_association
+```
+```release-note:new-resource
+google_compute_firewall_policy
+```

google-beta/expanders.go

@@ -13,5 +13,10 @@ func expandStringArray(v interface{}) []string {
 		return convertStringSet(arr)
 	}
 
-	return convertStringArr(v.([]interface{}))
+	arr = convertStringArr(v.([]interface{}))
+	if arr == nil {
+		// Send empty array specifically instead of nil
+		return make([]string, 0)
+	}
+	return arr
 }

google-beta/provider.go

@@ -1267,6 +1267,9 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_cloudfunctions_function":               resourceCloudFunctionsFunction(),
 			"google_composer_environment":                  resourceComposerEnvironment(),
 			"google_compute_attached_disk":                 resourceComputeAttachedDisk(),
+			"google_compute_firewall_policy_association":   resourceComputeFirewallPolicyAssociation(),
+			"google_compute_firewall_policy":               resourceComputeFirewallPolicy(),
+			"google_compute_firewall_policy_rule":          resourceComputeFirewallPolicyRule(),
 			"google_compute_instance":                      resourceComputeInstance(),
 			"google_compute_instance_from_machine_image":   resourceComputeInstanceFromMachineImage(),
 			"google_compute_instance_from_template":        resourceComputeInstanceFromTemplate(),

google-beta/provider_dcl_client_creation.go

@@ -20,6 +20,7 @@ import (
 
 	assuredworkloads "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/assuredworkloads/beta"
 	cloudbuild "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/cloudbuild/beta"
+	compute "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/compute/beta"
 	dataproc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/dataproc/beta"
 	eventarc "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/eventarc/beta"
 	gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta"
@@ -63,6 +64,25 @@ func NewDCLCloudbuildClient(config *Config, userAgent, billingProject string) *c
 	return cloudbuild.NewClient(dclConfig)
 }
 
+func NewDCLComputeClient(config *Config, userAgent, billingProject string) *compute.Client {
+	configOptions := []dcl.ConfigOption{
+		dcl.WithHTTPClient(config.client),
+		dcl.WithUserAgent(userAgent),
+		dcl.WithLogger(dclLogger{}),
+		dcl.WithBasePath(config.ComputeBasePath),
+	}
+
+	if config.UserProjectOverride {
+		configOptions = append(configOptions, dcl.WithUserProjectOverride())
+		if billingProject != "" {
+			configOptions = append(configOptions, dcl.WithBillingProject(billingProject))
+		}
+	}
+
+	dclConfig := dcl.NewConfig(configOptions...)
+	return compute.NewClient(dclConfig)
+}
+
 func NewDCLDataprocClient(config *Config, userAgent, billingProject string) *dataproc.Client {
 	configOptions := []dcl.ConfigOption{
 		dcl.WithHTTPClient(config.client),

google-beta/provider_dcl_endpoints.go

@@ -40,6 +40,15 @@ var CloudBuildWorkerPoolEndpointEntry = &schema.Schema{
 	}, ""),
 }
 
+var ComputeEndpointEntryKey = "compute_custom_endpoint"
+var ComputeEndpointEntry = &schema.Schema{
+	Type:     schema.TypeString,
+	Optional: true,
+	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+		"GOOGLE_COMPUTE_CUSTOM_ENDPOINT",
+	}, ""),
+}
+
 var EventarcEndpointEntryKey = "eventarc_custom_endpoint"
 var EventarcEndpointEntry = &schema.Schema{
 	Type:     schema.TypeString,
@@ -52,14 +61,17 @@ var EventarcEndpointEntry = &schema.Schema{
 //Add new values to config.go.erb config object declaration
 //AssuredWorkloadsBasePath string
 //CloudBuildWorkerPoolBasePath string
+//ComputeBasePath string
 //EventarcBasePath string
 
 //Add new values to provider.go.erb schema initialization
 // AssuredWorkloadsEndpointEntryKey:               AssuredWorkloadsEndpointEntry,
 // CloudBuildWorkerPoolEndpointEntryKey:               CloudBuildWorkerPoolEndpointEntry,
+// ComputeEndpointEntryKey:               ComputeEndpointEntry,
 // EventarcEndpointEntryKey:               EventarcEndpointEntry,
 
 //Add new values to provider.go.erb - provider block read
 // config.AssuredWorkloadsBasePath = d.Get(AssuredWorkloadsEndpointEntryKey).(string)
 // config.CloudBuildWorkerPoolBasePath = d.Get(CloudBuildWorkerPoolEndpointEntryKey).(string)
+// config.ComputeBasePath = d.Get(ComputeEndpointEntryKey).(string)
 // config.EventarcBasePath = d.Get(EventarcEndpointEntryKey).(string)