Skip to content

Commit 8bb09ac

Browse files
nfxnfx
committed
Moved Secrets API resources to a dedicated package
1 parent 4a5080e commit 8bb09ac

19 files changed

+64
-63
lines changed

‎catalog/resource_metastore_data_access_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func TestCreateDac(t *testing.T) {
3030
{
3131
Method: "PATCH",
3232
Resource: "/api/2.0/unity-catalog/metastores/abc",
33-
ExpectedRequest: map[string]interface {}{
34-
"default_data_access_config_id":"efg",
33+
ExpectedRequest: map[string]interface{}{
34+
"default_data_access_config_id": "efg",
3535
},
3636
},
3737
{
@@ -47,7 +47,7 @@ func TestCreateDac(t *testing.T) {
4747
{
4848
Method: "GET",
4949
Resource: "/api/2.0/unity-catalog/metastores/abc",
50-
Response: MetastoreInfo {
50+
Response: MetastoreInfo{
5151
DefaultDacID: "efg",
5252
},
5353
},

‎clusters/acceptance/clusters_api_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ func TestAccListClustersIntegration(t *testing.T) {
2626
randomName := qa.RandomName()
2727

2828
cluster := clusters.Cluster{
29-
NumWorkers: 1,
30-
ClusterName: "Terraform Integration Test " + randomName,
31-
SparkVersion: clustersAPI.LatestSparkVersionOrDefault(
29+
NumWorkers: 1,
30+
ClusterName: "Terraform Integration Test " + randomName,
31+
SparkVersion: clustersAPI.LatestSparkVersionOrDefault(
3232
clusters.SparkVersionRequest{
33-
Latest: true,
33+
Latest: true,
3434
LongTermSupport: true,
3535
}),
3636
InstancePoolID: compute.CommonInstancePoolID(),

‎exporter/exporter_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/databrickslabs/terraform-provider-databricks/access"
1312
"github.com/databrickslabs/terraform-provider-databricks/clusters"
1413
"github.com/databrickslabs/terraform-provider-databricks/commands"
1514
"github.com/databrickslabs/terraform-provider-databricks/common"
@@ -18,6 +17,7 @@ import (
1817
"github.com/databrickslabs/terraform-provider-databricks/libraries"
1918
"github.com/databrickslabs/terraform-provider-databricks/policies"
2019
"github.com/databrickslabs/terraform-provider-databricks/qa"
20+
"github.com/databrickslabs/terraform-provider-databricks/secrets"
2121
"github.com/databrickslabs/terraform-provider-databricks/workspace"
2222
"github.com/hashicorp/hcl/v2/hclwrite"
2323

@@ -302,8 +302,8 @@ func TestImportingUsersGroupsSecretScopes(t *testing.T) {
302302
Method: "GET",
303303
Resource: "/api/2.0/secrets/scopes/list",
304304
ReuseRequest: true,
305-
Response: access.SecretScopeList{
306-
Scopes: []access.SecretScope{
305+
Response: secrets.SecretScopeList{
306+
Scopes: []secrets.SecretScope{
307307
{Name: "a"},
308308
},
309309
},
@@ -312,17 +312,17 @@ func TestImportingUsersGroupsSecretScopes(t *testing.T) {
312312
Method: "GET",
313313
Resource: "/api/2.0/secrets/list?scope=a",
314314
ReuseRequest: true,
315-
Response: access.SecretsList{
316-
Secrets: []access.SecretMetadata{
315+
Response: secrets.SecretsList{
316+
Secrets: []secrets.SecretMetadata{
317317
{Key: "b"},
318318
},
319319
},
320320
},
321321
{
322322
Method: "GET",
323323
Resource: "/api/2.0/secrets/acls/list?scope=a",
324-
Response: access.SecretScopeACL{
325-
Items: []access.ACLItem{
324+
Response: secrets.SecretScopeACL{
325+
Items: []secrets.ACLItem{
326326
{Permission: "MANAGE", Principal: "test"},
327327
{Permission: "READ", Principal: "users"},
328328
},
@@ -331,8 +331,8 @@ func TestImportingUsersGroupsSecretScopes(t *testing.T) {
331331
{
332332
Method: "GET",
333333
Resource: "/api/2.0/secrets/acls/list?scope=a",
334-
Response: access.SecretScopeACL{
335-
Items: []access.ACLItem{
334+
Response: secrets.SecretScopeACL{
335+
Items: []secrets.ACLItem{
336336
{Permission: "MANAGE", Principal: "test"},
337337
{Permission: "READ", Principal: "users"},
338338
},
@@ -341,12 +341,12 @@ func TestImportingUsersGroupsSecretScopes(t *testing.T) {
341341
{
342342
Method: "GET",
343343
Resource: "/api/2.0/secrets/acls/get?principal=test&scope=a",
344-
Response: access.ACLItem{Permission: "MANAGE", Principal: "test"},
344+
Response: secrets.ACLItem{Permission: "MANAGE", Principal: "test"},
345345
},
346346
{
347347
Method: "GET",
348348
Resource: "/api/2.0/secrets/acls/get?principal=users&scope=a",
349-
Response: access.ACLItem{Permission: "READ", Principal: "users"},
349+
Response: secrets.ACLItem{Permission: "READ", Principal: "users"},
350350
},
351351
}, func(ctx context.Context, client *common.DatabricksClient) {
352352
tmpDir := fmt.Sprintf("/tmp/tf-%s", qa.RandomName())
@@ -395,8 +395,8 @@ func TestImportingNoResourcesError(t *testing.T) {
395395
Method: "GET",
396396
Resource: "/api/2.0/secrets/scopes/list",
397397
ReuseRequest: true,
398-
Response: access.SecretScopeList{
399-
Scopes: []access.SecretScope{},
398+
Response: secrets.SecretScopeList{
399+
Scopes: []secrets.SecretScope{},
400400
},
401401
},
402402
}, func(ctx context.Context, client *common.DatabricksClient) {

‎exporter/importables.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"strings"
1313
"time"
1414

15-
"github.com/databrickslabs/terraform-provider-databricks/access"
1615
"github.com/databrickslabs/terraform-provider-databricks/clusters"
1716
"github.com/databrickslabs/terraform-provider-databricks/common"
1817
"github.com/databrickslabs/terraform-provider-databricks/jobs"
1918
"github.com/databrickslabs/terraform-provider-databricks/permissions"
19+
"github.com/databrickslabs/terraform-provider-databricks/secrets"
2020
"github.com/databrickslabs/terraform-provider-databricks/workspace"
2121

2222
"github.com/databrickslabs/terraform-provider-databricks/storage"
@@ -549,7 +549,7 @@ var resourcesMap map[string]importable = map[string]importable{
549549
return d.Get("name").(string)
550550
},
551551
List: func(ic *importContext) error {
552-
ssAPI := access.NewSecretScopesAPI(ic.Context, ic.Client)
552+
ssAPI := secrets.NewSecretScopesAPI(ic.Context, ic.Client)
553553
if scopes, err := ssAPI.List(); err == nil {
554554
for i, scope := range scopes {
555555
if !ic.MatchesName(scope.Name) {
@@ -569,7 +569,7 @@ var resourcesMap map[string]importable = map[string]importable{
569569
Import: func(ic *importContext, r *resource) error {
570570
backendType, _ := r.Data.GetOk("backend_type")
571571
if backendType != "AZURE_KEYVAULT" {
572-
if l, err := access.NewSecretsAPI(ic.Context, ic.Client).List(r.ID); err == nil {
572+
if l, err := secrets.NewSecretsAPI(ic.Context, ic.Client).List(r.ID); err == nil {
573573
for _, secret := range l {
574574
ic.Emit(&resource{
575575
Resource: "databricks_secret",
@@ -578,7 +578,7 @@ var resourcesMap map[string]importable = map[string]importable{
578578
}
579579
}
580580
}
581-
if l, err := access.NewSecretAclsAPI(ic.Context, ic.Client).List(r.ID); err == nil {
581+
if l, err := secrets.NewSecretAclsAPI(ic.Context, ic.Client).List(r.ID); err == nil {
582582
for _, acl := range l {
583583
ic.Emit(&resource{
584584
Resource: "databricks_secret_acl",

‎exporter/importables_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"encoding/json"
55
"testing"
66

7-
"github.com/databrickslabs/terraform-provider-databricks/access"
87
"github.com/databrickslabs/terraform-provider-databricks/common"
98
"github.com/databrickslabs/terraform-provider-databricks/identity"
109
"github.com/databrickslabs/terraform-provider-databricks/permissions"
1110
"github.com/databrickslabs/terraform-provider-databricks/policies"
1211
"github.com/databrickslabs/terraform-provider-databricks/pools"
1312
"github.com/databrickslabs/terraform-provider-databricks/provider"
13+
"github.com/databrickslabs/terraform-provider-databricks/secrets"
1414
"github.com/stretchr/testify/assert"
1515
)
1616

@@ -150,7 +150,7 @@ func TestPermissions(t *testing.T) {
150150
}
151151

152152
func TestSecretScope(t *testing.T) {
153-
d := access.ResourceSecretScope().TestResourceData()
153+
d := secrets.ResourceSecretScope().TestResourceData()
154154
d.Set("name", "abc")
155155
ic := importContextForTest()
156156
name := ic.Importables["databricks_secret_scope"].Name(d)

‎internal/azureit/azureit_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestStart(t *testing.T) {
2929
os.Setenv("ACI_CONTAINER_GROUP", "")
3030
triggerStart(responseWriter, nil)
3131
assert.Equal(t, "400 Bad Request", responseWriter.Result().Status)
32-
32+
3333
responseWriter = httptest.NewRecorder()
3434
os.Setenv("ACI_CONTAINER_GROUP", "/abc")
3535
triggerStart(responseWriter, nil)

‎permissions/acceptance/api_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func TestAccPermissionsClusterPolicy(t *testing.T) {
108108
func TestAccPermissionsInstancePool(t *testing.T) {
109109
permissionsTestHelper(t, func(permissionsAPI permissions.PermissionsAPI, user, group string,
110110
ef func(string) permissions.PermissionsEntity) {
111-
client := common.NewClientFromEnvironment()
111+
client := common.NewClientFromEnvironment()
112112
poolsAPI := pools.NewInstancePoolsAPI(context.Background(), client)
113113
ctx := context.Background()
114114
ips, err := poolsAPI.Create(pools.InstancePool{
@@ -258,7 +258,7 @@ func TestAccPermissionsJobs(t *testing.T) {
258258
func TestAccPermissionsNotebooks(t *testing.T) {
259259
permissionsTestHelper(t, func(permissionsAPI permissions.PermissionsAPI, user, group string,
260260
ef func(string) permissions.PermissionsEntity) {
261-
client := common.NewClientFromEnvironment()
261+
client := common.NewClientFromEnvironment()
262262
workspaceAPI := workspace.NewNotebooksAPI(context.Background(), client)
263263

264264
notebookDir := fmt.Sprintf("/Testing/%s/something", group)

‎provider/provider.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/databrickslabs/terraform-provider-databricks/pipelines"
2424
"github.com/databrickslabs/terraform-provider-databricks/policies"
2525
"github.com/databrickslabs/terraform-provider-databricks/pools"
26+
"github.com/databrickslabs/terraform-provider-databricks/secrets"
2627
"github.com/databrickslabs/terraform-provider-databricks/sqlanalytics"
2728
"github.com/databrickslabs/terraform-provider-databricks/storage"
2829
"github.com/databrickslabs/terraform-provider-databricks/workspace"
@@ -84,9 +85,9 @@ func DatabricksProvider() *schema.Provider {
8485
"databricks_pipeline": pipelines.ResourcePipeline(),
8586
"databricks_repo": workspace.ResourceRepo(),
8687
"databricks_schema": catalog.ResourceSchema(),
87-
"databricks_secret": access.ResourceSecret(),
88-
"databricks_secret_scope": access.ResourceSecretScope(),
89-
"databricks_secret_acl": access.ResourceSecretACL(),
88+
"databricks_secret": secrets.ResourceSecret(),
89+
"databricks_secret_scope": secrets.ResourceSecretScope(),
90+
"databricks_secret_acl": secrets.ResourceSecretACL(),
9091
"databricks_service_principal": identity.ResourceServicePrincipal(),
9192
"databricks_sql_dashboard": sqlanalytics.ResourceDashboard(),
9293
"databricks_sql_endpoint": sqlanalytics.ResourceSQLEndpoint(),

‎access/acceptance/secret_acl_test.go‎ renamed to ‎secrets/acceptance/secret_acl_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66
"testing"
77

8-
. "github.com/databrickslabs/terraform-provider-databricks/access"
98
"github.com/databrickslabs/terraform-provider-databricks/identity"
9+
"github.com/databrickslabs/terraform-provider-databricks/secrets"
1010

1111
"github.com/databrickslabs/terraform-provider-databricks/common"
1212
"github.com/databrickslabs/terraform-provider-databricks/internal/acceptance"
@@ -44,7 +44,7 @@ func TestAccSecretAclResource(t *testing.T) {
4444
me, err := usersAPI.Me()
4545
require.NoError(t, err)
4646

47-
secretACLAPI := NewSecretAclsAPI(ctx, client)
47+
secretACLAPI := secrets.NewSecretAclsAPI(ctx, client)
4848
scope := s.RootModule().Resources["databricks_secret_scope.app"].Primary.ID
4949
acls, err := secretACLAPI.List(scope)
5050
require.NoError(t, err)
@@ -81,7 +81,7 @@ func TestAccSecretAclResourceDefaultPrincipal(t *testing.T) {
8181
}`),
8282
Check: acceptance.ResourceCheck("databricks_secret_scope.app",
8383
func(ctx context.Context, client *common.DatabricksClient, id string) error {
84-
secretACLAPI := NewSecretAclsAPI(ctx, client)
84+
secretACLAPI := secrets.NewSecretAclsAPI(ctx, client)
8585
acls, err := secretACLAPI.List(id)
8686
require.NoError(t, err)
8787
assert.Equal(t, 1, len(acls))

‎access/acceptance/secret_scope_test.go‎ renamed to ‎secrets/acceptance/secret_scope_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"os"
77
"testing"
88

9-
. "github.com/databrickslabs/terraform-provider-databricks/access"
109
"github.com/databrickslabs/terraform-provider-databricks/identity"
1110
"github.com/databrickslabs/terraform-provider-databricks/qa"
11+
"github.com/databrickslabs/terraform-provider-databricks/secrets"
1212

1313
"github.com/databrickslabs/terraform-provider-databricks/common"
1414
"github.com/databrickslabs/terraform-provider-databricks/internal/acceptance"
@@ -24,7 +24,7 @@ func TestAccRemoveScopes(t *testing.T) {
2424
t.Skip("Cleaning up tests only from IDE")
2525
}
2626
client := common.CommonEnvironmentClient()
27-
scopesAPI := NewSecretScopesAPI(context.Background(), client)
27+
scopesAPI := secrets.NewSecretScopesAPI(context.Background(), client)
2828
scopeList, err := scopesAPI.List()
2929
require.NoError(t, err)
3030
for _, scope := range scopeList {
@@ -40,12 +40,12 @@ func TestAzureAccKeyVaultSimple(t *testing.T) {
4040
if client.IsAzureClientSecretSet() {
4141
t.Skip("AKV scopes don't work for SP auth yet")
4242
}
43-
scopesAPI := NewSecretScopesAPI(context.Background(), client)
43+
scopesAPI := secrets.NewSecretScopesAPI(context.Background(), client)
4444
name := qa.RandomName("tf-scope-")
4545

46-
err := scopesAPI.Create(SecretScope{
46+
err := scopesAPI.Create(secrets.SecretScope{
4747
Name: name,
48-
KeyvaultMetadata: &KeyvaultMetadata{
48+
KeyvaultMetadata: &secrets.KeyvaultMetadata{
4949
ResourceID: resourceID,
5050
DNSName: DNSName,
5151
},
@@ -68,16 +68,16 @@ func TestAccInitialManagePrincipals(t *testing.T) {
6868
}
6969
ctx := context.Background()
7070
client := common.CommonEnvironmentClient()
71-
scopesAPI := NewSecretScopesAPI(context.Background(), client)
71+
scopesAPI := secrets.NewSecretScopesAPI(context.Background(), client)
7272

7373
scope := fmt.Sprintf("tf-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
74-
err := scopesAPI.Create(SecretScope{Name: scope})
74+
err := scopesAPI.Create(secrets.SecretScope{Name: scope})
7575
require.NoError(t, err)
7676
defer func() {
7777
assert.NoError(t, scopesAPI.Delete(scope))
7878
}()
7979

80-
secretACLAPI := NewSecretAclsAPI(ctx, client)
80+
secretACLAPI := secrets.NewSecretAclsAPI(ctx, client)
8181
acls, err := secretACLAPI.List(scope)
8282
require.NoError(t, err)
8383

@@ -94,10 +94,10 @@ func TestAccInitialManagePrincipalsGroup(t *testing.T) {
9494
}
9595
client := common.CommonEnvironmentClient()
9696
ctx := context.Background()
97-
scopesAPI := NewSecretScopesAPI(ctx, client)
97+
scopesAPI := secrets.NewSecretScopesAPI(ctx, client)
9898

9999
scope := fmt.Sprintf("tf-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
100-
err := scopesAPI.Create(SecretScope{
100+
err := scopesAPI.Create(secrets.SecretScope{
101101
Name: scope,
102102
InitialManagePrincipal: "users",
103103
})
@@ -106,7 +106,7 @@ func TestAccInitialManagePrincipalsGroup(t *testing.T) {
106106
assert.NoError(t, scopesAPI.Delete(scope))
107107
}()
108108

109-
secretACLAPI := NewSecretAclsAPI(ctx, client)
109+
secretACLAPI := secrets.NewSecretAclsAPI(ctx, client)
110110
acls, err := secretACLAPI.List(scope)
111111
require.NoError(t, err)
112112
assert.Equal(t, 1, len(acls))
@@ -131,7 +131,7 @@ func TestAccSecretScopeResource(t *testing.T) {
131131
resource.TestCheckResourceAttr("databricks_secret_scope.my_scope", "backend_type", "DATABRICKS"),
132132
acceptance.ResourceCheck("databricks_secret_scope.my_scope",
133133
func(ctx context.Context, client *common.DatabricksClient, id string) error {
134-
secretACLAPI := NewSecretAclsAPI(ctx, client)
134+
secretACLAPI := secrets.NewSecretAclsAPI(ctx, client)
135135
acls, err := secretACLAPI.List(id)
136136
require.NoError(t, err)
137137

@@ -147,7 +147,7 @@ func TestAccSecretScopeResource(t *testing.T) {
147147
{
148148
PreConfig: func() {
149149
client := common.CommonEnvironmentClient()
150-
err := NewSecretScopesAPI(context.Background(), client).Delete(scope)
150+
err := secrets.NewSecretScopesAPI(context.Background(), client).Delete(scope)
151151
assert.NoError(t, err, err)
152152
},
153153
Config: fmt.Sprintf(`

0 commit comments

Comments
 (0)