Skip to content

fix: If not deleting, update with empty CA alias then delete #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

fix: If not deleting, update with empty CA alias then delete #76

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11b21ce
fix: If not deleting, update with empty CA alias then delete
hawksight Jun 9, 2025
2273f1a
fix: Move errors about until it sorta works
hawksight Jun 9, 2025
24ba5e5
fix: move some calls, now things work consistently
hawksight Jun 9, 2025
7d6bc92
chore: Update comment and run docs generation update
hawksight Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 78 additions & 6 deletions internal/provider/application_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ func (r *applicationResource) Schema(_ context.Context, _ resource.SchemaRequest
MarkdownDescription: "A map of owner ids, see example for format",
},
"ca_template_aliases": schema.MapAttribute{
Required: true,
// Only required for create operations. In order to update with blank map, this must be optional.
Optional: true,
ElementType: types.StringType,
MarkdownDescription: "CA Template alias-to-id mapping for templates available to this application, see example for format",
},
Expand Down Expand Up @@ -271,7 +272,7 @@ func (r *applicationResource) Update(ctx context.Context, req resource.UpdateReq
}

func (r *applicationResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
var state applicationResourceModel
var plan, state applicationResourceModel

diags := req.State.Get(ctx, &state)
resp.Diagnostics.Append(diags...)
Expand All @@ -281,10 +282,81 @@ func (r *applicationResource) Delete(ctx context.Context, req resource.DeleteReq

err := r.client.DeleteApplication(state.ID.ValueString())
if err != nil {
resp.Diagnostics.AddError(
"Error Deleting Application",
"Could not delete Application ID "+state.ID.ValueString()+": "+err.Error(),
)
// Just take the error out for now, at least until we try below...
// resp.Diagnostics.AddError(
// "Error Deleting Application",
// "Could not delete Application ID "+state.ID.ValueString()+": "+err.Error(),
// )

// TODO: determine the error code here to kick in the next bit of logic.
// Just assume whatever the error, lets update the app anyway to remove CA Templates.
owners := []tlspc.OwnerAndType{}
for _, v := range state.Owners {
m := v.Elements()
// TODO: Work out how you're supposed to get an unquoted string out
kind := strings.Trim(m["type"].String(), `"`)
ownerId := strings.Trim(m["owner"].String(), `"`)
if kind != "USER" && kind != "TEAM" {
resp.Diagnostics.AddError(
"Error creating application",
"Could not create application, unsupported owner type: "+kind,
)
return
}
if ownerId == "" {
resp.Diagnostics.AddError(
"Error creating application",
"Could not create application, undefined owner",
)
return
}
owner := tlspc.OwnerAndType{
ID: ownerId,
Type: kind,
}
owners = append(owners, owner)
}

// Set this as: {"":""} to use to overwrite the state
aliases := map[string]string{}

// for k, v := range state.CATemplateAliases.Elements() {
// aliases[k] = strings.Trim(v.String(), `"`)
// }

application := tlspc.Application{
ID: state.ID.ValueString(),
Name: state.Name.ValueString(),
Owners: owners,
CertificateTemplates: aliases,
}

updated, err := r.client.UpdateApplication(application)
if err != nil {
resp.Diagnostics.AddError(
"Error updating application",
"Could not update application, unexpected error: "+err.Error(),
)
return
}
plan.ID = types.StringValue(updated.ID)
diags = resp.State.Set(ctx, plan)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd hazard a guess that your problem is here, you don't have a fully instantiated plan - just an otherwise empty applicationResourceModel with the ID attribute set, and so it might be failing whatever schema validation checks that are in State.Set.

resp.Diagnostics.Append(diags...)

diags := req.State.Get(ctx, &state)
resp.Diagnostics.Append(diags...)
if resp.Diagnostics.HasError() {
return
}

errr := r.client.DeleteApplication(state.ID.ValueString())
if errr != nil {
resp.Diagnostics.AddError(
"Error Deleting Application",
"Could not delete Application ID "+state.ID.ValueString()+": "+err.Error(),
)
}

return
}
}
Expand Down
Loading