Added logging service from DCL and log view resource. (#5795) (#4125)

* Added logging service from DCL and log view resource.

Ran make serialize.

* Added USE_DCL_ID override.

* Ran make upgrade-dcl.

* Removed some debug lines and ran make serialize.

* Made the test ignore long-form vs short-form bucket name for import purposes.

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

Author: modular-magician

.changelog/5795.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+google_logging_log_view
+```

go.mod

@@ -2,7 +2,7 @@ module github.com/hashicorp/terraform-provider-google-beta
 require (
 	cloud.google.com/go/bigtable v1.10.1
 	cloud.google.com/go/iam v0.1.1 // indirect
-	github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220304175357-35332d17a512
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220310234957-05f157784867
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/client9/misspell v0.3.4
 	github.com/davecgh/go-spew v1.1.1

go.sum

@@ -1533,3 +1533,5 @@ github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-202202
 github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220225200700-e76d50f1e637/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
 github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220304175357-35332d17a512 h1:8/Sn9pDdk/RxECtLUh4xum2eyUvf0h7bpx8h+lYvE+Q=
 github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220304175357-35332d17a512/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220310234957-05f157784867 h1:spnm9WU2KGFDrqgn0XL2d5H0oo7Lw0rvm/E8t1qWSdI=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220310234957-05f157784867/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=

google-beta/config.go

@@ -257,10 +257,10 @@ type Config struct {
 	// dataprocBasePath is implemented in mm
 	AssuredWorkloadsBasePath     string
 	CloudResourceManagerBasePath string
+	ContainerAwsBasePath         string
+	ContainerAzureBasePath       string
 	EventarcBasePath             string
 	GkeHubBasePath               string
-	ContainerAzureBasePath       string
-	ContainerAwsBasePath         string
 	NetworkConnectivityBasePath  string
 	OrgPolicyBasePath            string
 	RecaptchaEnterpriseBasePath  string

google-beta/provider.go

@@ -1384,22 +1384,23 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_compute_firewall_policy_association": resourceComputeFirewallPolicyAssociation(),
 			"google_compute_firewall_policy":             resourceComputeFirewallPolicy(),
 			"google_compute_firewall_policy_rule":        resourceComputeFirewallPolicyRule(),
+			"google_container_aws_cluster":               resourceContainerAwsCluster(),
+			"google_container_aws_node_pool":             resourceContainerAwsNodePool(),
+			"google_container_azure_client":              resourceContainerAzureClient(),
+			"google_container_azure_cluster":             resourceContainerAzureCluster(),
+			"google_container_azure_node_pool":           resourceContainerAzureNodePool(),
 			"google_dataproc_workflow_template":          resourceDataprocWorkflowTemplate(),
 			"google_eventarc_trigger":                    resourceEventarcTrigger(),
 			"google_gke_hub_feature":                     resourceGkeHubFeature(),
 			"google_gke_hub_feature_membership":          resourceGkeHubFeatureMembership(),
+			"google_logging_log_view":                    resourceLoggingLogView(),
 			"google_monitoring_monitored_project":        resourceMonitoringMonitoredProject(),
 			"google_network_connectivity_hub":            resourceNetworkConnectivityHub(),
 			"google_network_connectivity_spoke":          resourceNetworkConnectivitySpoke(),
 			"google_org_policy_policy":                   resourceOrgPolicyPolicy(),
 			"google_os_config_os_policy_assignment":      resourceOsConfigOsPolicyAssignment(),
 			"google_privateca_certificate_template":      resourcePrivatecaCertificateTemplate(),
 			"google_recaptcha_enterprise_key":            resourceRecaptchaEnterpriseKey(),
-			"google_container_aws_cluster":               resourceContainerAwsCluster(),
-			"google_container_aws_node_pool":             resourceContainerAwsNodePool(),
-			"google_container_azure_client":              resourceContainerAzureClient(),
-			"google_container_azure_cluster":             resourceContainerAzureCluster(),
-			"google_container_azure_node_pool":           resourceContainerAzureNodePool(),
 		},
 		// ------------------------------------
 		map[string]*schema.Resource{

google-beta/provider_dcl_client_creation.go

@@ -30,6 +30,7 @@ import (
 	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"
+	logging "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/logging/beta"
 	monitoring "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/monitoring/beta"
 	networkconnectivity "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/networkconnectivity/beta"
 	orgpolicy "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/orgpolicy/beta"
@@ -291,6 +292,29 @@ func NewDCLGkeHubClient(config *Config, userAgent, billingProject string, timeou
 	return gkehub.NewClient(dclConfig)
 }
 
+func NewDCLLoggingClient(config *Config, userAgent, billingProject string, timeout time.Duration) *logging.Client {
+	configOptions := []dcl.ConfigOption{
+		dcl.WithHTTPClient(config.client),
+		dcl.WithUserAgent(userAgent),
+		dcl.WithLogger(dclLogger{}),
+		dcl.WithBasePath(config.LoggingBasePath),
+	}
+
+	if timeout != 0 {
+		configOptions = append(configOptions, dcl.WithTimeout(timeout))
+	}
+
+	if config.UserProjectOverride {
+		configOptions = append(configOptions, dcl.WithUserProjectOverride())
+		if billingProject != "" {
+			configOptions = append(configOptions, dcl.WithBillingProject(billingProject))
+		}
+	}
+
+	dclConfig := dcl.NewConfig(configOptions...)
+	return logging.NewClient(dclConfig)
+}
+
 func NewDCLMonitoringClient(config *Config, userAgent, billingProject string, timeout time.Duration) *monitoring.Client {
 	configOptions := []dcl.ConfigOption{
 		dcl.WithHTTPClient(config.client),

google-beta/provider_dcl_endpoints.go

@@ -94,6 +94,15 @@ var EventarcEndpointEntry = &schema.Schema{
 	}, ""),
 }
 
+var LoggingEndpointEntryKey = "logging_custom_endpoint"
+var LoggingEndpointEntry = &schema.Schema{
+	Type:     schema.TypeString,
+	Optional: true,
+	DefaultFunc: schema.MultiEnvDefaultFunc([]string{
+		"GOOGLE_LOGGING_CUSTOM_ENDPOINT",
+	}, ""),
+}
+
 var MonitoringEndpointEntryKey = "monitoring_custom_endpoint"
 var MonitoringEndpointEntry = &schema.Schema{
 	Type:     schema.TypeString,
@@ -157,6 +166,7 @@ var RecaptchaEnterpriseEndpointEntry = &schema.Schema{
 //ContainerAwsBasePath string
 //ContainerAzureBasePath string
 //EventarcBasePath string
+//LoggingBasePath string
 //MonitoringBasePath string
 //NetworkConnectivityBasePath string
 //OrgPolicyBasePath string
@@ -173,6 +183,7 @@ var RecaptchaEnterpriseEndpointEntry = &schema.Schema{
 // ContainerAwsEndpointEntryKey:               ContainerAwsEndpointEntry,
 // ContainerAzureEndpointEntryKey:               ContainerAzureEndpointEntry,
 // EventarcEndpointEntryKey:               EventarcEndpointEntry,
+// LoggingEndpointEntryKey:               LoggingEndpointEntry,
 // MonitoringEndpointEntryKey:               MonitoringEndpointEntry,
 // NetworkConnectivityEndpointEntryKey:               NetworkConnectivityEndpointEntry,
 // OrgPolicyEndpointEntryKey:               OrgPolicyEndpointEntry,
@@ -189,6 +200,7 @@ var RecaptchaEnterpriseEndpointEntry = &schema.Schema{
 // config.ContainerAwsBasePath = d.Get(ContainerAwsEndpointEntryKey).(string)
 // config.ContainerAzureBasePath = d.Get(ContainerAzureEndpointEntryKey).(string)
 // config.EventarcBasePath = d.Get(EventarcEndpointEntryKey).(string)
+// config.LoggingBasePath = d.Get(LoggingEndpointEntryKey).(string)
 // config.MonitoringBasePath = d.Get(MonitoringEndpointEntryKey).(string)
 // config.NetworkConnectivityBasePath = d.Get(NetworkConnectivityEndpointEntryKey).(string)
 // config.OrgPolicyBasePath = d.Get(OrgPolicyEndpointEntryKey).(string)

google-beta/resource_apikeys_key_generated_test.go

@@ -200,8 +200,8 @@ resource "google_apikeys_key" "primary" {
     }
 
     api_targets {
-      methods = ["GET*"]
       service = "translate.googleapis.com"
+      methods = ["GET*"]
     }
   }
 }
@@ -232,8 +232,8 @@ resource "google_apikeys_key" "primary" {
     }
 
     api_targets {
-      methods = ["GET*"]
       service = "translate.googleapis.com"
+      methods = ["GET*"]
     }
   }
 }
@@ -257,8 +257,8 @@ resource "google_apikeys_key" "primary" {
 
   restrictions {
     api_targets {
-      methods = ["GET*"]
       service = "translate.googleapis.com"
+      methods = ["GET*"]
     }
 
     browser_key_restrictions {
@@ -286,8 +286,8 @@ resource "google_apikeys_key" "primary" {
 
   restrictions {
     api_targets {
-      methods = ["POST*"]
       service = "maps.googleapis.com"
+      methods = ["POST*"]
     }
 
     browser_key_restrictions {
@@ -315,8 +315,8 @@ resource "google_apikeys_key" "primary" {
 
   restrictions {
     api_targets {
-      methods = ["GET*"]
       service = "translate.googleapis.com"
+      methods = ["GET*"]
     }
 
     ios_key_restrictions {
@@ -344,8 +344,8 @@ resource "google_apikeys_key" "primary" {
 
   restrictions {
     api_targets {
-      methods = ["GET*"]
       service = "translate.googleapis.com"
+      methods = ["GET*"]
     }
 
     ios_key_restrictions {
@@ -391,8 +391,8 @@ resource "google_apikeys_key" "primary" {
 
   restrictions {
     api_targets {
-      methods = ["GET*"]
       service = "translate.googleapis.com"
+      methods = ["GET*"]
     }
 
     server_key_restrictions {
@@ -420,8 +420,8 @@ resource "google_apikeys_key" "primary" {
 
   restrictions {
     api_targets {
-      methods = ["GET*"]
       service = "translate.googleapis.com"
+      methods = ["GET*"]
     }
 
     server_key_restrictions {

google-beta/resource_eventarc_trigger.go

@@ -95,7 +95,7 @@ func resourceEventarcTrigger() *schema.Resource {
 				Type:             schema.TypeString,
 				Optional:         true,
 				DiffSuppressFunc: compareSelfLinkOrResourceName,
-				Description:      "Optional. The IAM service account email associated with the trigger. The service account represents the identity of the trigger. The principal who calls this API must have `iam.serviceAccounts.actAs` permission in the service account. See https://cloud.google.com/iam/docs/understanding-service-accounts?hl=en#sa_common for more information. For Cloud Run destinations, this service account is used to generate identity tokens when invoking the service. See https://cloud.google.com/run/docs/triggering/pubsub-push#create-service-account for information on how to invoke authenticated Cloud Run services. In order to create Audit Log triggers, the service account should also have `roles/eventarc.eventReceiver` IAM role.",
+				Description:      "Optional. The IAM service account email associated with the trigger. The service account represents the identity of the trigger. The principal who calls this API must have `iam.serviceAccounts.actAs` permission in the service account. See https://cloud.google.com/iam/docs/understanding-service-accounts#sa_common for more information. For Cloud Run destinations, this service account is used to generate identity tokens when invoking the service. See https://cloud.google.com/run/docs/triggering/pubsub-push#create-service-account for information on how to invoke authenticated Cloud Run services. In order to create Audit Log triggers, the service account should also have `roles/eventarc.eventReceiver` IAM role.",
 			},
 
 			"transport": {