Provider level compile

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Jul 23, 2019 · dc730c7 · dc730c7
1 parent afd47f1
commit dc730c7
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 37 deletions.
diff --git a/google/config.go b/google/config.go
@@ -69,30 +69,40 @@ type Config struct {
 	tokenSource oauth2.TokenSource
 
 	AccessContextManagerBasePath string
+	AppEngineBasePath            string
 	BinaryAuthorizationBasePath  string
+	CloudBuildBasePath           string
 	CloudSchedulerBasePath       string
+	ComputeBasePath              string
+	DnsBasePath                  string
+	FilestoreBasePath            string
 	FirestoreBasePath            string
+	KmsBasePath                  string
+	LoggingBasePath              string
 	MonitoringBasePath           string
+	PubsubBasePath               string
 	RedisBasePath                string
+	ResourceManagerBasePath      string
+	SourceRepoBasePath           string
+	SpannerBasePath              string
+	SqlBasePath                  string
+	StorageBasePath              string
 	TpuBasePath                  string
 
 	CloudBillingBasePath string
 	clientBilling        *cloudbilling.APIService
 
-	CloudBuildBasePath string
-	clientBuild        *cloudbuild.Service
+	clientBuild *cloudbuild.Service
 
 	ComposerBasePath string
 	clientComposer   *composer.Service
 
-	ComputeBasePath string
-	clientCompute   *compute.Service
+	clientCompute *compute.Service
 
 	ComputeBetaBasePath string
 	clientComputeBeta   *computeBeta.Service
 
-	ContainerBasePath string
-	clientContainer   *container.Service
+	clientContainer *container.Service
 
 	ContainerBetaBasePath string
 	clientContainerBeta   *containerBeta.Service
@@ -106,46 +116,36 @@ type Config struct {
 	DataflowBasePath string
 	clientDataflow   *dataflow.Service
 
-	DnsBasePath string
-	clientDns   *dns.Service
+	clientDns *dns.Service
 
 	DnsBetaBasePath string
 	clientDnsBeta   *dnsBeta.Service
 
-	FilestoreBasePath string
-	clientFilestore   *file.Service
+	clientFilestore *file.Service
 
 	IamCredentialsBasePath string
 	clientIamCredentials   *iamcredentials.Service
 
-	KmsBasePath string
-	clientKms   *cloudkms.Service
+	clientKms *cloudkms.Service
 
-	LoggingBasePath string
-	clientLogging   *cloudlogging.Service
+	clientLogging *cloudlogging.Service
 
-	PubsubBasePath string
-	clientPubsub   *pubsub.Service
+	clientPubsub *pubsub.Service
 
-	ResourceManagerBasePath string
-	clientResourceManager   *cloudresourcemanager.Service
+	clientResourceManager *cloudresourcemanager.Service
 
 	ResourceManagerV2Beta1BasePath string
 	clientResourceManagerV2Beta1   *resourceManagerV2Beta1.Service
 
 	RuntimeconfigBasePath string
 	clientRuntimeconfig   *runtimeconfig.Service
 
-	SpannerBasePath string
-	clientSpanner   *spanner.Service
+	clientSpanner *spanner.Service
 
-	SourceRepoBasePath string
-	clientSourceRepo   *sourcerepo.Service
+	clientSourceRepo *sourcerepo.Service
 
-	StorageBasePath string
-	clientStorage   *storage.Service
+	clientStorage *storage.Service
 
-	SqlBasePath    string
 	clientSqlAdmin *sqladmin.Service
 
 	IAMBasePath string

diff --git a/google/provider.go b/google/provider.go
@@ -101,13 +101,14 @@ func Provider() terraform.ResourceProvider {
 			AccessContextManagerCustomEndpointEntryKey: AccessContextManagerCustomEndpointEntry,
 			AppEngineCustomEndpointEntryKey:            AppEngineCustomEndpointEntry,
 			BinaryAuthorizationCustomEndpointEntryKey:  BinaryAuthorizationCustomEndpointEntry,
-			ComputeCustomEndpointEntryKey:              ComputeCustomEndpointEntry,
 			CloudBuildCustomEndpointEntryKey:           CloudBuildCustomEndpointEntry,
 			CloudSchedulerCustomEndpointEntryKey:       CloudSchedulerCustomEndpointEntry,
+			ComputeCustomEndpointEntryKey:              ComputeCustomEndpointEntry,
 			DnsCustomEndpointEntryKey:                  DnsCustomEndpointEntry,
 			FilestoreCustomEndpointEntryKey:            FilestoreCustomEndpointEntry,
 			FirestoreCustomEndpointEntryKey:            FirestoreCustomEndpointEntry,
 			KmsCustomEndpointEntryKey:                  KmsCustomEndpointEntry,
+			LoggingCustomEndpointEntryKey:              LoggingCustomEndpointEntry,
 			MonitoringCustomEndpointEntryKey:           MonitoringCustomEndpointEntry,
 			PubsubCustomEndpointEntryKey:               PubsubCustomEndpointEntry,
 			RedisCustomEndpointEntryKey:                RedisCustomEndpointEntry,
@@ -129,7 +130,6 @@ func Provider() terraform.ResourceProvider {
 			DataflowCustomEndpointEntryKey:               DataflowCustomEndpointEntry,
 			DnsBetaCustomEndpointEntryKey:                DnsBetaCustomEndpointEntry,
 			IamCredentialsCustomEndpointEntryKey:         IamCredentialsCustomEndpointEntry,
-			LoggingCustomEndpointEntryKey:                LoggingCustomEndpointEntry,
 			ResourceManagerV2Beta1CustomEndpointEntryKey: ResourceManagerV2Beta1CustomEndpointEntry,
 			RuntimeconfigCustomEndpointEntryKey:          RuntimeconfigCustomEndpointEntry,
 			IAMCustomEndpointEntryKey:                    IAMCustomEndpointEntry,
@@ -212,13 +212,15 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 		GeneratedAccessContextManagerResourcesMap,
 		GeneratedAppEngineResourcesMap,
 		GeneratedBinaryAuthorizationResourcesMap,
-		GeneratedComputeResourcesMap,
 		GeneratedCloudBuildResourcesMap,
 		GeneratedCloudSchedulerResourcesMap,
+		GeneratedComputeResourcesMap,
 		GeneratedDnsResourcesMap,
 		GeneratedFilestoreResourcesMap,
 		GeneratedFirestoreResourcesMap,
 		GeneratedKmsResourcesMap,
+		GeneratedLoggingResourcesMap,
+		GeneratedMonitoringResourcesMap,
 		GeneratedPubsubResourcesMap,
 		GeneratedRedisResourcesMap,
 		GeneratedResourceManagerResourcesMap,
@@ -227,7 +229,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 		GeneratedSqlResourcesMap,
 		GeneratedStorageResourcesMap,
 		GeneratedTpuResourcesMap,
-		GeneratedMonitoringResourcesMap,
 		map[string]*schema.Resource{
 			"google_app_engine_application":                resourceAppEngineApplication(),
 			"google_bigquery_dataset":                      resourceBigQueryDataset(),
@@ -287,7 +288,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
 			"google_folder_organization_policy":            resourceGoogleFolderOrganizationPolicy(),
 			"google_logging_billing_account_sink":          resourceLoggingBillingAccountSink(),
 			"google_logging_billing_account_exclusion":     ResourceLoggingExclusion(BillingAccountLoggingExclusionSchema, NewBillingAccountLoggingExclusionUpdater, billingAccountLoggingExclusionIdParseFunc),
-			"google_logging_metric":                        resourceLoggingMetric(),
 			"google_logging_organization_sink":             resourceLoggingOrganizationSink(),
 			"google_logging_organization_exclusion":        ResourceLoggingExclusion(OrganizationLoggingExclusionSchema, NewOrganizationLoggingExclusionUpdater, organizationLoggingExclusionIdParseFunc),
 			"google_logging_folder_sink":                   resourceLoggingFolderSink(),
@@ -379,17 +379,18 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	}
 	config.BatchingConfig = batchCfg
 
+	// Generated products
 	config.AccessContextManagerBasePath = d.Get(AccessContextManagerCustomEndpointEntryKey).(string)
-	config.CloudSchedulerBasePath = d.Get(CloudSchedulerCustomEndpointEntryKey).(string)
-	config.FirestoreBasePath = d.Get(FirestoreCustomEndpointEntryKey).(string)
-
 	config.AppEngineBasePath = d.Get(AppEngineCustomEndpointEntryKey).(string)
 	config.BinaryAuthorizationBasePath = d.Get(BinaryAuthorizationCustomEndpointEntryKey).(string)
-	config.ComputeBasePath = d.Get(ComputeCustomEndpointEntryKey).(string)
 	config.CloudBuildBasePath = d.Get(CloudBuildCustomEndpointEntryKey).(string)
+	config.CloudSchedulerBasePath = d.Get(CloudSchedulerCustomEndpointEntryKey).(string)
+	config.ComputeBasePath = d.Get(ComputeCustomEndpointEntryKey).(string)
 	config.DnsBasePath = d.Get(DnsCustomEndpointEntryKey).(string)
 	config.FilestoreBasePath = d.Get(FilestoreCustomEndpointEntryKey).(string)
+	config.FirestoreBasePath = d.Get(FirestoreCustomEndpointEntryKey).(string)
 	config.KmsBasePath = d.Get(KmsCustomEndpointEntryKey).(string)
+	config.LoggingBasePath = d.Get(LoggingCustomEndpointEntryKey).(string)
 	config.MonitoringBasePath = d.Get(MonitoringCustomEndpointEntryKey).(string)
 	config.PubsubBasePath = d.Get(PubsubCustomEndpointEntryKey).(string)
 	config.RedisBasePath = d.Get(RedisCustomEndpointEntryKey).(string)
@@ -400,6 +401,8 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config.StorageBasePath = d.Get(StorageCustomEndpointEntryKey).(string)
 	config.TpuBasePath = d.Get(TpuCustomEndpointEntryKey).(string)
 
+	// Handwritten Products / Versioned / Atypical Entries
+
 	config.CloudBillingBasePath = d.Get(CloudBillingCustomEndpointEntryKey).(string)
 	config.ComposerBasePath = d.Get(ComposerCustomEndpointEntryKey).(string)
 	config.ComputeBetaBasePath = d.Get(ComputeBetaCustomEndpointEntryKey).(string)
@@ -410,7 +413,6 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config.DataflowBasePath = d.Get(DataflowCustomEndpointEntryKey).(string)
 	config.DnsBetaBasePath = d.Get(DnsBetaCustomEndpointEntryKey).(string)
 	config.IamCredentialsBasePath = d.Get(IamCredentialsCustomEndpointEntryKey).(string)
-	config.LoggingBasePath = d.Get(LoggingCustomEndpointEntryKey).(string)
 	config.ResourceManagerV2Beta1BasePath = d.Get(ResourceManagerV2Beta1CustomEndpointEntryKey).(string)
 	config.RuntimeconfigBasePath = d.Get(RuntimeconfigCustomEndpointEntryKey).(string)
 	config.IAMBasePath = d.Get(IAMCustomEndpointEntryKey).(string)
@@ -438,13 +440,14 @@ func ConfigureBasePaths(c *Config) {
 	c.AccessContextManagerBasePath = AccessContextManagerDefaultBasePath
 	c.AppEngineBasePath = AppEngineDefaultBasePath
 	c.BinaryAuthorizationBasePath = BinaryAuthorizationDefaultBasePath
-	c.ComputeBasePath = ComputeDefaultBasePath
 	c.CloudBuildBasePath = CloudBuildDefaultBasePath
 	c.CloudSchedulerBasePath = CloudSchedulerDefaultBasePath
+	c.ComputeBasePath = ComputeDefaultBasePath
 	c.DnsBasePath = DnsDefaultBasePath
 	c.FilestoreBasePath = FilestoreDefaultBasePath
 	c.FirestoreBasePath = FirestoreDefaultBasePath
 	c.KmsBasePath = KmsDefaultBasePath
+	c.LoggingBasePath = LoggingDefaultBasePath
 	c.MonitoringBasePath = MonitoringDefaultBasePath
 	c.PubsubBasePath = PubsubDefaultBasePath
 	c.RedisBasePath = RedisDefaultBasePath
@@ -465,7 +468,6 @@ func ConfigureBasePaths(c *Config) {
 	c.DataflowBasePath = DataflowDefaultBasePath
 	c.DnsBetaBasePath = DnsBetaDefaultBasePath
 	c.IamCredentialsBasePath = IamCredentialsDefaultBasePath
-	c.LoggingBasePath = LoggingDefaultBasePath
 	c.ResourceManagerV2Beta1BasePath = ResourceManagerV2Beta1DefaultBasePath
 	c.RuntimeconfigBasePath = RuntimeconfigDefaultBasePath
 	c.IAMBasePath = IAMDefaultBasePath