From d56c8ed9963ff2b91b0df174d78abea8f8a4c38a Mon Sep 17 00:00:00 2001 From: Sriharsha Tikkireddy Date: Mon, 15 Jun 2020 11:20:32 -0400 Subject: [PATCH] formatting and fixed typo --- databricks/provider.go | 24 +++++++++---------- databricks/resource_databricks_group.go | 11 +++++---- .../resource_databricks_group_aws_test.go | 3 ++- .../resource_databricks_group_azure_test.go | 3 ++- ...ource_databricks_group_instance_profile.go | 5 ++-- ...abricks_group_instance_profile_aws_test.go | 3 ++- .../resource_databricks_group_member.go | 5 ++-- ...source_databricks_group_member_aws_test.go | 3 ++- ...urce_databricks_group_member_azure_test.go | 3 ++- databricks/utils.go | 5 ++-- 10 files changed, 37 insertions(+), 28 deletions(-) diff --git a/databricks/provider.go b/databricks/provider.go index 05f2ab497..ee93f40e3 100644 --- a/databricks/provider.go +++ b/databricks/provider.go @@ -34,19 +34,19 @@ func Provider(version string) terraform.ResourceProvider { "databricks_scim_user": resourceScimUser(), "databricks_scim_group": resourceScimGroup(), // Scim Group is split into multiple components for flexibility to pick and choose - "databricks_group": resourceGroup(), + "databricks_group": resourceGroup(), "databricks_group_instance_profile": resourceGroupInstanceProfile(), - "databricks_group_member": resourceGroupMember(), - "databricks_notebook": resourceNotebook(), - "databricks_cluster": resourceCluster(), - "databricks_job": resourceJob(), - "databricks_dbfs_file": resourceDBFSFile(), - "databricks_dbfs_file_sync": resourceDBFSFileSync(), - "databricks_instance_profile": resourceInstanceProfile(), - "databricks_aws_s3_mount": resourceAWSS3Mount(), - "databricks_azure_blob_mount": resourceAzureBlobMount(), - "databricks_azure_adls_gen1_mount": resourceAzureAdlsGen1Mount(), - "databricks_azure_adls_gen2_mount": resourceAzureAdlsGen2Mount(), + "databricks_group_member": resourceGroupMember(), + "databricks_notebook": resourceNotebook(), + "databricks_cluster": resourceCluster(), + "databricks_job": resourceJob(), + "databricks_dbfs_file": resourceDBFSFile(), + "databricks_dbfs_file_sync": resourceDBFSFileSync(), + "databricks_instance_profile": resourceInstanceProfile(), + "databricks_aws_s3_mount": resourceAWSS3Mount(), + "databricks_azure_blob_mount": resourceAzureBlobMount(), + "databricks_azure_adls_gen1_mount": resourceAzureAdlsGen1Mount(), + "databricks_azure_adls_gen2_mount": resourceAzureAdlsGen2Mount(), // MWS (multiple workspaces) resources are only limited to AWS as azure already has a built in concept of MWS "databricks_mws_credentials": resourceMWSCredentials(), "databricks_mws_storage_configurations": resourceMWSStorageConfigurations(), diff --git a/databricks/resource_databricks_group.go b/databricks/resource_databricks_group.go index ee51b67ab..8cb20355f 100644 --- a/databricks/resource_databricks_group.go +++ b/databricks/resource_databricks_group.go @@ -1,10 +1,11 @@ package databricks import ( + "log" + "github.com/databrickslabs/databricks-terraform/client/model" "github.com/databrickslabs/databricks-terraform/client/service" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "log" ) func resourceGroup() *schema.Resource { @@ -21,12 +22,12 @@ func resourceGroup() *schema.Resource { Required: true, }, "allow_cluster_create": { - Type: schema.TypeBool, - Optional: true, + Type: schema.TypeBool, + Optional: true, }, "allow_instance_pool_create": { - Type: schema.TypeBool, - Optional: true, + Type: schema.TypeBool, + Optional: true, }, }, Importer: &schema.ResourceImporter{ diff --git a/databricks/resource_databricks_group_aws_test.go b/databricks/resource_databricks_group_aws_test.go index 675f3b3d1..fceffef7a 100644 --- a/databricks/resource_databricks_group_aws_test.go +++ b/databricks/resource_databricks_group_aws_test.go @@ -3,13 +3,14 @@ package databricks import ( "errors" "fmt" + "testing" + "github.com/databrickslabs/databricks-terraform/client/model" "github.com/databrickslabs/databricks-terraform/client/service" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/stretchr/testify/assert" - "testing" ) func TestAccAWSGroupResource(t *testing.T) { diff --git a/databricks/resource_databricks_group_azure_test.go b/databricks/resource_databricks_group_azure_test.go index 984fb666d..f23f756f3 100644 --- a/databricks/resource_databricks_group_azure_test.go +++ b/databricks/resource_databricks_group_azure_test.go @@ -3,13 +3,14 @@ package databricks import ( "errors" "fmt" + "testing" + "github.com/databrickslabs/databricks-terraform/client/model" "github.com/databrickslabs/databricks-terraform/client/service" "github.com/hashicorp/terraform-plugin-sdk/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/stretchr/testify/assert" - "testing" ) func TestAccAzureGroupResource(t *testing.T) { diff --git a/databricks/resource_databricks_group_instance_profile.go b/databricks/resource_databricks_group_instance_profile.go index a069ab77f..aed137294 100644 --- a/databricks/resource_databricks_group_instance_profile.go +++ b/databricks/resource_databricks_group_instance_profile.go @@ -2,11 +2,12 @@ package databricks import ( "fmt" + "log" + "strings" + "github.com/databrickslabs/databricks-terraform/client/model" "github.com/databrickslabs/databricks-terraform/client/service" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "log" - "strings" ) func resourceGroupInstanceProfile() *schema.Resource { diff --git a/databricks/resource_databricks_group_instance_profile_aws_test.go b/databricks/resource_databricks_group_instance_profile_aws_test.go index 8d6876a72..30cf732e5 100644 --- a/databricks/resource_databricks_group_instance_profile_aws_test.go +++ b/databricks/resource_databricks_group_instance_profile_aws_test.go @@ -3,12 +3,13 @@ package databricks import ( "errors" "fmt" + "testing" + "github.com/databrickslabs/databricks-terraform/client/model" "github.com/databrickslabs/databricks-terraform/client/service" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/stretchr/testify/assert" - "testing" ) func TestAccAWSGroupInstanceProfileResource(t *testing.T) { diff --git a/databricks/resource_databricks_group_member.go b/databricks/resource_databricks_group_member.go index 33fbfbdd7..3e59ded94 100644 --- a/databricks/resource_databricks_group_member.go +++ b/databricks/resource_databricks_group_member.go @@ -2,11 +2,12 @@ package databricks import ( "fmt" + "log" + "strings" + "github.com/databrickslabs/databricks-terraform/client/model" "github.com/databrickslabs/databricks-terraform/client/service" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "log" - "strings" ) // Use this to manage individual members of a particular group diff --git a/databricks/resource_databricks_group_member_aws_test.go b/databricks/resource_databricks_group_member_aws_test.go index 8f1b9e699..7fdcb260c 100644 --- a/databricks/resource_databricks_group_member_aws_test.go +++ b/databricks/resource_databricks_group_member_aws_test.go @@ -3,12 +3,13 @@ package databricks import ( "errors" "fmt" + "testing" + "github.com/databrickslabs/databricks-terraform/client/model" "github.com/databrickslabs/databricks-terraform/client/service" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/stretchr/testify/assert" - "testing" ) func TestAccAWSGroupMemberResource(t *testing.T) { diff --git a/databricks/resource_databricks_group_member_azure_test.go b/databricks/resource_databricks_group_member_azure_test.go index 8b8b355df..770280a30 100644 --- a/databricks/resource_databricks_group_member_azure_test.go +++ b/databricks/resource_databricks_group_member_azure_test.go @@ -3,12 +3,13 @@ package databricks import ( "errors" "fmt" + "testing" + "github.com/databrickslabs/databricks-terraform/client/model" "github.com/databrickslabs/databricks-terraform/client/service" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/stretchr/testify/assert" - "testing" ) func TestAccAzureGroupMemberResource(t *testing.T) { diff --git a/databricks/utils.go b/databricks/utils.go index 1fc9d3a13..e28916e19 100644 --- a/databricks/utils.go +++ b/databricks/utils.go @@ -2,10 +2,11 @@ package databricks import ( "fmt" - "github.com/aws/aws-sdk-go/aws/arn" "strings" "time" + "github.com/aws/aws-sdk-go/aws/arn" + "github.com/databrickslabs/databricks-terraform/client/model" "github.com/databrickslabs/databricks-terraform/client/service" ) @@ -110,7 +111,7 @@ func ValidateInstanceProfileARN(val interface{}, key string) (warns []string, er // Parse and verify instance profiles instanceProfileArn, err := arn.Parse(v) if err != nil { - return nil, []error{fmt.Errorf("%s is invalid got: %s recieved error: %w", key, v, err)} + return nil, []error{fmt.Errorf("%s is invalid got: %s received error: %w", key, v, err)} } // Verify instance profile resource type, Resource gets parsed as instance-profile/ if !strings.HasPrefix(instanceProfileArn.Resource, "instance-profile") {