Skip to content

Commit 938e9ca

Browse files
Xiaoyi Hegovindrao55
authored andcommitted
fix marketplace provider bug
1 parent fc66dc8 commit 938e9ca

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

examples/marketplace/main.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ resource "oci_marketplace_listing_package_agreement" "test_listing_package_agree
4242
agreement_id = data.oci_marketplace_listing_package_agreements.test_listing_package_agreements.agreements[0].id
4343
listing_id = data.oci_marketplace_listing.test_listing.id
4444
package_version = data.oci_marketplace_listing.test_listing.default_package_version
45+
46+
#Optional
47+
compartment_id = var.compartment_ocid
4548
}
4649

4750
data "oci_marketplace_listing_package_agreements" "test_listing_package_agreements" {

oci/marketplace_listing_package_agreement_resource.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,15 @@ func MarketplaceListingPackageAgreementResource() *schema.Resource {
3535
Required: true,
3636
ForceNew: true,
3737
},
38-
// Computed
39-
"author": {
38+
// Optional
39+
"compartment_id": {
4040
Type: schema.TypeString,
41+
Optional: true,
4142
Computed: true,
43+
ForceNew: true,
4244
},
43-
"compartment_id": {
45+
// Computed
46+
"author": {
4447
Type: schema.TypeString,
4548
Computed: true,
4649
},
@@ -110,6 +113,11 @@ func (s *MarketplaceListingPackageAgreementResourceCrud) Create() error {
110113
request.PackageVersion = &tmp
111114
}
112115

116+
if compartmentId, ok := s.D.GetOkExists("compartment_id"); ok {
117+
tmp := compartmentId.(string)
118+
request.CompartmentId = &tmp
119+
}
120+
113121
request.RequestMetadata.RetryPolicy = GetRetryPolicy(false, "marketplace")
114122

115123
response, err := s.Client.GetAgreement(context.Background(), request)

oci/marketplace_listing_package_agreement_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ var (
1717
"agreement_id": Representation{RepType: Required, Create: `${data.oci_marketplace_listing_package_agreements.test_listing_package_agreements.agreements.0.id}`},
1818
"listing_id": Representation{RepType: Required, Create: `${data.oci_marketplace_listing.test_listing.id}`},
1919
"package_version": Representation{RepType: Required, Create: `${data.oci_marketplace_listing.test_listing.default_package_version}`},
20+
"compartment_id": Representation{RepType: Optional, Create: `${var.compartment_id}`},
2021
}
2122

2223
listingPackageAgreementDataSourceRepresentation = map[string]interface{}{

website/docs/r/marketplace_listing_package_agreement.html.markdown

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ resource "oci_marketplace_listing_package_agreement" "test_listing_package_agree
2222
agreement_id = oci_marketplace_agreement.test_agreement.id
2323
listing_id = oci_marketplace_listing.test_listing.id
2424
package_version = var.listing_package_agreement_package_version
25+
26+
#Optional
27+
compartment_id = var.compartment_id
2528
}
2629
```
2730

@@ -32,7 +35,7 @@ The following arguments are supported:
3235
* `agreement_id` - (Required) The unique identifier for the agreement.
3336
* `listing_id` - (Required) The unique identifier for the listing.
3437
* `package_version` - (Required) The version of the package. Package versions are unique within a listing.
35-
38+
* `compartment_id` - (Optional) The unique identifier for the compartment, required in gov regions.
3639

3740
## Attributes Reference
3841

0 commit comments

Comments
 (0)