Skip to content

Commit

Permalink
Uses newURL instead of resolvedURL in update resource.
Browse files Browse the repository at this point in the history
  • Loading branch information
anvial committed Feb 23, 2024
1 parent f4fbfa1 commit 0561709
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions internal/juju/applications.go
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,6 @@ func (c applicationsClient) UpdateApplication(input *UpdateApplicationInput) err
// ordering will help to prevent issues with the configuration parsing.
if input.Revision != nil || input.Channel != "" {
setCharmConfig, err := c.computeSetCharmConfig(input, applicationAPIClient, charmsAPIClient, resourcesAPIClient)
c.Tracef("SetCharmConfig", map[string]interface{}{"setCharmConfig": setCharmConfig})
if err != nil {
return err
}
Expand Down Expand Up @@ -1013,18 +1012,18 @@ func (c applicationsClient) computeSetCharmConfig(
}
}

resolvedURL, resolvedOrigin, _, err := resolveCharm(charmsAPIClient, newURL, newOrigin)
_, resolvedOrigin, _, err := resolveCharm(charmsAPIClient, newURL, newOrigin)
if err != nil {
return nil, err
}

resultOrigin, err := charmsAPIClient.AddCharm(resolvedURL, resolvedOrigin, false)
resultOrigin, err := charmsAPIClient.AddCharm(newURL, resolvedOrigin, false)
if err != nil {
return nil, err
}

apiCharmID := apiapplication.CharmID{
URL: resolvedURL,
URL: newURL,
Origin: resultOrigin,
}

Expand Down

0 comments on commit 0561709

Please sign in to comment.