resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

provider/scaleway: improve schema resources (#13522) 

improve readability by removing unecessary schema type declarations

this changeset does not include any semantic changes
This commit is contained in:
Raphael Randschau 2017-04-11 04:10:45 -04:00 committed by Paul Stack
parent ebb169a79f
commit 41e14baa57
8 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/providers/scaleway/data_source_scaleway_bootscript.go
View File

@ -13,43 +13,43 @@ func dataSourceScalewayBootscript() *schema.Resource {
Read: dataSourceScalewayBootscriptRead, Read: dataSourceScalewayBootscriptRead,
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
}, },
"name_filter": &schema.Schema{ "name_filter": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
}, },
"architecture": &schema.Schema{ "architecture": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
Optional: true, Optional: true,
}, },
// Computed values. // Computed values.
"organization": &schema.Schema{ "organization": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"public": &schema.Schema{ "public": {
Type: schema.TypeBool, Type: schema.TypeBool,
Computed: true, Computed: true,
}, },
"boot_cmd_args": &schema.Schema{ "boot_cmd_args": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"dtb": &schema.Schema{ "dtb": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"initrd": &schema.Schema{ "initrd": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"kernel": &schema.Schema{ "kernel": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },

12
builtin/providers/scaleway/data_source_scaleway_image.go
View File

@ -12,32 +12,32 @@ func dataSourceScalewayImage() *schema.Resource {
Read: dataSourceScalewayImageRead, Read: dataSourceScalewayImageRead,
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
Computed: true, Computed: true,
}, },
"name_filter": &schema.Schema{ "name_filter": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
}, },
"architecture": &schema.Schema{ "architecture": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ForceNew: true, ForceNew: true,
}, },
// Computed values. // Computed values.
"organization": &schema.Schema{ "organization": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"public": &schema.Schema{ "public": {
Type: schema.TypeBool, Type: schema.TypeBool,
Computed: true, Computed: true,
}, },
"creation_date": &schema.Schema{ "creation_date": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },

4
builtin/providers/scaleway/resource_scaleway_ip.go
View File

@ -18,11 +18,11 @@ func resourceScalewayIP() *schema.Resource {
}, },
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"server": &schema.Schema{ "server": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
}, },
"ip": &schema.Schema{ "ip": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },

4
builtin/providers/scaleway/resource_scaleway_security_group.go
View File

@ -19,11 +19,11 @@ func resourceScalewaySecurityGroup() *schema.Resource {
}, },
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
}, },
"description": &schema.Schema{ "description": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
}, },

12
builtin/providers/scaleway/resource_scaleway_security_group_rule.go
View File

@ -15,11 +15,11 @@ func resourceScalewaySecurityGroupRule() *schema.Resource {
Update: resourceScalewaySecurityGroupRuleUpdate, Update: resourceScalewaySecurityGroupRuleUpdate,
Delete: resourceScalewaySecurityGroupRuleDelete, Delete: resourceScalewaySecurityGroupRuleDelete,
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"security_group": &schema.Schema{ "security_group": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
}, },
"action": &schema.Schema{ "action": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) { ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
@ -30,7 +30,7 @@ func resourceScalewaySecurityGroupRule() *schema.Resource {
return return
}, },
}, },
"direction": &schema.Schema{ "direction": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) { ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
@ -41,11 +41,11 @@ func resourceScalewaySecurityGroupRule() *schema.Resource {
return return
}, },
}, },
"ip_range": &schema.Schema{ "ip_range": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
}, },
"protocol": &schema.Schema{ "protocol": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) { ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
@ -56,7 +56,7 @@ func resourceScalewaySecurityGroupRule() *schema.Resource {
return return
}, },
}, },
"port": &schema.Schema{ "port": {
Type: schema.TypeInt, Type: schema.TypeInt,
Optional: true, Optional: true,
}, },

32
builtin/providers/scaleway/resource_scaleway_server.go
View File

@ -19,45 +19,45 @@ func resourceScalewayServer() *schema.Resource {
}, },
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
}, },
"image": &schema.Schema{ "image": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ForceNew: true, ForceNew: true,
}, },
"type": &schema.Schema{ "type": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ForceNew: true, ForceNew: true,
}, },
"bootscript": &schema.Schema{ "bootscript": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
}, },
"tags": &schema.Schema{ "tags": {
Type: schema.TypeList, Type: schema.TypeList,
Elem: &schema.Schema{ Elem: &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
}, },
Optional: true, Optional: true,
}, },
"enable_ipv6": &schema.Schema{ "enable_ipv6": {
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
Default: false, Default: false,
}, },
"dynamic_ip_required": &schema.Schema{ "dynamic_ip_required": {
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
}, },
"security_group": &schema.Schema{ "security_group": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
}, },
"volume": &schema.Schema{ "volume": {
Type: schema.TypeList, Type: schema.TypeList,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
@ -68,36 +68,36 @@ func resourceScalewayServer() *schema.Resource {
Required: true, Required: true,
ValidateFunc: validateVolumeSize, ValidateFunc: validateVolumeSize,
}, },
"type": &schema.Schema{ "type": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ValidateFunc: validateVolumeType, ValidateFunc: validateVolumeType,
}, },
"volume_id": &schema.Schema{ "volume_id": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
}, },
}, },
}, },
"private_ip": &schema.Schema{ "private_ip": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"public_ip": &schema.Schema{ "public_ip": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"public_ipv6": &schema.Schema{ "public_ipv6": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },
"state": &schema.Schema{ "state": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Computed: true, Computed: true,
}, },
"state_detail": &schema.Schema{ "state_detail": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },

8
builtin/providers/scaleway/resource_scaleway_volume.go
View File

@ -21,21 +21,21 @@ func resourceScalewayVolume() *schema.Resource {
}, },
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
}, },
"size_in_gb": &schema.Schema{ "size_in_gb": {
Type: schema.TypeInt, Type: schema.TypeInt,
Required: true, Required: true,
ValidateFunc: validateVolumeSize, ValidateFunc: validateVolumeSize,
}, },
"type": &schema.Schema{ "type": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ValidateFunc: validateVolumeType, ValidateFunc: validateVolumeType,
}, },
"server": &schema.Schema{ "server": {
Type: schema.TypeString, Type: schema.TypeString,
Computed: true, Computed: true,
}, },

4
builtin/providers/scaleway/resource_scaleway_volume_attachment.go
View File

@ -16,12 +16,12 @@ func resourceScalewayVolumeAttachment() *schema.Resource {
Read: resourceScalewayVolumeAttachmentRead, Read: resourceScalewayVolumeAttachmentRead,
Delete: resourceScalewayVolumeAttachmentDelete, Delete: resourceScalewayVolumeAttachmentDelete,
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"server": &schema.Schema{ "server": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ForceNew: true, ForceNew: true,
}, },
"volume": &schema.Schema{ "volume": {
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
ForceNew: true, ForceNew: true,