Skip to content

Commit 1495497

Browse files
committed
Update vendor folder with latest govendor sync
This involves reenabling schema checks that were previously disabled. We also update our schemas to ensure the schema checks are passing.
1 parent 0bcebe5 commit 1495497

File tree

24 files changed

+2171
-57
lines changed

24 files changed

+2171
-57
lines changed

provider/core_boot_volumes_data_source.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ func BootVolumesDataSource() *schema.Resource {
4646
Computed: true,
4747
},
4848
"defined_tags": {
49-
Type: schema.TypeMap,
50-
Computed: true,
51-
DiffSuppressFunc: definedTagsDiffSuppressFunction,
52-
Elem: schema.TypeString,
49+
Type: schema.TypeMap,
50+
Computed: true,
51+
Elem: schema.TypeString,
5352
},
5453
"display_name": {
5554
Type: schema.TypeString,

provider/core_public_ip_data_source.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ func PublicIpDataSource() *schema.Resource {
4343
Computed: true,
4444
},
4545
"defined_tags": {
46-
Type: schema.TypeMap,
47-
Computed: true,
48-
DiffSuppressFunc: definedTagsDiffSuppressFunction,
49-
Elem: schema.TypeString,
46+
Type: schema.TypeMap,
47+
Computed: true,
48+
Elem: schema.TypeString,
5049
},
5150
"display_name": {
5251
Type: schema.TypeString,

provider/core_vnic_data_source.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ func VnicDataSource() *schema.Resource {
2727
Computed: true,
2828
},
2929
"defined_tags": {
30-
Type: schema.TypeMap,
31-
Computed: true,
32-
DiffSuppressFunc: definedTagsDiffSuppressFunction,
33-
Elem: schema.TypeString,
30+
Type: schema.TypeMap,
31+
Computed: true,
32+
Elem: schema.TypeString,
3433
},
3534
"display_name": {
3635
Type: schema.TypeString,

provider/crud_helpers.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,5 +502,31 @@ func GetDataSourceItemSchema(resourceSchema *schema.Resource) *schema.Resource {
502502
}
503503
}
504504

505+
// Ensure Create/Read are not set for nested sub-resource schemas. Otherwise, terraform will validate them
506+
// as though they were resources.
507+
resourceSchema.Create = nil
508+
resourceSchema.Read = nil
509+
510+
return convertResourceFieldsToDatasourceFields(resourceSchema)
511+
}
512+
513+
// This is mainly used to ensure that fields of a datasource item are compliant with Terraform schema validation
514+
// All datasource return items should have computed-only fields; and not require Diff, Validation, or Default settings.
515+
func convertResourceFieldsToDatasourceFields(resourceSchema *schema.Resource) *schema.Resource {
516+
for _, fieldSchema := range resourceSchema.Schema {
517+
fieldSchema.Computed = true
518+
fieldSchema.Required = false
519+
fieldSchema.Optional = false
520+
fieldSchema.DiffSuppressFunc = nil
521+
fieldSchema.ValidateFunc = nil
522+
fieldSchema.Default = nil
523+
524+
if fieldSchema.Elem != nil {
525+
if resource, ok := fieldSchema.Elem.(*schema.Resource); ok {
526+
fieldSchema.Elem = convertResourceFieldsToDatasourceFields(resource)
527+
}
528+
}
529+
}
530+
505531
return resourceSchema
506532
}

provider/database_database_data_source.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ func DatabaseDataSource() *schema.Resource {
6262
Computed: true,
6363
},
6464
"defined_tags": {
65-
Type: schema.TypeMap,
66-
Computed: true,
67-
DiffSuppressFunc: definedTagsDiffSuppressFunction,
68-
Elem: schema.TypeString,
65+
Type: schema.TypeMap,
66+
Computed: true,
67+
Elem: schema.TypeString,
6968
},
7069
"freeform_tags": {
7170
Type: schema.TypeMap,

provider/identity_tenancy_data_source.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ func TenancyDataSource() *schema.Resource {
1919
},
2020
// Computed
2121
"defined_tags": {
22-
Type: schema.TypeMap,
23-
Computed: true,
24-
DiffSuppressFunc: definedTagsDiffSuppressFunction,
25-
Elem: schema.TypeString,
22+
Type: schema.TypeMap,
23+
Computed: true,
24+
Elem: schema.TypeString,
2625
},
2726
"description": {
2827
Type: schema.TypeString,

vendor/github.com/aws/aws-sdk-go/LICENSE.txt

Lines changed: 202 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go/NOTICE.txt

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/aws/aws-sdk-go/aws/credentials/example.ini

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)