Skip to content

Commit 2b74f07

Browse files
denikIsaac
andcommitted
direct: let the framework re-key a secret that only follows its parent; drop duplicated test-server moves
Co-authored-by: Isaac <no-reply@databricks.com>
1 parent 63b6b73 commit 2b74f07

4 files changed

Lines changed: 13 additions & 28 deletions

File tree

‎acceptance/bundle/resources/secrets/parent_rename/output.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
102102
}
103103
],
104104
"action": "update_id",
105+
"state_only": true,
105106
"new_state": {
106107
"value": {
107108
"catalog_name": "test_catalog_[UNIQUE_NAME]",
@@ -182,9 +183,8 @@ Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
182183
>>> [CLI] bundle deploy
183184
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
184185
Updated schemas.schema1
185-
Updated secrets.secret1
186186
Files: 1 uploaded, 0 deleted
187-
Resources: 0 created, 2 changed, 0 deleted, 1 unchanged
187+
Resources: 0 created, 1 changed, 0 deleted, 2 unchanged
188188

189189
>>> print_requests.py //unity-catalog
190190
{
@@ -243,6 +243,7 @@ Resources: 0 created, 2 changed, 0 deleted, 1 unchanged
243243
}
244244
],
245245
"action": "update_id",
246+
"state_only": true,
246247
"new_state": {
247248
"value": {
248249
"catalog_name": "test_catalog_renamed_[UNIQUE_NAME]",
@@ -384,10 +385,9 @@ Resources: 0 created, 2 changed, 0 deleted, 1 unchanged
384385
>>> [CLI] bundle deploy
385386
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
386387
Updated catalogs.catalog1
387-
Updated schemas.schema1
388388
Updated secrets.secret1
389389
Files: 1 uploaded, 0 deleted
390-
Resources: 0 created, 3 changed, 0 deleted, 0 unchanged
390+
Resources: 0 created, 2 changed, 0 deleted, 1 unchanged
391391

392392
>>> print_requests.py //unity-catalog
393393
{

‎bundle/direct/dresources/secret.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,16 @@ func (r *ResourceSecret) DoUpdate(ctx context.Context, id string, state *catalog
104104
return remapSecretRemote(response), nil
105105
}
106106

107-
// DoUpdateWithID re-keys the secret after its catalog or schema is renamed: UC moves the secret
108-
// with its parent. A secret cannot be renamed itself, so this is the only way its ID changes.
107+
// IDFromState returns the full name, which is the ID.
108+
func (*ResourceSecret) IDFromState(state *catalog.Secret) string {
109+
return state.CatalogName + "." + state.SchemaName + "." + state.Name
110+
}
111+
112+
// DoUpdateWithID updates a secret whose catalog or schema was renamed: UC moved the secret with its
113+
// parent, so it is addressed at its new ID. A secret cannot be renamed itself, so this is the only
114+
// way its ID changes.
109115
func (r *ResourceSecret) DoUpdateWithID(ctx context.Context, _ string, state *catalog.Secret, entry *PlanEntry) (string, *catalog.Secret, error) {
110-
newID := state.CatalogName + "." + state.SchemaName + "." + state.Name
111-
if entry.Changes.OnlyParentRenamed() {
112-
return newID, nil, nil
113-
}
116+
newID := r.IDFromState(state)
114117
remote, err := r.DoUpdate(ctx, newID, state, entry)
115118
return newID, remote, err
116119
}

‎libs/testserver/catalogs.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,6 @@ func (s *FakeWorkspace) moveCatalogChildren(oldCatalogName, newCatalogName strin
169169
secret.FullName = newCatalogName + "." + secret.SchemaName + "." + secret.Name
170170
s.UCSecrets[secret.FullName] = secret
171171
}
172-
for key, secret := range s.UCSecrets {
173-
if secret.CatalogName != oldCatalogName {
174-
continue
175-
}
176-
delete(s.UCSecrets, key)
177-
secret.CatalogName = newCatalogName
178-
secret.FullName = newCatalogName + "." + secret.SchemaName + "." + secret.Name
179-
s.UCSecrets[secret.FullName] = secret
180-
}
181172
}
182173

183174
// CatalogsDelete mirrors UC, where deleting a catalog with force deletes its schemas, volumes, registered models and secrets too.

‎libs/testserver/schemas.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,6 @@ func (s *FakeWorkspace) moveSchemaChildren(catalogName, oldSchemaName, newSchema
143143
secret.FullName = catalogName + "." + newSchemaName + "." + secret.Name
144144
s.UCSecrets[secret.FullName] = secret
145145
}
146-
for key, secret := range s.UCSecrets {
147-
if secret.CatalogName != catalogName || secret.SchemaName != oldSchemaName {
148-
continue
149-
}
150-
delete(s.UCSecrets, key)
151-
secret.SchemaName = newSchemaName
152-
secret.FullName = catalogName + "." + newSchemaName + "." + secret.Name
153-
s.UCSecrets[secret.FullName] = secret
154-
}
155146
}
156147

157148
// SchemasDelete mirrors UC, where deleting a schema with force deletes the volumes, registered models and secrets in it too.

0 commit comments

Comments
 (0)