Migrated databricks_git_credential to Go SDK (#2069)

Author: nkvuong

exporter/exporter_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/databricks/databricks-sdk-go/service/gitcredentials"
 	"github.com/databricks/terraform-provider-databricks/access"
 	"github.com/databricks/terraform-provider-databricks/aws"
 	"github.com/databricks/terraform-provider-databricks/clusters"
@@ -228,7 +229,9 @@ var emptyRepos = qa.HTTPFixture{
 var emptyGitCredentials = qa.HTTPFixture{
 	Method:   http.MethodGet,
 	Resource: "/api/2.0/git-credentials",
-	Response: repos.GitCredentialList{},
+	Response: []gitcredentials.CredentialInfo{
+		{},
+	},
 }
 
 var emptyIpAccessLIst = qa.HTTPFixture{

internal/acceptance/git_credential_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/databricks/terraform-provider-databricks/common"
-	"github.com/databricks/terraform-provider-databricks/repos"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -19,10 +18,12 @@ func TestAccGitCredentials(t *testing.T) {
 		}`,
 		Check: resourceCheck("databricks_git_credential.this",
 			func(ctx context.Context, client *common.DatabricksClient, id string) error {
-				creds, err := repos.NewGitCredentialsAPI(ctx, client).List()
+				w, err := client.WorkspaceClient()
+				assert.NoError(t, err)
+				creds, err := w.GitCredentials.ListAll(ctx)
 				assert.NoError(t, err)
 				assert.Len(t, creds, 1)
-				assert.Equal(t, creds[0].UserName, "test")
+				assert.Equal(t, creds[0].GitUsername, "test")
 				return nil
 			}),
 	})

repos/resource_git_credential.go

@@ -3,70 +3,16 @@ package repos
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
 
+	"github.com/databricks/databricks-sdk-go/service/gitcredentials"
 	"github.com/databricks/terraform-provider-databricks/common"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-// GitCredentialsAPI exposes the Git Credentials API
-type GitCredentialsAPI struct {
-	client  *common.DatabricksClient
-	context context.Context
-}
-
-// GitCredentialsAPI creates GitCredentialsAPI instance from provider meta
-func NewGitCredentialsAPI(ctx context.Context, m any) GitCredentialsAPI {
-	return GitCredentialsAPI{m.(*common.DatabricksClient), ctx}
-}
-
-type GitCredentialRequest struct {
-	PAT      string `json:"personal_access_token" tf:"sensitive"`
-	Provider string `json:"git_provider" tf:"suppress_diff"`
-	UserName string `json:"git_username"`
-}
-
-type GitCredentialResponse struct {
-	ID       int64  `json:"credential_id"`
-	UserName string `json:"git_username"`
-	Provider string `json:"git_provider"`
-}
-
-type GitCredentialList struct {
-	Credentials []GitCredentialResponse `json:"credentials,omitempty"`
-}
-
-// ID returns job id as string
-func (r GitCredentialResponse) GitCredentialID() string {
-	return fmt.Sprintf("%d", r.ID)
-}
-
-func (a GitCredentialsAPI) Delete(id string) error {
-	return a.client.Delete(a.context, fmt.Sprintf("/git-credentials/%s", id), nil)
-}
-
-func (a GitCredentialsAPI) List() ([]GitCredentialResponse, error) {
-	resp := GitCredentialList{}
-	err := a.client.Get(a.context, "/git-credentials", nil, &resp)
-	return resp.Credentials, err
-}
-
-func (a GitCredentialsAPI) Read(id string) (resp GitCredentialResponse, err error) {
-	err = a.client.Get(a.context, fmt.Sprintf("/git-credentials/%s", id), nil, &resp)
-	return
-}
-
-func (a GitCredentialsAPI) Create(req GitCredentialRequest) (resp GitCredentialResponse, err error) {
-	err = a.client.Post(a.context, "/git-credentials", &req, &resp)
-	return
-}
-
-func (a GitCredentialsAPI) Update(id string, req GitCredentialRequest) error {
-	return a.client.Patch(a.context, fmt.Sprintf("/git-credentials/%s", id), &req)
-}
-
 func ResourceGitCredential() *schema.Resource {
-	s := common.StructToSchema(GitCredentialRequest{}, func(s map[string]*schema.Schema) map[string]*schema.Schema {
+	s := common.StructToSchema(gitcredentials.CreateCredentials{}, func(s map[string]*schema.Schema) map[string]*schema.Schema {
 		s["force"] = &schema.Schema{
 			Type:     schema.TypeBool,
 			Optional: true,
@@ -83,47 +29,81 @@ func ResourceGitCredential() *schema.Resource {
 		Schema:        s,
 		SchemaVersion: 1,
 		Create: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			api := NewGitCredentialsAPI(ctx, c)
-			var req GitCredentialRequest
+			w, err := c.WorkspaceClient()
+			if err != nil {
+				return err
+			}
+
+			var req gitcredentials.CreateCredentials
 			common.DataToStructPointer(d, s, &req)
-			resp, err := api.Create(req)
+			resp, err := w.GitCredentials.Create(ctx, req)
 
 			if err != nil {
 				if !d.Get("force").(bool) || !strings.HasPrefix(err.Error(), "Only one Git credential is supported at this time") {
 					return err
 				}
-				creds, err := api.List()
+				creds, err := w.GitCredentials.ListAll(ctx)
 				if err != nil {
 					return err
 				}
 				if len(creds) != 1 {
 					return fmt.Errorf("list of credentials is either empty or have more than one entry (%d)", len(creds))
 				}
-				resp = creds[0]
-				err = api.Update(resp.GitCredentialID(), req)
+				var req gitcredentials.UpdateCredentials
+				common.DataToStructPointer(d, s, &req)
+				req.CredentialId = creds[0].CredentialId
+
+				err = w.GitCredentials.Update(ctx, req)
 				if err != nil {
 					return err
 				}
+				resp.CredentialId = creds[0].CredentialId
 			}
-			d.SetId(resp.GitCredentialID())
+			d.SetId(fmt.Sprintf("%d", resp.CredentialId))
 			return nil
 		},
 		Read: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			resp, err := NewGitCredentialsAPI(ctx, c).Read(d.Id())
+			w, err := c.WorkspaceClient()
+			if err != nil {
+				return err
+			}
+			cred_id, err := strconv.ParseInt(d.Id(), 10, 0)
+			if err != nil {
+				return err
+			}
+			resp, err := w.GitCredentials.Get(ctx, gitcredentials.Get{CredentialId: cred_id})
 			if err != nil {
 				return err
 			}
-			d.Set("git_provider", resp.Provider)
-			d.Set("git_username", resp.UserName)
+			d.Set("git_provider", resp.GitProvider)
+			d.Set("git_username", resp.GitUsername)
 			return nil
 		},
 		Update: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			var req GitCredentialRequest
+			var req gitcredentials.UpdateCredentials
+
 			common.DataToStructPointer(d, s, &req)
-			return NewGitCredentialsAPI(ctx, c).Update(d.Id(), req)
+			cred_id, err := strconv.ParseInt(d.Id(), 10, 0)
+			if err != nil {
+				return err
+			}
+			req.CredentialId = cred_id
+			w, err := c.WorkspaceClient()
+			if err != nil {
+				return err
+			}
+			return w.GitCredentials.Update(ctx, req)
 		},
 		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			return NewGitCredentialsAPI(ctx, c).Delete(d.Id())
+			w, err := c.WorkspaceClient()
+			if err != nil {
+				return err
+			}
+			cred_id, err := strconv.ParseInt(d.Id(), 10, 0)
+			if err != nil {
+				return err
+			}
+			return w.GitCredentials.DeleteByCredentialId(ctx, cred_id)
 		},
 	}.ToResource()
 }