Skip to content

Commit

Permalink
Removed ValidateFunc
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbristowe
jbristowe committed Nov 27, 2020
1 parent dd83719 commit d159ad2
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 41 deletions.
23 changes: 11 additions & 12 deletions octopusdeploy/schema_certificate.go
View file
Expand Up @@ -198,7 +198,6 @@ func getCertificateDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down Expand Up @@ -256,10 +255,10 @@ func getCertificateSchema() map[string]*schema.Schema {
Type: schema.TypeString,
},
"certificate_data": {
Required: true,
Sensitive: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
Required: true,
Sensitive: true,
Type: schema.TypeString,
ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty),
},
"certificate_data_format": {
Optional: true,
Expand Down Expand Up @@ -295,9 +294,9 @@ func getCertificateSchema() map[string]*schema.Schema {
Type: schema.TypeString,
},
"name": {
Required: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
Required: true,
Type: schema.TypeString,
ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty),
},
"not_after": {
Optional: true,
Expand All @@ -312,10 +311,10 @@ func getCertificateSchema() map[string]*schema.Schema {
Type: schema.TypeString,
},
"password": {
Required: true,
Sensitive: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
Required: true,
Sensitive: true,
Type: schema.TypeString,
ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty),
},
"replaced_by": {
Optional: true,
Expand Down
7 changes: 3 additions & 4 deletions octopusdeploy/schema_channel.go
View file
Expand Up @@ -74,7 +74,6 @@ func getChannelDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down Expand Up @@ -124,9 +123,9 @@ func getChannelSchema() map[string]*schema.Schema {
Type: schema.TypeString,
},
"name": {
Required: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
Required: true,
Type: schema.TypeString,
ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty),
},
"project_id": {
Required: true,
Expand Down
7 changes: 3 additions & 4 deletions octopusdeploy/schema_deployment_target.go
View file
Expand Up @@ -143,7 +143,6 @@ func getDeploymentTargetDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down Expand Up @@ -327,9 +326,9 @@ func getDeploymentTargetSchema() map[string]*schema.Schema {
Type: schema.TypeString,
},
"name": {
Required: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
Required: true,
Type: schema.TypeString,
ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty),
},
"offline_drop": {
Computed: true,
Expand Down
7 changes: 3 additions & 4 deletions octopusdeploy/schema_environment.go
View file
Expand Up @@ -57,7 +57,6 @@ func getEnvironmentDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down Expand Up @@ -107,9 +106,9 @@ func getEnvironmentSchema() map[string]*schema.Schema {
Type: schema.TypeString,
},
"name": {
Required: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
Required: true,
Type: schema.TypeString,
ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty),
},
"sort_order": {
Computed: true,
Expand Down
1 change: 0 additions & 1 deletion octopusdeploy/schema_feed.go
View file
Expand Up @@ -94,7 +94,6 @@ func getFeedDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down
1 change: 0 additions & 1 deletion octopusdeploy/schema_machine_policy.go
View file
Expand Up @@ -108,7 +108,6 @@ func getMachinePolicyDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down
7 changes: 3 additions & 4 deletions octopusdeploy/schema_project.go
View file
Expand Up @@ -141,7 +141,6 @@ func getProjectDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down Expand Up @@ -272,9 +271,9 @@ func getProjectSchema() map[string]*schema.Schema {
Type: schema.TypeString,
},
"name": {
Required: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
Required: true,
Type: schema.TypeString,
ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty),
},
"project_group_id": {
Optional: true,
Expand Down
7 changes: 3 additions & 4 deletions octopusdeploy/schema_project_group.go
View file
Expand Up @@ -53,7 +53,6 @@ func getProjectGroupDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down Expand Up @@ -102,9 +101,9 @@ func getProjectGroupSchema() map[string]*schema.Schema {
Type: schema.TypeString,
},
"name": {
Required: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
Required: true,
Type: schema.TypeString,
ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty),
},
"retention_policy_id": {
Optional: true,
Expand Down
7 changes: 3 additions & 4 deletions octopusdeploy/schema_space.go
View file
Expand Up @@ -63,7 +63,6 @@ func getSpaceDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down Expand Up @@ -109,9 +108,9 @@ func getSpaceSchema() map[string]*schema.Schema {
Type: schema.TypeBool,
},
"name": {
Required: true,
Type: schema.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
Required: true,
Type: schema.TypeString,
ValidateDiagFunc: validateDiagFunc(validation.StringIsNotEmpty),
},
"space_managers_team_members": {
Elem: &schema.Schema{
Expand Down
1 change: 0 additions & 1 deletion octopusdeploy/schema_tag_set.go
View file
Expand Up @@ -43,7 +43,6 @@ func getTagSetDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down
1 change: 0 additions & 1 deletion octopusdeploy/schema_user.go
View file
Expand Up @@ -68,7 +68,6 @@ func getUserDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down
1 change: 0 additions & 1 deletion octopusdeploy/schema_variable.go
View file
Expand Up @@ -59,7 +59,6 @@ func getVariableDataSchema() map[string]*schema.Schema {
field.Optional = false
field.Required = false
field.ValidateDiagFunc = nil
field.ValidateFunc = nil
}

return map[string]*schema.Schema{
Expand Down

0 comments on commit d159ad2

Please sign in to comment.