@@ -101,13 +101,14 @@ func Provider() terraform.ResourceProvider {
101101 AccessContextManagerCustomEndpointEntryKey : AccessContextManagerCustomEndpointEntry ,
102102 AppEngineCustomEndpointEntryKey : AppEngineCustomEndpointEntry ,
103103 BinaryAuthorizationCustomEndpointEntryKey : BinaryAuthorizationCustomEndpointEntry ,
104- ComputeCustomEndpointEntryKey : ComputeCustomEndpointEntry ,
105104 CloudBuildCustomEndpointEntryKey : CloudBuildCustomEndpointEntry ,
106105 CloudSchedulerCustomEndpointEntryKey : CloudSchedulerCustomEndpointEntry ,
106+ ComputeCustomEndpointEntryKey : ComputeCustomEndpointEntry ,
107107 DnsCustomEndpointEntryKey : DnsCustomEndpointEntry ,
108108 FilestoreCustomEndpointEntryKey : FilestoreCustomEndpointEntry ,
109109 FirestoreCustomEndpointEntryKey : FirestoreCustomEndpointEntry ,
110110 KmsCustomEndpointEntryKey : KmsCustomEndpointEntry ,
111+ LoggingCustomEndpointEntryKey : LoggingCustomEndpointEntry ,
111112 MonitoringCustomEndpointEntryKey : MonitoringCustomEndpointEntry ,
112113 PubsubCustomEndpointEntryKey : PubsubCustomEndpointEntry ,
113114 RedisCustomEndpointEntryKey : RedisCustomEndpointEntry ,
@@ -129,7 +130,6 @@ func Provider() terraform.ResourceProvider {
129130 DataflowCustomEndpointEntryKey : DataflowCustomEndpointEntry ,
130131 DnsBetaCustomEndpointEntryKey : DnsBetaCustomEndpointEntry ,
131132 IamCredentialsCustomEndpointEntryKey : IamCredentialsCustomEndpointEntry ,
132- LoggingCustomEndpointEntryKey : LoggingCustomEndpointEntry ,
133133 ResourceManagerV2Beta1CustomEndpointEntryKey : ResourceManagerV2Beta1CustomEndpointEntry ,
134134 RuntimeconfigCustomEndpointEntryKey : RuntimeconfigCustomEndpointEntry ,
135135 IAMCustomEndpointEntryKey : IAMCustomEndpointEntry ,
@@ -212,13 +212,15 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
212212 GeneratedAccessContextManagerResourcesMap ,
213213 GeneratedAppEngineResourcesMap ,
214214 GeneratedBinaryAuthorizationResourcesMap ,
215- GeneratedComputeResourcesMap ,
216215 GeneratedCloudBuildResourcesMap ,
217216 GeneratedCloudSchedulerResourcesMap ,
217+ GeneratedComputeResourcesMap ,
218218 GeneratedDnsResourcesMap ,
219219 GeneratedFilestoreResourcesMap ,
220220 GeneratedFirestoreResourcesMap ,
221221 GeneratedKmsResourcesMap ,
222+ GeneratedLoggingResourcesMap ,
223+ GeneratedMonitoringResourcesMap ,
222224 GeneratedPubsubResourcesMap ,
223225 GeneratedRedisResourcesMap ,
224226 GeneratedResourceManagerResourcesMap ,
@@ -227,7 +229,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
227229 GeneratedSqlResourcesMap ,
228230 GeneratedStorageResourcesMap ,
229231 GeneratedTpuResourcesMap ,
230- GeneratedMonitoringResourcesMap ,
231232 map [string ]* schema.Resource {
232233 "google_app_engine_application" : resourceAppEngineApplication (),
233234 "google_bigquery_dataset" : resourceBigQueryDataset (),
@@ -287,7 +288,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
287288 "google_folder_organization_policy" : resourceGoogleFolderOrganizationPolicy (),
288289 "google_logging_billing_account_sink" : resourceLoggingBillingAccountSink (),
289290 "google_logging_billing_account_exclusion" : ResourceLoggingExclusion (BillingAccountLoggingExclusionSchema , NewBillingAccountLoggingExclusionUpdater , billingAccountLoggingExclusionIdParseFunc ),
290- "google_logging_metric" : resourceLoggingMetric (),
291291 "google_logging_organization_sink" : resourceLoggingOrganizationSink (),
292292 "google_logging_organization_exclusion" : ResourceLoggingExclusion (OrganizationLoggingExclusionSchema , NewOrganizationLoggingExclusionUpdater , organizationLoggingExclusionIdParseFunc ),
293293 "google_logging_folder_sink" : resourceLoggingFolderSink (),
@@ -379,17 +379,18 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
379379 }
380380 config .BatchingConfig = batchCfg
381381
382+ // Generated products
382383 config .AccessContextManagerBasePath = d .Get (AccessContextManagerCustomEndpointEntryKey ).(string )
383- config .CloudSchedulerBasePath = d .Get (CloudSchedulerCustomEndpointEntryKey ).(string )
384- config .FirestoreBasePath = d .Get (FirestoreCustomEndpointEntryKey ).(string )
385-
386384 config .AppEngineBasePath = d .Get (AppEngineCustomEndpointEntryKey ).(string )
387385 config .BinaryAuthorizationBasePath = d .Get (BinaryAuthorizationCustomEndpointEntryKey ).(string )
388- config .ComputeBasePath = d .Get (ComputeCustomEndpointEntryKey ).(string )
389386 config .CloudBuildBasePath = d .Get (CloudBuildCustomEndpointEntryKey ).(string )
387+ config .CloudSchedulerBasePath = d .Get (CloudSchedulerCustomEndpointEntryKey ).(string )
388+ config .ComputeBasePath = d .Get (ComputeCustomEndpointEntryKey ).(string )
390389 config .DnsBasePath = d .Get (DnsCustomEndpointEntryKey ).(string )
391390 config .FilestoreBasePath = d .Get (FilestoreCustomEndpointEntryKey ).(string )
391+ config .FirestoreBasePath = d .Get (FirestoreCustomEndpointEntryKey ).(string )
392392 config .KmsBasePath = d .Get (KmsCustomEndpointEntryKey ).(string )
393+ config .LoggingBasePath = d .Get (LoggingCustomEndpointEntryKey ).(string )
393394 config .MonitoringBasePath = d .Get (MonitoringCustomEndpointEntryKey ).(string )
394395 config .PubsubBasePath = d .Get (PubsubCustomEndpointEntryKey ).(string )
395396 config .RedisBasePath = d .Get (RedisCustomEndpointEntryKey ).(string )
@@ -400,6 +401,8 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
400401 config .StorageBasePath = d .Get (StorageCustomEndpointEntryKey ).(string )
401402 config .TpuBasePath = d .Get (TpuCustomEndpointEntryKey ).(string )
402403
404+ // Handwritten Products / Versioned / Atypical Entries
405+
403406 config .CloudBillingBasePath = d .Get (CloudBillingCustomEndpointEntryKey ).(string )
404407 config .ComposerBasePath = d .Get (ComposerCustomEndpointEntryKey ).(string )
405408 config .ComputeBetaBasePath = d .Get (ComputeBetaCustomEndpointEntryKey ).(string )
@@ -410,7 +413,6 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
410413 config .DataflowBasePath = d .Get (DataflowCustomEndpointEntryKey ).(string )
411414 config .DnsBetaBasePath = d .Get (DnsBetaCustomEndpointEntryKey ).(string )
412415 config .IamCredentialsBasePath = d .Get (IamCredentialsCustomEndpointEntryKey ).(string )
413- config .LoggingBasePath = d .Get (LoggingCustomEndpointEntryKey ).(string )
414416 config .ResourceManagerV2Beta1BasePath = d .Get (ResourceManagerV2Beta1CustomEndpointEntryKey ).(string )
415417 config .RuntimeconfigBasePath = d .Get (RuntimeconfigCustomEndpointEntryKey ).(string )
416418 config .IAMBasePath = d .Get (IAMCustomEndpointEntryKey ).(string )
@@ -438,13 +440,14 @@ func ConfigureBasePaths(c *Config) {
438440 c .AccessContextManagerBasePath = AccessContextManagerDefaultBasePath
439441 c .AppEngineBasePath = AppEngineDefaultBasePath
440442 c .BinaryAuthorizationBasePath = BinaryAuthorizationDefaultBasePath
441- c .ComputeBasePath = ComputeDefaultBasePath
442443 c .CloudBuildBasePath = CloudBuildDefaultBasePath
443444 c .CloudSchedulerBasePath = CloudSchedulerDefaultBasePath
445+ c .ComputeBasePath = ComputeDefaultBasePath
444446 c .DnsBasePath = DnsDefaultBasePath
445447 c .FilestoreBasePath = FilestoreDefaultBasePath
446448 c .FirestoreBasePath = FirestoreDefaultBasePath
447449 c .KmsBasePath = KmsDefaultBasePath
450+ c .LoggingBasePath = LoggingDefaultBasePath
448451 c .MonitoringBasePath = MonitoringDefaultBasePath
449452 c .PubsubBasePath = PubsubDefaultBasePath
450453 c .RedisBasePath = RedisDefaultBasePath
@@ -465,7 +468,6 @@ func ConfigureBasePaths(c *Config) {
465468 c .DataflowBasePath = DataflowDefaultBasePath
466469 c .DnsBetaBasePath = DnsBetaDefaultBasePath
467470 c .IamCredentialsBasePath = IamCredentialsDefaultBasePath
468- c .LoggingBasePath = LoggingDefaultBasePath
469471 c .ResourceManagerV2Beta1BasePath = ResourceManagerV2Beta1DefaultBasePath
470472 c .RuntimeconfigBasePath = RuntimeconfigDefaultBasePath
471473 c .IAMBasePath = IAMDefaultBasePath
0 commit comments