r/marketplace_agreement: fixing the Resource ID / downgrading to use …

…API Version `2015-06-01` (#22264)
hashicorp · Jun 23, 2023 · f3f1c0b · f3f1c0b
1 parent 4c5880b
commit f3f1c0b
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 63 deletions.
diff --git a/internal/services/compute/client/client.go b/internal/services/compute/client/client.go
@@ -20,7 +20,7 @@ import (
 	"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-03/galleries"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-03/galleryapplications"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2022-03-03/galleryapplicationversions"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2021-01-01/agreements"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2015-06-01/agreements"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 	"github.com/tombuildsstuff/kermit/sdk/compute/2023-03-01/compute"
 )

diff --git a/internal/services/compute/linux_virtual_machine_resource_images_test.go b/internal/services/compute/linux_virtual_machine_resource_images_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2021-01-01/agreements"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2015-06-01/agreements"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/compute/linux_virtual_machine_scale_set_images_resource_test.go b/internal/services/compute/linux_virtual_machine_scale_set_images_resource_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2021-01-01/agreements"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2015-06-01/agreements"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/compute/marketplace_agreement_data_source.go b/internal/services/compute/marketplace_agreement_data_source.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2021-01-01/agreements"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2015-06-01/agreements"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
@@ -59,14 +59,16 @@ func dataSourceMarketplaceAgreementRead(d *pluginsdk.ResourceData, meta interfac
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id := agreements.NewOfferPlanID(subscriptionId, d.Get("publisher").(string), d.Get("offer").(string), d.Get("plan").(string))
+	// The Resource ID for this is the Plan ID, however we have to retrieve information about the signed plan
+	id := agreements.NewPlanID(subscriptionId, d.Get("publisher").(string), d.Get("offer").(string), d.Get("plan").(string))
 
 	log.Printf("[DEBUG] retrieving %s", id)
 
-	term, err := client.MarketplaceAgreementsGet(ctx, id)
+	getId := agreements.NewOfferPlanID(id.SubscriptionId, id.PublisherId, id.OfferId, id.PlanId)
+	term, err := client.MarketplaceAgreementsGet(ctx, getId)
 	if err != nil {
-		if !response.WasNotFound(term.HttpResponse) {
-			return fmt.Errorf("%s was not found", id)
+		if response.WasNotFound(term.HttpResponse) {
+			return fmt.Errorf("%s was not found", getId)
 		}
 
 		return fmt.Errorf("retrieving %s: %s", id, err)

diff --git a/internal/services/compute/marketplace_agreement_resource.go b/internal/services/compute/marketplace_agreement_resource.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2021-01-01/agreements"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2015-06-01/agreements"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
@@ -21,7 +21,7 @@ func resourceMarketplaceAgreement() *pluginsdk.Resource {
 		Read:   resourceMarketplaceAgreementRead,
 		Delete: resourceMarketplaceAgreementDelete,
 		Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error {
-			_, err := agreements.ParseOfferPlanID(id)
+			_, err := agreements.ParsePlanID(id)
 			return err
 		}),
 
@@ -73,11 +73,12 @@ func resourceMarketplaceAgreementCreateUpdate(d *pluginsdk.ResourceData, meta in
 	subscriptionId := meta.(*clients.Client).Account.SubscriptionId
 	defer cancel()
 
-	id := agreements.NewOfferPlanID(subscriptionId, d.Get("publisher").(string), d.Get("offer").(string), d.Get("plan").(string))
+	id := agreements.NewPlanID(subscriptionId, d.Get("publisher").(string), d.Get("offer").(string), d.Get("plan").(string))
 
 	log.Printf("[DEBUG] retrieving %s", id)
 
-	term, err := client.MarketplaceAgreementsGet(ctx, id)
+	agreementId := agreements.NewOfferPlanID(id.SubscriptionId, id.PublisherId, id.OfferId, id.PlanId)
+	term, err := client.MarketplaceAgreementsGet(ctx, agreementId)
 	if err != nil {
 		if !response.WasNotFound(term.HttpResponse) {
 			return fmt.Errorf("retrieving %s: %s", id, err)
@@ -93,16 +94,10 @@ func resourceMarketplaceAgreementCreateUpdate(d *pluginsdk.ResourceData, meta in
 		}
 	}
 	if accepted {
-		agreement, err := client.MarketplaceAgreementsGet(ctx, id)
-		if err != nil {
-			if !response.WasNotFound(agreement.HttpResponse) {
-				return fmt.Errorf("retrieving %s: %s", id, err)
-			}
-		}
 		return tf.ImportAsExistsError("azurerm_marketplace_agreement", id.ID())
 	}
 
-	resp, err := client.MarketplaceAgreementsGet(ctx, id)
+	resp, err := client.MarketplaceAgreementsGet(ctx, agreementId)
 	if err != nil {
 		return fmt.Errorf("retrieving %s: %s", id, err)
 	}
@@ -119,7 +114,7 @@ func resourceMarketplaceAgreementCreateUpdate(d *pluginsdk.ResourceData, meta in
 	terms.Properties.Accepted = utils.Bool(true)
 
 	log.Printf("[DEBUG] Accepting the Marketplace Terms for %s", id)
-	if _, err := client.MarketplaceAgreementsCreate(ctx, id, *terms); err != nil {
+	if _, err := client.MarketplaceAgreementsCreate(ctx, agreementId, *terms); err != nil {
 		return fmt.Errorf("accepting Terms for %s: %s", id, err)
 	}
 	log.Printf("[DEBUG] Accepted the Marketplace Terms for %s", id)
@@ -134,12 +129,13 @@ func resourceMarketplaceAgreementRead(d *pluginsdk.ResourceData, meta interface{
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := agreements.ParseOfferPlanID(d.Id())
+	id, err := agreements.ParsePlanID(d.Id())
 	if err != nil {
 		return err
 	}
 
-	term, err := client.MarketplaceAgreementsGet(ctx, *id)
+	agreementId := agreements.NewOfferPlanID(id.SubscriptionId, id.PublisherId, id.OfferId, id.PlanId)
+	term, err := client.MarketplaceAgreementsGet(ctx, agreementId)
 	if err != nil {
 		if response.WasNotFound(term.HttpResponse) {
 			log.Printf("[DEBUG] The Marketplace Terms was not found for %s", id)
@@ -172,13 +168,12 @@ func resourceMarketplaceAgreementDelete(d *pluginsdk.ResourceData, meta interfac
 	ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id, err := agreements.ParseOfferPlanID(d.Id())
+	id, err := agreements.ParsePlanID(d.Id())
 	if err != nil {
 		return err
 	}
-	idCancel := agreements.NewPlanID(id.SubscriptionId, id.PublisherId, id.OfferId, id.PlanId)
 
-	if _, err = client.MarketplaceAgreementsCancel(ctx, idCancel); err != nil {
+	if _, err = client.MarketplaceAgreementsCancel(ctx, *id); err != nil {
 		return fmt.Errorf("cancelling agreement for %s: %s", *id, err)
 	}
 

diff --git a/internal/services/compute/marketplace_agreement_resource_test.go b/internal/services/compute/marketplace_agreement_resource_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2021-01-01/agreements"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2015-06-01/agreements"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
@@ -68,12 +68,13 @@ func TestAccMarketplaceAgreement_requiresImport(t *testing.T) {
 }
 
 func (t MarketplaceAgreementResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
-	id, err := agreements.ParseOfferPlanID(state.ID)
+	id, err := agreements.ParsePlanID(state.ID)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := clients.Compute.MarketplaceAgreementsClient.MarketplaceAgreementsGet(ctx, *id)
+	agreementId := agreements.NewOfferPlanID(id.SubscriptionId, id.PublisherId, id.OfferId, id.PlanId)
+	resp, err := clients.Compute.MarketplaceAgreementsClient.MarketplaceAgreementsGet(ctx, agreementId)
 	if err != nil {
 		return nil, fmt.Errorf("retrieving Compute Marketplace Agreement %q", id)
 	}
@@ -136,7 +137,6 @@ func (r MarketplaceAgreementResource) cancelExistingAgreement(offer string) acce
 
 		idGet := agreements.NewOfferPlanID(subscriptionId, "barracudanetworks", offer, "hourly")
 		idCancel := agreements.NewPlanID(subscriptionId, "barracudanetworks", offer, "hourly")
-
 		existing, err := client.MarketplaceAgreementsGet(ctx, idGet)
 		if err != nil {
 			return err

diff --git a/internal/services/compute/windows_virtual_machine_resource_images_test.go b/internal/services/compute/windows_virtual_machine_resource_images_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
 	"github.com/hashicorp/go-azure-sdk/resource-manager/compute/2021-11-01/virtualmachines"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2021-01-01/agreements"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2015-06-01/agreements"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/compute/windows_virtual_machine_scale_set_images_resource_test.go b/internal/services/compute/windows_virtual_machine_scale_set_images_resource_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2021-01-01/agreements"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2015-06-01/agreements"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/...eordering/2021-01-01/agreements/README.md → ...eordering/2015-06-01/agreements/README.md b/...eordering/2021-01-01/agreements/README.md → ...eordering/2015-06-01/agreements/README.md
diff --git a/...eordering/2021-01-01/agreements/client.go → ...eordering/2015-06-01/agreements/client.go b/...eordering/2021-01-01/agreements/client.go → ...eordering/2015-06-01/agreements/client.go
diff --git a/...dering/2021-01-01/agreements/constants.go → ...dering/2015-06-01/agreements/constants.go b/...dering/2021-01-01/agreements/constants.go → ...dering/2015-06-01/agreements/constants.go
diff --git a/...ing/2021-01-01/agreements/id_offerplan.go → ...ing/2015-06-01/agreements/id_offerplan.go b/...ing/2021-01-01/agreements/id_offerplan.go → ...ing/2015-06-01/agreements/id_offerplan.go
diff --git a/...ordering/2021-01-01/agreements/id_plan.go → ...ordering/2015-06-01/agreements/id_plan.go b/...ordering/2021-01-01/agreements/id_plan.go → ...ordering/2015-06-01/agreements/id_plan.go
diff --git a/...nts/method_marketplaceagreementscancel.go → ...nts/method_marketplaceagreementscancel.go b/...nts/method_marketplaceagreementscancel.go → ...nts/method_marketplaceagreementscancel.go
diff --git a/...nts/method_marketplaceagreementscreate.go → ...nts/method_marketplaceagreementscreate.go b/...nts/method_marketplaceagreementscreate.go → ...nts/method_marketplaceagreementscreate.go
diff --git a/...ements/method_marketplaceagreementsget.go → ...ements/method_marketplaceagreementsget.go b/...ements/method_marketplaceagreementsget.go → ...ements/method_marketplaceagreementsget.go
diff --git a/...thod_marketplaceagreementsgetagreement.go → ...thod_marketplaceagreementsgetagreement.go b/...thod_marketplaceagreementsgetagreement.go → ...thod_marketplaceagreementsgetagreement.go
diff --git a/...ments/method_marketplaceagreementslist.go → ...ments/method_marketplaceagreementslist.go b/...ments/method_marketplaceagreementslist.go → ...ments/method_marketplaceagreementslist.go
diff --git a/...ments/method_marketplaceagreementssign.go → ...ments/method_marketplaceagreementssign.go b/...ments/method_marketplaceagreementssign.go → ...ments/method_marketplaceagreementssign.go
diff --git a/...1/agreements/model_agreementproperties.go → ...1/agreements/model_agreementproperties.go b/...1/agreements/model_agreementproperties.go → ...1/agreements/model_agreementproperties.go
diff --git a/...re-sdk/resource-manager/marketplaceordering/2015-06-01/agreements/model_agreementterms.go b/...re-sdk/resource-manager/marketplaceordering/2015-06-01/agreements/model_agreementterms.go
diff --git a/...agreements/model_oldagreementtermslist.go → ...01/agreements/model_agreementtermslist.go b/...agreements/model_oldagreementtermslist.go → ...01/agreements/model_agreementtermslist.go
diff --git a/...greements/model_oldagreementproperties.go → ...greements/model_oldagreementproperties.go b/...greements/model_oldagreementproperties.go → ...greements/model_oldagreementproperties.go
diff --git a/...-01/agreements/model_oldagreementterms.go → ...-01/agreements/model_oldagreementterms.go b/...-01/agreements/model_oldagreementterms.go → ...-01/agreements/model_oldagreementterms.go
diff --git a/...ordering/2021-01-01/agreements/version.go → ...ordering/2015-06-01/agreements/version.go b/...ordering/2021-01-01/agreements/version.go → ...ordering/2015-06-01/agreements/version.go
diff --git a/...re-sdk/resource-manager/marketplaceordering/2021-01-01/agreements/model_agreementterms.go b/...re-sdk/resource-manager/marketplaceordering/2021-01-01/agreements/model_agreementterms.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -425,7 +425,7 @@ github.com/hashicorp/go-azure-sdk/resource-manager/mariadb/2018-06-01/databases
 github.com/hashicorp/go-azure-sdk/resource-manager/mariadb/2018-06-01/firewallrules
 github.com/hashicorp/go-azure-sdk/resource-manager/mariadb/2018-06-01/servers
 github.com/hashicorp/go-azure-sdk/resource-manager/mariadb/2018-06-01/virtualnetworkrules
-github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2021-01-01/agreements
+github.com/hashicorp/go-azure-sdk/resource-manager/marketplaceordering/2015-06-01/agreements
 github.com/hashicorp/go-azure-sdk/resource-manager/media/2021-11-01
 github.com/hashicorp/go-azure-sdk/resource-manager/media/2021-11-01/accountfilters
 github.com/hashicorp/go-azure-sdk/resource-manager/media/2021-11-01/accounts