diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 00000000..6f54be8a --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,34 @@ +--- +run: + tests: true + +linters: + disable-all: true + enable: + - errcheck + - gosimple + - govet + - ineffassign + - staticcheck + - unused + - gci + +linters-settings: + gci: + sections: + - standard # Standard section: captures all standard packages. + - default # Default section: contains all imports that could not be matched to another section type. + - prefix(github.com/cloudera/terraform-provider-cdp) # Custom section: groups all imports with the specified Prefix. + - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled. + - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled. + # Skip generated files. + # Default: true + skip-generated: true + +output: + format: colored-line-number + print-issued-lines: false + +issues: + max-issues-per-linter: 0 + max-same-issues: 0 diff --git a/Makefile b/Makefile index 89d4aec6..224d5d87 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,10 @@ build: generate fmt vet lint: golangci-lint run +# See https://golangci-lint.run/ +fix: + golangci-lint run --fix + install: main go install . diff --git a/cdp-sdk-go/cdp/retryable_transport_test.go b/cdp-sdk-go/cdp/retryable_transport_test.go index d4b1449b..4217ae1e 100644 --- a/cdp-sdk-go/cdp/retryable_transport_test.go +++ b/cdp-sdk-go/cdp/retryable_transport_test.go @@ -13,11 +13,12 @@ package cdp import ( "bytes" "fmt" - "github.com/jarcoal/httpmock" "io" "net/http" "os" "testing" + + "github.com/jarcoal/httpmock" ) const ( diff --git a/cdp-sdk-go/cdp/transport_test.go b/cdp-sdk-go/cdp/transport_test.go index 7fa46e3f..2c8b8e6f 100644 --- a/cdp-sdk-go/cdp/transport_test.go +++ b/cdp-sdk-go/cdp/transport_test.go @@ -12,12 +12,13 @@ package cdp import ( "context" - "github.com/go-openapi/errors" - "github.com/go-openapi/runtime" - "github.com/go-openapi/strfmt" "net/http" "regexp" "testing" + + "github.com/go-openapi/errors" + "github.com/go-openapi/runtime" + "github.com/go-openapi/strfmt" ) var ( diff --git a/cdpacctest/acctest.go b/cdpacctest/acctest.go index 6a016bc1..e524e4d8 100644 --- a/cdpacctest/acctest.go +++ b/cdpacctest/acctest.go @@ -18,12 +18,13 @@ import ( "sync" "testing" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - "github.com/cloudera/terraform-provider-cdp/provider" "github.com/hashicorp/terraform-plugin-framework/providerserver" "github.com/hashicorp/terraform-plugin-go/tfprotov6" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/pkg/errors" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + "github.com/cloudera/terraform-provider-cdp/provider" ) const ( diff --git a/main.go b/main.go index 377abe80..57e3aed1 100644 --- a/main.go +++ b/main.go @@ -15,8 +15,9 @@ import ( "flag" "log" - "github.com/cloudera/terraform-provider-cdp/provider" "github.com/hashicorp/terraform-plugin-framework/providerserver" + + "github.com/cloudera/terraform-provider-cdp/provider" ) var ( diff --git a/resources/datahub/constants_test.go b/resources/datahub/constants_test.go index 3cf2cf49..bcced7b6 100644 --- a/resources/datahub/constants_test.go +++ b/resources/datahub/constants_test.go @@ -10,8 +10,10 @@ package datahub -import "reflect" -import "testing" +import ( + "reflect" + "testing" +) func TestFailedStatusKeywords(t *testing.T) { expected := [2]string{"FAILED", "DELETED"} diff --git a/resources/datahub/converter_test.go b/resources/datahub/converter_test.go index 0ce63b60..afa7e92d 100644 --- a/resources/datahub/converter_test.go +++ b/resources/datahub/converter_test.go @@ -14,9 +14,10 @@ import ( "context" "testing" - "github.com/cloudera/terraform-provider-cdp/utils/test" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" + + "github.com/cloudera/terraform-provider-cdp/utils/test" ) func TestFromModelToRequestBasicFields(t *testing.T) { diff --git a/resources/datahub/model_datahub_test.go b/resources/datahub/model_datahub_test.go index fcda5d8b..8defd30d 100644 --- a/resources/datahub/model_datahub_test.go +++ b/resources/datahub/model_datahub_test.go @@ -11,8 +11,9 @@ package datahub import ( - "github.com/hashicorp/terraform-plugin-framework/types" "testing" + + "github.com/hashicorp/terraform-plugin-framework/types" ) func TestForceDeleteRequestedForAws(t *testing.T) { diff --git a/resources/datahub/model_gcp_datahub_test.go b/resources/datahub/model_gcp_datahub_test.go index 6157c0af..44a8532e 100644 --- a/resources/datahub/model_gcp_datahub_test.go +++ b/resources/datahub/model_gcp_datahub_test.go @@ -11,8 +11,9 @@ package datahub import ( - "github.com/hashicorp/terraform-plugin-framework/types" "testing" + + "github.com/hashicorp/terraform-plugin-framework/types" ) func TestForceDeleteRequestedForGcp(t *testing.T) { diff --git a/resources/datahub/polling.go b/resources/datahub/polling.go index b676a724..19210859 100644 --- a/resources/datahub/polling.go +++ b/resources/datahub/polling.go @@ -14,6 +14,7 @@ import ( "context" "errors" "fmt" + "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" diff --git a/resources/datahub/schema_aws_datahub_test.go b/resources/datahub/schema_aws_datahub_test.go index b7b03f93..cbdf1253 100644 --- a/resources/datahub/schema_aws_datahub_test.go +++ b/resources/datahub/schema_aws_datahub_test.go @@ -12,9 +12,10 @@ package datahub import ( "context" + "testing" + "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" - "testing" ) func TestAwsSchemaContainsCommonElements(t *testing.T) { diff --git a/resources/datahub/schema_azure_datahub_test.go b/resources/datahub/schema_azure_datahub_test.go index 76e10194..6a327f36 100644 --- a/resources/datahub/schema_azure_datahub_test.go +++ b/resources/datahub/schema_azure_datahub_test.go @@ -12,9 +12,10 @@ package datahub import ( "context" + "testing" + "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" - "testing" ) func TestAzureSchemaContainsCommonElements(t *testing.T) { diff --git a/resources/datahub/schema_gcp_datahub_test.go b/resources/datahub/schema_gcp_datahub_test.go index 672b7cbd..d9d3ba24 100644 --- a/resources/datahub/schema_gcp_datahub_test.go +++ b/resources/datahub/schema_gcp_datahub_test.go @@ -12,7 +12,6 @@ package datahub import ( "context" - "testing" "github.com/hashicorp/terraform-plugin-framework/resource" diff --git a/resources/datalake/converter_gcp.go b/resources/datalake/converter_gcp.go index 9bae3453..1691af22 100644 --- a/resources/datalake/converter_gcp.go +++ b/resources/datalake/converter_gcp.go @@ -14,9 +14,8 @@ import ( "context" "github.com/hashicorp/terraform-plugin-framework/diag" - "github.com/hashicorp/terraform-plugin-framework/types/basetypes" - "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-framework/types/basetypes" datalakemodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/datalake/models" "github.com/cloudera/terraform-provider-cdp/utils" diff --git a/resources/datalake/converter_gcp_test.go b/resources/datalake/converter_gcp_test.go index 3ddc6bf4..ed3a4b45 100644 --- a/resources/datalake/converter_gcp_test.go +++ b/resources/datalake/converter_gcp_test.go @@ -11,9 +11,10 @@ package datalake import ( - "github.com/go-openapi/strfmt" "testing" + "github.com/go-openapi/strfmt" + datalakemodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/datalake/models" ) diff --git a/resources/datalake/resource_aws_datalake_test.go b/resources/datalake/resource_aws_datalake_test.go index 901af483..8c451c8a 100644 --- a/resources/datalake/resource_aws_datalake_test.go +++ b/resources/datalake/resource_aws_datalake_test.go @@ -17,14 +17,15 @@ import ( "sync" "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/datalake/client/operations" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/datalake/models" "github.com/cloudera/terraform-provider-cdp/cdpacctest" "github.com/cloudera/terraform-provider-cdp/utils" - "github.com/hashicorp/terraform-plugin-testing/helper/acctest" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" ) const ( diff --git a/resources/datalake/resource_azure_datalake_test.go b/resources/datalake/resource_azure_datalake_test.go index 0a3982b1..383bbca7 100644 --- a/resources/datalake/resource_azure_datalake_test.go +++ b/resources/datalake/resource_azure_datalake_test.go @@ -14,9 +14,10 @@ import ( "context" "testing" - "github.com/cloudera/terraform-provider-cdp/utils/test" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" + + "github.com/cloudera/terraform-provider-cdp/utils/test" ) func TestFromModelToAzureRequestBasicFields(t *testing.T) { diff --git a/resources/de/resource_data_engineering_service.go b/resources/de/resource_data_engineering_service.go index 4a7b3106..69f095df 100644 --- a/resources/de/resource_data_engineering_service.go +++ b/resources/de/resource_data_engineering_service.go @@ -14,16 +14,16 @@ import ( "context" "errors" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/de/client/operations" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/de/models" - "github.com/cloudera/terraform-provider-cdp/utils" - "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/de/client/operations" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/de/models" + "github.com/cloudera/terraform-provider-cdp/utils" ) var _ resource.Resource = (*serviceResource)(nil) diff --git a/resources/de/schema_data_engineering_service.go b/resources/de/schema_data_engineering_service.go index df25e50c..b2b8dfb7 100644 --- a/resources/de/schema_data_engineering_service.go +++ b/resources/de/schema_data_engineering_service.go @@ -11,9 +11,8 @@ package de import ( - "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/types" ) var serviceSchema = schema.Schema{ diff --git a/resources/dw/cluster/aws/model_cluster_test.go b/resources/dw/cluster/aws/model_cluster_test.go index 349f65d6..e3ba72ca 100644 --- a/resources/dw/cluster/aws/model_cluster_test.go +++ b/resources/dw/cluster/aws/model_cluster_test.go @@ -12,12 +12,14 @@ package aws import ( "context" - models2 "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/dw/models" + "testing" + "time" + "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/stretchr/testify/suite" - "testing" - "time" + + models2 "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/dw/models" ) type DwClusterModelTestSuite struct { diff --git a/resources/dw/cluster/aws/resource_cluster_acc_test.go b/resources/dw/cluster/aws/resource_cluster_acc_test.go index 32670a57..157fcbd6 100644 --- a/resources/dw/cluster/aws/resource_cluster_acc_test.go +++ b/resources/dw/cluster/aws/resource_cluster_acc_test.go @@ -13,16 +13,18 @@ package aws_test import ( "context" "fmt" + "os" + "strings" + "testing" + + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/dw/client/operations" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/dw/models" "github.com/cloudera/terraform-provider-cdp/cdpacctest" "github.com/cloudera/terraform-provider-cdp/utils" - "github.com/hashicorp/terraform-plugin-testing/helper/acctest" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" - "os" - "strings" - "testing" ) const ( diff --git a/resources/dw/databasecatalog/model_catalog_test.go b/resources/dw/databasecatalog/model_catalog_test.go index 03dffbc7..2da5ee65 100644 --- a/resources/dw/databasecatalog/model_catalog_test.go +++ b/resources/dw/databasecatalog/model_catalog_test.go @@ -12,11 +12,12 @@ package databasecatalog import ( "context" + "testing" + "time" + "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/stretchr/testify/suite" - "testing" - "time" ) type DwDatabaseCatalogModelTestSuite struct { diff --git a/resources/environments/converter_freeipa.go b/resources/environments/converter_freeipa.go index 2c39183d..8753589b 100644 --- a/resources/environments/converter_freeipa.go +++ b/resources/environments/converter_freeipa.go @@ -13,11 +13,12 @@ package environments import ( "context" - environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" - "github.com/cloudera/terraform-provider-cdp/utils" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" + + environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" + "github.com/cloudera/terraform-provider-cdp/utils" ) func FreeIpaResponseToModel(ipaResp *environmentsmodels.FreeipaDetails, model *types.Object, ctx context.Context) *diag.Diagnostics { diff --git a/resources/environments/data_source_keytab.go b/resources/environments/data_source_keytab.go index 16816ad9..6b28b36a 100644 --- a/resources/environments/data_source_keytab.go +++ b/resources/environments/data_source_keytab.go @@ -12,6 +12,7 @@ package environments import ( "context" + "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" diff --git a/resources/environments/data_source_keytab_test.go b/resources/environments/data_source_keytab_test.go index 72ba62ed..5f2a221a 100644 --- a/resources/environments/data_source_keytab_test.go +++ b/resources/environments/data_source_keytab_test.go @@ -13,14 +13,15 @@ package environments import ( "context" "errors" + "strings" + "testing" + "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "strings" - "testing" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" diff --git a/resources/environments/polling.go b/resources/environments/polling.go index 6847dfb1..4caf89a3 100644 --- a/resources/environments/polling.go +++ b/resources/environments/polling.go @@ -18,7 +18,6 @@ import ( "time" "github.com/hashicorp/terraform-plugin-log/tflog" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client" diff --git a/resources/environments/resource_aws_credential_test.go b/resources/environments/resource_aws_credential_test.go index 9975e43c..66e8f22f 100644 --- a/resources/environments/resource_aws_credential_test.go +++ b/resources/environments/resource_aws_credential_test.go @@ -16,13 +16,14 @@ import ( "os" "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" "github.com/cloudera/terraform-provider-cdp/cdpacctest" "github.com/cloudera/terraform-provider-cdp/resources/environments" "github.com/cloudera/terraform-provider-cdp/utils" - "github.com/hashicorp/terraform-plugin-testing/helper/acctest" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccAwsCredential_basic(t *testing.T) { diff --git a/resources/environments/resource_azure_credential.go b/resources/environments/resource_azure_credential.go index 30afa803..c11158dd 100644 --- a/resources/environments/resource_azure_credential.go +++ b/resources/environments/resource_azure_credential.go @@ -13,15 +13,16 @@ package environments import ( "context" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" - environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" - "github.com/cloudera/terraform-provider-cdp/utils" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/types" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" + environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" + "github.com/cloudera/terraform-provider-cdp/utils" ) var ( diff --git a/resources/environments/resource_azure_image_terms.go b/resources/environments/resource_azure_image_terms.go index 42ac40c5..4ba4d8ef 100644 --- a/resources/environments/resource_azure_image_terms.go +++ b/resources/environments/resource_azure_image_terms.go @@ -13,13 +13,14 @@ package environments import ( "context" + "github.com/google/uuid" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" "github.com/cloudera/terraform-provider-cdp/utils" - "github.com/google/uuid" - "github.com/hashicorp/terraform-plugin-framework/resource" - "github.com/hashicorp/terraform-plugin-framework/types" ) var ( diff --git a/resources/environments/resource_azure_image_terms_test.go b/resources/environments/resource_azure_image_terms_test.go index 33a33995..4f5bffc6 100644 --- a/resources/environments/resource_azure_image_terms_test.go +++ b/resources/environments/resource_azure_image_terms_test.go @@ -15,15 +15,16 @@ import ( "errors" "testing" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" - mocks "github.com/cloudera/terraform-provider-cdp/mocks/github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" + mocks "github.com/cloudera/terraform-provider-cdp/mocks/github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" ) func createRawAzureImageTermsResource(accepted bool) tftypes.Value { diff --git a/resources/environments/resource_gcp_credential.go b/resources/environments/resource_gcp_credential.go index 2e384ffb..f6d13ee7 100644 --- a/resources/environments/resource_gcp_credential.go +++ b/resources/environments/resource_gcp_credential.go @@ -13,10 +13,10 @@ package environments import ( "context" "encoding/base64" - "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" diff --git a/resources/environments/resource_id_broker_mappings.go b/resources/environments/resource_id_broker_mappings.go index 04075d49..bdaad7a2 100644 --- a/resources/environments/resource_id_broker_mappings.go +++ b/resources/environments/resource_id_broker_mappings.go @@ -13,11 +13,6 @@ package environments import ( "context" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" - environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" - "github.com/cloudera/terraform-provider-cdp/utils" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/resource" @@ -28,6 +23,12 @@ import ( "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" + environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" + "github.com/cloudera/terraform-provider-cdp/utils" ) var ( diff --git a/resources/environments/resource_id_broker_mappings_test.go b/resources/environments/resource_id_broker_mappings_test.go index 7897e028..551d78ea 100644 --- a/resources/environments/resource_id_broker_mappings_test.go +++ b/resources/environments/resource_id_broker_mappings_test.go @@ -15,17 +15,18 @@ import ( "errors" "testing" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - environmentsclient "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" - mocks "github.com/cloudera/terraform-provider-cdp/mocks/github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" "github.com/go-openapi/runtime" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-go/tftypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + environmentsclient "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" + mocks "github.com/cloudera/terraform-provider-cdp/mocks/github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" ) type MockOperations struct { diff --git a/resources/environments/resource_user_sync.go b/resources/environments/resource_user_sync.go index db5538cc..b6a6eef8 100644 --- a/resources/environments/resource_user_sync.go +++ b/resources/environments/resource_user_sync.go @@ -15,11 +15,6 @@ import ( "fmt" "time" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" - environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" - "github.com/cloudera/terraform-provider-cdp/utils" "github.com/google/uuid" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/resource" @@ -32,6 +27,12 @@ import ( "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/client/operations" + environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" + "github.com/cloudera/terraform-provider-cdp/utils" ) var ( diff --git a/resources/environments/schema_aws_credential_prerequisites.go b/resources/environments/schema_aws_credential_prerequisites.go index 6f75003f..51547222 100644 --- a/resources/environments/schema_aws_credential_prerequisites.go +++ b/resources/environments/schema_aws_credential_prerequisites.go @@ -12,6 +12,7 @@ package environments import ( "context" + "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" diff --git a/resources/environments/schema_aws_environment.go b/resources/environments/schema_aws_environment.go index 1ac57b91..b01bcf49 100644 --- a/resources/environments/schema_aws_environment.go +++ b/resources/environments/schema_aws_environment.go @@ -13,11 +13,10 @@ package environments import ( "context" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default" - "github.com/hashicorp/terraform-plugin-framework/resource/schema" "github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault" "github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default" "github.com/hashicorp/terraform-plugin-framework/resource/schema/mapplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault" diff --git a/resources/environments/schema_azure_environment.go b/resources/environments/schema_azure_environment.go index eba905fb..b664877a 100644 --- a/resources/environments/schema_azure_environment.go +++ b/resources/environments/schema_azure_environment.go @@ -13,11 +13,10 @@ package environments import ( "context" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default" - "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault" "github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default" "github.com/hashicorp/terraform-plugin-framework/resource/schema/mapplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/objectplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" diff --git a/resources/environments/schema_azure_environment_test.go b/resources/environments/schema_azure_environment_test.go index 7cdb7a96..c57a331f 100644 --- a/resources/environments/schema_azure_environment_test.go +++ b/resources/environments/schema_azure_environment_test.go @@ -11,8 +11,9 @@ package environments import ( - "github.com/hashicorp/terraform-plugin-framework/resource/schema" "testing" + + "github.com/hashicorp/terraform-plugin-framework/resource/schema" ) var schemaElements = []SchemaTestCaseStructure{ diff --git a/resources/environments/utils.go b/resources/environments/utils.go index 3379c160..f6300977 100644 --- a/resources/environments/utils.go +++ b/resources/environments/utils.go @@ -12,6 +12,7 @@ package environments import ( "context" + "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" diff --git a/resources/environments/utils_test.go b/resources/environments/utils_test.go index 7122d140..e84af983 100644 --- a/resources/environments/utils_test.go +++ b/resources/environments/utils_test.go @@ -11,10 +11,11 @@ package environments import ( + "testing" + "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" "golang.org/x/net/context" - "testing" ) func TestConvertTagsWhenInputIsNil(t *testing.T) { diff --git a/resources/iam/converter.go b/resources/iam/converter.go index c7ff68aa..14479923 100644 --- a/resources/iam/converter.go +++ b/resources/iam/converter.go @@ -13,9 +13,10 @@ package iam import ( "context" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/models" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/models" ) func muRespToModel(ctx context.Context, mu *models.MachineUser, data *machineUserResourceModel) { diff --git a/resources/iam/data_source_group.go b/resources/iam/data_source_group.go index 8ba9f54e..193915fe 100644 --- a/resources/iam/data_source_group.go +++ b/resources/iam/data_source_group.go @@ -12,10 +12,12 @@ package iam import ( "context" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - "github.com/cloudera/terraform-provider-cdp/utils" + "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + "github.com/cloudera/terraform-provider-cdp/utils" ) // Ensure the implementation satisfies the expected interfaces. diff --git a/resources/iam/resource_group.go b/resources/iam/resource_group.go index d24f009f..6778a03d 100644 --- a/resources/iam/resource_group.go +++ b/resources/iam/resource_group.go @@ -12,11 +12,7 @@ package iam import ( "context" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/client" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/client/operations" - iammodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/models" - "github.com/cloudera/terraform-provider-cdp/utils" + "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" @@ -25,6 +21,12 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" "github.com/hashicorp/terraform-plugin-framework/tfsdk" "github.com/hashicorp/terraform-plugin-framework/types" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/client" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/client/operations" + iammodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/models" + "github.com/cloudera/terraform-provider-cdp/utils" ) var ( diff --git a/resources/iam/resource_machine_user.go b/resources/iam/resource_machine_user.go index 8a8ecd2d..5b2f8313 100644 --- a/resources/iam/resource_machine_user.go +++ b/resources/iam/resource_machine_user.go @@ -12,6 +12,7 @@ package iam import ( "context" + "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-log/tflog" diff --git a/resources/iam/resource_machine_user_group_assignment.go b/resources/iam/resource_machine_user_group_assignment.go index f68e6415..b8e26ca7 100644 --- a/resources/iam/resource_machine_user_group_assignment.go +++ b/resources/iam/resource_machine_user_group_assignment.go @@ -12,6 +12,7 @@ package iam import ( "context" + "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" diff --git a/resources/iam/resource_machine_user_resource_role_assignment.go b/resources/iam/resource_machine_user_resource_role_assignment.go index ea3bfcde..bdee2dec 100644 --- a/resources/iam/resource_machine_user_resource_role_assignment.go +++ b/resources/iam/resource_machine_user_resource_role_assignment.go @@ -12,11 +12,10 @@ package iam import ( "context" - "github.com/hashicorp/terraform-plugin-framework/types" - - "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/client/operations" diff --git a/resources/iam/resource_machine_user_resource_role_assignment_test.go b/resources/iam/resource_machine_user_resource_role_assignment_test.go index e660e2e1..66bd1200 100644 --- a/resources/iam/resource_machine_user_resource_role_assignment_test.go +++ b/resources/iam/resource_machine_user_resource_role_assignment_test.go @@ -13,16 +13,17 @@ package iam_test import ( "context" "fmt" - "github.com/cloudera/terraform-provider-cdp/resources/iam" "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/client/operations" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/models" "github.com/cloudera/terraform-provider-cdp/cdpacctest" + "github.com/cloudera/terraform-provider-cdp/resources/iam" "github.com/cloudera/terraform-provider-cdp/utils" - "github.com/hashicorp/terraform-plugin-testing/helper/acctest" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccIamMachineUserResourceRoleAssignment_basic(t *testing.T) { diff --git a/resources/iam/resource_machine_user_role_assignment.go b/resources/iam/resource_machine_user_role_assignment.go index db33f7d2..27093859 100644 --- a/resources/iam/resource_machine_user_role_assignment.go +++ b/resources/iam/resource_machine_user_role_assignment.go @@ -12,11 +12,10 @@ package iam import ( "context" - "github.com/hashicorp/terraform-plugin-framework/types" - - "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/client/operations" diff --git a/resources/iam/resource_machine_user_role_assignment_test.go b/resources/iam/resource_machine_user_role_assignment_test.go index a6572fba..a8550dda 100644 --- a/resources/iam/resource_machine_user_role_assignment_test.go +++ b/resources/iam/resource_machine_user_role_assignment_test.go @@ -13,16 +13,17 @@ package iam_test import ( "context" "fmt" - "github.com/cloudera/terraform-provider-cdp/resources/iam" "testing" + "github.com/hashicorp/terraform-plugin-testing/helper/acctest" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/client/operations" "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/iam/models" "github.com/cloudera/terraform-provider-cdp/cdpacctest" + "github.com/cloudera/terraform-provider-cdp/resources/iam" "github.com/cloudera/terraform-provider-cdp/utils" - "github.com/hashicorp/terraform-plugin-testing/helper/acctest" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-plugin-testing/terraform" ) func TestAccIamMachineUserRoleAssignment_basic(t *testing.T) { diff --git a/resources/iam/test_common_utils.go b/resources/iam/test_common_utils.go index 3208af2c..9175fad9 100644 --- a/resources/iam/test_common_utils.go +++ b/resources/iam/test_common_utils.go @@ -11,9 +11,10 @@ package iam import ( - "github.com/hashicorp/terraform-plugin-framework/resource/schema" "testing" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" ) diff --git a/resources/ml/resource_workspace.go b/resources/ml/resource_workspace.go index 28da6b76..5fc944b1 100644 --- a/resources/ml/resource_workspace.go +++ b/resources/ml/resource_workspace.go @@ -14,15 +14,16 @@ import ( "context" "errors" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/ml/client/operations" - "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/ml/models" - "github.com/cloudera/terraform-provider-cdp/utils" "github.com/hashicorp/terraform-plugin-framework/diag" "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-framework/types/basetypes" "github.com/hashicorp/terraform-plugin-log/tflog" + + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/cdp" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/ml/client/operations" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/ml/models" + "github.com/cloudera/terraform-provider-cdp/utils" ) var _ resource.Resource = (*workspaceResource)(nil) diff --git a/resources/ml/schema_workspace.go b/resources/ml/schema_workspace.go index bb3dc79f..a925e4d2 100644 --- a/resources/ml/schema_workspace.go +++ b/resources/ml/schema_workspace.go @@ -11,9 +11,8 @@ package ml import ( - "github.com/hashicorp/terraform-plugin-framework/types" - "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/types" ) var workspaceSchema = schema.Schema{ diff --git a/resources/opdb/constants_test.go b/resources/opdb/constants_test.go index 5f8b6d79..16a2e277 100644 --- a/resources/opdb/constants_test.go +++ b/resources/opdb/constants_test.go @@ -10,8 +10,10 @@ package opdb -import "reflect" -import "testing" +import ( + "reflect" + "testing" +) func TestFailedStatusKeywords(t *testing.T) { expected := [5]string{"FAILED", "DELETE_FAILED", "MISSING", "CREATE_FAILED", "DELETED"} diff --git a/resources/opdb/converter.go b/resources/opdb/converter.go index 1fcdbfd7..7bbf071d 100644 --- a/resources/opdb/converter.go +++ b/resources/opdb/converter.go @@ -13,11 +13,12 @@ package opdb import ( "context" "fmt" - "github.com/cloudera/terraform-provider-cdp/utils" + "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" opdbmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/opdb/models" + "github.com/cloudera/terraform-provider-cdp/utils" ) func fromModelToDatabaseRequest(model databaseResourceModel, ctx context.Context) *opdbmodels.CreateDatabaseRequest { diff --git a/resources/opdb/converter_test.go b/resources/opdb/converter_test.go index df76b16b..0febcc58 100644 --- a/resources/opdb/converter_test.go +++ b/resources/opdb/converter_test.go @@ -14,9 +14,10 @@ import ( "context" "testing" - "github.com/cloudera/terraform-provider-cdp/utils/test" "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" + + "github.com/cloudera/terraform-provider-cdp/utils/test" ) func TestFromSimplestModelToDatabaseRequestBasicFields(t *testing.T) { diff --git a/resources/opdb/polling.go b/resources/opdb/polling.go index 039bf34d..0b590bde 100644 --- a/resources/opdb/polling.go +++ b/resources/opdb/polling.go @@ -14,6 +14,7 @@ import ( "context" "errors" "fmt" + "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" diff --git a/resources/opdb/resource_database.go b/resources/opdb/resource_database.go index 2973381f..a05fe888 100644 --- a/resources/opdb/resource_database.go +++ b/resources/opdb/resource_database.go @@ -13,6 +13,7 @@ package opdb import ( "context" "fmt" + "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" diff --git a/resources/opdb/schema_database.go b/resources/opdb/schema_database.go index a45ec42f..7d8d5f8d 100644 --- a/resources/opdb/schema_database.go +++ b/resources/opdb/schema_database.go @@ -12,20 +12,18 @@ package opdb import ( "context" + "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" - - "github.com/hashicorp/terraform-plugin-framework/types" - - "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault" - "github.com/hashicorp/terraform-plugin-framework/resource/schema/boolplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64default" "github.com/hashicorp/terraform-plugin-framework/resource/schema/int64planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/objectplanmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/setplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework/types" "github.com/cloudera/terraform-provider-cdp/utils" ) diff --git a/resources/opdb/schema_database_test.go b/resources/opdb/schema_database_test.go index 3c54e058..abc39b70 100644 --- a/resources/opdb/schema_database_test.go +++ b/resources/opdb/schema_database_test.go @@ -12,9 +12,10 @@ package opdb import ( "context" + "testing" + "github.com/hashicorp/terraform-plugin-framework/resource" "github.com/hashicorp/terraform-plugin-framework/resource/schema" - "testing" ) func TestSchemaContainsCommonElements(t *testing.T) { diff --git a/resources/opdb/utils.go b/resources/opdb/utils.go index fea70fac..253add82 100644 --- a/resources/opdb/utils.go +++ b/resources/opdb/utils.go @@ -13,9 +13,10 @@ package opdb import ( "fmt" + "github.com/hashicorp/terraform-plugin-framework/types" + "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/opdb/client/operations" "github.com/cloudera/terraform-provider-cdp/utils" - "github.com/hashicorp/terraform-plugin-framework/types" ) func checkIfDatabaseCreationFailed(resp *operations.DescribeDatabaseOK) (interface{}, string, error) { diff --git a/utils/log.go b/utils/log.go index ebfd8627..e843b459 100644 --- a/utils/log.go +++ b/utils/log.go @@ -14,6 +14,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/hashicorp/terraform-plugin-log/tflog" environmentsmodels "github.com/cloudera/terraform-provider-cdp/cdp-sdk-go/gen/environments/models" diff --git a/utils/schema_utils_test.go b/utils/schema_utils_test.go index 3d71e688..a335791c 100644 --- a/utils/schema_utils_test.go +++ b/utils/schema_utils_test.go @@ -11,8 +11,9 @@ package utils import ( - "github.com/hashicorp/terraform-plugin-framework/resource/schema" "testing" + + "github.com/hashicorp/terraform-plugin-framework/resource/schema" ) func TestWithNoErrorAndAction(t *testing.T) {