Revert "Ensure Elem is always either a *Schema or *Resource (#929)" (#950)

This reverts commit a3352655ac.
This commit is contained in:
James McGill 2018-01-12 13:09:06 -05:00 committed by Vincent Roseberry
parent d9c7963241
commit bc266979d4
8 changed files with 10 additions and 10 deletions

View File

@ -62,7 +62,7 @@ func dataSourceGoogleSignedUrl() *schema.Resource {
"extension_headers": &schema.Schema{
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
ValidateFunc: validateExtensionHeaders,
},
"http_method": &schema.Schema{

View File

@ -43,7 +43,7 @@ var schemaNodeConfig = &schema.Schema{
Type: schema.TypeMap,
Optional: true,
ForceNew: true,
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
},
"local_ssd_count": {
@ -65,7 +65,7 @@ var schemaNodeConfig = &schema.Schema{
Type: schema.TypeMap,
Optional: true,
ForceNew: true,
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
},
"min_cpu_platform": {

View File

@ -105,7 +105,7 @@ func resourceBigQueryDataset() *schema.Resource {
"labels": &schema.Schema{
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
},
// SelfLink: [Output-only] A URL that can be used to access the resource

View File

@ -78,7 +78,7 @@ func resourceBigQueryTable() *schema.Resource {
"labels": &schema.Schema{
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
},
// Schema: [Optional] Describes the schema of this table.

View File

@ -271,7 +271,7 @@ func resourceComputeInstance() *schema.Resource {
"metadata": &schema.Schema{
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
},
"metadata_startup_script": &schema.Schema{

View File

@ -22,7 +22,7 @@ func resourceComputeProjectMetadata() *schema.Resource {
Schema: map[string]*schema.Schema{
"metadata": &schema.Schema{
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
Type: schema.TypeMap,
Required: true,
},

View File

@ -76,7 +76,7 @@ func resourceDataprocCluster() *schema.Resource {
"labels": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
// GCP automatically adds two labels
// 'goog-dataproc-cluster-uuid'
// 'goog-dataproc-cluster-name'
@ -253,7 +253,7 @@ func resourceDataprocCluster() *schema.Resource {
Type: schema.TypeMap,
Optional: true,
ForceNew: true,
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
},
"properties": {

View File

@ -61,7 +61,7 @@ func resourcePubsubSubscription() *schema.Resource {
"attributes": &schema.Schema{
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
Elem: schema.TypeString,
},
"push_endpoint": &schema.Schema{