Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: validator identifier names #3870

Merged
merged 2 commits into from
Jul 1, 2022
Merged

Fix: validator identifier names #3870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f60819
Fix: validator identifier names
kavya498 Jun 23, 2022
b08e9ba
Fix validateSchema from one element to zero
kavya498 Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ibm/service/cdtektonpipeline/resource_ibm_cd_tekton_pipeline_definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func ResourceIBMTektonPipelineDefinition() *schema.Resource {
}

func ResourceIBMTektonPipelineDefinitionValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "pipeline_id",
Expand Down
5 changes: 3 additions & 2 deletions ibm/service/cdtektonpipeline/resource_ibm_cd_tekton_pipeline_property.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import (
"crypto/hmac"
"encoding/hex"
"fmt"
"golang.org/x/crypto/sha3"
"log"
"strings"

"golang.org/x/crypto/sha3"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

Expand Down Expand Up @@ -99,7 +100,7 @@ func ResourceIBMTektonPipelineProperty() *schema.Resource {
}

func ResourceIBMTektonPipelinePropertyValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "pipeline_id",
Expand Down
5 changes: 3 additions & 2 deletions ibm/service/cdtektonpipeline/resource_ibm_cd_tekton_pipeline_trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import (
"crypto/hmac"
"encoding/hex"
"fmt"
"golang.org/x/crypto/sha3"
"log"
"strings"

"golang.org/x/crypto/sha3"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

Expand Down Expand Up @@ -253,7 +254,7 @@ func ResourceIBMTektonPipelineTrigger() *schema.Resource {
}

func ResourceIBMTektonPipelineTriggerValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "pipeline_id",
Expand Down
5 changes: 3 additions & 2 deletions ibm/service/cdtektonpipeline/resource_ibm_cd_tekton_pipeline_trigger_property.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import (
"crypto/hmac"
"encoding/hex"
"fmt"
"golang.org/x/crypto/sha3"
"log"
"strings"

"golang.org/x/crypto/sha3"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

Expand Down Expand Up @@ -106,7 +107,7 @@ func ResourceIBMTektonPipelineTriggerProperty() *schema.Resource {
}

func ResourceIBMTektonPipelineTriggerPropertyValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "pipeline_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func ResourceIBMCdToolchain() *schema.Resource {
}

func ResourceIBMCdToolchainValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "name",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_appconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func ResourceIBMCdToolchainToolAppconfig() *schema.Resource {
}

func ResourceIBMCdToolchainToolAppconfigValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_artifactory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func ResourceIBMCdToolchainToolArtifactory() *schema.Resource {
}

func ResourceIBMCdToolchainToolArtifactoryValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_bitbucketgit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func ResourceIBMCdToolchainToolBitbucketgit() *schema.Resource {
}

func ResourceIBMCdToolchainToolBitbucketgitValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func ResourceIBMCdToolchainToolCustom() *schema.Resource {
}

func ResourceIBMCdToolchainToolCustomValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_devopsinsights.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func ResourceIBMCdToolchainToolDevopsinsights() *schema.Resource {
}

func ResourceIBMCdToolchainToolDevopsinsightsValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_githubconsolidated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func ResourceIBMCdToolchainToolGithubconsolidated() *schema.Resource {
}

func ResourceIBMCdToolchainToolGithubconsolidatedValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_githubintegrated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func ResourceIBMCdToolchainToolGithubintegrated() *schema.Resource {
}

func ResourceIBMCdToolchainToolGithubintegratedValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_gitlab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func ResourceIBMCdToolchainToolGitlab() *schema.Resource {
}

func ResourceIBMCdToolchainToolGitlabValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_hashicorpvault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func ResourceIBMCdToolchainToolHashicorpvault() *schema.Resource {
}

func ResourceIBMCdToolchainToolHashicorpvaultValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_hostedgit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func ResourceIBMCdToolchainToolHostedgit() *schema.Resource {
}

func ResourceIBMCdToolchainToolHostedgitValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_jenkins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func ResourceIBMCdToolchainToolJenkins() *schema.Resource {
}

func ResourceIBMCdToolchainToolJenkinsValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_keyprotect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func ResourceIBMCdToolchainToolKeyprotect() *schema.Resource {
}

func ResourceIBMCdToolchainToolKeyprotectValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_nexus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func ResourceIBMCdToolchainToolNexus() *schema.Resource {
}

func ResourceIBMCdToolchainToolNexusValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_pagerduty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func ResourceIBMCdToolchainToolPagerduty() *schema.Resource {
}

func ResourceIBMCdToolchainToolPagerdutyValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func ResourceIBMCdToolchainToolPipeline() *schema.Resource {
}

func ResourceIBMCdToolchainToolPipelineValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_privateworker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func ResourceIBMCdToolchainToolPrivateworker() *schema.Resource {
}

func ResourceIBMCdToolchainToolPrivateworkerValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_saucelabs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func ResourceIBMCdToolchainToolSaucelabs() *schema.Resource {
}

func ResourceIBMCdToolchainToolSaucelabsValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_secretsmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func ResourceIBMCdToolchainToolSecretsmanager() *schema.Resource {
}

func ResourceIBMCdToolchainToolSecretsmanagerValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_securitycompliance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func ResourceIBMCdToolchainToolSecuritycompliance() *schema.Resource {
}

func ResourceIBMCdToolchainToolSecuritycomplianceValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_slack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func ResourceIBMCdToolchainToolSlack() *schema.Resource {
}

func ResourceIBMCdToolchainToolSlackValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/cdtoolchain/resource_ibm_cd_toolchain_tool_sonarqube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func ResourceIBMCdToolchainToolSonarqube() *schema.Resource {
}

func ResourceIBMCdToolchainToolSonarqubeValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 1)
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "toolchain_id",
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/cis/resource_ibm_cis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func ResourceIBMCISInstance() *schema.Resource {
"tags": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString, ValidateFunc: validate.InvokeValidator("ibm_cis", "tag")},
Elem: &schema.Schema{Type: schema.TypeString, ValidateFunc: validate.InvokeValidator("ibm_cis", "tags")},
Set: schema.HashString,
},

Expand Down Expand Up @@ -144,7 +144,7 @@ func ResourceIBMCISValidator() *validate.ResourceValidator {

validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "tag",
Identifier: "tags",
ValidateFunctionIdentifier: validate.ValidateRegexpLen,
Type: validate.TypeString,
Optional: true,
Expand Down
17 changes: 12 additions & 5 deletions ibm/service/cis/resource_ibm_cis_cache_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const (
cisCachePurgeByURLs = "purge_by_urls"
cisCachePurgeByCacheTags = "purge_by_tags"
cisCachePurgeByHosts = "purge_by_hosts"
cisCacheSettingsOnOffValidatorID = "on_off_validator_id"
cisCacheServeStaleContent = "serve_stale_content"
// cisCacheSettingsOnOffValidatorID = "on_off_validator_id"
cisCacheServeStaleContent = "serve_stale_content"
)

func ResourceIBMCISCacheSettings() *schema.Resource {
Expand Down Expand Up @@ -71,15 +71,15 @@ func ResourceIBMCISCacheSettings() *schema.Resource {
Optional: true,
Computed: true,
ValidateFunc: validate.InvokeValidator(ibmCISCacheSettings,
cisCacheSettingsOnOffValidatorID),
cisCacheSettingsDevelopmentMode),
},
cisCacheSettingsQueryStringSort: {
Type: schema.TypeString,
Description: "Query String sort setting",
Optional: true,
Computed: true,
ValidateFunc: validate.InvokeValidator(ibmCISCacheSettings,
cisCacheSettingsOnOffValidatorID),
cisCacheSettingsQueryStringSort),
},
cisCachePurgeAll: {
Type: schema.TypeBool,
Expand Down Expand Up @@ -143,7 +143,14 @@ func ResourceIBMCISCacheSettingsValidator() *validate.ResourceValidator {
"691200, 1382400, 2073600, 2678400, 5356800, 16070400, 31536000"
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: cisCacheSettingsOnOffValidatorID,
Identifier: cisCacheSettingsDevelopmentMode,
ValidateFunctionIdentifier: validate.ValidateAllowedStringValue,
Type: validate.TypeString,
Required: true,
AllowedValues: "on, off"})
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: cisCacheSettingsQueryStringSort,
ValidateFunctionIdentifier: validate.ValidateAllowedStringValue,
Type: validate.TypeString,
Required: true,
Expand Down
Loading