Skip to content
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

Crash Fix: azurerm_marketplace_agreement #14614

Merged
merged 2 commits into from
Dec 15, 2021
Merged

Crash Fix: azurerm_marketplace_agreement #14614

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
937ad62
Fix crash from import error
mbfrahry Dec 14, 2021
5310db6
Update internal/services/compute/marketplace_agreement_resource.go
mbfrahry Dec 15, 2021
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
38 changes: 16 additions & 22 deletions internal/services/compute/marketplace_agreement_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,17 @@ func resourceMarketplaceAgreement() *pluginsdk.Resource {
func resourceMarketplaceAgreementCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Compute.MarketplaceAgreementsClient
ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d)
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
defer cancel()

offer := d.Get("offer").(string)
plan := d.Get("plan").(string)
publisher := d.Get("publisher").(string)
id := parse.NewPlanID(subscriptionId, d.Get("publisher").(string), d.Get("offer").(string), d.Get("plan").(string))

log.Printf("[DEBUG] Retrieving the Marketplace Terms for Publisher %q / Offer %q / Plan %q", publisher, offer, plan)
log.Printf("[DEBUG] retrieving %s", id)

term, err := client.Get(ctx, publisher, offer, plan)
term, err := client.Get(ctx, id.AgreementName, id.OfferName, id.Name)
if err != nil {
if !utils.ResponseWasNotFound(term.Response) {
return fmt.Errorf("retrieving the Marketplace Terms for Publisher %q / Offer %q / Plan %q: %s", publisher, offer, plan, err)
return fmt.Errorf("retrieving %s: %s", id, err)
}
}

Expand All @@ -92,37 +91,32 @@ func resourceMarketplaceAgreementCreateUpdate(d *pluginsdk.ResourceData, meta in
}

if accepted {
agreement, err := client.GetAgreement(ctx, publisher, offer, plan)
agreement, err := client.GetAgreement(ctx, id.AgreementName, id.OfferName, id.Name)
if err != nil {
if !utils.ResponseWasNotFound(agreement.Response) {
return fmt.Errorf("retrieving agreement for Publisher %q / Offer %q / Plan %q: %s", publisher, offer, plan, err)
return fmt.Errorf("retrieving %s: %s", id, err)
}
}
return tf.ImportAsExistsError("azurerm_marketplace_agreement", *agreement.ID)
return tf.ImportAsExistsError("azurerm_marketplace_agreement", id.ID())
}

terms, err := client.Get(ctx, publisher, offer, plan)
terms, err := client.Get(ctx, id.AgreementName, id.OfferName, id.Name)
if err != nil {
return fmt.Errorf("retrieving the Marketplace Terms for Publisher %q / Offer %q / Plan %q: %s", publisher, offer, plan, err)
return fmt.Errorf("retrieving %s: %s", id, err)
}
if terms.AgreementProperties == nil {
return fmt.Errorf("retrieving the Marketplace Terms for Publisher %q / Offer %q / Plan %q: AgreementProperties was nil", publisher, offer, plan)
return fmt.Errorf("retrieving %s: AgreementProperties was nil", id)
}

terms.AgreementProperties.Accepted = utils.Bool(true)

log.Printf("[DEBUG] Accepting the Marketplace Terms for Publisher %q / Offer %q / Plan %q", publisher, offer, plan)
if _, err := client.Create(ctx, publisher, offer, plan, terms); err != nil {
return fmt.Errorf("accepting Terms for Publisher %q / Offer %q / Plan %q: %s", publisher, offer, plan, err)
}
log.Printf("[DEBUG] Accepted the Marketplace Terms for Publisher %q / Offer %q / Plan %q", publisher, offer, plan)

agreement, err := client.GetAgreement(ctx, publisher, offer, plan)
if err != nil {
return fmt.Errorf("retrieving agreement for Publisher %q / Offer %q / Plan %q: %s", publisher, offer, plan, err)
log.Printf("[DEBUG] Accepting the Marketplace Terms for %s", id)
if _, err := client.Create(ctx, id.AgreementName, id.OfferName, id.Name, terms); err != nil {
return fmt.Errorf("accepting Terms for %s: %s", id, err)
}
log.Printf("[DEBUG] Accepted the Marketplace Terms for %s", id)

d.SetId(*agreement.ID)
d.SetId(id.ID())

return resourceMarketplaceAgreementRead(d, meta)
}
Expand Down