mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-04 17:51:11 +00:00
Remove duplicates from provider resource map, add dupe test (#2683)
<!-- This change is generated by MagicModules. --> /cc @rileykarson
This commit is contained in:
parent
26bdb57a2e
commit
afc340e93e
@ -72,8 +72,8 @@ func Provider() terraform.ResourceProvider {
|
|||||||
"google_compute_forwarding_rule": dataSourceGoogleComputeForwardingRule(),
|
"google_compute_forwarding_rule": dataSourceGoogleComputeForwardingRule(),
|
||||||
"google_compute_image": dataSourceGoogleComputeImage(),
|
"google_compute_image": dataSourceGoogleComputeImage(),
|
||||||
"google_compute_instance": dataSourceGoogleComputeInstance(),
|
"google_compute_instance": dataSourceGoogleComputeInstance(),
|
||||||
"google_compute_instance_group": dataSourceGoogleComputeInstanceGroup(),
|
|
||||||
"google_compute_global_address": dataSourceGoogleComputeGlobalAddress(),
|
"google_compute_global_address": dataSourceGoogleComputeGlobalAddress(),
|
||||||
|
"google_compute_instance_group": dataSourceGoogleComputeInstanceGroup(),
|
||||||
"google_compute_lb_ip_ranges": dataSourceGoogleComputeLbIpRanges(),
|
"google_compute_lb_ip_ranges": dataSourceGoogleComputeLbIpRanges(),
|
||||||
"google_compute_network": dataSourceGoogleComputeNetwork(),
|
"google_compute_network": dataSourceGoogleComputeNetwork(),
|
||||||
"google_compute_regions": dataSourceGoogleComputeRegions(),
|
"google_compute_regions": dataSourceGoogleComputeRegions(),
|
||||||
@ -101,7 +101,19 @@ func Provider() terraform.ResourceProvider {
|
|||||||
"google_storage_project_service_account": dataSourceGoogleStorageProjectServiceAccount(),
|
"google_storage_project_service_account": dataSourceGoogleStorageProjectServiceAccount(),
|
||||||
},
|
},
|
||||||
|
|
||||||
ResourcesMap: mergeResourceMaps(
|
ResourcesMap: ResourceMap(),
|
||||||
|
|
||||||
|
ConfigureFunc: providerConfigure,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func ResourceMap() map[string]*schema.Resource {
|
||||||
|
resourceMap, _ := ResourceMapWithErrors()
|
||||||
|
return resourceMap
|
||||||
|
}
|
||||||
|
|
||||||
|
func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
|
||||||
|
return mergeResourceMaps(
|
||||||
GeneratedComputeResourcesMap,
|
GeneratedComputeResourcesMap,
|
||||||
GeneratedDnsResourcesMap,
|
GeneratedDnsResourcesMap,
|
||||||
GeneratedRedisResourcesMap,
|
GeneratedRedisResourcesMap,
|
||||||
@ -121,15 +133,9 @@ func Provider() terraform.ResourceProvider {
|
|||||||
"google_cloudfunctions_function": resourceCloudFunctionsFunction(),
|
"google_cloudfunctions_function": resourceCloudFunctionsFunction(),
|
||||||
"google_cloudiot_registry": resourceCloudIoTRegistry(),
|
"google_cloudiot_registry": resourceCloudIoTRegistry(),
|
||||||
"google_composer_environment": resourceComposerEnvironment(),
|
"google_composer_environment": resourceComposerEnvironment(),
|
||||||
"google_compute_autoscaler": resourceComputeAutoscaler(),
|
|
||||||
"google_compute_address": resourceComputeAddress(),
|
|
||||||
"google_compute_attached_disk": resourceComputeAttachedDisk(),
|
"google_compute_attached_disk": resourceComputeAttachedDisk(),
|
||||||
"google_compute_backend_service": resourceComputeBackendService(),
|
"google_compute_backend_service": resourceComputeBackendService(),
|
||||||
"google_compute_disk": resourceComputeDisk(),
|
|
||||||
"google_compute_firewall": resourceComputeFirewall(),
|
|
||||||
"google_compute_forwarding_rule": resourceComputeForwardingRule(),
|
|
||||||
"google_compute_global_forwarding_rule": resourceComputeGlobalForwardingRule(),
|
"google_compute_global_forwarding_rule": resourceComputeGlobalForwardingRule(),
|
||||||
"google_compute_health_check": resourceComputeHealthCheck(),
|
|
||||||
"google_compute_image": resourceComputeImage(),
|
"google_compute_image": resourceComputeImage(),
|
||||||
"google_compute_instance": resourceComputeInstance(),
|
"google_compute_instance": resourceComputeInstance(),
|
||||||
"google_compute_instance_from_template": resourceComputeInstanceFromTemplate(),
|
"google_compute_instance_from_template": resourceComputeInstanceFromTemplate(),
|
||||||
@ -140,26 +146,15 @@ func Provider() terraform.ResourceProvider {
|
|||||||
"google_compute_network_peering": resourceComputeNetworkPeering(),
|
"google_compute_network_peering": resourceComputeNetworkPeering(),
|
||||||
"google_compute_project_metadata": resourceComputeProjectMetadata(),
|
"google_compute_project_metadata": resourceComputeProjectMetadata(),
|
||||||
"google_compute_project_metadata_item": resourceComputeProjectMetadataItem(),
|
"google_compute_project_metadata_item": resourceComputeProjectMetadataItem(),
|
||||||
"google_compute_region_autoscaler": resourceComputeRegionAutoscaler(),
|
|
||||||
"google_compute_region_backend_service": resourceComputeRegionBackendService(),
|
"google_compute_region_backend_service": resourceComputeRegionBackendService(),
|
||||||
"google_compute_region_instance_group_manager": resourceComputeRegionInstanceGroupManager(),
|
"google_compute_region_instance_group_manager": resourceComputeRegionInstanceGroupManager(),
|
||||||
"google_compute_route": resourceComputeRoute(),
|
|
||||||
"google_compute_router": resourceComputeRouter(),
|
|
||||||
"google_compute_router_interface": resourceComputeRouterInterface(),
|
"google_compute_router_interface": resourceComputeRouterInterface(),
|
||||||
"google_compute_router_nat": resourceComputeRouterNat(),
|
"google_compute_router_nat": resourceComputeRouterNat(),
|
||||||
"google_compute_router_peer": resourceComputeRouterPeer(),
|
"google_compute_router_peer": resourceComputeRouterPeer(),
|
||||||
"google_compute_security_policy": resourceComputeSecurityPolicy(),
|
"google_compute_security_policy": resourceComputeSecurityPolicy(),
|
||||||
"google_compute_shared_vpc_host_project": resourceComputeSharedVpcHostProject(),
|
"google_compute_shared_vpc_host_project": resourceComputeSharedVpcHostProject(),
|
||||||
"google_compute_shared_vpc_service_project": resourceComputeSharedVpcServiceProject(),
|
"google_compute_shared_vpc_service_project": resourceComputeSharedVpcServiceProject(),
|
||||||
"google_compute_ssl_certificate": resourceComputeSslCertificate(),
|
|
||||||
"google_compute_ssl_policy": resourceComputeSslPolicy(),
|
|
||||||
"google_compute_subnetwork": resourceComputeSubnetwork(),
|
|
||||||
"google_compute_target_https_proxy": resourceComputeTargetHttpsProxy(),
|
|
||||||
"google_compute_target_tcp_proxy": resourceComputeTargetTcpProxy(),
|
|
||||||
"google_compute_target_pool": resourceComputeTargetPool(),
|
"google_compute_target_pool": resourceComputeTargetPool(),
|
||||||
"google_compute_url_map": resourceComputeUrlMap(),
|
|
||||||
"google_compute_vpn_gateway": resourceComputeVpnGateway(),
|
|
||||||
"google_compute_vpn_tunnel": resourceComputeVpnTunnel(),
|
|
||||||
"google_container_cluster": resourceContainerCluster(),
|
"google_container_cluster": resourceContainerCluster(),
|
||||||
"google_container_node_pool": resourceContainerNodePool(),
|
"google_container_node_pool": resourceContainerNodePool(),
|
||||||
"google_dataflow_job": resourceDataflowJob(),
|
"google_dataflow_job": resourceDataflowJob(),
|
||||||
@ -242,10 +237,7 @@ func Provider() terraform.ResourceProvider {
|
|||||||
"google_storage_default_object_acl": resourceStorageDefaultObjectAcl(),
|
"google_storage_default_object_acl": resourceStorageDefaultObjectAcl(),
|
||||||
"google_storage_notification": resourceStorageNotification(),
|
"google_storage_notification": resourceStorageNotification(),
|
||||||
},
|
},
|
||||||
),
|
)
|
||||||
|
|
||||||
ConfigureFunc: providerConfigure,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func providerConfigure(d *schema.ResourceData) (interface{}, error) {
|
func providerConfigure(d *schema.ResourceData) (interface{}, error) {
|
||||||
|
@ -70,6 +70,13 @@ func TestProvider_impl(t *testing.T) {
|
|||||||
var _ terraform.ResourceProvider = Provider()
|
var _ terraform.ResourceProvider = Provider()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestProvider_noDuplicatesInResourceMap(t *testing.T) {
|
||||||
|
_, err := ResourceMapWithErrors()
|
||||||
|
if err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func testAccPreCheck(t *testing.T) {
|
func testAccPreCheck(t *testing.T) {
|
||||||
if v := os.Getenv("GOOGLE_CREDENTIALS_FILE"); v != "" {
|
if v := os.Getenv("GOOGLE_CREDENTIALS_FILE"); v != "" {
|
||||||
creds, err := ioutil.ReadFile(v)
|
creds, err := ioutil.ReadFile(v)
|
||||||
|
@ -348,16 +348,26 @@ func mergeSchemas(a, b map[string]*schema.Schema) map[string]*schema.Schema {
|
|||||||
return merged
|
return merged
|
||||||
}
|
}
|
||||||
|
|
||||||
func mergeResourceMaps(ms ...map[string]*schema.Resource) map[string]*schema.Resource {
|
func mergeResourceMaps(ms ...map[string]*schema.Resource) (map[string]*schema.Resource, error) {
|
||||||
merged := make(map[string]*schema.Resource)
|
merged := make(map[string]*schema.Resource)
|
||||||
|
duplicates := []string{}
|
||||||
|
|
||||||
for _, m := range ms {
|
for _, m := range ms {
|
||||||
for k, v := range m {
|
for k, v := range m {
|
||||||
|
if _, ok := merged[k]; ok {
|
||||||
|
duplicates = append(duplicates, k)
|
||||||
|
}
|
||||||
|
|
||||||
merged[k] = v
|
merged[k] = v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return merged
|
var err error
|
||||||
|
if len(duplicates) > 0 {
|
||||||
|
err = fmt.Errorf("saw duplicates in mergeResourceMaps: %v", duplicates)
|
||||||
|
}
|
||||||
|
|
||||||
|
return merged, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func retry(retryFunc func() error) error {
|
func retry(retryFunc func() error) error {
|
||||||
|
Loading…
Reference in New Issue
Block a user