Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions build/Makefile.lint
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ lint: golangci-lint check-license tfproviderlint tfproviderdocs terrafmt fmt

.PHONY: tfproviderlint
tfproviderlint: tools
@ echo '-> Ignoring tfproviderlint until https://github.com/bflad/tfproviderlint/issues/255 is fixed...'
#@ echo "-> Checking source code against terraform provider linters..."
#@ $(GOBIN)/tfproviderlint ./...
@ echo "-> Checking source code against terraform provider linters..."
@ $(GOBIN)/tfproviderlint -v $$(go list ./... | grep -v '/gen/')

.PHONY: tfproviderdocs
tfproviderdocs: tools
Expand Down
2 changes: 1 addition & 1 deletion build/Makefile.tools
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

VERSION_TFPROVIDERDOCS:=v0.6.0
VERSION_TERRAFMT:=v0.5.2
VERSION_TFPROVIDERLINT:=v0.28.1
VERSION_TFPROVIDERLINT:=v0.31.0

## Installs the required static checks for terraform.
tools: $(GOBIN)/tfproviderdocs $(GOBIN)/terrafmt $(GOBIN)/tfproviderlint $(GOBIN)/tfplugindocs
Expand Down
2 changes: 1 addition & 1 deletion ec/acc/deployment_ml_only_autoscale_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
// Machine Learning nodes can be auto-scaled exclusively, while the data tier remains being managed manually.
//
// This feature leverages `autoscaling_tier_override` parameter within the ML topology element of the API payload.
func TestAccDeploymentWithMLOnlyAutoscale(t *testing.T) {
func TestAcc_DeploymentWithMLOnlyAutoscale(t *testing.T) {

resourceName := "ec_deployment.autoscale_ml"
initialTfConfigWithMlAutoscale := "testdata/deployment_autoscale_ml.tf"
Expand Down
2 changes: 1 addition & 1 deletion ec/acc/elasticsearch_project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/terraform"
)

func TestAccElasticsearchProject(t *testing.T) {
func TestAcc_ElasticsearchProject(t *testing.T) {
resId := "my_project"
resourceName := fmt.Sprintf("ec_elasticsearch_project.%s", resId)
randomName := prefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
Expand Down
4 changes: 2 additions & 2 deletions ec/acc/observability_project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/terraform"
)

func TestAccObservabilityProject(t *testing.T) {
func TestAcc_ObservabilityProject(t *testing.T) {
resId := "my_project"
resourceName := fmt.Sprintf("ec_observability_project.%s", resId)
randomName := prefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
Expand Down Expand Up @@ -114,7 +114,7 @@ resource ec_observability_project "%s" {
`, id, name, region, alias)
}

func TestAccObservabilityProjectTier(t *testing.T) {
func TestAcc_ObservabilityProjectTier(t *testing.T) {
resId := "my_project"
resourceName := fmt.Sprintf("ec_observability_project.%s", resId)
newName := prefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
Expand Down
4 changes: 2 additions & 2 deletions ec/acc/security_project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/hashicorp/terraform-plugin-testing/terraform"
)

func TestAccSecurityProject(t *testing.T) {
func TestAcc_SecurityProject(t *testing.T) {
resId := "my_project"
resourceName := fmt.Sprintf("ec_security_project.%s", resId)
randomName := prefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
Expand Down Expand Up @@ -87,7 +87,7 @@ func TestAccSecurityProject(t *testing.T) {
})
}

func TestAccSecurityProjectWithAdminFeaturesAndProductTypes(t *testing.T) {
func TestAcc_SecurityProjectWithAdminFeaturesAndProductTypes(t *testing.T) {
resId := "my_project"
resourceName := fmt.Sprintf("ec_security_project.%s", resId)
randomName := prefix + acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
Expand Down
1 change: 1 addition & 0 deletions ec/ecresource/projectresource/elasticsearch.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ type sleeper interface {
type realSleeper struct{}

func (r realSleeper) Sleep(d time.Duration) {
//lintignore:R018 // Intentionally wrapped for testability
time.Sleep(d)
}

Expand Down
5 changes: 4 additions & 1 deletion ec/ecresource/trafficfilterassocresource/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@ import (
)

func (r Resource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) {
panic("ec_deployment_traffic_filter_association resources can not be updated!")
response.Diagnostics.AddError(
"Update not supported",
"ec_deployment_traffic_filter_association resources can not be updated!",
)
}
Loading